Skip to content

Commit

Permalink
[Fix] :: all
Browse files Browse the repository at this point in the history
studentId, job, attendance save by no authenticate
  • Loading branch information
heunseoRyu committed May 22, 2024
1 parent b2c27f9 commit faecd09
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.beep.beep.domain.beep.presentation;

import com.beep.beep.domain.beep.presentation.dto.request.SaveAttendanceRequest;
import com.beep.beep.domain.beep.service.BeepService;
import com.beep.beep.domain.beep.presentation.dto.request.EnterRoomRequest;
import com.beep.beep.domain.beep.presentation.dto.request.ExitRoomRequest;
Expand Down Expand Up @@ -32,8 +33,10 @@ public class BeepController {
@PostMapping("/attendances")
@ResponseStatus(HttpStatus.CREATED)
@Operation(summary = "출석정보 초기화", description = "출석정보 초기값을 설정합니다.(student)")
public void saveAttendance() {
beepService.saveAttendance();
public void saveAttendance(
@RequestBody SaveAttendanceRequest request
) {
beepService.saveAttendance(request);
}

@PutMapping("/enter")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.beep.beep.domain.beep.presentation.dto.request;


import lombok.Getter;

@Getter
public class SaveAttendanceRequest {
private String email;
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.beep.beep.domain.beep.exception.RoomNotExistsException;
import com.beep.beep.domain.beep.mapper.BeepMapper;
import com.beep.beep.domain.beep.presentation.dto.Attendance;
import com.beep.beep.domain.beep.presentation.dto.request.SaveAttendanceRequest;
import com.beep.beep.domain.student.domain.repository.StudentIdRepository;
import com.beep.beep.domain.beep.presentation.dto.request.EnterRoomRequest;
import com.beep.beep.domain.beep.presentation.dto.request.ExitRoomRequest;
Expand Down Expand Up @@ -36,8 +37,8 @@ public class BeepService {
private final UserRepository userRepository;
private final RoomRepositoryCustom roomRepositoryCustom;

public void saveAttendance(){
attendanceRepository.save(beepMapper.toAttendance(userUtil.getCurrentUser()));
public void saveAttendance(SaveAttendanceRequest request){
attendanceRepository.save(beepMapper.toAttendance(userUtil.findUserByEmail(request.getEmail())));
}

@Transactional
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package com.beep.beep.domain.student.domain.repository.querydsl;

import com.beep.beep.domain.beep.domain.RoomEntity;
import com.beep.beep.domain.student.domain.QStudentIdEntity;
import com.beep.beep.domain.student.domain.StudentIdEntity;
import com.querydsl.core.types.Projections;
import com.querydsl.jpa.impl.JPAQueryFactory;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

@Getter
public class StudentIdRequest {
private String email;

private int grade;
private int cls;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class StudentService {
private final UserRepository userRepository;

public void saveStudentId(StudentIdRequest request){
studentIdRepository.save(studentMapper.toStudentId(userUtil.getCurrentUser(),request));
studentIdRepository.save(studentMapper.toStudentId(userUtil.findUserByEmail(request.getEmail()),request));
}

public List<AdminStudentResponse> studentList(){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class TeacherController {
public void saveJob(
@RequestBody SaveJobRequest request
){
System.out.println("일단 왔음");
teacherService.saveJob(request);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

@Getter
public class SaveJobRequest {
private String email;
private String job;
private String department;
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ public class TeacherService {
private final UserUtil userUtil;

public void saveJob(SaveJobRequest request){
User user = userUtil.getCurrentUser();
findByUserIdx(user.getIdx());
jobRepository.save(teacherMapper.toJob(user,request));
jobRepository.save(teacherMapper.toJob(userUtil.findUserByEmail(request.getEmail()),request));
}

public List<AdminTeacherResponse> teacherList() {
Expand All @@ -42,9 +40,7 @@ public List<AdminTeacherResponse> teacherList() {
}

public TeacherInfoResponse getTeacherInfo(){
System.out.println("되나?");
User user = userUtil.getCurrentUser();
System.out.println("진짜?");
return TeacherMapper.toTeacherInfoDto(user, findByUserIdx(user.getIdx()));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public SecurityFilterChain configure(HttpSecurity http) throws Exception {
.requestMatchers("/beep/enter").hasAuthority(STUDENT.getAuthority())
.requestMatchers("/beep/exit").hasAuthority(STUDENT.getAuthority())
.requestMatchers("/beep/rooms").hasAuthority(TEACHER.getAuthority())
.requestMatchers(HttpMethod.POST,"/beep/attendances").hasAuthority(STUDENT.getAuthority())
.requestMatchers(HttpMethod.POST,"/beep/attendances").permitAll()
.requestMatchers(HttpMethod.GET,"/beep/attendances").hasAuthority(TEACHER.getAuthority())

.requestMatchers("/teachers/job").permitAll()
Expand Down

0 comments on commit faecd09

Please sign in to comment.