Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/domain 도메인 정리 및 권한 설정 #16

Merged
merged 18 commits into from
Apr 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions src/main/java/com/beep/beep/domain/TestController.java

This file was deleted.

This file was deleted.

52 changes: 0 additions & 52 deletions src/main/java/com/beep/beep/domain/admin/service/AdminService.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.beep.beep.domain.auth.presentation;


import com.beep.beep.domain.auth.presentation.dto.request.AdminSignUpRequest;
import com.beep.beep.domain.auth.presentation.dto.request.TeacherSignUpRequest;
import com.beep.beep.domain.auth.presentation.dto.request.SignInRequest;
import com.beep.beep.domain.auth.presentation.dto.request.StudentSignUpRequest;
import com.beep.beep.domain.auth.presentation.dto.request.TokenRefreshRequest;
Expand All @@ -27,31 +29,50 @@
@RestController
@RequestMapping(value = "/auth")
@RequiredArgsConstructor
@Tag(name = " Total Server (Auth)")
@Tag(name = "AUTH", description = "auth API")
public class AuthController {

private final AuthService authService;

@GetMapping("/{id}")
@ResponseStatus(HttpStatus.OK)
@Operation(summary = "Student Id-Check API")
@Operation(summary = "아이디 확인", description = "아이디 존재여부 확인 (unauthenticated)")
public void studentIdCheck(
@PathVariable String id
) {
authService.idCheck(id);
}

@PostMapping("/sign-up")
@PostMapping("/student/sign-up")
@ResponseStatus(HttpStatus.CREATED)
@Operation(summary = "Student Sign-UP API")
@Operation(summary = "학생 회원가입", description = "학생계정으로 회원가입합니다. (unauthenticated)")
public void studentSignUp(
@RequestBody StudentSignUpRequest request
){
authService.studentSignUp(request);
}

@PostMapping("/teacher/sign-up")
@ResponseStatus(HttpStatus.CREATED)
@Operation(summary = "선생님 회원가입", description = "선생님계정으로 회원가입합니다. (unauthenticated)")
public void studentSignUp(
@RequestBody TeacherSignUpRequest request
){
authService.teacherSignUp(request);
}

@PostMapping("/admin/sign-up")
@ResponseStatus(HttpStatus.CREATED)
@Operation(summary = "관리자 회원가입", description = "관리자계정으로 회원가입합니다. (unauthenticated)")
public void adminSignUp(
@RequestBody AdminSignUpRequest request
){
authService.adminSignUp(request);
}

@PostMapping("/sign-in")
@Operation(summary = "Total Sign-In API")
@ResponseStatus(HttpStatus.CREATED)
@Operation(summary = "로그인", description = "모든 계정이 이 요청을 통해 로그인 합니다. (unauthenticated)")
public SignInResponse signIn(
@Validated @RequestBody SignInRequest request
) {
Expand All @@ -60,7 +81,7 @@ public SignInResponse signIn(

@GetMapping("/refresh")
@ResponseStatus(HttpStatus.OK)
@Operation(summary = "Total Token-Refresh API")
@Operation(summary = "토큰 재발급", description = "access 토큰 재발급 (student,teacher,admin)")
public TokenRefreshResponse refresh(
@Validated @RequestBody TokenRefreshRequest request
) {
Expand All @@ -69,7 +90,7 @@ public TokenRefreshResponse refresh(

@GetMapping("/{email}")
@ResponseStatus(HttpStatus.OK)
@Operation(summary = "Get UserId API")
@Operation(summary = "아이디 찾기", description = "검증된 이메일로 아이디를 찾습니다. (unauthenticated)")
public UserIdResponse findId(
@PathVariable String email
){
Expand All @@ -78,7 +99,7 @@ public UserIdResponse findId(

@GetMapping("/email/id")
@ResponseStatus(HttpStatus.OK)
@Operation(summary = "Check Id-Email API")
@Operation(summary = "이메일-유저아이디에 일치하는 유저존재여부 조회", description = "이메일-유저아이디에 일치하는 유저가 존재하는지를 조회합니다.(unauthenticated)")
public void checkIdEmail(
@RequestParam String email,
@RequestParam String id
Expand All @@ -88,7 +109,7 @@ public void checkIdEmail(

@PutMapping("/pw")
@ResponseStatus(HttpStatus.OK)
@Operation(summary = "Changing Password API")
@Operation(summary = "비밀번호 찾기", description = "아이디와 변경할 비번 값을 받아 비번을 변경해줍니다.(unauthenticated)")
public void changePw(
@RequestBody ChangePwRequest request
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.beep.beep.domain.auth.presentation.dto.request;


import com.beep.beep.domain.user.domain.User;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

import static com.beep.beep.domain.user.domain.enums.UserType.ADMIN;

@Getter
@Builder
@AllArgsConstructor
public class AdminSignUpRequest {
private String id;
private String password;
private String email;
private String name;

public User toEntity(String encryptedPassword){
return User.builder()
.id(this.id)
.password(encryptedPassword)
.email(this.email)
.name(this.name)
.authority(ADMIN).build();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import com.beep.beep.domain.beep.domain.Attendance;
import com.beep.beep.domain.student.domain.StudentId;
import com.beep.beep.domain.user.domain.User;
import com.beep.beep.domain.user.domain.enums.UserType;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import static com.beep.beep.domain.user.domain.enums.UserType.STUDENT;

@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
Expand All @@ -27,7 +27,7 @@ public User toUserEntity(String encodedPassword){
.password(encodedPassword)
.email(this.email)
.name(this.name)
.authority(UserType.ROLE_STUDENT).build();
.authority(STUDENT).build();
}

public StudentId toStudentIdEntity(User user) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.beep.beep.domain.admin.presentation.dto.request;
package com.beep.beep.domain.auth.presentation.dto.request;

import com.beep.beep.domain.teacher.domain.Job;
import com.beep.beep.domain.user.domain.User;
Expand Down Expand Up @@ -26,7 +26,7 @@ public User toUserEntity(String encodedPassword){
.password(encodedPassword)
.email(this.email)
.name(this.name)
.authority(UserType.ROLE_TEACHER).build();
.authority(UserType.TEACHER).build();
}

public Job toJobEntity(User user) {
Expand Down
20 changes: 16 additions & 4 deletions src/main/java/com/beep/beep/domain/auth/service/AuthService.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package com.beep.beep.domain.auth.service;

import com.beep.beep.domain.auth.presentation.dto.request.AdminSignUpRequest;
import com.beep.beep.domain.auth.presentation.dto.request.TeacherSignUpRequest;
import com.beep.beep.domain.auth.presentation.dto.request.SignInRequest;
import com.beep.beep.domain.auth.presentation.dto.request.StudentSignUpRequest;
import com.beep.beep.domain.auth.presentation.dto.request.TokenRefreshRequest;
import com.beep.beep.domain.auth.presentation.dto.request.WithdrawalRequest;
import com.beep.beep.domain.auth.presentation.dto.response.SignInResponse;
import com.beep.beep.domain.auth.presentation.dto.response.TokenRefreshResponse;
import com.beep.beep.domain.beep.facade.BeepFacade;
import com.beep.beep.domain.student.facade.StudentFacade;
import com.beep.beep.domain.teacher.domain.facade.TeacherFacade;
import com.beep.beep.domain.user.domain.User;
import com.beep.beep.domain.user.domain.enums.UserType;
import com.beep.beep.domain.user.exception.PasswordWrongException;
Expand All @@ -32,6 +34,7 @@ public class AuthService {
private final JwtProvider jwtProvider;
private final UserFacade userFacade;
private final StudentFacade studentFacade;
private final TeacherFacade teacherFacade;
private final BeepFacade beepFacade;

public void idCheck(String id) {
Expand All @@ -46,15 +49,24 @@ public void studentSignUp(StudentSignUpRequest request){
beepFacade.save(request.toAttendanceEntity(user));
}

public void teacherSignUp(TeacherSignUpRequest request){
userFacade.save(request.toUserEntity(encoder.encode(request.getPassword())));
User user = userFacade.findUserById(request.getId());

teacherFacade.save(request.toJobEntity(user));
}

public void adminSignUp(AdminSignUpRequest request){
User user = request.toEntity(encoder.encode(request.getPassword()));
userFacade.save(user);
}

public SignInResponse signIn(SignInRequest request){
User user = userFacade.findUserById(request.getId());

if (!encoder.matches(request.getPassword(), user.getPassword()))
throw PasswordWrongException.EXCEPTION;

// String accessToken = jwtProvider.generateAccessToken(user.getEmail(),user.getAuthority());
// String refreshToken = jwtProvider.generateRefreshToken(user.getEmail(),user.getAuthority());

return SignInResponse.builder()
.accessToken(jwtProvider.generateAccessToken(user.getEmail(),user.getAuthority()))
.refreshToken(jwtProvider.generateRefreshToken(user.getEmail(),user.getAuthority()))
Expand Down
Loading
Loading