Merge pull request #257 from WE-ARE-RACCOONS/develop

Develop

src/main/java/com/postgraduate/domain/auth/presentation/AuthController.java

@@ -63,10 +63,6 @@ public ResponseDto<Void> logout(@AuthenticationPrincipal User user) {
         return ResponseDto.create(AUTH_DELETE.getCode(), LOGOUT_USER.getMessage());
     }
 
-    /**
-     * 우선 문의를 통해 탈퇴를 시켜준다 했으니 유저 토큰을 받을 수 없다
-     * 다만, userId를 통해 탈퇴를 처리시켜줄 때 그 어떤 보안 장치도 없다면 문제인 것 같으니 관리자의 권한으로 처리한다
-     */
     @PostMapping("/signout/{provider}/{userId}")
     @Operation(summary = "회원 탈퇴 | 관리자 토큰 필요", description = "회원 탈퇴 진행")
     public ResponseDto<Void> signOut(@PathVariable Provider provider, @PathVariable Long userId) {
@@ -129,36 +125,4 @@ public ResponseDto<JwtTokenResponse> refresh(@AuthenticationPrincipal User user,
         JwtTokenResponse jwtToken = jwtUseCase.regenerateToken(user, request);
         return ResponseDto.create(AUTH_UPDATE.getCode(), SUCCESS_REGENERATE_TOKEN.getMessage(), jwtToken);
     }
-
-    /**
-     * 여기부터 케이스 B 위한 임시 매핑
-     */
-
-    @PostMapping("/senior/signup/b")
-    @Operation(summary = "대학원생 가입(Case B) - 필수 과정만", description = "대학원생 회원가입 - 필수 과정만")
-    public ResponseDto<JwtTokenResponse> singUpSeniorB(@RequestBody @Valid SeniorSignUpRequest request) {
-        User user = signUpUseCase.seniorSignUp(request);
-        JwtTokenResponse jwtToken = jwtUseCase.signIn(user);
-        return ResponseDto.create(SENIOR_CREATE.getCode(), CREATE_SENIOR.getMessage(), jwtToken);
-    }
-
-    @PostMapping("/senior/change/b")
-    @Operation(summary = "선배로 추가 가입(Case B) | 토큰 필요", description = "대학생 대학원생으로 변경 추가 가입")
-    public ResponseDto<JwtTokenResponse> changeSeniorB(@AuthenticationPrincipal User user,
-                                                      @RequestBody @Valid SeniorChangeRequest changeRequest) {
-        User changeUser = signUpUseCase.changeSenior(user, changeRequest);
-        JwtTokenResponse jwtToken = jwtUseCase.changeSenior(changeUser);
-        return ResponseDto.create(SENIOR_CREATE.getCode(), CREATE_SENIOR.getMessage(), jwtToken);
-    }
-
-    @PostMapping("/login/{provider}/b")
-    @Operation(summary = "소셜 로그인", description = "회원인 경우 JWT를, 회원이 아닌 경우 socialId를 반환합니다(회원가입은 진행하지 않습니다).")
-    public ResponseDto<AuthResponse> authLoginB(@RequestBody @Valid CodeRequest request, @PathVariable Provider provider) {
-        SignInUseCase signInUseCase = selectOauth.selectSignIn(provider);
-        AuthUserResponse authUser = signInUseCase.getUserB(request);
-        if (authUser.user() == null)
-            return ResponseDto.create(AUTH_NONE.getCode(), NOT_REGISTERED_USER.getMessage(), authUser);
-        JwtTokenResponse jwtToken = jwtUseCase.signIn(authUser.user());
-        return ResponseDto.create(AUTH_ALREADY.getCode(), SUCCESS_AUTH.getMessage(), jwtToken);
-    }
 }

src/main/java/com/postgraduate/domain/payment/presentation/PaymentController.java

@@ -20,8 +20,6 @@ public class PaymentController {
     private final PaymentManageUseCase paymentManageUseCase;
     @Value("${payple.redirect-uri}")
     private String redirectUri;
-    @Value("${payple.redirect-uri-b}")
-    private String redirectUriB;
     @Value("${payple.redirect-uri-dev}")
     private String redirectUriDev;
 
@@ -41,11 +39,4 @@ public void resultGetWithDev(HttpServletResponse response, @ModelAttribute Payme
     public void webhook(@RequestBody PaymentResultRequest request) {
         log.info("payple webhook");
     }
-
-    @PostMapping("/payple/result/b")
-    public void resultGetB(HttpServletResponse response, @ModelAttribute PaymentResultRequest request) throws IOException {
-        paymentManageUseCase.savePay(request);
-        response.sendRedirect(redirectUriB + request.PCD_PAY_OID());
-    }
-
 }

src/main/java/com/postgraduate/domain/senior/presentation/SeniorController.java

@@ -142,54 +142,4 @@ public ResponseDto<SeniorPossibleResponse> checkRole(@AuthenticationPrincipal Us
         SeniorPossibleResponse possibleResponse = seniorMyPageUseCase.checkUser(user);
         return ResponseDto.create(SENIOR_FIND.getCode(), GET_USER_CHECK.getMessage(), possibleResponse);
     }
-
-    /**
-     * 여기서 부터 Case B를 위한 코드
-     */
-    @GetMapping("/{seniorId}/b")
-    @Operation(summary = "대학원생 상세 조회(Case B) | 토큰 필요")
-    public ResponseDto<SeniorDetailResponse> getSeniorDetailsB(@AuthenticationPrincipal User user,
-                                                              @PathVariable Long seniorId) {
-        SeniorDetailResponse seniorDetail = seniorInfoUseCase.getSeniorDetail(user, seniorId);
-        return ResponseDto.create(SENIOR_FIND.getCode(), GET_SENIOR_INFO.getMessage(), seniorDetail);
-    }
-
-    @GetMapping("/{seniorId}/profile/b")
-    @Operation(summary = "대학원생 닉네임~연구실 등 기본 정보 확인(Case B) | 토큰 필요", description = "신청서 완료 후 결제시 노출 필요")
-    public ResponseDto<SeniorProfileResponse> getSeniorProfileB(@AuthenticationPrincipal User user, @PathVariable Long seniorId) {
-        SeniorProfileResponse seniorProfile = seniorInfoUseCase.getSeniorProfile(user, seniorId);
-        return ResponseDto.create(SENIOR_FIND.getCode(), GET_SENIOR_INFO.getMessage(), seniorProfile);
-    }
-
-    @GetMapping("/{seniorId}/times/b")
-    @Operation(summary = "대학원생 가능 시간 확인(Case B) | 토큰 필요", description = "신청서 작성에서 가능 시간 작성시 노출 필요")
-    public ResponseDto<AvailableTimesResponse> getSeniorTimesB(@PathVariable Long seniorId) {
-        AvailableTimesResponse times = seniorInfoUseCase.getSeniorTimes(seniorId);
-        return ResponseDto.create(SENIOR_FIND.getCode(), GET_SENIOR_TIME.getMessage(), times);
-    }
-
-    @GetMapping("/search/b")
-    @Operation(summary = "대학원생 검색어 검색(Case B)", description = "find 필수, sort 선택 - 안보낼 경우 아예 파라미터 추가x (조회수 낮은순 low, 높은순 high), page선택 (안보내면 기본 1페이지)")
-    public ResponseDto<AllSeniorSearchResponse> getSearchSeniorB(@RequestParam String find,
-                                                                @RequestParam(required = false) String sort,
-                                                                @RequestParam(required = false) Integer page) {
-        AllSeniorSearchResponse searchSenior = seniorInfoUseCase.getSearchSenior(find, page, sort);
-        return ResponseDto.create(SENIOR_FIND.getCode(), GET_SENIOR_LIST_INFO.getMessage(), searchSenior);
-    }
-
-    @GetMapping("/field/b")
-    @Operation(summary = "대학원생 필드 검색(Case B)", description = "분야 (분야1,분야2 이런식으로, 다른분야 : others), 대학원 필수 (대학원1,대학원2 이런식으로, 다른학교 : others, 전체 : all), 페이지 선택 ")
-    public ResponseDto<AllSeniorSearchResponse> getFieldSeniorB(@RequestParam String field,
-                                                               @RequestParam String postgradu,
-                                                               @RequestParam(required = false) Integer page) {
-        AllSeniorSearchResponse searchSenior = seniorInfoUseCase.getFieldSenior(field, postgradu, page);
-        return ResponseDto.create(SENIOR_FIND.getCode(), GET_SENIOR_LIST_INFO.getMessage(), searchSenior);
-    }
-
-    @GetMapping("/me/b")
-    @Operation(summary = "대학원생 마이페이지 기본 정보 조회 | 토큰 필요(Case B)", description = "닉네임, 프로필 사진, 프로필 작성 여부")
-    public ResponseDto<SeniorMyPageResponse> getSeniorInfoB(@AuthenticationPrincipal User user) {
-        SeniorMyPageResponse seniorMyPageResponse = seniorMyPageUseCase.getSeniorMyPage(user);
-        return ResponseDto.create(SENIOR_FIND.getCode(), GET_SENIOR_INFO.getMessage(), seniorMyPageResponse);
-    }
 }