From 1a03c31e0d526619df51a2481e616927016889c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=82=98=EA=B2=BD=ED=98=B8?= Date: Wed, 6 Mar 2024 21:08:43 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/JwtAuthenticationProvider.java | 2 +- .../core/config/SecurityConfig.java | 2 +- .../CalculateGraduationApiPresentation.java | 4 +- .../CalculateGraduationController.java | 6 +-- .../dto}/response/BasicInfoResponse.java | 2 +- .../dto}/response/ChapelResultResponse.java | 2 +- ...etailGraduationCategoryResultResponse.java | 2 +- .../DetailGraduationResultResponse.java | 2 +- .../dto}/response/GraduationResponse.java | 2 +- .../dto}/response/LectureResponse.java | 2 +- .../dto}/response/MajorInfoResponse.java | 2 +- .../dto}/response/RestResultResponse.java | 2 +- .../CalculateGraduationService.java | 18 +++---- .../CalculateGraduationUseCase.java | 4 +- .../SearchLectureApiPresentation.java | 4 +- .../web => api}/SearchLectureController.java | 8 +-- .../dto/response}/LectureResponse.java | 2 +- .../dto/response}/SearchLectureResponse.java | 2 +- .../FindBasicAcademicalCulturePort.java | 2 +- .../port/{out => }/FindCommonCulturePort.java | 2 +- .../port/{out => }/FindCoreCulturePort.java | 2 +- .../port/{out => }/FindLecturePort.java | 2 +- .../port/{out => }/FindMajorPort.java | 2 +- .../port/{out => }/SearchLecturePort.java | 2 +- .../port/in/search/SearchLectureUseCase.java | 5 -- .../{find => }/FindLecturesByIdService.java | 6 +-- .../FindLecturesByLectureCodeService.java | 6 +-- .../{search => }/SearchLectureService.java | 12 ++--- .../FindLecturesByIdUseCase.java | 2 +- .../FindLecturesByLectureCodeUseCase.java | 2 +- .../SearchLectureCommand.java | 2 +- .../usecase/SearchLectureUseCase.java | 7 +++ ...icAcademicalCulturePersistenceAdapter.java | 7 +-- .../FindCommonCulturePersistenceAdapter.java | 7 +-- .../FindCoreCulturePersistenceAdapter.java | 7 +-- .../FindMajorPersistenceAdapter.java | 8 +-- .../LecturePersistenceAdapter.java} | 15 +++--- ...asicAcademicalCultureLectureJpaEntity.java | 2 +- .../entity/CommonCultureJpaEntity.java | 2 +- .../entity/CoreCultureJpaEntity.java | 2 +- .../persistence/entity/LectureJpaEntity.java | 2 +- .../entity/MajorLectureJpaEntity.java | 2 +- .../persistence/mapper}/LectureMapper.java | 22 ++++---- .../BasicAcademicalCultureRepository.java | 4 +- .../repository/CommonCultureRepository.java | 4 +- .../repository/CoreCultureRepository.java | 4 +- .../repository/LectureQueryRepository.java | 4 +- .../repository/LectureRepository.java | 4 +- .../repository/MajorLectureRepository.java | 4 +- .../persistence/ParsingTextRepository.java | 11 ---- .../ParsingTextApiPresentation.java | 3 +- .../in/web => api}/ParsingTextController.java | 9 ++-- .../dto/request}/ParsingTextRequest.java | 4 +- .../DeleteParsingTextHistoryPort.java | 2 +- .../{out => }/SaveParsingTextHistoryPort.java | 2 +- .../service/ParsingTextHistoryService.java | 8 +-- .../service/ParsingTextService.java | 16 +++--- .../in => usecase}/ParsingTextCommand.java | 2 +- .../ParsingTextHistoryUseCase.java | 2 +- .../in => usecase}/ParsingTextUseCase.java | 2 +- .../ParsingTextHistoryAdapter.java} | 10 ++-- .../entity}/ParsingTextHistoryJpaEntity.java | 4 +- .../mapper}/ParsingTextHistoryMapper.java | 11 ++-- .../repository/ParsingTextRepository.java | 12 +++++ .../FindTakenLectureApiPresentation.java | 4 +- .../FindTakenLectureController.java | 6 +-- .../UpdateTakenLectureApiPresentation.java | 3 +- .../UpdateTakenLectureController.java | 5 +- .../request}/UpdateTakenLectureRequest.java | 4 +- .../{out => }/DeleteTakenLecturePort.java | 2 +- .../port/{out => }/FindTakenLecturePort.java | 2 +- .../port/{out => }/SaveTakenLecturePort.java | 2 +- .../DeleteTakenLectureByUserService.java | 4 +- .../service/find/FindTakenLectureService.java | 10 ++-- ...aveTakenLectureFromParsingTextService.java | 8 +-- .../update/UpdateTakenLectureService.java | 12 ++--- .../DeleteTakenLectureByUserUseCase.java | 2 +- .../find/FindTakenLectureResponse.java | 2 +- .../find/FindTakenLectureUseCase.java | 2 +- .../find/TakenLectureResponse.java | 2 +- .../save/SaveTakenLectureCommand.java | 2 +- ...aveTakenLectureFromParsingTextUseCase.java | 2 +- .../update/UpdateTakenLectureCommand.java | 2 +- .../update/UpdateTakenLectureUseCase.java | 2 +- .../TakenLecturePersistenceAdapter.java} | 14 +++--- .../persistence/TakenLectureRepository.java | 5 +- .../entity}/TakenLectureJpaEntity.java | 6 +-- .../mapper}/TakenLectureMapper.java | 15 +++--- .../findauthid/FindAuthIdApiPresentation.java | 4 +- .../findauthid/FindAuthIdController.java | 6 +-- .../dto/response}/UserAuthIdResponse.java | 2 +- .../FindUserInformationApiPresentation.java | 4 +- .../FindUserInformationController.java | 6 +-- .../response}/UserInformationResponse.java | 2 +- .../ResetPasswordApiPresentation.java | 4 +- .../ResetPasswordController.java | 8 +-- .../resetpassword/ResetPasswordRequest.java | 4 +- .../dto/response}/ValidateUserResponse.java | 2 +- .../signup/SignUpApiPresentation.java | 6 +-- .../web => api}/signup/SignUpController.java | 12 ++--- .../in/web => api}/signup/SignUpRequest.java | 4 +- .../response}/AuthIdDuplicationResponse.java | 3 +- .../StudentNumberDuplicationResponse.java | 2 +- .../withdraw/WithDrawApiPresentation.java | 2 +- .../withdraw/WithDrawController.java | 4 +- .../web => api}/withdraw/WithDrawRequest.java | 4 +- .../port/{out => }/CheckUserPort.java | 2 +- .../port/{out => }/DeleteUserPort.java | 2 +- .../port/{out => }/FindUserPort.java | 2 +- .../port/{out => }/SaveUserPort.java | 2 +- .../port/{out => }/UpdateUserPort.java | 2 +- .../check/CheckAuthIdDuplicationUseCase.java | 6 --- .../CheckStudentNumberDuplicationUseCase.java | 6 --- .../port/in/find/FindUserAuthIdUseCase.java | 6 --- .../in/find/FindUserInformationUseCase.java | 6 --- .../port/in/validate/ValidateUserUseCase.java | 6 --- .../check/CheckAuthIdDuplicationService.java | 6 +-- .../CheckStudentNumberDuplicationService.java | 6 +-- .../service/find/FindUserAuthIdService.java | 6 +-- .../find/FindUserInformationService.java | 6 +-- .../service/find/FindUserService.java | 4 +- .../resetpassword/ResetPasswordService.java | 8 +-- .../service/signup/SignUpService.java | 8 +-- .../UpdateStudentInformationService.java | 6 +-- .../service/validate/ValidateUserService.java | 6 +-- .../service/withdraw/WithDrawUserService.java | 12 ++--- .../check/CheckAuthIdDuplicationUseCase.java | 8 +++ .../CheckStudentNumberDuplicationUseCase.java | 8 +++ .../usecase/find/FindUserAuthIdUseCase.java | 8 +++ .../find/FindUserInformationUseCase.java | 8 +++ .../in => usecase}/find/FindUserUseCase.java | 2 +- .../resetpassword/ResetPasswordCommand.java | 2 +- .../resetpassword/ResetPasswordUseCase.java | 2 +- .../in => usecase}/signup/SignUpCommand.java | 2 +- .../in => usecase}/signup/SignUpUseCase.java | 2 +- .../UpdateStudentInformationCommand.java | 2 +- .../UpdateStudentInformationUseCase.java | 2 +- .../usecase/validate/ValidateUserUseCase.java | 8 +++ .../withdraw/WithDrawCommand.java | 2 +- .../withdraw/WithDrawUserUseCase.java | 2 +- .../persistence/UserPersistenceAdapter.java} | 18 ++++--- .../persistence/entity}/UserJpaEntity.java | 2 +- .../persistence/mapper}/UserMapper.java | 3 +- .../repository}/UserRepository.java | 4 +- .../CalculateGraduationControllerTest.java | 10 ++-- .../in/web/SearchLectureControllerTest.java | 4 +- .../out/LectureQueryRepositoryTest.java | 6 +-- .../adapter/out/TestQuerydslConfig.java | 2 +- ...cademicalCultureLectureRepositoryTest.java | 8 +-- .../CommonCultureRepositoryTest.java | 8 +-- .../CoreCultureRepositoryTest.java | 8 +-- ...ademicalCulturePersistenceAdapterTest.java | 9 ++-- ...ndCommonCulturePersistenceAdapterTest.java | 9 ++-- ...FindCoreCulturePersistenceAdapterTest.java | 9 ++-- .../FindMajorPersistenceAdapterTest.java | 9 ++-- .../out/persistence/LectureMapperTest.java | 11 ++-- .../LecturePersistenceAdaptorTest.java | 9 ++-- .../MajorLectureRepositoryTest.java | 8 +-- .../find/FindLecturesByIdServiceTest.java | 3 +- .../FindLecturesByLectureCodeServiceTest.java | 3 +- .../search/SearchLectureServiceTest.java | 7 +-- .../in/web/ParsingTextControllerTest.java | 3 +- .../ParsingTextHistoryAdaptorTest.java | 9 ++-- .../ParsingTextHistoryMapperTest.java | 2 + .../ParsingTextHistoryServiceTest.java | 7 ++- .../service/ParsingTextServiceTest.java | 14 +++--- .../support/WebAdaptorTestSupport.java | 50 +++++++++---------- .../find/FindTakenLectureControllerTest.java | 6 +-- .../UpdateTakenLectureControllerTest.java | 3 +- .../persistence/TakenLectureMapperTest.java | 8 +-- .../TakenLectureRepositoryTest.java | 12 +++-- .../DeleteTakenLectureByUserServiceTest.java | 3 +- .../find/FindTakenLectureServiceTest.java | 8 ++- ...akenLectureFromParsingTextServiceTest.java | 6 +-- .../update/UpdateTakenLectureServiceTest.java | 10 ++-- .../findauthid/FindAuthIdControllerTest.java | 4 +- .../FindUserInformationControllerTest.java | 4 +- .../ResetPasswordControllerTest.java | 5 +- .../in/web/signup/SignUpControllerTest.java | 7 +-- .../web/withdraw/WithDrawControllerTest.java | 5 +- .../persistence/UserMapperTest.java | 4 +- .../UserPersistenceAdaptorTest.java | 6 ++- .../persistence/UserRepositoryTest.java | 4 +- .../CheckAuthIdDuplicationServiceTest.java | 4 +- ...ckStudentNumberDuplicationServiceTest.java | 4 +- .../find/FindUserAuthIdServiceTest.java | 4 +- .../find/FindUserInformationServiceTest.java | 4 +- .../service/find/FindUserServiceTest.java | 2 +- .../ResetPasswordServiceTest.java | 6 +-- .../service/signup/SignUpServiceTest.java | 6 +-- .../UpdateStudentInformationServiceTest.java | 5 +- .../validate/ValidateUserServiceTest.java | 4 +- .../withdraw/WithDrawUserServiceTest.java | 10 ++-- 193 files changed, 559 insertions(+), 503 deletions(-) rename src/main/java/com/plzgraduate/myongjigraduatebe/graduation/{adpater/in/web => api}/CalculateGraduationApiPresentation.java (72%) rename src/main/java/com/plzgraduate/myongjigraduatebe/graduation/{adpater/in/web => api}/CalculateGraduationController.java (78%) rename src/main/java/com/plzgraduate/myongjigraduatebe/graduation/{application/port/in => api/dto}/response/BasicInfoResponse.java (93%) rename src/main/java/com/plzgraduate/myongjigraduatebe/graduation/{application/port/in => api/dto}/response/ChapelResultResponse.java (89%) rename src/main/java/com/plzgraduate/myongjigraduatebe/graduation/{application/port/in => api/dto}/response/DetailGraduationCategoryResultResponse.java (95%) rename src/main/java/com/plzgraduate/myongjigraduatebe/graduation/{application/port/in => api/dto}/response/DetailGraduationResultResponse.java (94%) rename src/main/java/com/plzgraduate/myongjigraduatebe/graduation/{application/port/in => api/dto}/response/GraduationResponse.java (97%) rename src/main/java/com/plzgraduate/myongjigraduatebe/graduation/{application/port/in => api/dto}/response/LectureResponse.java (91%) rename src/main/java/com/plzgraduate/myongjigraduatebe/graduation/{application/port/in => api/dto}/response/MajorInfoResponse.java (92%) rename src/main/java/com/plzgraduate/myongjigraduatebe/graduation/{application/port/in => api/dto}/response/RestResultResponse.java (94%) rename src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/{port => service}/CalculateGraduationService.java (96%) rename src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/{port/in => usecase}/CalculateGraduationUseCase.java (60%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/in/web => api}/SearchLectureApiPresentation.java (81%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/in/web => api}/SearchLectureController.java (72%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{application/port/in/search => api/dto/response}/LectureResponse.java (93%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{application/port/in/search => api/dto/response}/SearchLectureResponse.java (85%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/{out => }/FindBasicAcademicalCulturePort.java (97%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/{out => }/FindCommonCulturePort.java (97%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/{out => }/FindCoreCulturePort.java (97%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/{out => }/FindLecturePort.java (97%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/{out => }/FindMajorPort.java (96%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/{out => }/SearchLecturePort.java (97%) delete mode 100644 src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/search/SearchLectureUseCase.java rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/{find => }/FindLecturesByIdService.java (84%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/{find => }/FindLecturesByLectureCodeService.java (84%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/{search => }/SearchLectureService.java (67%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/{port/in/find => usecase}/FindLecturesByIdUseCase.java (72%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/{port/in/find => usecase}/FindLecturesByLectureCodeUseCase.java (74%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/{port/in/search => usecase}/SearchLectureCommand.java (85%) create mode 100644 src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/SearchLectureUseCase.java rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/FindBasicAcademicalCulturePersistenceAdapter.java (75%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/FindCommonCulturePersistenceAdapter.java (83%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/FindCoreCulturePersistenceAdapter.java (71%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/FindMajorPersistenceAdapter.java (68%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out/persistence/LecturePersistenceAdaptor.java => infrastructure/adapter/persistence/LecturePersistenceAdapter.java} (70%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/entity/BasicAcademicalCultureLectureJpaEntity.java (91%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/entity/CommonCultureJpaEntity.java (93%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/entity/CoreCultureJpaEntity.java (93%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/entity/LectureJpaEntity.java (91%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/entity/MajorLectureJpaEntity.java (92%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out/persistence => infrastructure/adapter/persistence/mapper}/LectureMapper.java (73%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/repository/BasicAcademicalCultureRepository.java (70%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/repository/CommonCultureRepository.java (86%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/repository/CoreCultureRepository.java (71%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/repository/LectureQueryRepository.java (81%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/repository/LectureRepository.java (59%) rename src/main/java/com/plzgraduate/myongjigraduatebe/lecture/{adapter/out => infrastructure/adapter}/persistence/repository/MajorLectureRepository.java (69%) delete mode 100644 src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextRepository.java rename src/main/java/com/plzgraduate/myongjigraduatebe/parsing/{adaptor/in/web => api}/ParsingTextApiPresentation.java (80%) rename src/main/java/com/plzgraduate/myongjigraduatebe/parsing/{adaptor/in/web => api}/ParsingTextController.java (72%) rename src/main/java/com/plzgraduate/myongjigraduatebe/parsing/{adaptor/in/web => api/dto/request}/ParsingTextRequest.java (95%) rename src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/{out => }/DeleteParsingTextHistoryPort.java (96%) rename src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/{out => }/SaveParsingTextHistoryPort.java (97%) rename src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/{port/in => usecase}/ParsingTextCommand.java (82%) rename src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/{port/in => usecase}/ParsingTextHistoryUseCase.java (73%) rename src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/{port/in => usecase}/ParsingTextUseCase.java (59%) rename src/main/java/com/plzgraduate/myongjigraduatebe/parsing/{adaptor/out/persistence/ParsingTextHistoryAdaptor.java => infrastructure/adapter/persistence/ParsingTextHistoryAdapter.java} (67%) rename src/main/java/com/plzgraduate/myongjigraduatebe/parsing/{adaptor/out/persistence => infrastructure/adapter/persistence/entity}/ParsingTextHistoryJpaEntity.java (84%) rename src/main/java/com/plzgraduate/myongjigraduatebe/parsing/{adaptor/out/persistence => infrastructure/adapter/persistence/mapper}/ParsingTextHistoryMapper.java (64%) create mode 100644 src/main/java/com/plzgraduate/myongjigraduatebe/parsing/infrastructure/adapter/persistence/repository/ParsingTextRepository.java rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/{adaptor/in/web/find => api}/FindTakenLectureApiPresentation.java (81%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/{adaptor/in/web/find => api}/FindTakenLectureController.java (83%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/{adaptor/in/web/update => api}/UpdateTakenLectureApiPresentation.java (79%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/{adaptor/in/web/update => api}/UpdateTakenLectureController.java (82%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/{adaptor/in/web/update => api/dto/request}/UpdateTakenLectureRequest.java (88%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/{out => }/DeleteTakenLecturePort.java (95%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/{out => }/FindTakenLecturePort.java (96%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/{out => }/SaveTakenLecturePort.java (95%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/{port/in => usecase}/delete/DeleteTakenLectureByUserUseCase.java (92%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/{port/in => usecase}/find/FindTakenLectureResponse.java (97%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/{port/in => usecase}/find/FindTakenLectureUseCase.java (90%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/{port/in => usecase}/find/TakenLectureResponse.java (98%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/{port/in => usecase}/save/SaveTakenLectureCommand.java (98%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/{port/in => usecase}/save/SaveTakenLectureFromParsingTextUseCase.java (92%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/{port/in => usecase}/update/UpdateTakenLectureCommand.java (96%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/{port/in => usecase}/update/UpdateTakenLectureUseCase.java (90%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/{adaptor/out/persistence/TakenLecturePersistenceAdaptor.java => infrastructure/adapter/persistence/TakenLecturePersistenceAdapter.java} (78%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/{adaptor/out => infrastructure/adapter}/persistence/TakenLectureRepository.java (70%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/{adaptor/out/persistence => infrastructure/adapter/persistence/entity}/TakenLectureJpaEntity.java (75%) rename src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/{adaptor/out/persistence => infrastructure/adapter/persistence/mapper}/TakenLectureMapper.java (78%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/in/web => api}/findauthid/FindAuthIdApiPresentation.java (76%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/in/web => api}/findauthid/FindAuthIdController.java (73%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{application/port/in/find => api/findauthid/dto/response}/UserAuthIdResponse.java (90%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/in/web => api}/finduserinformation/FindUserInformationApiPresentation.java (71%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/in/web => api}/finduserinformation/FindUserInformationController.java (71%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{application/port/in/find => api/finduserinformation/dto/response}/UserInformationResponse.java (88%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/in/web => api}/resetpassword/ResetPasswordApiPresentation.java (87%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/in/web => api}/resetpassword/ResetPasswordController.java (76%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/in/web => api}/resetpassword/ResetPasswordRequest.java (88%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{application/port/in/validate => api/resetpassword/dto/response}/ValidateUserResponse.java (82%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/in/web => api}/signup/SignUpApiPresentation.java (78%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/in/web => api}/signup/SignUpController.java (71%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/in/web => api}/signup/SignUpRequest.java (91%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{application/port/in/check => api/signup/dto/response}/AuthIdDuplicationResponse.java (81%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{application/port/in/check => api/signup/dto/response}/StudentNumberDuplicationResponse.java (87%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/in/web => api}/withdraw/WithDrawApiPresentation.java (87%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/in/web => api}/withdraw/WithDrawController.java (81%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/in/web => api}/withdraw/WithDrawRequest.java (77%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/{out => }/CheckUserPort.java (67%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/{out => }/DeleteUserPort.java (65%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/{out => }/FindUserPort.java (80%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/{out => }/SaveUserPort.java (64%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/{out => }/UpdateUserPort.java (65%) delete mode 100644 src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/check/CheckAuthIdDuplicationUseCase.java delete mode 100644 src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/check/CheckStudentNumberDuplicationUseCase.java delete mode 100644 src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/FindUserAuthIdUseCase.java delete mode 100644 src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/FindUserInformationUseCase.java delete mode 100644 src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/validate/ValidateUserUseCase.java create mode 100644 src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/check/CheckAuthIdDuplicationUseCase.java create mode 100644 src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/check/CheckStudentNumberDuplicationUseCase.java create mode 100644 src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/find/FindUserAuthIdUseCase.java create mode 100644 src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/find/FindUserInformationUseCase.java rename src/main/java/com/plzgraduate/myongjigraduatebe/user/application/{port/in => usecase}/find/FindUserUseCase.java (75%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/application/{port/in => usecase}/resetpassword/ResetPasswordCommand.java (84%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/application/{port/in => usecase}/resetpassword/ResetPasswordUseCase.java (56%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/application/{port/in => usecase}/signup/SignUpCommand.java (88%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/application/{port/in => usecase}/signup/SignUpUseCase.java (51%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/application/{port/in => usecase}/update/UpdateStudentInformationCommand.java (93%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/application/{port/in => usecase}/update/UpdateStudentInformationUseCase.java (64%) create mode 100644 src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/validate/ValidateUserUseCase.java rename src/main/java/com/plzgraduate/myongjigraduatebe/user/application/{port/in => usecase}/withdraw/WithDrawCommand.java (72%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/application/{port/in => usecase}/withdraw/WithDrawUserUseCase.java (57%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/out/persistence/UserPersistenceAdaptor.java => infrastructure/adapter/persistence/UserPersistenceAdapter.java} (65%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/out/persistence => infrastructure/adapter/persistence/entity}/UserJpaEntity.java (93%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/out/persistence => infrastructure/adapter/persistence/mapper}/UserMapper.java (85%) rename src/main/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/out/persistence => infrastructure/adapter/persistence/repository}/UserRepository.java (66%) rename src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/{adaptor => adapter}/in/web/find/FindTakenLectureControllerTest.java (91%) rename src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/{adaptor => adapter}/in/web/update/UpdateTakenLectureControllerTest.java (89%) rename src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/{adaptor => adapter}/out/persistence/TakenLectureMapperTest.java (91%) rename src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/{adaptor => adapter}/out/persistence/TakenLectureRepositoryTest.java (66%) rename src/test/java/com/plzgraduate/myongjigraduatebe/user/{adaptor => adapter}/in/web/findauthid/FindAuthIdControllerTest.java (92%) rename src/test/java/com/plzgraduate/myongjigraduatebe/user/{adaptor => adapter}/in/web/finduserinformation/FindUserInformationControllerTest.java (89%) rename src/test/java/com/plzgraduate/myongjigraduatebe/user/{adaptor => adapter}/in/web/resetpassword/ResetPasswordControllerTest.java (94%) rename src/test/java/com/plzgraduate/myongjigraduatebe/user/{adaptor => adapter}/in/web/signup/SignUpControllerTest.java (93%) rename src/test/java/com/plzgraduate/myongjigraduatebe/user/{adaptor => adapter}/in/web/withdraw/WithDrawControllerTest.java (85%) rename src/test/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/out => adapter}/persistence/UserMapperTest.java (91%) rename src/test/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/out => adapter}/persistence/UserPersistenceAdaptorTest.java (91%) rename src/test/java/com/plzgraduate/myongjigraduatebe/user/{adaptor/out => adapter}/persistence/UserRepositoryTest.java (89%) diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/auth/security/JwtAuthenticationProvider.java b/src/main/java/com/plzgraduate/myongjigraduatebe/auth/security/JwtAuthenticationProvider.java index a23390d0..b0a713e0 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/auth/security/JwtAuthenticationProvider.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/auth/security/JwtAuthenticationProvider.java @@ -11,7 +11,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import com.plzgraduate.myongjigraduatebe.core.exception.UnAuthorizedException; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/core/config/SecurityConfig.java b/src/main/java/com/plzgraduate/myongjigraduatebe/core/config/SecurityConfig.java index 5223e5d4..ec886ccc 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/core/config/SecurityConfig.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/core/config/SecurityConfig.java @@ -20,7 +20,7 @@ import com.plzgraduate.myongjigraduatebe.auth.security.JwtAuthenticationProvider; import com.plzgraduate.myongjigraduatebe.auth.security.TokenAuthenticationFilter; import com.plzgraduate.myongjigraduatebe.auth.security.TokenProvider; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/adpater/in/web/CalculateGraduationApiPresentation.java b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/CalculateGraduationApiPresentation.java similarity index 72% rename from src/main/java/com/plzgraduate/myongjigraduatebe/graduation/adpater/in/web/CalculateGraduationApiPresentation.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/CalculateGraduationApiPresentation.java index 0185ad76..2528ed57 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/adpater/in/web/CalculateGraduationApiPresentation.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/CalculateGraduationApiPresentation.java @@ -1,7 +1,7 @@ -package com.plzgraduate.myongjigraduatebe.graduation.adpater.in.web; +package com.plzgraduate.myongjigraduatebe.graduation.api; import com.plzgraduate.myongjigraduatebe.core.meta.LoginUser; -import com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response.GraduationResponse; +import com.plzgraduate.myongjigraduatebe.graduation.api.dto.response.GraduationResponse; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/adpater/in/web/CalculateGraduationController.java b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/CalculateGraduationController.java similarity index 78% rename from src/main/java/com/plzgraduate/myongjigraduatebe/graduation/adpater/in/web/CalculateGraduationController.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/CalculateGraduationController.java index a5c383bd..2b7d24ce 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/adpater/in/web/CalculateGraduationController.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/CalculateGraduationController.java @@ -1,12 +1,12 @@ -package com.plzgraduate.myongjigraduatebe.graduation.adpater.in.web; +package com.plzgraduate.myongjigraduatebe.graduation.api; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import com.plzgraduate.myongjigraduatebe.core.meta.LoginUser; import com.plzgraduate.myongjigraduatebe.core.meta.WebAdapter; -import com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response.GraduationResponse; -import com.plzgraduate.myongjigraduatebe.graduation.application.port.in.CalculateGraduationUseCase; +import com.plzgraduate.myongjigraduatebe.graduation.api.dto.response.GraduationResponse; +import com.plzgraduate.myongjigraduatebe.graduation.application.usecase.CalculateGraduationUseCase; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/BasicInfoResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/BasicInfoResponse.java similarity index 93% rename from src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/BasicInfoResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/BasicInfoResponse.java index 6961fc10..52a33bc9 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/BasicInfoResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/BasicInfoResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response; +package com.plzgraduate.myongjigraduatebe.graduation.api.dto.response; import com.plzgraduate.myongjigraduatebe.graduation.domain.model.GraduationResult; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/ChapelResultResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/ChapelResultResponse.java similarity index 89% rename from src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/ChapelResultResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/ChapelResultResponse.java index 4468c799..b957f9b3 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/ChapelResultResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/ChapelResultResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response; +package com.plzgraduate.myongjigraduatebe.graduation.api.dto.response; import com.plzgraduate.myongjigraduatebe.graduation.domain.model.ChapelResult; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/DetailGraduationCategoryResultResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/DetailGraduationCategoryResultResponse.java similarity index 95% rename from src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/DetailGraduationCategoryResultResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/DetailGraduationCategoryResultResponse.java index 6bc7b217..f04d8456 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/DetailGraduationCategoryResultResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/DetailGraduationCategoryResultResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response; +package com.plzgraduate.myongjigraduatebe.graduation.api.dto.response; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/DetailGraduationResultResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/DetailGraduationResultResponse.java similarity index 94% rename from src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/DetailGraduationResultResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/DetailGraduationResultResponse.java index 584f054b..6f16fa3d 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/DetailGraduationResultResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/DetailGraduationResultResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response; +package com.plzgraduate.myongjigraduatebe.graduation.api.dto.response; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/GraduationResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/GraduationResponse.java similarity index 97% rename from src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/GraduationResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/GraduationResponse.java index 2e0ebe77..24d0c2ba 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/GraduationResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/GraduationResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response; +package com.plzgraduate.myongjigraduatebe.graduation.api.dto.response; import static com.plzgraduate.myongjigraduatebe.graduation.domain.model.GraduationCategory.*; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/LectureResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/LectureResponse.java similarity index 91% rename from src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/LectureResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/LectureResponse.java index e14cf547..a7c79467 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/LectureResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/LectureResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response; +package com.plzgraduate.myongjigraduatebe.graduation.api.dto.response; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/MajorInfoResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/MajorInfoResponse.java similarity index 92% rename from src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/MajorInfoResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/MajorInfoResponse.java index 77308621..556098cd 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/MajorInfoResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/MajorInfoResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response; +package com.plzgraduate.myongjigraduatebe.graduation.api.dto.response; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/RestResultResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/RestResultResponse.java similarity index 94% rename from src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/RestResultResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/RestResultResponse.java index c61e7260..740097f8 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/response/RestResultResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/api/dto/response/RestResultResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response; +package com.plzgraduate.myongjigraduatebe.graduation.api.dto.response; import com.plzgraduate.myongjigraduatebe.graduation.domain.model.FreeElectiveGraduationResult; import com.plzgraduate.myongjigraduatebe.graduation.domain.model.NormalCultureGraduationResult; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/CalculateGraduationService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/service/CalculateGraduationService.java similarity index 96% rename from src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/CalculateGraduationService.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/service/CalculateGraduationService.java index 14e6a383..a315ce6d 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/CalculateGraduationService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/service/CalculateGraduationService.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.graduation.application.port; +package com.plzgraduate.myongjigraduatebe.graduation.application.service; import java.util.ArrayList; import java.util.List; @@ -7,8 +7,8 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response.GraduationResponse; -import com.plzgraduate.myongjigraduatebe.graduation.application.port.in.CalculateGraduationUseCase; +import com.plzgraduate.myongjigraduatebe.graduation.api.dto.response.GraduationResponse; +import com.plzgraduate.myongjigraduatebe.graduation.application.usecase.CalculateGraduationUseCase; import com.plzgraduate.myongjigraduatebe.graduation.domain.model.ChapelResult; import com.plzgraduate.myongjigraduatebe.graduation.domain.model.DetailGraduationResult; import com.plzgraduate.myongjigraduatebe.graduation.domain.model.GraduationRequirement; @@ -21,17 +21,17 @@ import com.plzgraduate.myongjigraduatebe.graduation.domain.service.coreculture.CoreCultureGraduationManager; import com.plzgraduate.myongjigraduatebe.graduation.domain.service.major.MajorManager; import com.plzgraduate.myongjigraduatebe.graduation.domain.service.submajor.SubMajorManager; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.FindBasicAcademicalCulturePort; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.FindCommonCulturePort; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.FindCoreCulturePort; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.FindMajorPort; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindBasicAcademicalCulturePort; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindCommonCulturePort; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindCoreCulturePort; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindMajorPort; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.BasicAcademicalCultureLecture; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.CommonCulture; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.CoreCulture; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.MajorLecture; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out.FindTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.FindTakenLecturePort; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLectureInventory; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; import com.plzgraduate.myongjigraduatebe.user.domain.model.College; import com.plzgraduate.myongjigraduatebe.user.domain.model.GraduationRequirementType; import com.plzgraduate.myongjigraduatebe.user.domain.model.StudentCategory; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/CalculateGraduationUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/usecase/CalculateGraduationUseCase.java similarity index 60% rename from src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/CalculateGraduationUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/usecase/CalculateGraduationUseCase.java index 1c3101e1..20fb227d 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/port/in/CalculateGraduationUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/graduation/application/usecase/CalculateGraduationUseCase.java @@ -1,6 +1,6 @@ -package com.plzgraduate.myongjigraduatebe.graduation.application.port.in; +package com.plzgraduate.myongjigraduatebe.graduation.application.usecase; -import com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response.GraduationResponse; +import com.plzgraduate.myongjigraduatebe.graduation.api.dto.response.GraduationResponse; public interface CalculateGraduationUseCase { diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/in/web/SearchLectureApiPresentation.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/api/SearchLectureApiPresentation.java similarity index 81% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/in/web/SearchLectureApiPresentation.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/api/SearchLectureApiPresentation.java index e2346b73..9f4bd5bf 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/in/web/SearchLectureApiPresentation.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/api/SearchLectureApiPresentation.java @@ -1,10 +1,10 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.in.web; +package com.plzgraduate.myongjigraduatebe.lecture.api; import javax.validation.constraints.Size; import org.springframework.web.bind.annotation.RequestParam; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search.SearchLectureResponse; +import com.plzgraduate.myongjigraduatebe.lecture.api.dto.response.SearchLectureResponse; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/in/web/SearchLectureController.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/api/SearchLectureController.java similarity index 72% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/in/web/SearchLectureController.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/api/SearchLectureController.java index b039fefb..49784bcf 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/in/web/SearchLectureController.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/api/SearchLectureController.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.in.web; +package com.plzgraduate.myongjigraduatebe.lecture.api; import javax.validation.constraints.Size; @@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestParam; import com.plzgraduate.myongjigraduatebe.core.meta.WebAdapter; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search.SearchLectureCommand; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search.SearchLectureResponse; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search.SearchLectureUseCase; +import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.SearchLectureCommand; +import com.plzgraduate.myongjigraduatebe.lecture.api.dto.response.SearchLectureResponse; +import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.SearchLectureUseCase; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/search/LectureResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/api/dto/response/LectureResponse.java similarity index 93% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/search/LectureResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/api/dto/response/LectureResponse.java index 140b64bc..ed47fed9 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/search/LectureResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/api/dto/response/LectureResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search; +package com.plzgraduate.myongjigraduatebe.lecture.api.dto.response; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/search/SearchLectureResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/api/dto/response/SearchLectureResponse.java similarity index 85% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/search/SearchLectureResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/api/dto/response/SearchLectureResponse.java index 1ae2a1ce..48323fb0 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/search/SearchLectureResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/api/dto/response/SearchLectureResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search; +package com.plzgraduate.myongjigraduatebe.lecture.api.dto.response; import java.util.List; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindBasicAcademicalCulturePort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindBasicAcademicalCulturePort.java similarity index 97% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindBasicAcademicalCulturePort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindBasicAcademicalCulturePort.java index 89540387..fa31cf39 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindBasicAcademicalCulturePort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindBasicAcademicalCulturePort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.port.out; +package com.plzgraduate.myongjigraduatebe.lecture.application.port; import java.util.Set; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindCommonCulturePort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindCommonCulturePort.java similarity index 97% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindCommonCulturePort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindCommonCulturePort.java index e396828c..ce02c80e 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindCommonCulturePort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindCommonCulturePort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.port.out; +package com.plzgraduate.myongjigraduatebe.lecture.application.port; import java.util.Set; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindCoreCulturePort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindCoreCulturePort.java similarity index 97% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindCoreCulturePort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindCoreCulturePort.java index 988e6258..1bd9ffb3 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindCoreCulturePort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindCoreCulturePort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.port.out; +package com.plzgraduate.myongjigraduatebe.lecture.application.port; import java.util.Set; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindLecturePort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindLecturePort.java similarity index 97% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindLecturePort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindLecturePort.java index 18613cf6..2d1f97a4 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindLecturePort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindLecturePort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.port.out; +package com.plzgraduate.myongjigraduatebe.lecture.application.port; import java.util.List; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindMajorPort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindMajorPort.java similarity index 96% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindMajorPort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindMajorPort.java index bc26e55b..df3954cf 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/FindMajorPort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/FindMajorPort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.port.out; +package com.plzgraduate.myongjigraduatebe.lecture.application.port; import java.util.Set; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/SearchLecturePort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/SearchLecturePort.java similarity index 97% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/SearchLecturePort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/SearchLecturePort.java index b988e56e..1ed00380 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/out/SearchLecturePort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/SearchLecturePort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.port.out; +package com.plzgraduate.myongjigraduatebe.lecture.application.port; import java.util.List; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/search/SearchLectureUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/search/SearchLectureUseCase.java deleted file mode 100644 index 4d3ead93..00000000 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/search/SearchLectureUseCase.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search; - -public interface SearchLectureUseCase { - SearchLectureResponse searchLectures(SearchLectureCommand searchLectureCommand); -} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/find/FindLecturesByIdService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/FindLecturesByIdService.java similarity index 84% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/find/FindLecturesByIdService.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/FindLecturesByIdService.java index e2537796..7be10690 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/find/FindLecturesByIdService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/FindLecturesByIdService.java @@ -1,12 +1,12 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.service.find; +package com.plzgraduate.myongjigraduatebe.lecture.application.service; import java.util.List; import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.find.FindLecturesByIdUseCase; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.FindLecturePort; +import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.FindLecturesByIdUseCase; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindLecturePort; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/find/FindLecturesByLectureCodeService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/FindLecturesByLectureCodeService.java similarity index 84% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/find/FindLecturesByLectureCodeService.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/FindLecturesByLectureCodeService.java index 98a561a1..07e164e5 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/find/FindLecturesByLectureCodeService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/FindLecturesByLectureCodeService.java @@ -1,12 +1,12 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.service.find; +package com.plzgraduate.myongjigraduatebe.lecture.application.service; import java.util.List; import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.find.FindLecturesByLectureCodeUseCase; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.FindLecturePort; +import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.FindLecturesByLectureCodeUseCase; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindLecturePort; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/search/SearchLectureService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/SearchLectureService.java similarity index 67% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/search/SearchLectureService.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/SearchLectureService.java index 92712fad..2e9d014a 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/search/SearchLectureService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/SearchLectureService.java @@ -1,14 +1,14 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.service.search; +package com.plzgraduate.myongjigraduatebe.lecture.application.service; import java.util.List; import java.util.stream.Collectors; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search.SearchLectureCommand; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search.LectureResponse; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search.SearchLectureResponse; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search.SearchLectureUseCase; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.SearchLecturePort; +import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.SearchLectureCommand; +import com.plzgraduate.myongjigraduatebe.lecture.api.dto.response.LectureResponse; +import com.plzgraduate.myongjigraduatebe.lecture.api.dto.response.SearchLectureResponse; +import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.SearchLectureUseCase; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.SearchLecturePort; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/find/FindLecturesByIdUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/FindLecturesByIdUseCase.java similarity index 72% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/find/FindLecturesByIdUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/FindLecturesByIdUseCase.java index 17ea5bfb..de163b99 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/find/FindLecturesByIdUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/FindLecturesByIdUseCase.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.port.in.find; +package com.plzgraduate.myongjigraduatebe.lecture.application.usecase; import java.util.List; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/find/FindLecturesByLectureCodeUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/FindLecturesByLectureCodeUseCase.java similarity index 74% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/find/FindLecturesByLectureCodeUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/FindLecturesByLectureCodeUseCase.java index 4c2f22e2..4390da98 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/find/FindLecturesByLectureCodeUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/FindLecturesByLectureCodeUseCase.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.port.in.find; +package com.plzgraduate.myongjigraduatebe.lecture.application.usecase; import java.util.List; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/search/SearchLectureCommand.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/SearchLectureCommand.java similarity index 85% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/search/SearchLectureCommand.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/SearchLectureCommand.java index 0d46d4f0..72930fa9 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/port/in/search/SearchLectureCommand.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/SearchLectureCommand.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search; +package com.plzgraduate.myongjigraduatebe.lecture.application.usecase; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/SearchLectureUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/SearchLectureUseCase.java new file mode 100644 index 00000000..7f763d03 --- /dev/null +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/SearchLectureUseCase.java @@ -0,0 +1,7 @@ +package com.plzgraduate.myongjigraduatebe.lecture.application.usecase; + +import com.plzgraduate.myongjigraduatebe.lecture.api.dto.response.SearchLectureResponse; + +public interface SearchLectureUseCase { + SearchLectureResponse searchLectures(SearchLectureCommand searchLectureCommand); +} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindBasicAcademicalCulturePersistenceAdapter.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/FindBasicAcademicalCulturePersistenceAdapter.java similarity index 75% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindBasicAcademicalCulturePersistenceAdapter.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/FindBasicAcademicalCulturePersistenceAdapter.java index eaef6507..37e43eb2 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindBasicAcademicalCulturePersistenceAdapter.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/FindBasicAcademicalCulturePersistenceAdapter.java @@ -1,11 +1,12 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence; import java.util.Set; import java.util.stream.Collectors; import com.plzgraduate.myongjigraduatebe.core.meta.PersistenceAdapter; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.BasicAcademicalCultureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.FindBasicAcademicalCulturePort; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.mapper.LectureMapper; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.BasicAcademicalCultureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindBasicAcademicalCulturePort; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.BasicAcademicalCultureLecture; import com.plzgraduate.myongjigraduatebe.user.domain.model.College; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindCommonCulturePersistenceAdapter.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/FindCommonCulturePersistenceAdapter.java similarity index 83% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindCommonCulturePersistenceAdapter.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/FindCommonCulturePersistenceAdapter.java index afd0f5f7..67263a0b 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindCommonCulturePersistenceAdapter.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/FindCommonCulturePersistenceAdapter.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence; import static com.plzgraduate.myongjigraduatebe.user.domain.model.EnglishLevel.*; @@ -6,8 +6,9 @@ import java.util.stream.Collectors; import com.plzgraduate.myongjigraduatebe.core.meta.PersistenceAdapter; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.CommonCultureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.FindCommonCulturePort; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.mapper.LectureMapper; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.CommonCultureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindCommonCulturePort; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.CommonCulture; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindCoreCulturePersistenceAdapter.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/FindCoreCulturePersistenceAdapter.java similarity index 71% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindCoreCulturePersistenceAdapter.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/FindCoreCulturePersistenceAdapter.java index 4f722808..3015eb26 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindCoreCulturePersistenceAdapter.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/FindCoreCulturePersistenceAdapter.java @@ -1,11 +1,12 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence; import java.util.Set; import java.util.stream.Collectors; import com.plzgraduate.myongjigraduatebe.core.meta.PersistenceAdapter; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.CoreCultureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.FindCoreCulturePort; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.mapper.LectureMapper; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.CoreCultureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindCoreCulturePort; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.CoreCulture; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindMajorPersistenceAdapter.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/FindMajorPersistenceAdapter.java similarity index 68% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindMajorPersistenceAdapter.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/FindMajorPersistenceAdapter.java index 83917e59..e73a8481 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindMajorPersistenceAdapter.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/FindMajorPersistenceAdapter.java @@ -1,13 +1,13 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence; import java.util.Set; import java.util.stream.Collectors; import com.plzgraduate.myongjigraduatebe.core.meta.PersistenceAdapter; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.MajorLectureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.FindMajorPort; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.mapper.LectureMapper; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.MajorLectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindMajorPort; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.MajorLecture; -import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/LecturePersistenceAdaptor.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/LecturePersistenceAdapter.java similarity index 70% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/LecturePersistenceAdaptor.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/LecturePersistenceAdapter.java index 3d2b0454..cedea2bf 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/LecturePersistenceAdaptor.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/LecturePersistenceAdapter.java @@ -1,21 +1,22 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence; import java.util.List; import java.util.stream.Collectors; import com.plzgraduate.myongjigraduatebe.core.meta.PersistenceAdapter; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureQueryRepository; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.FindLecturePort; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.SearchLecturePort; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.mapper.LectureMapper; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureQueryRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindLecturePort; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.SearchLecturePort; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; import lombok.RequiredArgsConstructor; @PersistenceAdapter @RequiredArgsConstructor -class LecturePersistenceAdaptor implements FindLecturePort, SearchLecturePort { +class LecturePersistenceAdapter implements FindLecturePort, SearchLecturePort { private final LectureQueryRepository lectureQueryRepository; private final LectureRepository lectureRepository; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/BasicAcademicalCultureLectureJpaEntity.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/BasicAcademicalCultureLectureJpaEntity.java similarity index 91% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/BasicAcademicalCultureLectureJpaEntity.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/BasicAcademicalCultureLectureJpaEntity.java index 1c971e8b..20da0ebd 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/BasicAcademicalCultureLectureJpaEntity.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/BasicAcademicalCultureLectureJpaEntity.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/CommonCultureJpaEntity.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/CommonCultureJpaEntity.java similarity index 93% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/CommonCultureJpaEntity.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/CommonCultureJpaEntity.java index 04b37fd4..b3fcc205 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/CommonCultureJpaEntity.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/CommonCultureJpaEntity.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity; import javax.persistence.Entity; import javax.persistence.EnumType; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/CoreCultureJpaEntity.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/CoreCultureJpaEntity.java similarity index 93% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/CoreCultureJpaEntity.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/CoreCultureJpaEntity.java index a47edd65..fe9d3ad2 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/CoreCultureJpaEntity.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/CoreCultureJpaEntity.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity; import javax.persistence.Entity; import javax.persistence.EnumType; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/LectureJpaEntity.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/LectureJpaEntity.java similarity index 91% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/LectureJpaEntity.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/LectureJpaEntity.java index 334e49ef..7bcc18bd 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/LectureJpaEntity.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/LectureJpaEntity.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/MajorLectureJpaEntity.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/MajorLectureJpaEntity.java similarity index 92% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/MajorLectureJpaEntity.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/MajorLectureJpaEntity.java index 11e9191f..d70ac703 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/entity/MajorLectureJpaEntity.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/entity/MajorLectureJpaEntity.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/LectureMapper.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/mapper/LectureMapper.java similarity index 73% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/LectureMapper.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/mapper/LectureMapper.java index 500d2796..cbe0ec18 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/LectureMapper.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/mapper/LectureMapper.java @@ -1,12 +1,12 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.mapper; import org.springframework.stereotype.Component; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.BasicAcademicalCultureLectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.CommonCultureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.CoreCultureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.MajorLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.BasicAcademicalCultureLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.CommonCultureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.CoreCultureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.MajorLectureJpaEntity; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.BasicAcademicalCultureLecture; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.CommonCulture; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.CoreCulture; @@ -16,7 +16,7 @@ @Component public class LectureMapper { - Lecture mapToLectureModel(LectureJpaEntity lecture) { + public Lecture mapToLectureModel(LectureJpaEntity lecture) { return Lecture.builder() .id(lecture.getId()) @@ -28,7 +28,7 @@ Lecture mapToLectureModel(LectureJpaEntity lecture) { .build(); } - CommonCulture mapToCommonCultureModel(CommonCultureJpaEntity entity) { + public CommonCulture mapToCommonCultureModel(CommonCultureJpaEntity entity) { LectureJpaEntity lectureJpaEntity = entity.getLectureJpaEntity(); return CommonCulture.builder() .lecture( @@ -45,7 +45,7 @@ CommonCulture mapToCommonCultureModel(CommonCultureJpaEntity entity) { .build(); } - CoreCulture mapToCoreCultureModel(CoreCultureJpaEntity entity) { + public CoreCulture mapToCoreCultureModel(CoreCultureJpaEntity entity) { LectureJpaEntity lectureJpaEntity = entity.getLectureJpaEntity(); return CoreCulture.builder() .lecture( @@ -62,7 +62,7 @@ CoreCulture mapToCoreCultureModel(CoreCultureJpaEntity entity) { .build(); } - BasicAcademicalCultureLecture mapToBasicAcademicalCultureLectureModel( + public BasicAcademicalCultureLecture mapToBasicAcademicalCultureLectureModel( BasicAcademicalCultureLectureJpaEntity entity) { LectureJpaEntity lectureJpaEntity = entity.getLectureJpaEntity(); return BasicAcademicalCultureLecture.builder() @@ -80,7 +80,7 @@ BasicAcademicalCultureLecture mapToBasicAcademicalCultureLectureModel( .build(); } - MajorLecture mapToMajorLectureModel(MajorLectureJpaEntity entity) { + public MajorLecture mapToMajorLectureModel(MajorLectureJpaEntity entity) { LectureJpaEntity lectureJpaEntity = entity.getLectureJpaEntity(); return MajorLecture.builder() .lecture( diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/BasicAcademicalCultureRepository.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/BasicAcademicalCultureRepository.java similarity index 70% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/BasicAcademicalCultureRepository.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/BasicAcademicalCultureRepository.java index 87d9ac28..15d02955 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/BasicAcademicalCultureRepository.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/BasicAcademicalCultureRepository.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository; import java.util.List; @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.BasicAcademicalCultureLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.BasicAcademicalCultureLectureJpaEntity; public interface BasicAcademicalCultureRepository extends JpaRepository { diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/CommonCultureRepository.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/CommonCultureRepository.java similarity index 86% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/CommonCultureRepository.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/CommonCultureRepository.java index 53ca9071..562d862c 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/CommonCultureRepository.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/CommonCultureRepository.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository; import java.util.List; @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.CommonCultureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.CommonCultureJpaEntity; public interface CommonCultureRepository extends JpaRepository { diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/CoreCultureRepository.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/CoreCultureRepository.java similarity index 71% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/CoreCultureRepository.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/CoreCultureRepository.java index 5c1ddbd8..bca19e7a 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/CoreCultureRepository.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/CoreCultureRepository.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository; import java.util.List; @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.CoreCultureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.CoreCultureJpaEntity; public interface CoreCultureRepository extends JpaRepository { diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/LectureQueryRepository.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/LectureQueryRepository.java similarity index 81% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/LectureQueryRepository.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/LectureQueryRepository.java index 49743bae..70359b9f 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/LectureQueryRepository.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/LectureQueryRepository.java @@ -1,10 +1,10 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository; import java.util.List; import org.springframework.stereotype.Repository; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.QLectureJpaEntity; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.impl.JPAQueryFactory; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/LectureRepository.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/LectureRepository.java similarity index 59% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/LectureRepository.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/LectureRepository.java index bf36c370..231131a6 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/LectureRepository.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/LectureRepository.java @@ -1,10 +1,10 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; public interface LectureRepository extends JpaRepository { diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/MajorLectureRepository.java b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/MajorLectureRepository.java similarity index 69% rename from src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/MajorLectureRepository.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/MajorLectureRepository.java index 2df093b0..0221acca 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/repository/MajorLectureRepository.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/lecture/infrastructure/adapter/persistence/repository/MajorLectureRepository.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository; +package com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository; import java.util.List; @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.MajorLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.MajorLectureJpaEntity; public interface MajorLectureRepository extends JpaRepository { diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextRepository.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextRepository.java deleted file mode 100644 index 889b7574..00000000 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.plzgraduate.myongjigraduatebe.parsing.adaptor.out.persistence; - -import org.springframework.data.jpa.repository.JpaRepository; - -import com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence.UserJpaEntity; - -public interface ParsingTextRepository extends JpaRepository { - - void deleteAllByUser(UserJpaEntity user); - -} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/in/web/ParsingTextApiPresentation.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/api/ParsingTextApiPresentation.java similarity index 80% rename from src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/in/web/ParsingTextApiPresentation.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/parsing/api/ParsingTextApiPresentation.java index 194b176c..b201addd 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/in/web/ParsingTextApiPresentation.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/api/ParsingTextApiPresentation.java @@ -1,10 +1,11 @@ -package com.plzgraduate.myongjigraduatebe.parsing.adaptor.in.web; +package com.plzgraduate.myongjigraduatebe.parsing.api; import javax.validation.Valid; import org.springframework.web.bind.annotation.RequestBody; import com.plzgraduate.myongjigraduatebe.core.meta.LoginUser; +import com.plzgraduate.myongjigraduatebe.parsing.adaptor.in.web.ParsingTextRequest; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/in/web/ParsingTextController.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/api/ParsingTextController.java similarity index 72% rename from src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/in/web/ParsingTextController.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/parsing/api/ParsingTextController.java index 20e5aa96..00e21951 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/in/web/ParsingTextController.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/api/ParsingTextController.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.parsing.adaptor.in.web; +package com.plzgraduate.myongjigraduatebe.parsing.api; import javax.validation.Valid; @@ -8,9 +8,10 @@ import com.plzgraduate.myongjigraduatebe.core.meta.LoginUser; import com.plzgraduate.myongjigraduatebe.core.meta.WebAdapter; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.in.ParsingTextCommand; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.in.ParsingTextHistoryUseCase; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.in.ParsingTextUseCase; +import com.plzgraduate.myongjigraduatebe.parsing.adaptor.in.web.ParsingTextRequest; +import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextCommand; +import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextHistoryUseCase; +import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextUseCase; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/in/web/ParsingTextRequest.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/api/dto/request/ParsingTextRequest.java similarity index 95% rename from src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/in/web/ParsingTextRequest.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/parsing/api/dto/request/ParsingTextRequest.java index b2bad2a3..73bdab16 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/in/web/ParsingTextRequest.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/api/dto/request/ParsingTextRequest.java @@ -1,8 +1,8 @@ -package com.plzgraduate.myongjigraduatebe.parsing.adaptor.in.web; +package com.plzgraduate.myongjigraduatebe.parsing.api.dto.request; import javax.validation.constraints.NotNull; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.in.ParsingTextCommand; +import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextCommand; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/out/DeleteParsingTextHistoryPort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/DeleteParsingTextHistoryPort.java similarity index 96% rename from src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/out/DeleteParsingTextHistoryPort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/DeleteParsingTextHistoryPort.java index 2fa3c0d8..490ecbc6 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/out/DeleteParsingTextHistoryPort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/DeleteParsingTextHistoryPort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.parsing.application.port.out; +package com.plzgraduate.myongjigraduatebe.parsing.application.port; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/out/SaveParsingTextHistoryPort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/SaveParsingTextHistoryPort.java similarity index 97% rename from src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/out/SaveParsingTextHistoryPort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/SaveParsingTextHistoryPort.java index aff2a36f..b0598c53 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/out/SaveParsingTextHistoryPort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/SaveParsingTextHistoryPort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.parsing.application.port.out; +package com.plzgraduate.myongjigraduatebe.parsing.application.port; import com.plzgraduate.myongjigraduatebe.parsing.domain.ParsingTextHistory; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextHistoryService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextHistoryService.java index 8f61a555..c29c8695 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextHistoryService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextHistoryService.java @@ -3,11 +3,11 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.in.ParsingTextHistoryUseCase; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.in.ParsingTextCommand; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.out.SaveParsingTextHistoryPort; +import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextHistoryUseCase; +import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextCommand; +import com.plzgraduate.myongjigraduatebe.parsing.application.port.SaveParsingTextHistoryPort; import com.plzgraduate.myongjigraduatebe.parsing.domain.ParsingTextHistory; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextService.java index 86452fb4..edad5088 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextService.java @@ -10,16 +10,16 @@ import com.plzgraduate.myongjigraduatebe.core.exception.InvalidPdfException; import com.plzgraduate.myongjigraduatebe.core.exception.PdfParsingException; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.in.ParsingTextUseCase; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.in.ParsingTextCommand; +import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextUseCase; +import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextCommand; import com.plzgraduate.myongjigraduatebe.parsing.domain.ParsingInformation; import com.plzgraduate.myongjigraduatebe.parsing.domain.ParsingTakenLectureDto; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.delete.DeleteTakenLectureByUserUseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.save.SaveTakenLectureCommand; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.save.SaveTakenLectureFromParsingTextUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.update.UpdateStudentInformationUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.update.UpdateStudentInformationCommand; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureByUserUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save.SaveTakenLectureCommand; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save.SaveTakenLectureFromParsingTextUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.update.UpdateStudentInformationUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.update.UpdateStudentInformationCommand; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/in/ParsingTextCommand.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/usecase/ParsingTextCommand.java similarity index 82% rename from src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/in/ParsingTextCommand.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/usecase/ParsingTextCommand.java index 46ae9f64..0d1a1d65 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/in/ParsingTextCommand.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/usecase/ParsingTextCommand.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.parsing.application.port.in; +package com.plzgraduate.myongjigraduatebe.parsing.application.usecase; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/in/ParsingTextHistoryUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/usecase/ParsingTextHistoryUseCase.java similarity index 73% rename from src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/in/ParsingTextHistoryUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/usecase/ParsingTextHistoryUseCase.java index 91b6eb77..5c3f472b 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/in/ParsingTextHistoryUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/usecase/ParsingTextHistoryUseCase.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.parsing.application.port.in; +package com.plzgraduate.myongjigraduatebe.parsing.application.usecase; public interface ParsingTextHistoryUseCase { void saveParsingTextHistoryIfSuccess(ParsingTextCommand parsingTextCommand); diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/in/ParsingTextUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/usecase/ParsingTextUseCase.java similarity index 59% rename from src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/in/ParsingTextUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/usecase/ParsingTextUseCase.java index 270c3143..ace543ae 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/port/in/ParsingTextUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/application/usecase/ParsingTextUseCase.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.parsing.application.port.in; +package com.plzgraduate.myongjigraduatebe.parsing.application.usecase; public interface ParsingTextUseCase { diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryAdaptor.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/infrastructure/adapter/persistence/ParsingTextHistoryAdapter.java similarity index 67% rename from src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryAdaptor.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/parsing/infrastructure/adapter/persistence/ParsingTextHistoryAdapter.java index 4b639288..a6b94c8f 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryAdaptor.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/infrastructure/adapter/persistence/ParsingTextHistoryAdapter.java @@ -1,16 +1,18 @@ -package com.plzgraduate.myongjigraduatebe.parsing.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.parsing.infrastructure.adapter.persistence; import com.plzgraduate.myongjigraduatebe.core.meta.PersistenceAdapter; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.out.DeleteParsingTextHistoryPort; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.out.SaveParsingTextHistoryPort; +import com.plzgraduate.myongjigraduatebe.parsing.application.port.DeleteParsingTextHistoryPort; +import com.plzgraduate.myongjigraduatebe.parsing.application.port.SaveParsingTextHistoryPort; import com.plzgraduate.myongjigraduatebe.parsing.domain.ParsingTextHistory; +import com.plzgraduate.myongjigraduatebe.parsing.infrastructure.adapter.persistence.mapper.ParsingTextHistoryMapper; +import com.plzgraduate.myongjigraduatebe.parsing.infrastructure.adapter.persistence.repository.ParsingTextRepository; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; @PersistenceAdapter @RequiredArgsConstructor -class ParsingTextHistoryAdaptor implements SaveParsingTextHistoryPort, DeleteParsingTextHistoryPort { +class ParsingTextHistoryAdapter implements SaveParsingTextHistoryPort, DeleteParsingTextHistoryPort { private final ParsingTextRepository parsingTextRepository; private final ParsingTextHistoryMapper parsingTextHistoryMapper; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryJpaEntity.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/infrastructure/adapter/persistence/entity/ParsingTextHistoryJpaEntity.java similarity index 84% rename from src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryJpaEntity.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/parsing/infrastructure/adapter/persistence/entity/ParsingTextHistoryJpaEntity.java index 99d73973..6b058582 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryJpaEntity.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/infrastructure/adapter/persistence/entity/ParsingTextHistoryJpaEntity.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.parsing.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.parsing.infrastructure.adapter.persistence.entity; import javax.persistence.Column; import javax.persistence.Entity; @@ -13,7 +13,7 @@ import com.plzgraduate.myongjigraduatebe.core.entity.TimeBaseEntity; import com.plzgraduate.myongjigraduatebe.parsing.domain.ParsingResult; -import com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence.UserJpaEntity; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryMapper.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/infrastructure/adapter/persistence/mapper/ParsingTextHistoryMapper.java similarity index 64% rename from src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryMapper.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/parsing/infrastructure/adapter/persistence/mapper/ParsingTextHistoryMapper.java index fc65b845..0583ee8a 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryMapper.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/infrastructure/adapter/persistence/mapper/ParsingTextHistoryMapper.java @@ -1,15 +1,16 @@ -package com.plzgraduate.myongjigraduatebe.parsing.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.parsing.infrastructure.adapter.persistence.mapper; import org.springframework.stereotype.Component; +import com.plzgraduate.myongjigraduatebe.parsing.infrastructure.adapter.persistence.entity.ParsingTextHistoryJpaEntity; import com.plzgraduate.myongjigraduatebe.parsing.domain.ParsingTextHistory; -import com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence.UserJpaEntity; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; @Component -class ParsingTextHistoryMapper { +public class ParsingTextHistoryMapper { - ParsingTextHistoryJpaEntity mapToJpaEntity(ParsingTextHistory parsingTextHistory) { + public ParsingTextHistoryJpaEntity mapToJpaEntity(ParsingTextHistory parsingTextHistory) { return ParsingTextHistoryJpaEntity.builder() .id(parsingTextHistory.getId()) @@ -19,7 +20,7 @@ ParsingTextHistoryJpaEntity mapToJpaEntity(ParsingTextHistory parsingTextHistory .build(); } - UserJpaEntity mapToUserJpaEntity(User user) { + public UserJpaEntity mapToUserJpaEntity(User user) { return UserJpaEntity.builder() .id(user.getId()) diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/infrastructure/adapter/persistence/repository/ParsingTextRepository.java b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/infrastructure/adapter/persistence/repository/ParsingTextRepository.java new file mode 100644 index 00000000..9fdcbcd1 --- /dev/null +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/parsing/infrastructure/adapter/persistence/repository/ParsingTextRepository.java @@ -0,0 +1,12 @@ +package com.plzgraduate.myongjigraduatebe.parsing.infrastructure.adapter.persistence.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.plzgraduate.myongjigraduatebe.parsing.infrastructure.adapter.persistence.entity.ParsingTextHistoryJpaEntity; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; + +public interface ParsingTextRepository extends JpaRepository { + + void deleteAllByUser(UserJpaEntity user); + +} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/find/FindTakenLectureApiPresentation.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/FindTakenLectureApiPresentation.java similarity index 81% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/find/FindTakenLectureApiPresentation.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/FindTakenLectureApiPresentation.java index 61e1f408..211fc285 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/find/FindTakenLectureApiPresentation.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/FindTakenLectureApiPresentation.java @@ -1,7 +1,7 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.in.web.find; +package com.plzgraduate.myongjigraduatebe.takenlecture.api; import com.plzgraduate.myongjigraduatebe.core.meta.LoginUser; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.find.FindTakenLectureResponse; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.find.FindTakenLectureResponse; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/find/FindTakenLectureController.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/FindTakenLectureController.java similarity index 83% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/find/FindTakenLectureController.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/FindTakenLectureController.java index 2a2db8b1..e4d38f54 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/find/FindTakenLectureController.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/FindTakenLectureController.java @@ -1,12 +1,12 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.in.web.find; +package com.plzgraduate.myongjigraduatebe.takenlecture.api; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import com.plzgraduate.myongjigraduatebe.core.meta.LoginUser; import com.plzgraduate.myongjigraduatebe.core.meta.WebAdapter; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.find.FindTakenLectureUseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.find.FindTakenLectureResponse; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.find.FindTakenLectureUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.find.FindTakenLectureResponse; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/update/UpdateTakenLectureApiPresentation.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/UpdateTakenLectureApiPresentation.java similarity index 79% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/update/UpdateTakenLectureApiPresentation.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/UpdateTakenLectureApiPresentation.java index 9b72c612..55d4fc8c 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/update/UpdateTakenLectureApiPresentation.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/UpdateTakenLectureApiPresentation.java @@ -1,10 +1,11 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.in.web.update; +package com.plzgraduate.myongjigraduatebe.takenlecture.api; import javax.validation.Valid; import org.springframework.web.bind.annotation.RequestBody; import com.plzgraduate.myongjigraduatebe.core.meta.LoginUser; +import com.plzgraduate.myongjigraduatebe.takenlecture.api.dto.request.UpdateTakenLectureRequest; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/update/UpdateTakenLectureController.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/UpdateTakenLectureController.java similarity index 82% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/update/UpdateTakenLectureController.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/UpdateTakenLectureController.java index c594cb25..a803ae75 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/update/UpdateTakenLectureController.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/UpdateTakenLectureController.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.in.web.update; +package com.plzgraduate.myongjigraduatebe.takenlecture.api; import javax.validation.Valid; @@ -8,7 +8,8 @@ import com.plzgraduate.myongjigraduatebe.core.meta.LoginUser; import com.plzgraduate.myongjigraduatebe.core.meta.WebAdapter; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.update.UpdateTakenLectureUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.api.dto.request.UpdateTakenLectureRequest; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.update.UpdateTakenLectureUseCase; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/update/UpdateTakenLectureRequest.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/dto/request/UpdateTakenLectureRequest.java similarity index 88% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/update/UpdateTakenLectureRequest.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/dto/request/UpdateTakenLectureRequest.java index 6a341f7f..aeac016d 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/update/UpdateTakenLectureRequest.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/api/dto/request/UpdateTakenLectureRequest.java @@ -1,8 +1,8 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.in.web.update; +package com.plzgraduate.myongjigraduatebe.takenlecture.api.dto.request; import java.util.List; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.update.UpdateTakenLectureCommand; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.update.UpdateTakenLectureCommand; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/out/DeleteTakenLecturePort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/DeleteTakenLecturePort.java similarity index 95% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/out/DeleteTakenLecturePort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/DeleteTakenLecturePort.java index ab3b8677..c6d8d796 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/out/DeleteTakenLecturePort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/DeleteTakenLecturePort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out; +package com.plzgraduate.myongjigraduatebe.takenlecture.application.port; import java.util.List; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/out/FindTakenLecturePort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/FindTakenLecturePort.java similarity index 96% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/out/FindTakenLecturePort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/FindTakenLecturePort.java index fc2fb169..52f4e363 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/out/FindTakenLecturePort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/FindTakenLecturePort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out; +package com.plzgraduate.myongjigraduatebe.takenlecture.application.port; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/out/SaveTakenLecturePort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/SaveTakenLecturePort.java similarity index 95% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/out/SaveTakenLecturePort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/SaveTakenLecturePort.java index 012e0d7b..88006c26 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/out/SaveTakenLecturePort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/SaveTakenLecturePort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out; +package com.plzgraduate.myongjigraduatebe.takenlecture.application.port; import java.util.List; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureByUserService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureByUserService.java index 6ca3a69e..f1e5a943 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureByUserService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureByUserService.java @@ -3,8 +3,8 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.delete.DeleteTakenLectureByUserUseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out.DeleteTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureByUserUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.DeleteTakenLecturePort; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/find/FindTakenLectureService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/find/FindTakenLectureService.java index 0de42ffd..97346844 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/find/FindTakenLectureService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/find/FindTakenLectureService.java @@ -8,12 +8,12 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.find.FindTakenLectureUseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.find.FindTakenLectureResponse; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.find.TakenLectureResponse; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out.FindTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.find.FindTakenLectureUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.find.FindTakenLectureResponse; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.find.TakenLectureResponse; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.FindTakenLecturePort; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/save/SaveTakenLectureFromParsingTextService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/save/SaveTakenLectureFromParsingTextService.java index c2bd0adf..3b979aab 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/save/SaveTakenLectureFromParsingTextService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/save/SaveTakenLectureFromParsingTextService.java @@ -9,11 +9,11 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.find.FindLecturesByLectureCodeUseCase; +import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.FindLecturesByLectureCodeUseCase; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.save.SaveTakenLectureCommand; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.save.SaveTakenLectureFromParsingTextUseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out.SaveTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save.SaveTakenLectureCommand; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save.SaveTakenLectureFromParsingTextUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.SaveTakenLecturePort; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/update/UpdateTakenLectureService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/update/UpdateTakenLectureService.java index 2ae4e843..b67cd397 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/update/UpdateTakenLectureService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/update/UpdateTakenLectureService.java @@ -6,14 +6,14 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.find.FindLecturesByIdUseCase; +import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.FindLecturesByIdUseCase; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.update.UpdateTakenLectureCommand; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.update.UpdateTakenLectureUseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out.DeleteTakenLecturePort; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out.SaveTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.update.UpdateTakenLectureCommand; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.update.UpdateTakenLectureUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.DeleteTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.SaveTakenLecturePort; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/delete/DeleteTakenLectureByUserUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/delete/DeleteTakenLectureByUserUseCase.java similarity index 92% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/delete/DeleteTakenLectureByUserUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/delete/DeleteTakenLectureByUserUseCase.java index fc9a76bb..1012f5a3 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/delete/DeleteTakenLectureByUserUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/delete/DeleteTakenLectureByUserUseCase.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.delete; +package com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/find/FindTakenLectureResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/find/FindTakenLectureResponse.java similarity index 97% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/find/FindTakenLectureResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/find/FindTakenLectureResponse.java index 5b82045a..ee6fea4d 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/find/FindTakenLectureResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/find/FindTakenLectureResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.find; +package com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.find; import java.util.List; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/find/FindTakenLectureUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/find/FindTakenLectureUseCase.java similarity index 90% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/find/FindTakenLectureUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/find/FindTakenLectureUseCase.java index b2243ab4..c161479b 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/find/FindTakenLectureUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/find/FindTakenLectureUseCase.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.find; +package com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.find; public interface FindTakenLectureUseCase { FindTakenLectureResponse getTakenLectures(Long userId); diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/find/TakenLectureResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/find/TakenLectureResponse.java similarity index 98% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/find/TakenLectureResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/find/TakenLectureResponse.java index ffabaff7..bdc28d17 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/find/TakenLectureResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/find/TakenLectureResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.find; +package com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.find; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/save/SaveTakenLectureCommand.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/save/SaveTakenLectureCommand.java similarity index 98% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/save/SaveTakenLectureCommand.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/save/SaveTakenLectureCommand.java index 0e9c0d71..4c88b9ae 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/save/SaveTakenLectureCommand.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/save/SaveTakenLectureCommand.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.save; +package com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save; import java.util.List; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/save/SaveTakenLectureFromParsingTextUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/save/SaveTakenLectureFromParsingTextUseCase.java similarity index 92% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/save/SaveTakenLectureFromParsingTextUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/save/SaveTakenLectureFromParsingTextUseCase.java index c437d44b..625584a9 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/save/SaveTakenLectureFromParsingTextUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/save/SaveTakenLectureFromParsingTextUseCase.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.save; +package com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save; public interface SaveTakenLectureFromParsingTextUseCase { diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/update/UpdateTakenLectureCommand.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/update/UpdateTakenLectureCommand.java similarity index 96% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/update/UpdateTakenLectureCommand.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/update/UpdateTakenLectureCommand.java index 1edc1b50..99bf4b26 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/update/UpdateTakenLectureCommand.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/update/UpdateTakenLectureCommand.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.update; +package com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.update; import java.util.List; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/update/UpdateTakenLectureUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/update/UpdateTakenLectureUseCase.java similarity index 90% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/update/UpdateTakenLectureUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/update/UpdateTakenLectureUseCase.java index 67e5d4de..f8168c7c 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/port/in/update/UpdateTakenLectureUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/usecase/update/UpdateTakenLectureUseCase.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.update; +package com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.update; public interface UpdateTakenLectureUseCase { diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLecturePersistenceAdaptor.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/TakenLecturePersistenceAdapter.java similarity index 78% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLecturePersistenceAdaptor.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/TakenLecturePersistenceAdapter.java index 274615d5..55751fa4 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLecturePersistenceAdaptor.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/TakenLecturePersistenceAdapter.java @@ -1,22 +1,24 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence; import java.util.List; import java.util.Set; import java.util.stream.Collectors; import com.plzgraduate.myongjigraduatebe.core.meta.PersistenceAdapter; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out.DeleteTakenLecturePort; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out.FindTakenLecturePort; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out.SaveTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.entity.TakenLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.mapper.TakenLectureMapper; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.DeleteTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.FindTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.SaveTakenLecturePort; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; -import com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence.UserJpaEntity; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; @PersistenceAdapter @RequiredArgsConstructor -class TakenLecturePersistenceAdaptor implements FindTakenLecturePort, SaveTakenLecturePort, DeleteTakenLecturePort { +class TakenLecturePersistenceAdapter implements FindTakenLecturePort, SaveTakenLecturePort, DeleteTakenLecturePort { private final TakenLectureRepository takenLectureRepository; private final TakenLectureMapper takenLectureMapper; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureRepository.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/TakenLectureRepository.java similarity index 70% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureRepository.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/TakenLectureRepository.java index c3685bfa..6ba91b45 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureRepository.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/TakenLectureRepository.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence; import java.util.List; @@ -7,7 +7,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence.UserJpaEntity; +import com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.entity.TakenLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; public interface TakenLectureRepository extends JpaRepository { diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureJpaEntity.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/entity/TakenLectureJpaEntity.java similarity index 75% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureJpaEntity.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/entity/TakenLectureJpaEntity.java index b09f6a20..521624b1 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureJpaEntity.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/entity/TakenLectureJpaEntity.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.entity; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -9,9 +9,9 @@ import javax.persistence.Table; import com.plzgraduate.myongjigraduatebe.core.entity.TimeBaseEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.Semester; -import com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence.UserJpaEntity; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureMapper.java b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/mapper/TakenLectureMapper.java similarity index 78% rename from src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureMapper.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/mapper/TakenLectureMapper.java index 30a07921..5ec48452 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureMapper.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/takenlecture/infrastructure/adapter/persistence/mapper/TakenLectureMapper.java @@ -1,17 +1,18 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.mapper; import org.springframework.stereotype.Component; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; +import com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.entity.TakenLectureJpaEntity; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; -import com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence.UserJpaEntity; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; @Component -class TakenLectureMapper { +public class TakenLectureMapper { - TakenLecture mapToDomainEntity(TakenLectureJpaEntity takenLecture) { + public TakenLecture mapToDomainEntity(TakenLectureJpaEntity takenLecture) { return TakenLecture.builder() .id(takenLecture.getId()) @@ -23,7 +24,7 @@ TakenLecture mapToDomainEntity(TakenLectureJpaEntity takenLecture) { .build(); } - TakenLectureJpaEntity mapToJpaEntity(TakenLecture takenLecture) { + public TakenLectureJpaEntity mapToJpaEntity(TakenLecture takenLecture) { return TakenLectureJpaEntity.builder() .id(takenLecture.getId()) @@ -52,7 +53,7 @@ private User mapToUserDomainEntity(UserJpaEntity user) { .build(); } - UserJpaEntity mapToUserJpaEntity(User user) { + public UserJpaEntity mapToUserJpaEntity(User user) { return UserJpaEntity.builder() .id(user.getId()) diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/findauthid/FindAuthIdApiPresentation.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/FindAuthIdApiPresentation.java similarity index 76% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/findauthid/FindAuthIdApiPresentation.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/FindAuthIdApiPresentation.java index 6ff11d13..aad23168 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/findauthid/FindAuthIdApiPresentation.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/FindAuthIdApiPresentation.java @@ -1,8 +1,8 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.findauthid; +package com.plzgraduate.myongjigraduatebe.user.api.findauthid; import org.springframework.web.bind.annotation.PathVariable; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.UserAuthIdResponse; +import com.plzgraduate.myongjigraduatebe.user.api.findauthid.dto.response.UserAuthIdResponse; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/findauthid/FindAuthIdController.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/FindAuthIdController.java similarity index 73% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/findauthid/FindAuthIdController.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/FindAuthIdController.java index 3a4060da..5ab85958 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/findauthid/FindAuthIdController.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/FindAuthIdController.java @@ -1,12 +1,12 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.findauthid; +package com.plzgraduate.myongjigraduatebe.user.api.findauthid; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import com.plzgraduate.myongjigraduatebe.core.meta.WebAdapter; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserAuthIdUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.UserAuthIdResponse; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserAuthIdUseCase; +import com.plzgraduate.myongjigraduatebe.user.api.findauthid.dto.response.UserAuthIdResponse; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/UserAuthIdResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/dto/response/UserAuthIdResponse.java similarity index 90% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/UserAuthIdResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/dto/response/UserAuthIdResponse.java index e284df0c..3274382d 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/UserAuthIdResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/findauthid/dto/response/UserAuthIdResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.find; +package com.plzgraduate.myongjigraduatebe.user.api.findauthid.dto.response; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/finduserinformation/FindUserInformationApiPresentation.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/finduserinformation/FindUserInformationApiPresentation.java similarity index 71% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/finduserinformation/FindUserInformationApiPresentation.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/finduserinformation/FindUserInformationApiPresentation.java index 5d60f829..76b95205 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/finduserinformation/FindUserInformationApiPresentation.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/finduserinformation/FindUserInformationApiPresentation.java @@ -1,7 +1,7 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.finduserinformation; +package com.plzgraduate.myongjigraduatebe.user.api.finduserinformation; import com.plzgraduate.myongjigraduatebe.core.meta.LoginUser; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.UserInformationResponse; +import com.plzgraduate.myongjigraduatebe.user.api.finduserinformation.dto.response.UserInformationResponse; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/finduserinformation/FindUserInformationController.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/finduserinformation/FindUserInformationController.java similarity index 71% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/finduserinformation/FindUserInformationController.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/finduserinformation/FindUserInformationController.java index af481908..72a4edd3 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/finduserinformation/FindUserInformationController.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/finduserinformation/FindUserInformationController.java @@ -1,12 +1,12 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.finduserinformation; +package com.plzgraduate.myongjigraduatebe.user.api.finduserinformation; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import com.plzgraduate.myongjigraduatebe.core.meta.LoginUser; import com.plzgraduate.myongjigraduatebe.core.meta.WebAdapter; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserInformationUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.UserInformationResponse; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserInformationUseCase; +import com.plzgraduate.myongjigraduatebe.user.api.finduserinformation.dto.response.UserInformationResponse; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/UserInformationResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/finduserinformation/dto/response/UserInformationResponse.java similarity index 88% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/UserInformationResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/finduserinformation/dto/response/UserInformationResponse.java index 5f64f471..abed479c 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/UserInformationResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/finduserinformation/dto/response/UserInformationResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.find; +package com.plzgraduate.myongjigraduatebe.user.api.finduserinformation.dto.response; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/resetpassword/ResetPasswordApiPresentation.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordApiPresentation.java similarity index 87% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/resetpassword/ResetPasswordApiPresentation.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordApiPresentation.java index 97c5ea51..9e44f12b 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/resetpassword/ResetPasswordApiPresentation.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordApiPresentation.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.resetpassword; +package com.plzgraduate.myongjigraduatebe.user.api.resetpassword; import javax.validation.Valid; @@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.validate.ValidateUserResponse; +import com.plzgraduate.myongjigraduatebe.user.api.resetpassword.dto.response.ValidateUserResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/resetpassword/ResetPasswordController.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordController.java similarity index 76% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/resetpassword/ResetPasswordController.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordController.java index 1102380c..c2d8f909 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/resetpassword/ResetPasswordController.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordController.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.resetpassword; +package com.plzgraduate.myongjigraduatebe.user.api.resetpassword; import javax.validation.Valid; @@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.RequestParam; import com.plzgraduate.myongjigraduatebe.core.meta.WebAdapter; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.resetpassword.ResetPasswordUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.validate.ValidateUserResponse; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.validate.ValidateUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.resetpassword.ResetPasswordUseCase; +import com.plzgraduate.myongjigraduatebe.user.api.resetpassword.dto.response.ValidateUserResponse; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.validate.ValidateUserUseCase; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/resetpassword/ResetPasswordRequest.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordRequest.java similarity index 88% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/resetpassword/ResetPasswordRequest.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordRequest.java index f0255392..6aaa1d2f 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/resetpassword/ResetPasswordRequest.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/ResetPasswordRequest.java @@ -1,9 +1,9 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.resetpassword; +package com.plzgraduate.myongjigraduatebe.user.api.resetpassword; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.resetpassword.ResetPasswordCommand; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.resetpassword.ResetPasswordCommand; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/validate/ValidateUserResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/dto/response/ValidateUserResponse.java similarity index 82% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/validate/ValidateUserResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/dto/response/ValidateUserResponse.java index efc37a50..f7b6b7cd 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/validate/ValidateUserResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/resetpassword/dto/response/ValidateUserResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.validate; +package com.plzgraduate.myongjigraduatebe.user.api.resetpassword.dto.response; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/signup/SignUpApiPresentation.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/SignUpApiPresentation.java similarity index 78% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/signup/SignUpApiPresentation.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/SignUpApiPresentation.java index 4500bbf2..49825dbe 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/signup/SignUpApiPresentation.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/SignUpApiPresentation.java @@ -1,12 +1,12 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.signup; +package com.plzgraduate.myongjigraduatebe.user.api.signup; import javax.validation.Valid; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.AuthIdDuplicationResponse; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.StudentNumberDuplicationResponse; +import com.plzgraduate.myongjigraduatebe.user.api.signup.dto.response.AuthIdDuplicationResponse; +import com.plzgraduate.myongjigraduatebe.user.api.signup.dto.response.StudentNumberDuplicationResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/signup/SignUpController.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/SignUpController.java similarity index 71% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/signup/SignUpController.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/SignUpController.java index 6ac98ffb..e8f2fc18 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/signup/SignUpController.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/SignUpController.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.signup; +package com.plzgraduate.myongjigraduatebe.user.api.signup; import javax.validation.Valid; @@ -9,11 +9,11 @@ import org.springframework.web.bind.annotation.RequestParam; import com.plzgraduate.myongjigraduatebe.core.meta.WebAdapter; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.AuthIdDuplicationResponse; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.CheckAuthIdDuplicationUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.CheckStudentNumberDuplicationUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.StudentNumberDuplicationResponse; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.signup.SignUpUseCase; +import com.plzgraduate.myongjigraduatebe.user.api.signup.dto.response.AuthIdDuplicationResponse; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.check.CheckAuthIdDuplicationUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.check.CheckStudentNumberDuplicationUseCase; +import com.plzgraduate.myongjigraduatebe.user.api.signup.dto.response.StudentNumberDuplicationResponse; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.signup.SignUpUseCase; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/signup/SignUpRequest.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/SignUpRequest.java similarity index 91% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/signup/SignUpRequest.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/SignUpRequest.java index a9998a17..8d992623 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/signup/SignUpRequest.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/SignUpRequest.java @@ -1,10 +1,10 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.signup; +package com.plzgraduate.myongjigraduatebe.user.api.signup; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.signup.SignUpCommand; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.signup.SignUpCommand; import com.plzgraduate.myongjigraduatebe.user.domain.model.EnglishLevel; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/check/AuthIdDuplicationResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/dto/response/AuthIdDuplicationResponse.java similarity index 81% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/check/AuthIdDuplicationResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/dto/response/AuthIdDuplicationResponse.java index 9a2fc87f..72a8cad0 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/check/AuthIdDuplicationResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/dto/response/AuthIdDuplicationResponse.java @@ -1,9 +1,8 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.check; +package com.plzgraduate.myongjigraduatebe.user.api.signup.dto.response; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Getter; -import lombok.NoArgsConstructor; @Getter public class AuthIdDuplicationResponse { diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/check/StudentNumberDuplicationResponse.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/dto/response/StudentNumberDuplicationResponse.java similarity index 87% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/check/StudentNumberDuplicationResponse.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/dto/response/StudentNumberDuplicationResponse.java index c511ea41..409bf35a 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/check/StudentNumberDuplicationResponse.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/signup/dto/response/StudentNumberDuplicationResponse.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.check; +package com.plzgraduate.myongjigraduatebe.user.api.signup.dto.response; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/withdraw/WithDrawApiPresentation.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/withdraw/WithDrawApiPresentation.java similarity index 87% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/withdraw/WithDrawApiPresentation.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/withdraw/WithDrawApiPresentation.java index 467df438..ca84d557 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/withdraw/WithDrawApiPresentation.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/withdraw/WithDrawApiPresentation.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.withdraw; +package com.plzgraduate.myongjigraduatebe.user.api.withdraw; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/withdraw/WithDrawController.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/withdraw/WithDrawController.java similarity index 81% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/withdraw/WithDrawController.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/withdraw/WithDrawController.java index f1d87d08..3b09918b 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/withdraw/WithDrawController.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/withdraw/WithDrawController.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.withdraw; +package com.plzgraduate.myongjigraduatebe.user.api.withdraw; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -6,7 +6,7 @@ import com.plzgraduate.myongjigraduatebe.core.meta.LoginUser; import com.plzgraduate.myongjigraduatebe.core.meta.WebAdapter; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.withdraw.WithDrawUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.withdraw.WithDrawUserUseCase; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/withdraw/WithDrawRequest.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/withdraw/WithDrawRequest.java similarity index 77% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/withdraw/WithDrawRequest.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/api/withdraw/WithDrawRequest.java index 9c258bb9..52d07b32 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/withdraw/WithDrawRequest.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/api/withdraw/WithDrawRequest.java @@ -1,8 +1,8 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.withdraw; +package com.plzgraduate.myongjigraduatebe.user.api.withdraw; import javax.validation.constraints.NotBlank; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.withdraw.WithDrawCommand; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.withdraw.WithDrawCommand; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/CheckUserPort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/CheckUserPort.java similarity index 67% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/CheckUserPort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/CheckUserPort.java index 9c95ac0c..444dabb7 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/CheckUserPort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/CheckUserPort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.out; +package com.plzgraduate.myongjigraduatebe.user.application.port; public interface CheckUserPort { boolean checkDuplicateAuthId(String authId); diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/DeleteUserPort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/DeleteUserPort.java similarity index 65% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/DeleteUserPort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/DeleteUserPort.java index 9804faf1..3c1e56c9 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/DeleteUserPort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/DeleteUserPort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.out; +package com.plzgraduate.myongjigraduatebe.user.application.port; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/FindUserPort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/FindUserPort.java similarity index 80% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/FindUserPort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/FindUserPort.java index 75521358..249d30d9 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/FindUserPort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/FindUserPort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.out; +package com.plzgraduate.myongjigraduatebe.user.application.port; import java.util.Optional; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/SaveUserPort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/SaveUserPort.java similarity index 64% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/SaveUserPort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/SaveUserPort.java index 75c49ece..9aac0cf8 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/SaveUserPort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/SaveUserPort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.out; +package com.plzgraduate.myongjigraduatebe.user.application.port; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/UpdateUserPort.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/UpdateUserPort.java similarity index 65% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/UpdateUserPort.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/UpdateUserPort.java index 90623dac..ce29763b 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/out/UpdateUserPort.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/UpdateUserPort.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.out; +package com.plzgraduate.myongjigraduatebe.user.application.port; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/check/CheckAuthIdDuplicationUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/check/CheckAuthIdDuplicationUseCase.java deleted file mode 100644 index 80188a9a..00000000 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/check/CheckAuthIdDuplicationUseCase.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.check; - -public interface CheckAuthIdDuplicationUseCase { - - AuthIdDuplicationResponse checkAuthIdDuplication(String authId); -} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/check/CheckStudentNumberDuplicationUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/check/CheckStudentNumberDuplicationUseCase.java deleted file mode 100644 index 212d575f..00000000 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/check/CheckStudentNumberDuplicationUseCase.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.check; - -public interface CheckStudentNumberDuplicationUseCase { - - StudentNumberDuplicationResponse checkStudentNumberDuplication(String studentNumber); -} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/FindUserAuthIdUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/FindUserAuthIdUseCase.java deleted file mode 100644 index d7f4cf7f..00000000 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/FindUserAuthIdUseCase.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.find; - -public interface FindUserAuthIdUseCase { - - UserAuthIdResponse findUserAuthId(String studentNumber); -} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/FindUserInformationUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/FindUserInformationUseCase.java deleted file mode 100644 index ed60d719..00000000 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/FindUserInformationUseCase.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.find; - -public interface FindUserInformationUseCase { - - UserInformationResponse findUserInformation(Long userId); -} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/validate/ValidateUserUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/validate/ValidateUserUseCase.java deleted file mode 100644 index 8d776bda..00000000 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/validate/ValidateUserUseCase.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.validate; - -public interface ValidateUserUseCase { - - ValidateUserResponse validateUser(String studentNumber, String authId); -} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckAuthIdDuplicationService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckAuthIdDuplicationService.java index a80417e9..b2145274 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckAuthIdDuplicationService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckAuthIdDuplicationService.java @@ -3,9 +3,9 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.AuthIdDuplicationResponse; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.CheckAuthIdDuplicationUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.CheckUserPort; +import com.plzgraduate.myongjigraduatebe.user.api.signup.dto.response.AuthIdDuplicationResponse; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.check.CheckAuthIdDuplicationUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.port.CheckUserPort; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckStudentNumberDuplicationService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckStudentNumberDuplicationService.java index bd562c1f..aaf635eb 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckStudentNumberDuplicationService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckStudentNumberDuplicationService.java @@ -3,9 +3,9 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.CheckStudentNumberDuplicationUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.StudentNumberDuplicationResponse; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.CheckUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.check.CheckStudentNumberDuplicationUseCase; +import com.plzgraduate.myongjigraduatebe.user.api.signup.dto.response.StudentNumberDuplicationResponse; +import com.plzgraduate.myongjigraduatebe.user.application.port.CheckUserPort; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserAuthIdService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserAuthIdService.java index 19727039..bec5a254 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserAuthIdService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserAuthIdService.java @@ -3,9 +3,9 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserAuthIdUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.UserAuthIdResponse; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserAuthIdUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.api.findauthid.dto.response.UserAuthIdResponse; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserInformationService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserInformationService.java index cac61abf..866f5c82 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserInformationService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserInformationService.java @@ -3,9 +3,9 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserInformationUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.UserInformationResponse; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserInformationUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.api.finduserinformation.dto.response.UserInformationResponse; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserService.java index 1e46a34a..1fed0c55 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserService.java @@ -3,8 +3,8 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.FindUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.port.FindUserPort; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/resetpassword/ResetPasswordService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/resetpassword/ResetPasswordService.java index e36f7732..6526cac1 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/resetpassword/ResetPasswordService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/resetpassword/ResetPasswordService.java @@ -4,10 +4,10 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.resetpassword.ResetPasswordCommand; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.resetpassword.ResetPasswordUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.UpdateUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.resetpassword.ResetPasswordCommand; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.resetpassword.ResetPasswordUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.port.UpdateUserPort; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/signup/SignUpService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/signup/SignUpService.java index 8a534020..ee9b4427 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/signup/SignUpService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/signup/SignUpService.java @@ -4,10 +4,10 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.signup.SignUpUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.signup.SignUpCommand; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.CheckUserPort; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.SaveUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.signup.SignUpUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.signup.SignUpCommand; +import com.plzgraduate.myongjigraduatebe.user.application.port.CheckUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.port.SaveUserPort; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/update/UpdateStudentInformationService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/update/UpdateStudentInformationService.java index bface4eb..ad3fa010 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/update/UpdateStudentInformationService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/update/UpdateStudentInformationService.java @@ -3,9 +3,9 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.update.UpdateStudentInformationUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.update.UpdateStudentInformationCommand; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.UpdateUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.update.UpdateStudentInformationUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.update.UpdateStudentInformationCommand; +import com.plzgraduate.myongjigraduatebe.user.application.port.UpdateUserPort; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/validate/ValidateUserService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/validate/ValidateUserService.java index eb0f5227..fae31780 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/validate/ValidateUserService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/validate/ValidateUserService.java @@ -3,9 +3,9 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.validate.ValidateUserResponse; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.validate.ValidateUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.api.resetpassword.dto.response.ValidateUserResponse; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.validate.ValidateUserUseCase; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserService.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserService.java index 2e5dd608..448dbaca 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserService.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserService.java @@ -4,12 +4,12 @@ import org.springframework.transaction.annotation.Transactional; import com.plzgraduate.myongjigraduatebe.core.meta.UseCase; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.out.DeleteParsingTextHistoryPort; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.delete.DeleteTakenLectureByUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.withdraw.WithDrawCommand; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.withdraw.WithDrawUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.DeleteUserPort; +import com.plzgraduate.myongjigraduatebe.parsing.application.port.DeleteParsingTextHistoryPort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureByUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.withdraw.WithDrawCommand; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.withdraw.WithDrawUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.port.DeleteUserPort; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/check/CheckAuthIdDuplicationUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/check/CheckAuthIdDuplicationUseCase.java new file mode 100644 index 00000000..58f0dde3 --- /dev/null +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/check/CheckAuthIdDuplicationUseCase.java @@ -0,0 +1,8 @@ +package com.plzgraduate.myongjigraduatebe.user.application.usecase.check; + +import com.plzgraduate.myongjigraduatebe.user.api.signup.dto.response.AuthIdDuplicationResponse; + +public interface CheckAuthIdDuplicationUseCase { + + AuthIdDuplicationResponse checkAuthIdDuplication(String authId); +} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/check/CheckStudentNumberDuplicationUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/check/CheckStudentNumberDuplicationUseCase.java new file mode 100644 index 00000000..d84716cd --- /dev/null +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/check/CheckStudentNumberDuplicationUseCase.java @@ -0,0 +1,8 @@ +package com.plzgraduate.myongjigraduatebe.user.application.usecase.check; + +import com.plzgraduate.myongjigraduatebe.user.api.signup.dto.response.StudentNumberDuplicationResponse; + +public interface CheckStudentNumberDuplicationUseCase { + + StudentNumberDuplicationResponse checkStudentNumberDuplication(String studentNumber); +} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/find/FindUserAuthIdUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/find/FindUserAuthIdUseCase.java new file mode 100644 index 00000000..38b70381 --- /dev/null +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/find/FindUserAuthIdUseCase.java @@ -0,0 +1,8 @@ +package com.plzgraduate.myongjigraduatebe.user.application.usecase.find; + +import com.plzgraduate.myongjigraduatebe.user.api.findauthid.dto.response.UserAuthIdResponse; + +public interface FindUserAuthIdUseCase { + + UserAuthIdResponse findUserAuthId(String studentNumber); +} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/find/FindUserInformationUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/find/FindUserInformationUseCase.java new file mode 100644 index 00000000..f664aa4a --- /dev/null +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/find/FindUserInformationUseCase.java @@ -0,0 +1,8 @@ +package com.plzgraduate.myongjigraduatebe.user.application.usecase.find; + +import com.plzgraduate.myongjigraduatebe.user.api.finduserinformation.dto.response.UserInformationResponse; + +public interface FindUserInformationUseCase { + + UserInformationResponse findUserInformation(Long userId); +} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/FindUserUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/find/FindUserUseCase.java similarity index 75% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/FindUserUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/find/FindUserUseCase.java index 81f8e3c1..480bd97c 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/find/FindUserUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/find/FindUserUseCase.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.find; +package com.plzgraduate.myongjigraduatebe.user.application.usecase.find; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/resetpassword/ResetPasswordCommand.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/resetpassword/ResetPasswordCommand.java similarity index 84% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/resetpassword/ResetPasswordCommand.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/resetpassword/ResetPasswordCommand.java index 639de46b..2a2ae234 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/resetpassword/ResetPasswordCommand.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/resetpassword/ResetPasswordCommand.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.resetpassword; +package com.plzgraduate.myongjigraduatebe.user.application.usecase.resetpassword; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/resetpassword/ResetPasswordUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/resetpassword/ResetPasswordUseCase.java similarity index 56% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/resetpassword/ResetPasswordUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/resetpassword/ResetPasswordUseCase.java index 23faee77..c727b560 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/resetpassword/ResetPasswordUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/resetpassword/ResetPasswordUseCase.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.resetpassword; +package com.plzgraduate.myongjigraduatebe.user.application.usecase.resetpassword; public interface ResetPasswordUseCase { diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/signup/SignUpCommand.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/signup/SignUpCommand.java similarity index 88% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/signup/SignUpCommand.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/signup/SignUpCommand.java index 92e91d67..a37e3096 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/signup/SignUpCommand.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/signup/SignUpCommand.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.signup; +package com.plzgraduate.myongjigraduatebe.user.application.usecase.signup; import com.plzgraduate.myongjigraduatebe.user.domain.model.EnglishLevel; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/signup/SignUpUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/signup/SignUpUseCase.java similarity index 51% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/signup/SignUpUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/signup/SignUpUseCase.java index b6bc2e01..c846cbf3 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/signup/SignUpUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/signup/SignUpUseCase.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.signup; +package com.plzgraduate.myongjigraduatebe.user.application.usecase.signup; public interface SignUpUseCase { void signUp(SignUpCommand signUpCommand); diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/update/UpdateStudentInformationCommand.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/update/UpdateStudentInformationCommand.java similarity index 93% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/update/UpdateStudentInformationCommand.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/update/UpdateStudentInformationCommand.java index 4c0b65c3..394ab9cc 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/update/UpdateStudentInformationCommand.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/update/UpdateStudentInformationCommand.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.update; +package com.plzgraduate.myongjigraduatebe.user.application.usecase.update; import com.plzgraduate.myongjigraduatebe.user.domain.model.StudentCategory; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/update/UpdateStudentInformationUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/update/UpdateStudentInformationUseCase.java similarity index 64% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/update/UpdateStudentInformationUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/update/UpdateStudentInformationUseCase.java index 42e96aff..3bb36a80 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/update/UpdateStudentInformationUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/update/UpdateStudentInformationUseCase.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.update; +package com.plzgraduate.myongjigraduatebe.user.application.usecase.update; public interface UpdateStudentInformationUseCase { void updateUser(UpdateStudentInformationCommand updateStudentInformationCommand); diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/validate/ValidateUserUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/validate/ValidateUserUseCase.java new file mode 100644 index 00000000..a919e53e --- /dev/null +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/validate/ValidateUserUseCase.java @@ -0,0 +1,8 @@ +package com.plzgraduate.myongjigraduatebe.user.application.usecase.validate; + +import com.plzgraduate.myongjigraduatebe.user.api.resetpassword.dto.response.ValidateUserResponse; + +public interface ValidateUserUseCase { + + ValidateUserResponse validateUser(String studentNumber, String authId); +} diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/withdraw/WithDrawCommand.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/withdraw/WithDrawCommand.java similarity index 72% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/withdraw/WithDrawCommand.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/withdraw/WithDrawCommand.java index a41c34df..fd59e394 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/withdraw/WithDrawCommand.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/withdraw/WithDrawCommand.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.withdraw; +package com.plzgraduate.myongjigraduatebe.user.application.usecase.withdraw; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/withdraw/WithDrawUserUseCase.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/withdraw/WithDrawUserUseCase.java similarity index 57% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/withdraw/WithDrawUserUseCase.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/withdraw/WithDrawUserUseCase.java index 5ada1f8f..7be39fe9 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/port/in/withdraw/WithDrawUserUseCase.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/application/usecase/withdraw/WithDrawUserUseCase.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.application.port.in.withdraw; +package com.plzgraduate.myongjigraduatebe.user.application.usecase.withdraw; public interface WithDrawUserUseCase { diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserPersistenceAdaptor.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/infrastructure/adapter/persistence/UserPersistenceAdapter.java similarity index 65% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserPersistenceAdaptor.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/infrastructure/adapter/persistence/UserPersistenceAdapter.java index 2e69377e..9ad215ed 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserPersistenceAdaptor.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/infrastructure/adapter/persistence/UserPersistenceAdapter.java @@ -1,14 +1,18 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence; import java.util.Optional; import com.plzgraduate.myongjigraduatebe.core.meta.PersistenceAdapter; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.CheckUserPort; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.DeleteUserPort; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.FindUserPort; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.SaveUserPort; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.UpdateUserPort; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; +import com.plzgraduate.myongjigraduatebe.user.adapter.out.persistence.mapper.UserMapper; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.repository.UserRepository; +import com.plzgraduate.myongjigraduatebe.user.application.port.CheckUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.port.DeleteUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.port.FindUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.port.SaveUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.port.UpdateUserPort; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.mapper.UserMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -16,7 +20,7 @@ @PersistenceAdapter @Slf4j @RequiredArgsConstructor -class UserPersistenceAdaptor implements FindUserPort, SaveUserPort, CheckUserPort, UpdateUserPort, DeleteUserPort { +class UserPersistenceAdapter implements FindUserPort, SaveUserPort, CheckUserPort, UpdateUserPort, DeleteUserPort { private final UserMapper userMapper; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserJpaEntity.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/infrastructure/adapter/persistence/entity/UserJpaEntity.java similarity index 93% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserJpaEntity.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/infrastructure/adapter/persistence/entity/UserJpaEntity.java index 8e9e784d..f44337bb 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserJpaEntity.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/infrastructure/adapter/persistence/entity/UserJpaEntity.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserMapper.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/infrastructure/adapter/persistence/mapper/UserMapper.java similarity index 85% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserMapper.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/infrastructure/adapter/persistence/mapper/UserMapper.java index 91b49408..b0e5f1dc 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserMapper.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/infrastructure/adapter/persistence/mapper/UserMapper.java @@ -1,7 +1,8 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.mapper; import org.springframework.stereotype.Component; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; @Component diff --git a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserRepository.java b/src/main/java/com/plzgraduate/myongjigraduatebe/user/infrastructure/adapter/persistence/repository/UserRepository.java similarity index 66% rename from src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserRepository.java rename to src/main/java/com/plzgraduate/myongjigraduatebe/user/infrastructure/adapter/persistence/repository/UserRepository.java index fa268179..cebf64eb 100644 --- a/src/main/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserRepository.java +++ b/src/main/java/com/plzgraduate/myongjigraduatebe/user/infrastructure/adapter/persistence/repository/UserRepository.java @@ -1,9 +1,11 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.repository; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; + public interface UserRepository extends JpaRepository { Optional findByAuthId(String authId); diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/graduation/adpater/in/web/CalculateGraduationControllerTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/graduation/adpater/in/web/CalculateGraduationControllerTest.java index 188b1168..220d4dbe 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/graduation/adpater/in/web/CalculateGraduationControllerTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/graduation/adpater/in/web/CalculateGraduationControllerTest.java @@ -10,11 +10,11 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response.BasicInfoResponse; -import com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response.ChapelResultResponse; -import com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response.DetailGraduationResultResponse; -import com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response.GraduationResponse; -import com.plzgraduate.myongjigraduatebe.graduation.application.port.in.response.RestResultResponse; +import com.plzgraduate.myongjigraduatebe.graduation.api.dto.response.BasicInfoResponse; +import com.plzgraduate.myongjigraduatebe.graduation.api.dto.response.ChapelResultResponse; +import com.plzgraduate.myongjigraduatebe.graduation.api.dto.response.DetailGraduationResultResponse; +import com.plzgraduate.myongjigraduatebe.graduation.api.dto.response.GraduationResponse; +import com.plzgraduate.myongjigraduatebe.graduation.api.dto.response.RestResultResponse; import com.plzgraduate.myongjigraduatebe.support.WebAdaptorTestSupport; import com.plzgraduate.myongjigraduatebe.support.WithMockAuthenticationUser; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/in/web/SearchLectureControllerTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/in/web/SearchLectureControllerTest.java index 7f53cad3..16e8899f 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/in/web/SearchLectureControllerTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/in/web/SearchLectureControllerTest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search.LectureResponse; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search.SearchLectureResponse; +import com.plzgraduate.myongjigraduatebe.lecture.api.dto.response.LectureResponse; +import com.plzgraduate.myongjigraduatebe.lecture.api.dto.response.SearchLectureResponse; import com.plzgraduate.myongjigraduatebe.support.WebAdaptorTestSupport; import com.plzgraduate.myongjigraduatebe.support.WithMockAuthenticationUser; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/LectureQueryRepositoryTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/LectureQueryRepositoryTest.java index 156ec3c2..513be785 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/LectureQueryRepositoryTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/LectureQueryRepositoryTest.java @@ -8,9 +8,9 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureQueryRepository; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureQueryRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureRepository; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; class LectureQueryRepositoryTest extends PersistenceTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/TestQuerydslConfig.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/TestQuerydslConfig.java index 9337c5dd..583a0dc2 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/TestQuerydslConfig.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/TestQuerydslConfig.java @@ -6,7 +6,7 @@ import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureQueryRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureQueryRepository; import com.querydsl.jpa.impl.JPAQueryFactory; @TestConfiguration diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/BasicAcademicalCultureLectureRepositoryTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/BasicAcademicalCultureLectureRepositoryTest.java index 1db75b19..f3287dfe 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/BasicAcademicalCultureLectureRepositoryTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/BasicAcademicalCultureLectureRepositoryTest.java @@ -9,10 +9,10 @@ import org.junit.jupiter.params.provider.ValueSource; import org.springframework.beans.factory.annotation.Autowired; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.BasicAcademicalCultureLectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.BasicAcademicalCultureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.BasicAcademicalCultureLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.BasicAcademicalCultureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureRepository; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; class BasicAcademicalCultureLectureRepositoryTest extends PersistenceTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/CommonCultureRepositoryTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/CommonCultureRepositoryTest.java index 35ef47b5..dfbf1b57 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/CommonCultureRepositoryTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/CommonCultureRepositoryTest.java @@ -10,10 +10,10 @@ import org.junit.jupiter.params.provider.ValueSource; import org.springframework.beans.factory.annotation.Autowired; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.CommonCultureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.CommonCultureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.CommonCultureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.CommonCultureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureRepository; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; class CommonCultureRepositoryTest extends PersistenceTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/CoreCultureRepositoryTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/CoreCultureRepositoryTest.java index 9f3ca91f..fe78a296 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/CoreCultureRepositoryTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/CoreCultureRepositoryTest.java @@ -9,10 +9,10 @@ import org.junit.jupiter.params.provider.ValueSource; import org.springframework.beans.factory.annotation.Autowired; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.CoreCultureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.CoreCultureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.CoreCultureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.CoreCultureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureRepository; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; class CoreCultureRepositoryTest extends PersistenceTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindBasicAcademicalCulturePersistenceAdapterTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindBasicAcademicalCulturePersistenceAdapterTest.java index a69a4cdb..5ac9eec1 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindBasicAcademicalCulturePersistenceAdapterTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindBasicAcademicalCulturePersistenceAdapterTest.java @@ -12,10 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired; import com.plzgraduate.myongjigraduatebe.fixture.UserFixture; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.BasicAcademicalCultureLectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.BasicAcademicalCultureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.adapter.persistence.FindBasicAcademicalCulturePersistenceAdapter; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.BasicAcademicalCultureLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.BasicAcademicalCultureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureRepository; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.BasicAcademicalCultureLecture; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindCommonCulturePersistenceAdapterTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindCommonCulturePersistenceAdapterTest.java index 15579980..30422480 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindCommonCulturePersistenceAdapterTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindCommonCulturePersistenceAdapterTest.java @@ -11,10 +11,11 @@ import org.springframework.beans.factory.annotation.Autowired; import com.plzgraduate.myongjigraduatebe.fixture.UserFixture; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.CommonCultureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.CommonCultureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.adapter.persistence.FindCommonCulturePersistenceAdapter; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.CommonCultureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.CommonCultureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureRepository; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.CommonCulture; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindCoreCulturePersistenceAdapterTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindCoreCulturePersistenceAdapterTest.java index 92c5cd09..df53ee2d 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindCoreCulturePersistenceAdapterTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindCoreCulturePersistenceAdapterTest.java @@ -12,10 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired; import com.plzgraduate.myongjigraduatebe.fixture.UserFixture; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.CoreCultureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.CoreCultureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.adapter.persistence.FindCoreCulturePersistenceAdapter; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.CoreCultureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.CoreCultureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureRepository; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.CoreCulture; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindMajorPersistenceAdapterTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindMajorPersistenceAdapterTest.java index 79878ed2..7269f76a 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindMajorPersistenceAdapterTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/FindMajorPersistenceAdapterTest.java @@ -10,10 +10,11 @@ import org.springframework.beans.factory.annotation.Autowired; import com.plzgraduate.myongjigraduatebe.fixture.UserFixture; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.MajorLectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.MajorLectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.adapter.persistence.FindMajorPersistenceAdapter; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.MajorLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.MajorLectureRepository; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.MajorLecture; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/LectureMapperTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/LectureMapperTest.java index 0af44fec..17be7c1b 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/LectureMapperTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/LectureMapperTest.java @@ -8,11 +8,12 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.BasicAcademicalCultureLectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.CommonCultureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.CoreCultureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.MajorLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.mapper.LectureMapper; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.BasicAcademicalCultureLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.CommonCultureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.CoreCultureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.MajorLectureJpaEntity; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.BasicAcademicalCultureLecture; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.CommonCulture; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.CoreCulture; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/LecturePersistenceAdaptorTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/LecturePersistenceAdaptorTest.java index 5adcf946..f23943c2 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/LecturePersistenceAdaptorTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/LecturePersistenceAdaptorTest.java @@ -11,9 +11,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureQueryRepository; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.LecturePersistenceAdapter; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureQueryRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureRepository; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; @@ -26,7 +27,7 @@ class LecturePersistenceAdaptorTest extends PersistenceTestSupport { private LectureQueryRepository lectureQueryRepository; @Autowired - private LecturePersistenceAdaptor lecturePersistenceAdaptor; + private LecturePersistenceAdapter lecturePersistenceAdapter; @AfterEach void afterEach() { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/MajorLectureRepositoryTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/MajorLectureRepositoryTest.java index 52da8e03..0fc684e5 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/MajorLectureRepositoryTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/adapter/out/persistence/MajorLectureRepositoryTest.java @@ -8,10 +8,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.MajorLectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureRepository; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.MajorLectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.MajorLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.MajorLectureRepository; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; class MajorLectureRepositoryTest extends PersistenceTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/find/FindLecturesByIdServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/find/FindLecturesByIdServiceTest.java index 930c5826..6de35553 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/find/FindLecturesByIdServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/find/FindLecturesByIdServiceTest.java @@ -12,7 +12,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.FindLecturePort; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindLecturePort; +import com.plzgraduate.myongjigraduatebe.lecture.application.service.FindLecturesByIdService; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/find/FindLecturesByLectureCodeServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/find/FindLecturesByLectureCodeServiceTest.java index cc753ae0..0542af69 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/find/FindLecturesByLectureCodeServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/find/FindLecturesByLectureCodeServiceTest.java @@ -12,7 +12,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.FindLecturePort; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindLecturePort; +import com.plzgraduate.myongjigraduatebe.lecture.application.service.FindLecturesByLectureCodeService; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/search/SearchLectureServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/search/SearchLectureServiceTest.java index d3480101..fc9c9dfe 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/search/SearchLectureServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/search/SearchLectureServiceTest.java @@ -12,9 +12,10 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search.SearchLectureCommand; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search.SearchLectureResponse; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.out.SearchLecturePort; +import com.plzgraduate.myongjigraduatebe.lecture.application.service.SearchLectureService; +import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.SearchLectureCommand; +import com.plzgraduate.myongjigraduatebe.lecture.api.dto.response.SearchLectureResponse; +import com.plzgraduate.myongjigraduatebe.lecture.application.port.SearchLecturePort; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/in/web/ParsingTextControllerTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/in/web/ParsingTextControllerTest.java index efac676f..1c63d636 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/in/web/ParsingTextControllerTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/in/web/ParsingTextControllerTest.java @@ -15,7 +15,8 @@ import org.springframework.test.web.servlet.ResultActions; import com.plzgraduate.myongjigraduatebe.core.exception.InvalidPdfException; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.in.ParsingTextCommand; +import com.plzgraduate.myongjigraduatebe.parsing.api.dto.request.ParsingTextRequest; +import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextCommand; import com.plzgraduate.myongjigraduatebe.support.WebAdaptorTestSupport; import com.plzgraduate.myongjigraduatebe.support.WithMockAuthenticationUser; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryAdaptorTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryAdaptorTest.java index 511ec0c0..4993def9 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryAdaptorTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryAdaptorTest.java @@ -8,14 +8,15 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; -import com.plzgraduate.myongjigraduatebe.fixture.UserFixture; +import com.plzgraduate.myongjigraduatebe.parsing.adaptor.persistence.ParsingTextHistoryAdaptor; +import com.plzgraduate.myongjigraduatebe.parsing.infrastructure.adapter.persistence.entity.ParsingTextHistoryJpaEntity; +import com.plzgraduate.myongjigraduatebe.parsing.infrastructure.adapter.persistence.repository.ParsingTextRepository; import com.plzgraduate.myongjigraduatebe.parsing.domain.ParsingResult; import com.plzgraduate.myongjigraduatebe.parsing.domain.ParsingTextHistory; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; -import com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence.UserJpaEntity; -import com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence.UserRepository; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.repository.UserRepository; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; class ParsingTextHistoryAdaptorTest extends PersistenceTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryMapperTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryMapperTest.java index e47f6b41..394336d9 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryMapperTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/adaptor/out/persistence/ParsingTextHistoryMapperTest.java @@ -7,6 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired; import com.plzgraduate.myongjigraduatebe.fixture.UserFixture; +import com.plzgraduate.myongjigraduatebe.parsing.infrastructure.adapter.persistence.entity.ParsingTextHistoryJpaEntity; +import com.plzgraduate.myongjigraduatebe.parsing.api.mapper.ParsingTextHistoryMapper; import com.plzgraduate.myongjigraduatebe.parsing.domain.ParsingResult; import com.plzgraduate.myongjigraduatebe.parsing.domain.ParsingTextHistory; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextHistoryServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextHistoryServiceTest.java index dc765ebe..e0b80f67 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextHistoryServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextHistoryServiceTest.java @@ -1,6 +1,5 @@ package com.plzgraduate.myongjigraduatebe.parsing.application.service; -import static org.junit.jupiter.api.Assertions.*; import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; @@ -12,10 +11,10 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.in.ParsingTextCommand; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.out.SaveParsingTextHistoryPort; +import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextCommand; +import com.plzgraduate.myongjigraduatebe.parsing.application.port.SaveParsingTextHistoryPort; import com.plzgraduate.myongjigraduatebe.parsing.domain.ParsingTextHistory; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; import com.plzgraduate.myongjigraduatebe.user.domain.model.EnglishLevel; import com.plzgraduate.myongjigraduatebe.user.domain.model.StudentCategory; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextServiceTest.java index 052e3883..e5155f79 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/parsing/application/service/ParsingTextServiceTest.java @@ -12,13 +12,13 @@ import com.plzgraduate.myongjigraduatebe.core.exception.InvalidPdfException; import com.plzgraduate.myongjigraduatebe.core.exception.PdfParsingException; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.in.ParsingTextCommand; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.delete.DeleteTakenLectureByUserUseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.save.SaveTakenLectureCommand; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.save.SaveTakenLectureFromParsingTextUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.update.UpdateStudentInformationCommand; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.update.UpdateStudentInformationUseCase; +import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextCommand; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureByUserUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save.SaveTakenLectureCommand; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save.SaveTakenLectureFromParsingTextUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.update.UpdateStudentInformationCommand; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.update.UpdateStudentInformationUseCase; import com.plzgraduate.myongjigraduatebe.user.domain.model.EnglishLevel; import com.plzgraduate.myongjigraduatebe.user.domain.model.StudentCategory; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/support/WebAdaptorTestSupport.java b/src/test/java/com/plzgraduate/myongjigraduatebe/support/WebAdaptorTestSupport.java index c853b796..848d2650 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/support/WebAdaptorTestSupport.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/support/WebAdaptorTestSupport.java @@ -21,31 +21,31 @@ import com.plzgraduate.myongjigraduatebe.core.config.JpaAuditingConfig; import com.plzgraduate.myongjigraduatebe.core.config.QuerydslConfig; import com.plzgraduate.myongjigraduatebe.core.config.SecurityConfig; -import com.plzgraduate.myongjigraduatebe.graduation.adpater.in.web.CalculateGraduationController; -import com.plzgraduate.myongjigraduatebe.graduation.application.port.in.CalculateGraduationUseCase; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.in.web.SearchLectureController; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.search.SearchLectureUseCase; -import com.plzgraduate.myongjigraduatebe.parsing.adaptor.in.web.ParsingTextController; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.in.ParsingTextHistoryUseCase; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.in.ParsingTextUseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.in.web.find.FindTakenLectureController; -import com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.in.web.update.UpdateTakenLectureController; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.find.FindTakenLectureUseCase; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.update.UpdateTakenLectureUseCase; -import com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.findauthid.FindAuthIdController; -import com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.finduserinformation.FindUserInformationController; -import com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.resetpassword.ResetPasswordController; -import com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.signup.SignUpController; -import com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.withdraw.WithDrawController; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.CheckAuthIdDuplicationUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.CheckStudentNumberDuplicationUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserAuthIdUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserInformationUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.resetpassword.ResetPasswordUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.signup.SignUpUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.validate.ValidateUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.withdraw.WithDrawUserUseCase; +import com.plzgraduate.myongjigraduatebe.graduation.api.CalculateGraduationController; +import com.plzgraduate.myongjigraduatebe.graduation.application.usecase.CalculateGraduationUseCase; +import com.plzgraduate.myongjigraduatebe.lecture.api.SearchLectureController; +import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.SearchLectureUseCase; +import com.plzgraduate.myongjigraduatebe.parsing.api.ParsingTextController; +import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextHistoryUseCase; +import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.api.FindTakenLectureController; +import com.plzgraduate.myongjigraduatebe.takenlecture.api.UpdateTakenLectureController; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.find.FindTakenLectureUseCase; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.update.UpdateTakenLectureUseCase; +import com.plzgraduate.myongjigraduatebe.user.api.findauthid.FindAuthIdController; +import com.plzgraduate.myongjigraduatebe.user.api.finduserinformation.FindUserInformationController; +import com.plzgraduate.myongjigraduatebe.user.api.resetpassword.ResetPasswordController; +import com.plzgraduate.myongjigraduatebe.user.api.signup.SignUpController; +import com.plzgraduate.myongjigraduatebe.user.api.withdraw.WithDrawController; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.check.CheckAuthIdDuplicationUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.check.CheckStudentNumberDuplicationUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserAuthIdUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserInformationUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.resetpassword.ResetPasswordUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.signup.SignUpUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.validate.ValidateUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.withdraw.WithDrawUserUseCase; @ActiveProfiles("test") @ComponentScan( diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/find/FindTakenLectureControllerTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adapter/in/web/find/FindTakenLectureControllerTest.java similarity index 91% rename from src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/find/FindTakenLectureControllerTest.java rename to src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adapter/in/web/find/FindTakenLectureControllerTest.java index 31680f2e..42a44d9b 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/find/FindTakenLectureControllerTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adapter/in/web/find/FindTakenLectureControllerTest.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.in.web.find; +package com.plzgraduate.myongjigraduatebe.takenlecture.adapter.in.web.find; import static org.mockito.BDDMockito.anyLong; import static org.mockito.BDDMockito.given; @@ -15,8 +15,8 @@ import com.plzgraduate.myongjigraduatebe.support.WebAdaptorTestSupport; import com.plzgraduate.myongjigraduatebe.support.WithMockAuthenticationUser; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.find.FindTakenLectureResponse; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.find.TakenLectureResponse; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.find.FindTakenLectureResponse; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.find.TakenLectureResponse; class FindTakenLectureControllerTest extends WebAdaptorTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/update/UpdateTakenLectureControllerTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adapter/in/web/update/UpdateTakenLectureControllerTest.java similarity index 89% rename from src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/update/UpdateTakenLectureControllerTest.java rename to src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adapter/in/web/update/UpdateTakenLectureControllerTest.java index c8bdb40d..abbd779d 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/in/web/update/UpdateTakenLectureControllerTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adapter/in/web/update/UpdateTakenLectureControllerTest.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.in.web.update; +package com.plzgraduate.myongjigraduatebe.takenlecture.adapter.in.web.update; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; @@ -13,6 +13,7 @@ import com.plzgraduate.myongjigraduatebe.support.WebAdaptorTestSupport; import com.plzgraduate.myongjigraduatebe.support.WithMockAuthenticationUser; +import com.plzgraduate.myongjigraduatebe.takenlecture.api.dto.request.UpdateTakenLectureRequest; class UpdateTakenLectureControllerTest extends WebAdaptorTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureMapperTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adapter/out/persistence/TakenLectureMapperTest.java similarity index 91% rename from src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureMapperTest.java rename to src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adapter/out/persistence/TakenLectureMapperTest.java index be6ef0a7..ff1972f5 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureMapperTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adapter/out/persistence/TakenLectureMapperTest.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.takenlecture.adapter.out.persistence; import static org.assertj.core.api.Assertions.assertThat; @@ -6,12 +6,14 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; +import com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.entity.TakenLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.takenlecture.adapter.persistence.TakenLectureMapper; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.Semester; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; -import com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence.UserJpaEntity; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; import com.plzgraduate.myongjigraduatebe.user.domain.model.EnglishLevel; import com.plzgraduate.myongjigraduatebe.user.domain.model.StudentCategory; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureRepositoryTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adapter/out/persistence/TakenLectureRepositoryTest.java similarity index 66% rename from src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureRepositoryTest.java rename to src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adapter/out/persistence/TakenLectureRepositoryTest.java index f122d9f8..8d44494c 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adaptor/out/persistence/TakenLectureRepositoryTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/adapter/out/persistence/TakenLectureRepositoryTest.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.takenlecture.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.takenlecture.adapter.out.persistence; import static org.assertj.core.api.Assertions.assertThat; @@ -8,11 +8,13 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.entity.LectureJpaEntity; -import com.plzgraduate.myongjigraduatebe.lecture.adapter.out.persistence.repository.LectureRepository; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.entity.LectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.lecture.infrastructure.adapter.persistence.repository.LectureRepository; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; -import com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence.UserJpaEntity; -import com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence.UserRepository; +import com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.entity.TakenLectureJpaEntity; +import com.plzgraduate.myongjigraduatebe.takenlecture.infrastructure.adapter.persistence.TakenLectureRepository; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.repository.UserRepository; class TakenLectureRepositoryTest extends PersistenceTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureByUserServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureByUserServiceTest.java index d663263c..329560cd 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureByUserServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/delete/DeleteTakenLectureByUserServiceTest.java @@ -1,6 +1,5 @@ package com.plzgraduate.myongjigraduatebe.takenlecture.application.service.delete; -import static org.junit.jupiter.api.Assertions.*; import static org.mockito.BDDMockito.*; import org.junit.jupiter.api.DisplayName; @@ -10,7 +9,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out.DeleteTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.DeleteTakenLecturePort; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/find/FindTakenLectureServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/find/FindTakenLectureServiceTest.java index f6927715..742de4cd 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/find/FindTakenLectureServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/find/FindTakenLectureServiceTest.java @@ -1,6 +1,5 @@ package com.plzgraduate.myongjigraduatebe.takenlecture.application.service.find; -import static org.junit.jupiter.api.Assertions.*; import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; @@ -16,12 +15,11 @@ import org.mockito.junit.jupiter.MockitoExtension; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.find.FindTakenLectureResponse; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.find.TakenLectureResponse; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out.FindTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.find.FindTakenLectureResponse; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.FindTakenLecturePort; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.Semester; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/save/SaveTakenLectureFromParsingTextServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/save/SaveTakenLectureFromParsingTextServiceTest.java index 5bc9d0e1..7cfcfa0c 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/save/SaveTakenLectureFromParsingTextServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/save/SaveTakenLectureFromParsingTextServiceTest.java @@ -14,10 +14,10 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.find.FindLecturesByLectureCodeUseCase; +import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.FindLecturesByLectureCodeUseCase; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.save.SaveTakenLectureCommand; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out.SaveTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.save.SaveTakenLectureCommand; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.SaveTakenLecturePort; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.Semester; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/update/UpdateTakenLectureServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/update/UpdateTakenLectureServiceTest.java index 7bfa84c5..09a27805 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/update/UpdateTakenLectureServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/takenlecture/application/service/update/UpdateTakenLectureServiceTest.java @@ -14,13 +14,13 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.plzgraduate.myongjigraduatebe.lecture.application.port.in.find.FindLecturesByIdUseCase; +import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.FindLecturesByIdUseCase; import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.update.UpdateTakenLectureCommand; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out.DeleteTakenLecturePort; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.out.SaveTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.update.UpdateTakenLectureCommand; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.DeleteTakenLecturePort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.SaveTakenLecturePort; import com.plzgraduate.myongjigraduatebe.takenlecture.domain.model.TakenLecture; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/findauthid/FindAuthIdControllerTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/findauthid/FindAuthIdControllerTest.java similarity index 92% rename from src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/findauthid/FindAuthIdControllerTest.java rename to src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/findauthid/FindAuthIdControllerTest.java index 98548f33..c2d73192 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/findauthid/FindAuthIdControllerTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/findauthid/FindAuthIdControllerTest.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.findauthid; +package com.plzgraduate.myongjigraduatebe.user.adapter.in.web.findauthid; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; @@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test; import com.plzgraduate.myongjigraduatebe.support.WebAdaptorTestSupport; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.UserAuthIdResponse; +import com.plzgraduate.myongjigraduatebe.user.api.findauthid.dto.response.UserAuthIdResponse; class FindAuthIdControllerTest extends WebAdaptorTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/finduserinformation/FindUserInformationControllerTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/finduserinformation/FindUserInformationControllerTest.java similarity index 89% rename from src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/finduserinformation/FindUserInformationControllerTest.java rename to src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/finduserinformation/FindUserInformationControllerTest.java index 27ec159b..498d57a9 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/finduserinformation/FindUserInformationControllerTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/finduserinformation/FindUserInformationControllerTest.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.finduserinformation; +package com.plzgraduate.myongjigraduatebe.user.adapter.in.web.finduserinformation; import static org.mockito.BDDMockito.given; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -11,7 +11,7 @@ import com.plzgraduate.myongjigraduatebe.support.WebAdaptorTestSupport; import com.plzgraduate.myongjigraduatebe.support.WithMockAuthenticationUser; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.UserInformationResponse; +import com.plzgraduate.myongjigraduatebe.user.api.finduserinformation.dto.response.UserInformationResponse; class FindUserInformationControllerTest extends WebAdaptorTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/resetpassword/ResetPasswordControllerTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/resetpassword/ResetPasswordControllerTest.java similarity index 94% rename from src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/resetpassword/ResetPasswordControllerTest.java rename to src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/resetpassword/ResetPasswordControllerTest.java index 14274398..025ba3e9 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/resetpassword/ResetPasswordControllerTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/resetpassword/ResetPasswordControllerTest.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.resetpassword; +package com.plzgraduate.myongjigraduatebe.user.adapter.in.web.resetpassword; import static org.hamcrest.Matchers.is; import static org.mockito.BDDMockito.given; @@ -15,7 +15,8 @@ import org.springframework.test.web.servlet.ResultActions; import com.plzgraduate.myongjigraduatebe.support.WebAdaptorTestSupport; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.validate.ValidateUserResponse; +import com.plzgraduate.myongjigraduatebe.user.api.resetpassword.ResetPasswordRequest; +import com.plzgraduate.myongjigraduatebe.user.api.resetpassword.dto.response.ValidateUserResponse; class ResetPasswordControllerTest extends WebAdaptorTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/signup/SignUpControllerTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/signup/SignUpControllerTest.java similarity index 93% rename from src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/signup/SignUpControllerTest.java rename to src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/signup/SignUpControllerTest.java index 8561fc09..25e9f64f 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/signup/SignUpControllerTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/signup/SignUpControllerTest.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.signup; +package com.plzgraduate.myongjigraduatebe.user.adapter.in.web.signup; import static org.mockito.BDDMockito.given; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; @@ -14,8 +14,9 @@ import org.springframework.test.web.servlet.ResultActions; import com.plzgraduate.myongjigraduatebe.support.WebAdaptorTestSupport; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.AuthIdDuplicationResponse; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.StudentNumberDuplicationResponse; +import com.plzgraduate.myongjigraduatebe.user.api.signup.SignUpRequest; +import com.plzgraduate.myongjigraduatebe.user.api.signup.dto.response.AuthIdDuplicationResponse; +import com.plzgraduate.myongjigraduatebe.user.api.signup.dto.response.StudentNumberDuplicationResponse; class SignUpControllerTest extends WebAdaptorTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/withdraw/WithDrawControllerTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/withdraw/WithDrawControllerTest.java similarity index 85% rename from src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/withdraw/WithDrawControllerTest.java rename to src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/withdraw/WithDrawControllerTest.java index 68ec2757..63ef2c31 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/in/web/withdraw/WithDrawControllerTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/in/web/withdraw/WithDrawControllerTest.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.in.web.withdraw; +package com.plzgraduate.myongjigraduatebe.user.adapter.in.web.withdraw; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.then; @@ -13,7 +13,8 @@ import com.plzgraduate.myongjigraduatebe.support.WebAdaptorTestSupport; import com.plzgraduate.myongjigraduatebe.support.WithMockAuthenticationUser; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.withdraw.WithDrawCommand; +import com.plzgraduate.myongjigraduatebe.user.api.withdraw.WithDrawRequest; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.withdraw.WithDrawCommand; class WithDrawControllerTest extends WebAdaptorTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserMapperTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/persistence/UserMapperTest.java similarity index 91% rename from src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserMapperTest.java rename to src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/persistence/UserMapperTest.java index bfd51bff..dbe0d595 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserMapperTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/persistence/UserMapperTest.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.user.adapter.out.persistence; import static org.assertj.core.api.Assertions.assertThat; @@ -7,6 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; +import com.plzgraduate.myongjigraduatebe.user.adapter.out.persistence.mapper.UserMapper; import com.plzgraduate.myongjigraduatebe.user.domain.model.EnglishLevel; import com.plzgraduate.myongjigraduatebe.user.domain.model.StudentCategory; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserPersistenceAdaptorTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/persistence/UserPersistenceAdaptorTest.java similarity index 91% rename from src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserPersistenceAdaptorTest.java rename to src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/persistence/UserPersistenceAdaptorTest.java index 3ccaabd8..3f6b61bc 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserPersistenceAdaptorTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/persistence/UserPersistenceAdaptorTest.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.user.adapter.out.persistence; import static org.assertj.core.api.Assertions.assertThat; @@ -9,12 +9,14 @@ import org.springframework.beans.factory.annotation.Autowired; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.repository.UserRepository; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; class UserPersistenceAdaptorTest extends PersistenceTestSupport { @Autowired - private UserPersistenceAdaptor userPersistenceAdaptor; + private UserPersistenceAdapter userPersistenceAdaptor; @Autowired private UserRepository userRepository; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserRepositoryTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/persistence/UserRepositoryTest.java similarity index 89% rename from src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserRepositoryTest.java rename to src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/persistence/UserRepositoryTest.java index 9da5a8b5..f7ba032a 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/adaptor/out/persistence/UserRepositoryTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/adapter/persistence/UserRepositoryTest.java @@ -1,4 +1,4 @@ -package com.plzgraduate.myongjigraduatebe.user.adaptor.out.persistence; +package com.plzgraduate.myongjigraduatebe.user.adapter.out.persistence; import static org.assertj.core.api.Assertions.*; @@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired; import com.plzgraduate.myongjigraduatebe.support.PersistenceTestSupport; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.entity.UserJpaEntity; +import com.plzgraduate.myongjigraduatebe.user.infrastructure.adapter.persistence.repository.UserRepository; class UserRepositoryTest extends PersistenceTestSupport { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckAuthIdDuplicationServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckAuthIdDuplicationServiceTest.java index 08948473..d7105761 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckAuthIdDuplicationServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckAuthIdDuplicationServiceTest.java @@ -10,8 +10,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.AuthIdDuplicationResponse; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.CheckUserPort; +import com.plzgraduate.myongjigraduatebe.user.api.signup.dto.response.AuthIdDuplicationResponse; +import com.plzgraduate.myongjigraduatebe.user.application.port.CheckUserPort; @ExtendWith(MockitoExtension.class) class CheckAuthIdDuplicationServiceTest { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckStudentNumberDuplicationServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckStudentNumberDuplicationServiceTest.java index 1523df57..930f93ba 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckStudentNumberDuplicationServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/check/CheckStudentNumberDuplicationServiceTest.java @@ -10,8 +10,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.check.StudentNumberDuplicationResponse; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.CheckUserPort; +import com.plzgraduate.myongjigraduatebe.user.api.signup.dto.response.StudentNumberDuplicationResponse; +import com.plzgraduate.myongjigraduatebe.user.application.port.CheckUserPort; @ExtendWith(MockitoExtension.class) class CheckStudentNumberDuplicationServiceTest { diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserAuthIdServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserAuthIdServiceTest.java index 958da596..7230f978 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserAuthIdServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserAuthIdServiceTest.java @@ -12,8 +12,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.UserAuthIdResponse; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.api.findauthid.dto.response.UserAuthIdResponse; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserInformationServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserInformationServiceTest.java index 7f53aed4..7a388fc5 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserInformationServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserInformationServiceTest.java @@ -10,8 +10,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.UserInformationResponse; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.api.finduserinformation.dto.response.UserInformationResponse; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserServiceTest.java index d9ef2505..c760bb82 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/find/FindUserServiceTest.java @@ -13,7 +13,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.FindUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.port.FindUserPort; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/resetpassword/ResetPasswordServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/resetpassword/ResetPasswordServiceTest.java index de5c6f97..fa9d2fe5 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/resetpassword/ResetPasswordServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/resetpassword/ResetPasswordServiceTest.java @@ -12,9 +12,9 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.security.crypto.password.PasswordEncoder; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.resetpassword.ResetPasswordCommand; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.UpdateUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.resetpassword.ResetPasswordCommand; +import com.plzgraduate.myongjigraduatebe.user.application.port.UpdateUserPort; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/signup/SignUpServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/signup/SignUpServiceTest.java index c89c9150..d4baa620 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/signup/SignUpServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/signup/SignUpServiceTest.java @@ -11,9 +11,9 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.security.crypto.password.PasswordEncoder; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.signup.SignUpCommand; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.CheckUserPort; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.SaveUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.signup.SignUpCommand; +import com.plzgraduate.myongjigraduatebe.user.application.port.CheckUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.port.SaveUserPort; import com.plzgraduate.myongjigraduatebe.user.domain.model.EnglishLevel; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/update/UpdateStudentInformationServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/update/UpdateStudentInformationServiceTest.java index daad60bf..275e247b 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/update/UpdateStudentInformationServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/update/UpdateStudentInformationServiceTest.java @@ -1,6 +1,5 @@ package com.plzgraduate.myongjigraduatebe.user.application.service.update; -import static org.junit.jupiter.api.Assertions.*; import static org.mockito.BDDMockito.*; import org.junit.jupiter.api.DisplayName; @@ -10,8 +9,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.update.UpdateStudentInformationCommand; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.UpdateUserPort; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.update.UpdateStudentInformationCommand; +import com.plzgraduate.myongjigraduatebe.user.application.port.UpdateUserPort; import com.plzgraduate.myongjigraduatebe.user.domain.model.StudentCategory; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/validate/ValidateUserServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/validate/ValidateUserServiceTest.java index 831809b5..a295a679 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/validate/ValidateUserServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/validate/ValidateUserServiceTest.java @@ -10,8 +10,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.validate.ValidateUserResponse; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.api.resetpassword.dto.response.ValidateUserResponse; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserServiceTest.java b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserServiceTest.java index e015da51..52dbda8b 100644 --- a/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserServiceTest.java +++ b/src/test/java/com/plzgraduate/myongjigraduatebe/user/application/service/withdraw/WithDrawUserServiceTest.java @@ -14,11 +14,11 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; -import com.plzgraduate.myongjigraduatebe.parsing.application.port.out.DeleteParsingTextHistoryPort; -import com.plzgraduate.myongjigraduatebe.takenlecture.application.port.in.delete.DeleteTakenLectureByUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.find.FindUserUseCase; -import com.plzgraduate.myongjigraduatebe.user.application.port.in.withdraw.WithDrawCommand; -import com.plzgraduate.myongjigraduatebe.user.application.port.out.DeleteUserPort; +import com.plzgraduate.myongjigraduatebe.parsing.application.port.DeleteParsingTextHistoryPort; +import com.plzgraduate.myongjigraduatebe.takenlecture.application.usecase.delete.DeleteTakenLectureByUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.find.FindUserUseCase; +import com.plzgraduate.myongjigraduatebe.user.application.usecase.withdraw.WithDrawCommand; +import com.plzgraduate.myongjigraduatebe.user.application.port.DeleteUserPort; import com.plzgraduate.myongjigraduatebe.user.domain.model.User; @ExtendWith(MockitoExtension.class)