From 845e7a830265cb128d84741c713e6a3e90bd6d26 Mon Sep 17 00:00:00 2001 From: welshimeat Date: Mon, 3 May 2021 00:25:36 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20[#3]=20=EC=BB=B4=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20-=20Co?= =?UTF-8?q?ntroller=20=EB=B6=84=EB=A6=AC=20=EB=B3=91=ED=95=A9=20HomeContro?= =?UTF-8?q?ller=EB=A5=BC=20alarmController=EB=A1=9C=20=EB=B6=84=EB=A6=AC?= =?UTF-8?q?=20UserController=EB=A5=BC=20ProjectController=EC=97=90=20?= =?UTF-8?q?=EB=B3=91=ED=95=A9=20ComplimentMarkController=EB=A5=BC=20Review?= =?UTF-8?q?Controller=EC=97=90=20=EB=B3=91=ED=95=A9=20-=20Service=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC=20=EB=B3=91=ED=95=A9=20UserService=EB=A5=BC?= =?UTF-8?q?=20ProjectService=EC=97=90=20=EB=B3=91=ED=95=A9=20HashtagServic?= =?UTF-8?q?e,=20PositionService=EC=9D=84=20SignupSerivce=EC=97=90=20?= =?UTF-8?q?=EB=B3=91=ED=95=A9=20ComplimentMarkService=EB=A5=BC=20ReviewSer?= =?UTF-8?q?vice=EC=97=90=20=EB=B3=91=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MakeUs/Moira/advice/ExceptionAdvice.java | 108 ------------ .../advice/exception/CustomException.java | 15 -- .../Moira/advice/exception/ErrorCode.java | 69 -------- .../Moira/config/SwaggerConfiguration.java | 42 ----- .../security/CustomAccessDeniedHandler.java | 2 - .../config/security/CustomAuthEntryPoint.java | 2 - .../controller/alarm/AlarmController.java | 82 +++++++++ .../dto/AlarmReadStatusUpdateResponseDto.java | 2 +- .../{home => alarm}/dto/AlarmResponseDto.java | 2 +- .../Moira/controller/chat/ChatController.java | 8 +- .../chat/dto/ChatMessageSendRequestDto.java | 4 +- .../ComplimentMarkController.java | 43 ----- .../exception/ExceptionController.java | 6 +- .../Moira/controller/home/HomeController.java | 68 +------- .../Moira/controller/jwt/JwtController.java | 4 +- .../controller/myPage/MyPageController.java | 8 +- .../dto/AppliedProjectInfoResponseDto.java | 7 +- .../myPage/dto/HashtagResponseDto.java | 4 +- .../myPage/dto/LikedProjectResponseDto.java | 8 +- .../myPageEdit/MyPageEditController.java | 8 +- .../myProject/MyProjectController.java | 8 +- .../controller/project/ProjectController.java | 8 +- .../project/dto/ProjectMemberResponseDto.java | 2 +- .../project/dto/ProjectRequestDTO.java | 7 +- .../project/dto/ProjectResponseDTO.java | 5 +- .../projectApply/ProjectApplyController.java | 8 +- .../ProjectApplyModifyStatusRequestDTO.java | 2 +- .../ProjectCommentController.java | 8 +- .../controller/report/ReportController.java | 4 +- .../controller/review/ReviewController.java | 38 ++++- .../dto/ComplimentMarkInfoResponseDto.java | 2 +- .../controller/signup/SignupController.java | 8 +- .../Moira/controller/user/UserController.java | 46 ----- .../userPool/UserPoolController.java | 8 +- .../userPool/dto/UserPoolLikeAddResponse.java | 2 +- .../userPool/dto/UserPoolResponseDto.java | 2 +- .../userAward/UserAwardController.java | 10 +- .../userCareer/UserCareerController.java | 10 +- .../userLicense/UserLicenseController.java | 10 +- .../userLink/UserLinkController.java | 10 +- .../userSchool/UserSchoolController.java | 10 +- .../Moira/domain/alarm/AlarmHistory.java | 4 +- .../domain/alarmHistory/AlarmHistory.java | 72 -------- .../domain/alarmHistory/AlarmHistoryRepo.java | 11 -- .../Moira/domain/alarmHistory/AlarmType.java | 24 --- .../java/MakeUs/Moira/domain/club/Club.java | 31 ---- .../MakeUs/Moira/domain/club/ClubImage.java | 17 -- .../MakeUs/Moira/domain/club/ClubLike.java | 21 --- .../Moira/domain/club/RecruitStatus.java | 5 - .../MakeUs/Moira/domain/inquiry/Inquiry.java | 2 +- .../MakeUs/Moira/domain/project/Project.java | 7 +- .../Moira/domain/project/ProjectHashtag.java | 34 ---- .../domain/project/ProjectHashtagRepo.java | 10 -- .../Moira/domain/project/ProjectImage.java | 30 ---- .../domain/project/ProjectImageRepo.java | 6 - .../Moira/domain/project/ProjectLike.java | 46 ----- .../Moira/domain/project/ProjectLikeRepo.java | 10 -- .../projectApply/OptionalApplyInfo.java | 33 ---- .../project/projectApply/ProjectApply.java | 57 ------- .../projectApply/ProjectApplyRepo.java | 11 -- .../projectApply/ProjectApplyStatus.java | 5 - .../project/projectDetail/ProjectComment.java | 39 ----- .../projectDetail/ProjectCommentRepo.java | 9 - .../project/projectDetail/ProjectDetail.java | 72 -------- .../projectDetail/ProjectDetailRepo.java | 9 - .../projectDetail/ProjectDuration.java | 5 - .../projectDetail/ProjectLocalType.java | 5 - .../projectDetail/ProjectPosition.java | 38 ----- .../projectDetail/ProjectPositonRepo.java | 7 - .../domain/projectApply/ProjectApply.java | 9 +- .../domain/projectDetail/ProjectDetail.java | 6 +- .../MakeUs/Moira/domain/report/Report.java | 3 +- .../domain/security/token/TokenProvider.java | 6 - .../security/token/TokenProviderFactory.java | 22 --- .../security/token/kakaoTokenProvider.java | 41 ----- .../java/MakeUs/Moira/domain/user/User.java | 1 + .../MakeUs/Moira/domain/user/UserFcmInfo.java | 33 ---- .../Moira/domain/user/UserFcmInfoRepo.java | 10 -- .../MakeUs/Moira/domain/user/UserHashtag.java | 39 ----- .../Moira/domain/user/UserHashtagRepo.java | 12 -- .../MakeUs/Moira/domain/user/UserHistory.java | 92 ---------- .../Moira/domain/user/UserHistoryRepo.java | 11 -- .../MakeUs/Moira/domain/user/UserProject.java | 54 ------ .../Moira/domain/user/UserProjectRepo.java | 13 -- .../domain/user/UserProjectRoleType.java | 5 - .../Moira/domain/user/UserProjectStatus.java | 5 - .../Moira/domain/userHistory/UserHistory.java | 9 +- .../Moira/domain/userPool/UserPool.java | 1 + .../Moira/domain/userPool/UserPoolLike.java | 52 ------ .../domain/userPool/UserPoolLikeRepo.java | 8 - .../Moira/domain/userPool/UserPoolOffer.java | 22 --- .../domain/userPool/UserPoolOfferStatus.java | 5 - .../domain/userPool/UserPoolOptionalInfo.java | 21 --- .../Moira/domain/userReview/UserReview.java | 2 +- .../UserReviewComplimentMark.java | 42 ----- .../UserReviewComplimentMarkRepo.java | 6 - .../Moira/response/ResponseService.java | 47 ------ .../Moira/response/model/CommonResult.java | 21 --- .../Moira/response/model/ListResult.java | 12 -- .../Moira/response/model/SingleResult.java | 10 -- .../java/MakeUs/Moira/service/S3Service.java | 4 +- .../Moira/service/alarm/AlarmService.java | 10 +- .../Moira/service/chat/ChatService.java | 4 +- .../ComplimentMarkInfoService.java | 23 --- .../Moira/service/home/HomeService.java | 8 +- .../service/jwt/CustomUserDetailService.java | 4 +- .../MakeUs/Moira/service/jwt/JwtService.java | 5 +- .../Moira/service/myPage/MyPageService.java | 19 ++- .../service/myPageEdit/MyPageEditService.java | 7 +- .../service/myProject/MyProjectService.java | 11 +- .../Moira/service/project/ProjectService.java | 32 ++-- .../projectApply/ProjectApplyService.java | 158 ++---------------- .../projectComment/ProjectCommentService.java | 12 +- .../Moira/service/report/ReportService.java | 16 +- .../Moira/service/review/ReviewService.java | 17 +- .../Moira/service/user/UserService.java | 9 +- .../service/userPool/UserPoolService.java | 12 +- .../userPortfolio/UserAwardService.java | 4 +- .../userPortfolio/UserCareerService.java | 4 +- .../userPortfolio/UserLicenseService.java | 5 +- .../userPortfolio/UserLinkService.java | 5 +- .../userPortfolio/UserSchoolService.java | 4 +- 122 files changed, 348 insertions(+), 1965 deletions(-) delete mode 100644 src/main/java/MakeUs/Moira/advice/ExceptionAdvice.java delete mode 100644 src/main/java/MakeUs/Moira/advice/exception/CustomException.java delete mode 100644 src/main/java/MakeUs/Moira/advice/exception/ErrorCode.java delete mode 100644 src/main/java/MakeUs/Moira/config/SwaggerConfiguration.java create mode 100644 src/main/java/MakeUs/Moira/controller/alarm/AlarmController.java rename src/main/java/MakeUs/Moira/controller/{home => alarm}/dto/AlarmReadStatusUpdateResponseDto.java (88%) rename src/main/java/MakeUs/Moira/controller/{home => alarm}/dto/AlarmResponseDto.java (98%) delete mode 100644 src/main/java/MakeUs/Moira/controller/complimentMark/ComplimentMarkController.java rename src/main/java/MakeUs/Moira/controller/{complimentMark => review}/dto/ComplimentMarkInfoResponseDto.java (91%) delete mode 100644 src/main/java/MakeUs/Moira/controller/user/UserController.java delete mode 100644 src/main/java/MakeUs/Moira/domain/alarmHistory/AlarmHistory.java delete mode 100644 src/main/java/MakeUs/Moira/domain/alarmHistory/AlarmHistoryRepo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/alarmHistory/AlarmType.java delete mode 100644 src/main/java/MakeUs/Moira/domain/club/Club.java delete mode 100644 src/main/java/MakeUs/Moira/domain/club/ClubImage.java delete mode 100644 src/main/java/MakeUs/Moira/domain/club/ClubLike.java delete mode 100644 src/main/java/MakeUs/Moira/domain/club/RecruitStatus.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/ProjectHashtag.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/ProjectHashtagRepo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/ProjectImage.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/ProjectImageRepo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/ProjectLike.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/ProjectLikeRepo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/projectApply/OptionalApplyInfo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/projectApply/ProjectApply.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/projectApply/ProjectApplyRepo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/projectApply/ProjectApplyStatus.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectComment.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectCommentRepo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectDetail.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectDetailRepo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectDuration.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectLocalType.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectPosition.java delete mode 100644 src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectPositonRepo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/security/token/TokenProvider.java delete mode 100644 src/main/java/MakeUs/Moira/domain/security/token/TokenProviderFactory.java delete mode 100644 src/main/java/MakeUs/Moira/domain/security/token/kakaoTokenProvider.java delete mode 100644 src/main/java/MakeUs/Moira/domain/user/UserFcmInfo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/user/UserFcmInfoRepo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/user/UserHashtag.java delete mode 100644 src/main/java/MakeUs/Moira/domain/user/UserHashtagRepo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/user/UserHistory.java delete mode 100644 src/main/java/MakeUs/Moira/domain/user/UserHistoryRepo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/user/UserProject.java delete mode 100644 src/main/java/MakeUs/Moira/domain/user/UserProjectRepo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/user/UserProjectRoleType.java delete mode 100644 src/main/java/MakeUs/Moira/domain/user/UserProjectStatus.java delete mode 100644 src/main/java/MakeUs/Moira/domain/userPool/UserPoolLike.java delete mode 100644 src/main/java/MakeUs/Moira/domain/userPool/UserPoolLikeRepo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/userPool/UserPoolOffer.java delete mode 100644 src/main/java/MakeUs/Moira/domain/userPool/UserPoolOfferStatus.java delete mode 100644 src/main/java/MakeUs/Moira/domain/userPool/UserPoolOptionalInfo.java delete mode 100644 src/main/java/MakeUs/Moira/domain/userReviewComplimentMark/UserReviewComplimentMark.java delete mode 100644 src/main/java/MakeUs/Moira/domain/userReviewComplimentMark/UserReviewComplimentMarkRepo.java delete mode 100644 src/main/java/MakeUs/Moira/response/ResponseService.java delete mode 100644 src/main/java/MakeUs/Moira/response/model/CommonResult.java delete mode 100644 src/main/java/MakeUs/Moira/response/model/ListResult.java delete mode 100644 src/main/java/MakeUs/Moira/response/model/SingleResult.java delete mode 100644 src/main/java/MakeUs/Moira/service/complimentMark/ComplimentMarkInfoService.java diff --git a/src/main/java/MakeUs/Moira/advice/ExceptionAdvice.java b/src/main/java/MakeUs/Moira/advice/ExceptionAdvice.java deleted file mode 100644 index 05b8944..0000000 --- a/src/main/java/MakeUs/Moira/advice/ExceptionAdvice.java +++ /dev/null @@ -1,108 +0,0 @@ -package MakeUs.Moira.advice; - -import MakeUs.Moira.advice.exception.*; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.CommonResult; -import io.jsonwebtoken.JwtException; -import lombok.RequiredArgsConstructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.HttpStatus; -import org.springframework.http.converter.HttpMessageNotReadableException; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RestControllerAdvice; -import org.springframework.web.client.HttpClientErrorException; - -import javax.servlet.http.HttpServletRequest; - -@RequiredArgsConstructor -@RestControllerAdvice // 예외 발생 시, JSON으로 반환 -public class ExceptionAdvice { - - private final ResponseService responseService; - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @ExceptionHandler(Exception.class) - @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) - protected CommonResult defaultException(HttpServletRequest request, Exception e) { - System.out.println(e.getClass()); - // 아무데서도 안 거르면, 여기서 거른다. -> 데이터가 없는 리스폰스 - logger.info("code : 500 " + e.getMessage()); - return responseService.mappingFailCommonResultOnly(500, e.getMessage()); - } - - - @ExceptionHandler(CustomException.class) - @ResponseStatus(HttpStatus.BAD_REQUEST) - protected CommonResult CustomException(CustomException e) { - logger.info("code : " + e.getErrorCode().getCode() + " " + e.getMessage()); - return responseService.mappingFailCommonResultOnly(e.getErrorCode().getCode(), e.getMessage()); - } - - - // 잘못된 KAKAO TOKEN - @ExceptionHandler(HttpClientErrorException.class) - @ResponseStatus(HttpStatus.BAD_REQUEST) - public CommonResult HttpClientErrorException(HttpServletRequest request, HttpClientErrorException e) { - logger.info("code : 411 " + e.getMessage()); - return responseService.mappingFailCommonResultOnly(411, e.getMessage()); - } - - // @Valid에 의한 검증 - @ExceptionHandler(MethodArgumentNotValidException.class) - @ResponseStatus(HttpStatus.BAD_REQUEST) - public CommonResult MethodArgumentNotValidException(HttpServletRequest request, MethodArgumentNotValidException e) { - int code = 400; - String message = ""; - BindingResult bindingResult = e.getBindingResult(); - - //에러가 있다면 - if(bindingResult.hasErrors()) { - //DTO에 설정한 meaasge값을 가져온다 - message = bindingResult.getFieldError() - .getDefaultMessage(); - - //DTO에 유효성체크를 걸어놓은 어노테이션명을 가져온다. - String bindResultCode = bindingResult.getFieldError() - .getCode(); - - switch (bindResultCode) { - case "NotNull": - code = ErrorCode.NOT_NULL.getCode(); - break; - case "NotBlank": - code = ErrorCode.NOT_BLANK.getCode(); - break; - case "Min": - code = ErrorCode.MIN.getCode(); - break; - case "Max": - code = ErrorCode.MAX.getCode(); - break; - } - } - logger.info("code : " + code + " " + e.getMessage()); - return responseService.mappingFailCommonResultOnly(code, message); - } - - - // 잘못된 enum RequestDTO - @ExceptionHandler(HttpMessageNotReadableException.class) - @ResponseStatus(HttpStatus.BAD_REQUEST) - public CommonResult HttpMessageNotReadableException(HttpServletRequest request, HttpMessageNotReadableException e) { - logger.info("code : 410 " + e.getMessage()); - return responseService.mappingFailCommonResultOnly(410, e.getMessage()); - } - - - @ExceptionHandler(JwtException.class) - @ResponseStatus(HttpStatus.BAD_REQUEST) - public CommonResult JWTException(HttpServletRequest request, JwtException e) { - logger.info("code : 435 " + e.getMessage()); - return responseService.mappingFailCommonResultOnly(435, e.getMessage()); - } - -} diff --git a/src/main/java/MakeUs/Moira/advice/exception/CustomException.java b/src/main/java/MakeUs/Moira/advice/exception/CustomException.java deleted file mode 100644 index bfab25e..0000000 --- a/src/main/java/MakeUs/Moira/advice/exception/CustomException.java +++ /dev/null @@ -1,15 +0,0 @@ -package MakeUs.Moira.advice.exception; - -import lombok.Getter; - -@Getter -public class CustomException extends RuntimeException{ - - private final ErrorCode errorCode; - - public CustomException(ErrorCode errorCode) - { - super(errorCode.getMessage()); - this.errorCode = errorCode; - } -} diff --git a/src/main/java/MakeUs/Moira/advice/exception/ErrorCode.java b/src/main/java/MakeUs/Moira/advice/exception/ErrorCode.java deleted file mode 100644 index aaa3c34..0000000 --- a/src/main/java/MakeUs/Moira/advice/exception/ErrorCode.java +++ /dev/null @@ -1,69 +0,0 @@ -package MakeUs.Moira.advice.exception; - -public enum ErrorCode { - - NOT_NULL(400, ""), - NOT_BLANK(401, ""), - MIN(402, ""), - MAX(403, ""), - - // 410 : HttpMessageNotReadableException -> enum 에러 - // 411 : HttpClientErrorException -> 잘못된 kakao 토큰 - - - INVALID_USER(420, "유효하지 않은 유저 혹은 유저 ID"), - INVALID_PROJECT(421, "유효하지 않은 프로젝트 혹은 프로젝트 ID"), - INVALID_COMMENT(422, "유효하지 않은 댓글 혹은 댓글 ID"), - INVALID_PROJECT_APPLY(423, "유효하지 않은 지원서 혹은 지원서 ID"), - INVALID_USER_POOL(424, "유효하지 않은 유저풀 혹은 유저풀 ID"), - INVALID_USER_PROJECT(425, "유효하지 않은 유저 프로젝트 혹은 유저 프로젝트 ID"), - INVALID_PROJECT_APPLY_OPTIONAL_INFO(426, "유효하지 않은 지원서 선택사항 정보"), - INVALID_SCHOOL(427, "유효하지 않은 학교 혹은 학교 ID"), - INVALID_MAJOR(428, "유효하지 않은 전공 혹은 전공 ID"), - INVALID_POSITION(429, "유효하지 않은 포지션 혹은 포지션 ID"), - INVALID_POSITION_CATEGORY(430, "유효하지 않은 포지션 카테고리 혹은 ID"), - INVALID_HASHTAG(431, "유효하지 않은 태그 이름 혹은 ID"), - INVALID_SORT(432, "유효하지 않은 정렬 방식"), - INVALID_FILE_IO(433, "유효하지 않은 파일 입출력"), - INVALID_TOKEN_PROVIDER(434, "유효하지 않은 토큰 제공자(kakao)"), - INVALID_JWT_TOKEN(435, "유효하지 않은 JWT 토큰"), - INVALID_MESSAGE_TYPE(436, "유효하지 않은 쪽지 타입"), - INVALID_CHAT_ROOM(437, "유효하지 않은 채팅방"), - INVALID_USER_PORTFOLIO(438, "유효하지 않은 유저선택정보"), - INVALID_PROJECT_APPLY_STATUS_CHANGE(439, "유효하지 않은 프로젝트 지원 상태 변경"), - INVALID_ALARM(441, "유효하지 않은 알람"), - - - ALREADY_REGISTERED_USER(450, "이미 가입된 유저"), - ALREADY_REGISTERED_NICKNAME(451, "이미 존재하는 닉네임"), - ALREADY_EXIST_PARENT_COMMENT(452, "이미 대댓글인 부모 댓글"), - ALREADY_REGISTERED_PROJECT_IMAGE(453, "이미 등록된 프로젝트 이미지"), - ALREADY_REGISTERED_PROJECT_APPLICANT(454, "이미 지원한 유저"), - - UNAUTHORIZED_USER(460, "권한이 없는 유저"), - UNAUTHORIZED_JWT(461, "해당 리소스에 접근 권한이 없는 JWT"), - UNAUTHORIZED_REPORT_PROJECT(462, "자신 게시글에 신고할 수 없음"), - UNAUTHORIZED_REPORT_COMMENT(463, "자신 댓글에 신고할 수 없음"), - - NON_EXIST_FILE_NAME(470, "존재하지 않는 파일 이름"), - NON_EXIST_PROJECT_LEADER(471, "존재하지 않는 팀장"), - NON_EXIST_PROJECT_APPLY(472, "존재하지 않는 지원서"), - NON_EXIST_FCM_TOKEN(471, "유저의 FCM 토큰이 존재하지 않음"); - - - private final int code; - private final String message; - - public int getCode() { - return code; - } - - public String getMessage() { - return message; - } - - ErrorCode(final int code, final String message) { - this.message = message; - this.code = code; - } -} \ No newline at end of file diff --git a/src/main/java/MakeUs/Moira/config/SwaggerConfiguration.java b/src/main/java/MakeUs/Moira/config/SwaggerConfiguration.java deleted file mode 100644 index 8b8bf0e..0000000 --- a/src/main/java/MakeUs/Moira/config/SwaggerConfiguration.java +++ /dev/null @@ -1,42 +0,0 @@ -package MakeUs.Moira.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.ParameterBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.schema.ModelRef; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.ApiKey; -import springfox.documentation.service.Parameter; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -@Configuration -@EnableSwagger2 -public class SwaggerConfiguration { - @Bean - public Docket swaggerApi() { - - return new Docket(DocumentationType.SWAGGER_2) - .apiInfo(swaggerInfo()) - .select() - .apis(RequestHandlerSelectors.basePackage("MakeUs.Moira.controller")) - .paths(PathSelectors.any()) - .build() - .useDefaultResponseMessages(false); // 기본으로 세팅되는 200,401,403,404 메시지를 표시 하지 않음 - } - - - private ApiInfo swaggerInfo() { - return new ApiInfoBuilder().title("Moira API Documentation") - .description("Moira 앱 개발시 사용되는 서버 API 문서입니다") - .build(); - } -} diff --git a/src/main/java/MakeUs/Moira/config/security/CustomAccessDeniedHandler.java b/src/main/java/MakeUs/Moira/config/security/CustomAccessDeniedHandler.java index cfeb6a3..0d184fd 100644 --- a/src/main/java/MakeUs/Moira/config/security/CustomAccessDeniedHandler.java +++ b/src/main/java/MakeUs/Moira/config/security/CustomAccessDeniedHandler.java @@ -1,7 +1,5 @@ package MakeUs.Moira.config.security; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; import org.springframework.stereotype.Component; diff --git a/src/main/java/MakeUs/Moira/config/security/CustomAuthEntryPoint.java b/src/main/java/MakeUs/Moira/config/security/CustomAuthEntryPoint.java index 3e331b2..590cbd5 100644 --- a/src/main/java/MakeUs/Moira/config/security/CustomAuthEntryPoint.java +++ b/src/main/java/MakeUs/Moira/config/security/CustomAuthEntryPoint.java @@ -1,7 +1,5 @@ package MakeUs.Moira.config.security; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; diff --git a/src/main/java/MakeUs/Moira/controller/alarm/AlarmController.java b/src/main/java/MakeUs/Moira/controller/alarm/AlarmController.java new file mode 100644 index 0000000..551d9fe --- /dev/null +++ b/src/main/java/MakeUs/Moira/controller/alarm/AlarmController.java @@ -0,0 +1,82 @@ +package MakeUs.Moira.controller.alarm; + +import MakeUs.Moira.config.security.JwtTokenProvider; +import MakeUs.Moira.controller.alarm.dto.AlarmReadStatusUpdateResponseDto; +import MakeUs.Moira.controller.alarm.dto.AlarmResponseDto; +import MakeUs.Moira.service.home.HomeService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.ListResult; +import MakeUs.Moira.util.response.model.SingleResult; +import io.swagger.annotations.*; +import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Api(tags = {"1.알람"}) +@RequiredArgsConstructor +@RestController +public class AlarmController { + + private final HomeService homeService; + private final ResponseService responseService; + private final JwtTokenProvider jwtTokenProvider; + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @ApiImplicitParams({ + @ApiImplicitParam( + name = "X-AUTH-TOKEN", + value = "로그인 성공 후 JWT_TOKEN", + required = true, dataType = "String", paramType = "header") + }) + @ApiOperation( + value = "홈화면 - 알람 목록", + notes = "### 홈화면에서 알람 목록을 확인합니다.\n" + + "### 페이징이 적용되며 10개씩 목록을 가져옵니다.\n\n" + + "### 알람 타입으로 PROJECT, APPLY(지원서), APPLY_ANSWER(지원서 응답), INVITE_ANSWER(팀장 초대 응답), REVIEW(리뷰), CHATROOM(채팅방)이 있습니다.\n\n" + + "### PROJECT\n" + + "- alarmTargetId를 projectId로 사용하여 /project/{projectId} 팀원 모집 - 팀 모집글 상세로 리다이렉팅 시킵니다.\n" + + "### REVIEW\n" + + "- alarmTargetId를 userId로 사용하여 /review/detail/{userId} 유저의 모든 리뷰 내용 조회로 리다이렉팅 시킵니다.\n" + + "### CHATROOM\n" + + "- alarmTargetId를 chatRoomId로 사용하여 /chatroom/{chatRoomId} 유저와 채팅 내용 불러오기로 리다이렉팅 시킵니다.\n" + + "### APPLY\n" + + "- alarmTargetId를 projectApplyId로 사용하여 /apply/{projectApplyId} 마이페이지 - 지원한 글 - 지원 목록 - 지원 내역로 리다이렉팅 시킵니다.\n" + + "### APPLY_ANSWER\n" + + "- 지원자를 수락할지 거절할지 선택하여 alarmTargetId를 projectApplyId로 사용하여 /apply/{projectApplyId} 지원서의 상태를 변경을 통해 상태를 변경시킬 수 있도록 합니다.\n" + + "### INVITE_ANSWER\n" + + "- 팀장의 초대를 수락할지 거절할지 선택하여 alarmTargetId를 projectApplyId로 사용하여 /apply/{projectApplyId} 지원서의 상태를 변경을 통해 상태를 변경시킬 수 있도록 합니다." + ) + @GetMapping("/alarm") + public ListResult getAlarm(@RequestHeader(value = "X-AUTH-TOKEN") String token, + @ApiParam(value = "페이지 Ex) page=1", required = true) @RequestParam int page) + { + Long userId = Long.parseLong(jwtTokenProvider.getUserPk(token)); + List alarmResponseDtoList = homeService.getAlarm(userId, page); + logger.info(alarmResponseDtoList.toString()); + return responseService.mappingListResult(alarmResponseDtoList, "홈화면 - 알람 목록"); + } + + + @ApiImplicitParams({ + @ApiImplicitParam( + name = "X-AUTH-TOKEN", + value = "로그인 성공 후 JWT_TOKEN", + required = true, dataType = "String", paramType = "header") + }) + @ApiOperation( + value = "홈화면 - 알람목록 - 특정 알람 읽음 처리", + notes = "### 알람으로 리다이렉션이 일어날 때, 해당 알람을 읽음 처리합니다.\n" + ) + @PatchMapping("/alarm/{alarmId}") + public SingleResult updateReadStatus(@RequestHeader(value = "X-AUTH-TOKEN") String token, + @ApiParam(value = "읽음 처리할 alarmId", required = true) @PathVariable Long alarmId ) + { + AlarmReadStatusUpdateResponseDto alarmReadStatusUpdateResponseDto = homeService.updateReadStatus(alarmId); + logger.info(alarmReadStatusUpdateResponseDto.toString()); + return responseService.mappingSingleResult(alarmReadStatusUpdateResponseDto, "홈화면 - 알람목록 - 특정 알람 읽음 처리"); + } +} diff --git a/src/main/java/MakeUs/Moira/controller/home/dto/AlarmReadStatusUpdateResponseDto.java b/src/main/java/MakeUs/Moira/controller/alarm/dto/AlarmReadStatusUpdateResponseDto.java similarity index 88% rename from src/main/java/MakeUs/Moira/controller/home/dto/AlarmReadStatusUpdateResponseDto.java rename to src/main/java/MakeUs/Moira/controller/alarm/dto/AlarmReadStatusUpdateResponseDto.java index a3a0671..c7fc853 100644 --- a/src/main/java/MakeUs/Moira/controller/home/dto/AlarmReadStatusUpdateResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/alarm/dto/AlarmReadStatusUpdateResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.home.dto; +package MakeUs.Moira.controller.alarm.dto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/MakeUs/Moira/controller/home/dto/AlarmResponseDto.java b/src/main/java/MakeUs/Moira/controller/alarm/dto/AlarmResponseDto.java similarity index 98% rename from src/main/java/MakeUs/Moira/controller/home/dto/AlarmResponseDto.java rename to src/main/java/MakeUs/Moira/controller/alarm/dto/AlarmResponseDto.java index 2bc9484..38e0f92 100644 --- a/src/main/java/MakeUs/Moira/controller/home/dto/AlarmResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/alarm/dto/AlarmResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.home.dto; +package MakeUs.Moira.controller.alarm.dto; import MakeUs.Moira.domain.alarm.AlarmType; import MakeUs.Moira.domain.chat.ReadStatus; diff --git a/src/main/java/MakeUs/Moira/controller/chat/ChatController.java b/src/main/java/MakeUs/Moira/controller/chat/ChatController.java index 2164022..2bd18f1 100644 --- a/src/main/java/MakeUs/Moira/controller/chat/ChatController.java +++ b/src/main/java/MakeUs/Moira/controller/chat/ChatController.java @@ -5,11 +5,11 @@ import MakeUs.Moira.controller.chat.dto.ChatMessageSendRequestDto; import MakeUs.Moira.controller.chat.dto.ChatMessageSendResponseDto; import MakeUs.Moira.controller.chat.dto.ChatRoomResponseDto; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.ListResult; -import MakeUs.Moira.response.model.SingleResult; import MakeUs.Moira.service.alarm.AlarmService; import MakeUs.Moira.service.chat.ChatService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.ListResult; +import MakeUs.Moira.util.response.model.SingleResult; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; @@ -25,7 +25,7 @@ public class ChatController { private final ChatService chatService; private final JwtTokenProvider jwtTokenProvider; - private final ResponseService responseService; + private final ResponseService responseService; private final AlarmService alarmService; private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/src/main/java/MakeUs/Moira/controller/chat/dto/ChatMessageSendRequestDto.java b/src/main/java/MakeUs/Moira/controller/chat/dto/ChatMessageSendRequestDto.java index d365224..c52da10 100644 --- a/src/main/java/MakeUs/Moira/controller/chat/dto/ChatMessageSendRequestDto.java +++ b/src/main/java/MakeUs/Moira/controller/chat/dto/ChatMessageSendRequestDto.java @@ -1,11 +1,11 @@ package MakeUs.Moira.controller.chat.dto; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.domain.chat.ChatMessage; import MakeUs.Moira.domain.chat.MessageType; import MakeUs.Moira.domain.chat.ReadStatus; import MakeUs.Moira.domain.user.User; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/MakeUs/Moira/controller/complimentMark/ComplimentMarkController.java b/src/main/java/MakeUs/Moira/controller/complimentMark/ComplimentMarkController.java deleted file mode 100644 index 49e4470..0000000 --- a/src/main/java/MakeUs/Moira/controller/complimentMark/ComplimentMarkController.java +++ /dev/null @@ -1,43 +0,0 @@ -package MakeUs.Moira.controller.complimentMark; - - -import MakeUs.Moira.controller.complimentMark.dto.ComplimentMarkInfoResponseDto; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.ListResult; -import MakeUs.Moira.service.complimentMark.ComplimentMarkInfoService; -import io.swagger.annotations.*; -import lombok.RequiredArgsConstructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@Api(tags = {"5.유저 리뷰"}) -@RequiredArgsConstructor -@RestController -public class ComplimentMarkController { - - private final ComplimentMarkInfoService complimentMarkInfoService; - private final ResponseService responseService; - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @ApiImplicitParams({ - @ApiImplicitParam( - name = "X-AUTH-TOKEN", - value = "로그인 성공 후 JWT_TOKEN", - required = true, dataType = "String", paramType = "header") - }) - @ApiOperation( - value = "칭찬 뱃지 정보 불러오기", - notes = "- 팀원 평가하기 - 특정 멤버 평가 - 칭찬 뱃지 정보 불러오기\n" + - "- 비회원인 경우 에러가 발생합니다." - ) - @GetMapping(value = "/compliment") - public ListResult getComplimentMark(@RequestHeader(value = "X-AUTH-TOKEN") String token) - { - List complimentMarkInfoResponseDtoList = complimentMarkInfoService.getComplimentMark(); - logger.info(complimentMarkInfoResponseDtoList.toString()); - return responseService.mappingListResult(complimentMarkInfoResponseDtoList, "칭찬 뱃지 정보 불러오기"); - } -} diff --git a/src/main/java/MakeUs/Moira/controller/exception/ExceptionController.java b/src/main/java/MakeUs/Moira/controller/exception/ExceptionController.java index 8bb5a88..211ae0b 100644 --- a/src/main/java/MakeUs/Moira/controller/exception/ExceptionController.java +++ b/src/main/java/MakeUs/Moira/controller/exception/ExceptionController.java @@ -1,8 +1,8 @@ package MakeUs.Moira.controller.exception; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; -import MakeUs.Moira.response.model.CommonResult; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; +import MakeUs.Moira.util.response.model.CommonResult; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/MakeUs/Moira/controller/home/HomeController.java b/src/main/java/MakeUs/Moira/controller/home/HomeController.java index c208885..72169b7 100644 --- a/src/main/java/MakeUs/Moira/controller/home/HomeController.java +++ b/src/main/java/MakeUs/Moira/controller/home/HomeController.java @@ -1,13 +1,13 @@ package MakeUs.Moira.controller.home; import MakeUs.Moira.config.security.JwtTokenProvider; -import MakeUs.Moira.controller.home.dto.AlarmReadStatusUpdateResponseDto; +import MakeUs.Moira.controller.alarm.dto.AlarmReadStatusUpdateResponseDto; import MakeUs.Moira.controller.home.dto.HomeResponseDto; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.controller.home.dto.AlarmResponseDto; -import MakeUs.Moira.response.model.ListResult; -import MakeUs.Moira.response.model.SingleResult; +import MakeUs.Moira.controller.alarm.dto.AlarmResponseDto; import MakeUs.Moira.service.home.HomeService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.ListResult; +import MakeUs.Moira.util.response.model.SingleResult; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; @@ -25,7 +25,7 @@ public class HomeController { private final HomeService homeService; - private final ResponseService responseService; + private final ResponseService responseService; private final JwtTokenProvider jwtTokenProvider; private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -37,7 +37,8 @@ public class HomeController { }) @ApiOperation( value = "홈화면", - notes = "### 읽지 않은 알림과 메시지가 있는지 확인합니다.\n" + notes = "### 읽지 않은 알림과 메시지가 있는지 확인합니다.\n" + + "![image](https://moira-springboot.s3.ap-northeast-2.amazonaws.com/007e6c69-8e30-4f03-b088-7e4326a2e887.png)\n" ) @GetMapping("/home") public SingleResult getHome(@RequestHeader(value = "X-AUTH-TOKEN") String token) @@ -48,57 +49,4 @@ public SingleResult getHome(@RequestHeader(value = "X-AUTH-TOKE return responseService.mappingSingleResult(homeResponseDto, "홈화면"); } - @ApiImplicitParams({ - @ApiImplicitParam( - name = "X-AUTH-TOKEN", - value = "로그인 성공 후 JWT_TOKEN", - required = true, dataType = "String", paramType = "header") - }) - @ApiOperation( - value = "홈화면 - 알람 목록", - notes = "### 홈화면에서 알람 목록을 확인합니다.\n" + - "### 페이징이 적용되며 10개씩 목록을 가져옵니다.\n\n" + - "### 알람 타입으로 PROJECT, APPLY(지원서), APPLY_ANSWER(지원서 응답), INVITE_ANSWER(팀장 초대 응답), REVIEW(리뷰), CHATROOM(채팅방)이 있습니다.\n\n" + - "### PROJECT\n" + - "- alarmTargetId를 projectId로 사용하여 /project/{projectId} 팀원 모집 - 팀 모집글 상세로 리다이렉팅 시킵니다.\n" + - "### REVIEW\n" + - "- alarmTargetId를 userId로 사용하여 /review/detail/{userId} 유저의 모든 리뷰 내용 조회로 리다이렉팅 시킵니다.\n" + - "### CHATROOM\n" + - "- alarmTargetId를 chatRoomId로 사용하여 /chatroom/{chatRoomId} 유저와 채팅 내용 불러오기로 리다이렉팅 시킵니다.\n" + - "### APPLY\n" + - "- alarmTargetId를 projectApplyId로 사용하여 /apply/{projectApplyId} 마이페이지 - 지원한 글 - 지원 목록 - 지원 내역로 리다이렉팅 시킵니다.\n" + - "### APPLY_ANSWER\n" + - "- 지원자를 수락할지 거절할지 선택하여 alarmTargetId를 projectApplyId로 사용하여 /apply/{projectApplyId} 지원서의 상태를 변경을 통해 상태를 변경시킬 수 있도록 합니다.\n" + - "### INVITE_ANSWER\n" + - "- 팀장의 초대를 수락할지 거절할지 선택하여 alarmTargetId를 projectApplyId로 사용하여 /apply/{projectApplyId} 지원서의 상태를 변경을 통해 상태를 변경시킬 수 있도록 합니다." - ) - @GetMapping("/home/alarm") - public ListResult getAlarm(@RequestHeader(value = "X-AUTH-TOKEN") String token, - @ApiParam(value = "페이지 Ex) page=1", required = true) @RequestParam int page) - { - Long userId = Long.parseLong(jwtTokenProvider.getUserPk(token)); - List alarmResponseDtoList = homeService.getAlarm(userId, page); - logger.info(alarmResponseDtoList.toString()); - return responseService.mappingListResult(alarmResponseDtoList, "홈화면 - 알람 목록"); - } - - - @ApiImplicitParams({ - @ApiImplicitParam( - name = "X-AUTH-TOKEN", - value = "로그인 성공 후 JWT_TOKEN", - required = true, dataType = "String", paramType = "header") - }) - @ApiOperation( - value = "홈화면 - 알람목록 - 특정 알람 읽음 처리", - notes = "### 알람으로 리다이렉션이 일어날 때, 해당 알람을 읽음 처리합니다.\n" - ) - @PutMapping("/home/alarm/{alarmId}") - public SingleResult updateReadStatus(@RequestHeader(value = "X-AUTH-TOKEN") String token, - @ApiParam(value = "읽음 처리할 alarmId", required = true) @PathVariable Long alarmId ) - { - AlarmReadStatusUpdateResponseDto alarmReadStatusUpdateResponseDto = homeService.updateReadStatus(alarmId); - logger.info(alarmReadStatusUpdateResponseDto.toString()); - return responseService.mappingSingleResult(alarmReadStatusUpdateResponseDto, "홈화면 - 알람목록 - 특정 알람 읽음 처리"); - } } diff --git a/src/main/java/MakeUs/Moira/controller/jwt/JwtController.java b/src/main/java/MakeUs/Moira/controller/jwt/JwtController.java index 4edb730..e0fc312 100644 --- a/src/main/java/MakeUs/Moira/controller/jwt/JwtController.java +++ b/src/main/java/MakeUs/Moira/controller/jwt/JwtController.java @@ -2,9 +2,9 @@ import MakeUs.Moira.controller.jwt.dto.LoginRequestDto; import MakeUs.Moira.controller.jwt.dto.LoginResponseDto; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.SingleResult; import MakeUs.Moira.service.jwt.JwtService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.SingleResult; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; diff --git a/src/main/java/MakeUs/Moira/controller/myPage/MyPageController.java b/src/main/java/MakeUs/Moira/controller/myPage/MyPageController.java index 51dc88a..354a072 100644 --- a/src/main/java/MakeUs/Moira/controller/myPage/MyPageController.java +++ b/src/main/java/MakeUs/Moira/controller/myPage/MyPageController.java @@ -2,10 +2,10 @@ import MakeUs.Moira.config.security.JwtTokenProvider; import MakeUs.Moira.controller.myPage.dto.*; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.ListResult; -import MakeUs.Moira.response.model.SingleResult; import MakeUs.Moira.service.myPage.MyPageService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.ListResult; +import MakeUs.Moira.util.response.model.SingleResult; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; @@ -22,7 +22,7 @@ public class MyPageController { private final MyPageService myPageService; private final JwtTokenProvider jwtTokenProvider; - private final ResponseService responseService; + private final ResponseService responseService; private final Logger logger = LoggerFactory.getLogger(this.getClass()); @ApiImplicitParams({ diff --git a/src/main/java/MakeUs/Moira/controller/myPage/dto/AppliedProjectInfoResponseDto.java b/src/main/java/MakeUs/Moira/controller/myPage/dto/AppliedProjectInfoResponseDto.java index dfe0a08..53b6f31 100644 --- a/src/main/java/MakeUs/Moira/controller/myPage/dto/AppliedProjectInfoResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPage/dto/AppliedProjectInfoResponseDto.java @@ -1,13 +1,10 @@ package MakeUs.Moira.controller.myPage.dto; - -import MakeUs.Moira.domain.project.Project; -import MakeUs.Moira.domain.project.projectApply.ProjectApply; -import MakeUs.Moira.domain.project.projectDetail.ProjectDetail; +import MakeUs.Moira.domain.projectApply.ProjectApply; +import MakeUs.Moira.domain.projectDetail.ProjectDetail; import lombok.Getter; import lombok.ToString; -import java.time.LocalDate; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; diff --git a/src/main/java/MakeUs/Moira/controller/myPage/dto/HashtagResponseDto.java b/src/main/java/MakeUs/Moira/controller/myPage/dto/HashtagResponseDto.java index 5002420..3d43328 100644 --- a/src/main/java/MakeUs/Moira/controller/myPage/dto/HashtagResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPage/dto/HashtagResponseDto.java @@ -1,7 +1,7 @@ package MakeUs.Moira.controller.myPage.dto; -import MakeUs.Moira.domain.project.ProjectHashtag; -import MakeUs.Moira.domain.user.UserHashtag; +import MakeUs.Moira.domain.projectHashtag.ProjectHashtag; +import MakeUs.Moira.domain.userHashtag.UserHashtag; import lombok.Builder; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/MakeUs/Moira/controller/myPage/dto/LikedProjectResponseDto.java b/src/main/java/MakeUs/Moira/controller/myPage/dto/LikedProjectResponseDto.java index a96a31e..5b7210e 100644 --- a/src/main/java/MakeUs/Moira/controller/myPage/dto/LikedProjectResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPage/dto/LikedProjectResponseDto.java @@ -1,11 +1,9 @@ package MakeUs.Moira.controller.myPage.dto; - - -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.domain.project.Project; -import MakeUs.Moira.domain.user.UserProjectRoleType; +import MakeUs.Moira.domain.userProject.UserProjectRoleType; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/MakeUs/Moira/controller/myPageEdit/MyPageEditController.java b/src/main/java/MakeUs/Moira/controller/myPageEdit/MyPageEditController.java index 24d0aa0..fdbffc1 100644 --- a/src/main/java/MakeUs/Moira/controller/myPageEdit/MyPageEditController.java +++ b/src/main/java/MakeUs/Moira/controller/myPageEdit/MyPageEditController.java @@ -4,10 +4,10 @@ import MakeUs.Moira.config.security.JwtTokenProvider; import MakeUs.Moira.controller.myPageEdit.dto.*; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.ListResult; -import MakeUs.Moira.response.model.SingleResult; import MakeUs.Moira.service.myPageEdit.MyPageEditService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.ListResult; +import MakeUs.Moira.util.response.model.SingleResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -25,7 +25,7 @@ @RestController public class MyPageEditController { - private final ResponseService responseService; + private final ResponseService responseService; private final JwtTokenProvider jwtTokenProvider; private final MyPageEditService myPageEditService; private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/src/main/java/MakeUs/Moira/controller/myProject/MyProjectController.java b/src/main/java/MakeUs/Moira/controller/myProject/MyProjectController.java index 25afc45..ba4e15e 100644 --- a/src/main/java/MakeUs/Moira/controller/myProject/MyProjectController.java +++ b/src/main/java/MakeUs/Moira/controller/myProject/MyProjectController.java @@ -3,11 +3,11 @@ import MakeUs.Moira.config.security.JwtTokenProvider; import MakeUs.Moira.controller.myProject.dto.MyProjectResponseDTO; import MakeUs.Moira.controller.myProject.dto.MyProjectsResponseDTO; -import MakeUs.Moira.domain.user.UserProjectStatus; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.ListResult; -import MakeUs.Moira.response.model.SingleResult; +import MakeUs.Moira.domain.userProject.UserProjectStatus; import MakeUs.Moira.service.myProject.MyProjectService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.ListResult; +import MakeUs.Moira.util.response.model.SingleResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/src/main/java/MakeUs/Moira/controller/project/ProjectController.java b/src/main/java/MakeUs/Moira/controller/project/ProjectController.java index 104beea..eb6d565 100644 --- a/src/main/java/MakeUs/Moira/controller/project/ProjectController.java +++ b/src/main/java/MakeUs/Moira/controller/project/ProjectController.java @@ -2,11 +2,11 @@ import MakeUs.Moira.config.security.JwtTokenProvider; import MakeUs.Moira.controller.project.dto.*; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.CommonResult; -import MakeUs.Moira.response.model.ListResult; -import MakeUs.Moira.response.model.SingleResult; import MakeUs.Moira.service.project.ProjectService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.CommonResult; +import MakeUs.Moira.util.response.model.ListResult; +import MakeUs.Moira.util.response.model.SingleResult; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/ProjectMemberResponseDto.java b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectMemberResponseDto.java index cf864ed..c274c75 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/ProjectMemberResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectMemberResponseDto.java @@ -1,6 +1,6 @@ package MakeUs.Moira.controller.project.dto; -import MakeUs.Moira.domain.user.UserProject; +import MakeUs.Moira.domain.userProject.UserProject; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/ProjectRequestDTO.java b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectRequestDTO.java index e587b1d..d500b55 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/ProjectRequestDTO.java +++ b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectRequestDTO.java @@ -1,7 +1,6 @@ package MakeUs.Moira.controller.project.dto; -import MakeUs.Moira.domain.project.projectDetail.ProjectDuration; -import MakeUs.Moira.domain.project.projectDetail.ProjectLocalType; +import MakeUs.Moira.domain.projectDetail.ProjectDuration; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Getter; @@ -29,10 +28,6 @@ public class ProjectRequestDTO { @NotNull(message = "duration에 빈 값을 넣을 수 없음") private ProjectDuration duration; - @ApiModelProperty(value = "지역", example = "서울_인천_경기", allowableValues = "서울_인천_경기, 대전_충북_충남_세종, 광주_전남_전북, 부산_울산_경남, 강원, 대구_경북, 제주, 온라인") - @NotNull(message = "localType에 빈 값을 넣을 수 없음") - private ProjectLocalType localType; - @ApiModelProperty(value = "포지션 카테고리 리스트") private List positionCategoryList; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/ProjectResponseDTO.java b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectResponseDTO.java index 4f31d9a..b0c5490 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/ProjectResponseDTO.java +++ b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectResponseDTO.java @@ -1,7 +1,6 @@ package MakeUs.Moira.controller.project.dto; -import MakeUs.Moira.domain.project.projectDetail.ProjectDuration; -import MakeUs.Moira.domain.project.projectDetail.ProjectLocalType; +import MakeUs.Moira.domain.projectDetail.ProjectDuration; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; @@ -31,8 +30,6 @@ public class ProjectResponseDTO { private int likeCount; @ApiModelProperty(value = "기간", example = "한달_미만") private ProjectDuration duration; - @ApiModelProperty(value = "지역", example = "서울_인천_경기") - private ProjectLocalType location; @ApiModelProperty(value = "포지션 리스트") private List positionCategoryList; @ApiModelProperty(value = "생성 시간", example = "방금전") diff --git a/src/main/java/MakeUs/Moira/controller/projectApply/ProjectApplyController.java b/src/main/java/MakeUs/Moira/controller/projectApply/ProjectApplyController.java index f13dbab..f064430 100644 --- a/src/main/java/MakeUs/Moira/controller/projectApply/ProjectApplyController.java +++ b/src/main/java/MakeUs/Moira/controller/projectApply/ProjectApplyController.java @@ -5,11 +5,11 @@ import MakeUs.Moira.controller.projectApply.dto.ProjectApplyModifyStatusRequestDTO; import MakeUs.Moira.controller.projectApply.dto.ProjectApplyRequestDTO; import MakeUs.Moira.controller.projectApply.dto.ProjectApplyResponseDTO; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.CommonResult; -import MakeUs.Moira.response.model.ListResult; -import MakeUs.Moira.response.model.SingleResult; import MakeUs.Moira.service.projectApply.ProjectApplyService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.CommonResult; +import MakeUs.Moira.util.response.model.ListResult; +import MakeUs.Moira.util.response.model.SingleResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplyModifyStatusRequestDTO.java b/src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplyModifyStatusRequestDTO.java index 987b0ec..b7dde7b 100644 --- a/src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplyModifyStatusRequestDTO.java +++ b/src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplyModifyStatusRequestDTO.java @@ -1,6 +1,6 @@ package MakeUs.Moira.controller.projectApply.dto; -import MakeUs.Moira.domain.project.projectApply.ProjectApplyStatus; +import MakeUs.Moira.domain.projectApply.ProjectApplyStatus; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/MakeUs/Moira/controller/projectComment/ProjectCommentController.java b/src/main/java/MakeUs/Moira/controller/projectComment/ProjectCommentController.java index 77dc2dc..2343869 100644 --- a/src/main/java/MakeUs/Moira/controller/projectComment/ProjectCommentController.java +++ b/src/main/java/MakeUs/Moira/controller/projectComment/ProjectCommentController.java @@ -3,11 +3,11 @@ import MakeUs.Moira.config.security.JwtTokenProvider; import MakeUs.Moira.controller.projectComment.dto.ProjectCommentRequestDTO; import MakeUs.Moira.controller.projectComment.dto.ProjectCommentResponseDTO; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.CommonResult; -import MakeUs.Moira.response.model.ListResult; -import MakeUs.Moira.response.model.SingleResult; import MakeUs.Moira.service.projectComment.ProjectCommentService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.CommonResult; +import MakeUs.Moira.util.response.model.ListResult; +import MakeUs.Moira.util.response.model.SingleResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/src/main/java/MakeUs/Moira/controller/report/ReportController.java b/src/main/java/MakeUs/Moira/controller/report/ReportController.java index 26975eb..77e7ea5 100644 --- a/src/main/java/MakeUs/Moira/controller/report/ReportController.java +++ b/src/main/java/MakeUs/Moira/controller/report/ReportController.java @@ -3,9 +3,9 @@ import MakeUs.Moira.config.security.JwtTokenProvider; import MakeUs.Moira.controller.report.dto.ReportRequestDTO; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.CommonResult; import MakeUs.Moira.service.report.ReportService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.CommonResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/src/main/java/MakeUs/Moira/controller/review/ReviewController.java b/src/main/java/MakeUs/Moira/controller/review/ReviewController.java index 80a8037..4f4fb1c 100644 --- a/src/main/java/MakeUs/Moira/controller/review/ReviewController.java +++ b/src/main/java/MakeUs/Moira/controller/review/ReviewController.java @@ -2,16 +2,16 @@ import MakeUs.Moira.config.security.JwtTokenProvider; +import MakeUs.Moira.controller.review.dto.ComplimentMarkInfoResponseDto; import MakeUs.Moira.controller.review.dto.UserReviewAddRequestDto; import MakeUs.Moira.controller.review.dto.UserReviewAddResponseDto; import MakeUs.Moira.controller.review.dto.UserReviewDetailResponseDto; import MakeUs.Moira.controller.review.dto.UserReviewResponseDto; -import MakeUs.Moira.response.ResponseService; - -import MakeUs.Moira.response.model.ListResult; -import MakeUs.Moira.response.model.SingleResult; import MakeUs.Moira.service.alarm.AlarmService; import MakeUs.Moira.service.review.ReviewService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.ListResult; +import MakeUs.Moira.util.response.model.SingleResult; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; @@ -27,8 +27,8 @@ @RestController public class ReviewController { - private final ReviewService userReviewService; - private final ResponseService responseService; + private final ReviewService reviewService; + private final ResponseService responseService; private final AlarmService alarmService; private final JwtTokenProvider jwtTokenProvider; private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -54,7 +54,7 @@ public SingleResult addUserReview( logger.info(userReviewAddRequestDto.toString()); // 권한 설정은 시큐리티에서 하자 Long userId = Long.parseLong(jwtTokenProvider.getUserPk(token)); - UserReviewAddResponseDto userReviewAddResponseDto = userReviewService.addUserReview(userId, userReviewAddRequestDto); + UserReviewAddResponseDto userReviewAddResponseDto = reviewService.addUserReview(userId, userReviewAddRequestDto); logger.info(userReviewAddResponseDto.toString()); alarmService.saveUserReview(userId, userReviewAddResponseDto); return responseService.mappingSingleResult(userReviewAddResponseDto, "팀원 평가하기 - 특정 유저 평가하기"); @@ -76,7 +76,7 @@ public SingleResult addUserReview( public SingleResult getUserReview(@RequestHeader(value = "X-AUTH-TOKEN") String token, @ApiParam(value = "조회하려는 유저의 userId", required = true) @PathVariable Long userId) { - UserReviewResponseDto userReviewResponseDto = userReviewService.getUserReview(userId); + UserReviewResponseDto userReviewResponseDto = reviewService.getUserReview(userId); logger.info(userReviewResponseDto.toString()); return responseService.mappingSingleResult(userReviewResponseDto, "유저의 사용자 평가 조회"); } @@ -97,8 +97,28 @@ public ListResult getUserReviewDetail(@RequestHeade @ApiParam(value = "조회하려는 유저의 userId", required = true) @PathVariable Long userId, @ApiParam(value = "정렬 방식: date, point", allowableValues = "date, point", required = true) @RequestParam String sort) { - List userReviewDetailResponseDtoList = userReviewService.getUserReviewDetail(userId, sort); + List userReviewDetailResponseDtoList = reviewService.getUserReviewDetail(userId, sort); logger.info(userReviewDetailResponseDtoList.toString()); return responseService.mappingListResult(userReviewDetailResponseDtoList, "유저의 모든 리뷰 내용 조회"); } + + + @ApiImplicitParams({ + @ApiImplicitParam( + name = "X-AUTH-TOKEN", + value = "로그인 성공 후 JWT_TOKEN", + required = true, dataType = "String", paramType = "header") + }) + @ApiOperation( + value = "칭찬 뱃지 정보 불러오기", + notes = "- 팀원 평가하기 - 특정 멤버 평가 - 칭찬 뱃지 정보 불러오기\n" + + "- 비회원인 경우 에러가 발생합니다." + ) + @GetMapping(value = "/compliment") + public ListResult getComplimentMark(@RequestHeader(value = "X-AUTH-TOKEN") String token) + { + List complimentMarkInfoResponseDtoList = reviewService.getComplimentMark(); + logger.info(complimentMarkInfoResponseDtoList.toString()); + return responseService.mappingListResult(complimentMarkInfoResponseDtoList, "칭찬 뱃지 정보 불러오기"); + } } diff --git a/src/main/java/MakeUs/Moira/controller/complimentMark/dto/ComplimentMarkInfoResponseDto.java b/src/main/java/MakeUs/Moira/controller/review/dto/ComplimentMarkInfoResponseDto.java similarity index 91% rename from src/main/java/MakeUs/Moira/controller/complimentMark/dto/ComplimentMarkInfoResponseDto.java rename to src/main/java/MakeUs/Moira/controller/review/dto/ComplimentMarkInfoResponseDto.java index 7cebaed..767bf3c 100644 --- a/src/main/java/MakeUs/Moira/controller/complimentMark/dto/ComplimentMarkInfoResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/review/dto/ComplimentMarkInfoResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.complimentMark.dto; +package MakeUs.Moira.controller.review.dto; import MakeUs.Moira.domain.complimentMark.ComplimentMarkInfo; import lombok.Getter; diff --git a/src/main/java/MakeUs/Moira/controller/signup/SignupController.java b/src/main/java/MakeUs/Moira/controller/signup/SignupController.java index 7635dd7..92f16bf 100644 --- a/src/main/java/MakeUs/Moira/controller/signup/SignupController.java +++ b/src/main/java/MakeUs/Moira/controller/signup/SignupController.java @@ -7,12 +7,12 @@ import MakeUs.Moira.controller.signup.dto.PositionCategoryResponseDto; import MakeUs.Moira.controller.signup.dto.PositionResponseDto; import MakeUs.Moira.controller.signup.dto.SignupResponseDto; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.CommonResult; -import MakeUs.Moira.response.model.ListResult; import MakeUs.Moira.service.hashtag.HashTagService; import MakeUs.Moira.service.position.PositionService; import MakeUs.Moira.service.user.UserService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.CommonResult; +import MakeUs.Moira.util.response.model.ListResult; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; @@ -34,7 +34,7 @@ public class SignupController { private final UserService userService; private final PositionService positionService; private final HashTagService hashTagService; - private final ResponseService responseService; + private final ResponseService responseService; private final JwtTokenProvider jwtTokenProvider; private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/src/main/java/MakeUs/Moira/controller/user/UserController.java b/src/main/java/MakeUs/Moira/controller/user/UserController.java deleted file mode 100644 index fa8a5dc..0000000 --- a/src/main/java/MakeUs/Moira/controller/user/UserController.java +++ /dev/null @@ -1,46 +0,0 @@ -package MakeUs.Moira.controller.user; - -import MakeUs.Moira.config.security.JwtTokenProvider; -import MakeUs.Moira.domain.hashtag.HashtagRepo; -import MakeUs.Moira.domain.user.UserHashtag; -import MakeUs.Moira.domain.user.UserHashtagRepo; -import MakeUs.Moira.domain.user.UserHistoryRepo; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.ListResult; -import MakeUs.Moira.service.user.UserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.RequiredArgsConstructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@Api(tags = {"7.유저"}) -@RequiredArgsConstructor -@RestController -@RequestMapping("/user") -public class UserController { - - private final UserService userService; - private final JwtTokenProvider jwtTokenProvider; - private final ResponseService responseService; - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @ApiOperation( - value = "팀 목록 - 나의 태그 리스트", - notes = "로그인한 유저의 태그를 조회합니다\n" - ) - @GetMapping(value = "/tag") - public ListResult getUserHashtags( - @ApiParam(value = "JWT 토큰", required = true) @RequestHeader(value = "X-AUTH-TOKEN") String token){ - List resultList = userService.getUserHashtags(Long.parseLong(jwtTokenProvider.getUserPk(token))); - logger.info(resultList.toString()); - return responseService.mappingListResult(resultList, "나의 태그 조회 성공"); - } -} diff --git a/src/main/java/MakeUs/Moira/controller/userPool/UserPoolController.java b/src/main/java/MakeUs/Moira/controller/userPool/UserPoolController.java index b949c93..4c608ee 100644 --- a/src/main/java/MakeUs/Moira/controller/userPool/UserPoolController.java +++ b/src/main/java/MakeUs/Moira/controller/userPool/UserPoolController.java @@ -3,10 +3,10 @@ import MakeUs.Moira.config.security.JwtTokenProvider; import MakeUs.Moira.controller.userPool.dto.*; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.ListResult; -import MakeUs.Moira.response.model.SingleResult; import MakeUs.Moira.service.userPool.UserPoolService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.ListResult; +import MakeUs.Moira.util.response.model.SingleResult; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; @@ -26,7 +26,7 @@ public class UserPoolController { private final UserPoolService userPoolService; private final JwtTokenProvider jwtTokenProvider; - private final ResponseService responseService; + private final ResponseService responseService; private final Logger logger = LoggerFactory.getLogger(this.getClass()); @ApiImplicitParams({ diff --git a/src/main/java/MakeUs/Moira/controller/userPool/dto/UserPoolLikeAddResponse.java b/src/main/java/MakeUs/Moira/controller/userPool/dto/UserPoolLikeAddResponse.java index bb663fb..cb0f09c 100644 --- a/src/main/java/MakeUs/Moira/controller/userPool/dto/UserPoolLikeAddResponse.java +++ b/src/main/java/MakeUs/Moira/controller/userPool/dto/UserPoolLikeAddResponse.java @@ -1,6 +1,6 @@ package MakeUs.Moira.controller.userPool.dto; -import MakeUs.Moira.domain.userPool.UserPoolLike; +import MakeUs.Moira.domain.userPoolLike.UserPoolLike; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/MakeUs/Moira/controller/userPool/dto/UserPoolResponseDto.java b/src/main/java/MakeUs/Moira/controller/userPool/dto/UserPoolResponseDto.java index c0401e8..5f5b5f4 100644 --- a/src/main/java/MakeUs/Moira/controller/userPool/dto/UserPoolResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/userPool/dto/UserPoolResponseDto.java @@ -3,7 +3,7 @@ import MakeUs.Moira.domain.user.User; import MakeUs.Moira.domain.userPool.UserPool; -import MakeUs.Moira.domain.userPool.UserPoolLike; +import MakeUs.Moira.domain.userPoolLike.UserPoolLike; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/MakeUs/Moira/controller/userPortfolio/userAward/UserAwardController.java b/src/main/java/MakeUs/Moira/controller/userPortfolio/userAward/UserAwardController.java index f2784d5..794f247 100644 --- a/src/main/java/MakeUs/Moira/controller/userPortfolio/userAward/UserAwardController.java +++ b/src/main/java/MakeUs/Moira/controller/userPortfolio/userAward/UserAwardController.java @@ -4,12 +4,10 @@ import MakeUs.Moira.config.security.JwtTokenProvider; import MakeUs.Moira.controller.userPortfolio.userAward.dto.UserAwardAddRequestDto; import MakeUs.Moira.controller.userPortfolio.userAward.dto.UserAwardResponseDto; -import MakeUs.Moira.controller.userPortfolio.userCareer.dto.UserCareerAddRequestDto; -import MakeUs.Moira.controller.userPortfolio.userCareer.dto.UserCareerResponseDto; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.CommonResult; -import MakeUs.Moira.response.model.ListResult; import MakeUs.Moira.service.userPortfolio.UserAwardService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.CommonResult; +import MakeUs.Moira.util.response.model.ListResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -29,7 +27,7 @@ public class UserAwardController { private final UserAwardService userAwardService; private final JwtTokenProvider jwtTokenProvider; - private final ResponseService responseService; + private final ResponseService responseService; private final Logger logger = LoggerFactory.getLogger(this.getClass()); @ApiImplicitParams({ diff --git a/src/main/java/MakeUs/Moira/controller/userPortfolio/userCareer/UserCareerController.java b/src/main/java/MakeUs/Moira/controller/userPortfolio/userCareer/UserCareerController.java index c2de2b8..8a8190b 100644 --- a/src/main/java/MakeUs/Moira/controller/userPortfolio/userCareer/UserCareerController.java +++ b/src/main/java/MakeUs/Moira/controller/userPortfolio/userCareer/UserCareerController.java @@ -4,12 +4,10 @@ import MakeUs.Moira.config.security.JwtTokenProvider; import MakeUs.Moira.controller.userPortfolio.userCareer.dto.UserCareerAddRequestDto; import MakeUs.Moira.controller.userPortfolio.userCareer.dto.UserCareerResponseDto; -import MakeUs.Moira.controller.userPortfolio.userSchool.dto.UserSchoolAddRequestDto; -import MakeUs.Moira.controller.userPortfolio.userSchool.dto.UserSchoolResponseDto; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.CommonResult; -import MakeUs.Moira.response.model.ListResult; import MakeUs.Moira.service.userPortfolio.UserCareerService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.CommonResult; +import MakeUs.Moira.util.response.model.ListResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -30,7 +28,7 @@ public class UserCareerController { private final UserCareerService userCareerService; private final JwtTokenProvider jwtTokenProvider; - private final ResponseService responseService; + private final ResponseService responseService; private final Logger logger = LoggerFactory.getLogger(this.getClass()); @ApiImplicitParams({ diff --git a/src/main/java/MakeUs/Moira/controller/userPortfolio/userLicense/UserLicenseController.java b/src/main/java/MakeUs/Moira/controller/userPortfolio/userLicense/UserLicenseController.java index 47b7a2b..bfac719 100644 --- a/src/main/java/MakeUs/Moira/controller/userPortfolio/userLicense/UserLicenseController.java +++ b/src/main/java/MakeUs/Moira/controller/userPortfolio/userLicense/UserLicenseController.java @@ -4,10 +4,10 @@ import MakeUs.Moira.config.security.JwtTokenProvider; import MakeUs.Moira.controller.userPortfolio.userLicense.dto.UserLicenseAddRequestDto; import MakeUs.Moira.controller.userPortfolio.userLicense.dto.UserLicenseResponseDto; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.CommonResult; -import MakeUs.Moira.response.model.ListResult; import MakeUs.Moira.service.userPortfolio.UserLicenseService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.CommonResult; +import MakeUs.Moira.util.response.model.ListResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +27,7 @@ public class UserLicenseController { private final UserLicenseService userLicenseService; private final JwtTokenProvider jwtTokenProvider; - private final ResponseService responseService; + private final ResponseService responseService; private final Logger logger = LoggerFactory.getLogger(this.getClass()); @ApiImplicitParams({ @@ -67,7 +67,7 @@ public ListResult addUserLicense( ) @DeleteMapping(value = "/mypage/edit/license/{userLicenseId}") public CommonResult deleteUserLicense(@RequestHeader(value = "X-AUTH-TOKEN") String token, - @PathVariable Long userLicenseId) + @PathVariable Long userLicenseId) { // 권한 설정은 시큐리티에서 하자 Long userId = Long.parseLong(jwtTokenProvider.getUserPk(token)); diff --git a/src/main/java/MakeUs/Moira/controller/userPortfolio/userLink/UserLinkController.java b/src/main/java/MakeUs/Moira/controller/userPortfolio/userLink/UserLinkController.java index a91d7cd..97f113e 100644 --- a/src/main/java/MakeUs/Moira/controller/userPortfolio/userLink/UserLinkController.java +++ b/src/main/java/MakeUs/Moira/controller/userPortfolio/userLink/UserLinkController.java @@ -4,10 +4,10 @@ import MakeUs.Moira.config.security.JwtTokenProvider; import MakeUs.Moira.controller.userPortfolio.userLink.dto.UserLinkAddRequestDto; import MakeUs.Moira.controller.userPortfolio.userLink.dto.UserLinkResponseDto; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.CommonResult; -import MakeUs.Moira.response.model.ListResult; import MakeUs.Moira.service.userPortfolio.UserLinkService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.CommonResult; +import MakeUs.Moira.util.response.model.ListResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +27,7 @@ public class UserLinkController { private final UserLinkService userLinkService; private final JwtTokenProvider jwtTokenProvider; - private final ResponseService responseService; + private final ResponseService responseService; private final Logger logger = LoggerFactory.getLogger(this.getClass()); @ApiImplicitParams({ @@ -67,7 +67,7 @@ public ListResult addUserLink( ) @DeleteMapping(value = "/mypage/edit/link/{userLinkId}") public CommonResult deleteUserLink(@RequestHeader(value = "X-AUTH-TOKEN") String token, - @PathVariable Long userLinkId) + @PathVariable Long userLinkId) { // 권한 설정은 시큐리티에서 하자 Long userId = Long.parseLong(jwtTokenProvider.getUserPk(token)); diff --git a/src/main/java/MakeUs/Moira/controller/userPortfolio/userSchool/UserSchoolController.java b/src/main/java/MakeUs/Moira/controller/userPortfolio/userSchool/UserSchoolController.java index b2d149e..c895f11 100644 --- a/src/main/java/MakeUs/Moira/controller/userPortfolio/userSchool/UserSchoolController.java +++ b/src/main/java/MakeUs/Moira/controller/userPortfolio/userSchool/UserSchoolController.java @@ -6,10 +6,10 @@ import MakeUs.Moira.controller.userPortfolio.userSchool.dto.UserSchoolResponseDto; import MakeUs.Moira.controller.userPortfolio.userSchool.dto.MajorInfoResponseDto; import MakeUs.Moira.controller.userPortfolio.userSchool.dto.SchoolInfoResponseDto; -import MakeUs.Moira.response.ResponseService; -import MakeUs.Moira.response.model.CommonResult; -import MakeUs.Moira.response.model.ListResult; import MakeUs.Moira.service.userPortfolio.UserSchoolService; +import MakeUs.Moira.util.response.ResponseService; +import MakeUs.Moira.util.response.model.CommonResult; +import MakeUs.Moira.util.response.model.ListResult; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; @@ -27,7 +27,7 @@ public class UserSchoolController { private final JwtTokenProvider jwtTokenProvider; private final UserSchoolService userSchoolService; - private final ResponseService responseService; + private final ResponseService responseService; private final Logger logger = LoggerFactory.getLogger(this.getClass()); @ApiImplicitParams({ @@ -109,7 +109,7 @@ public ListResult addUserSchool( ) @DeleteMapping(value = "/mypage/edit/school/{userSchoolId}") public CommonResult deleteUserSchool(@RequestHeader(value = "X-AUTH-TOKEN") String token, - @PathVariable Long userSchoolId) + @PathVariable Long userSchoolId) { // 권한 설정은 시큐리티에서 하자 Long userId = Long.parseLong(jwtTokenProvider.getUserPk(token)); diff --git a/src/main/java/MakeUs/Moira/domain/alarm/AlarmHistory.java b/src/main/java/MakeUs/Moira/domain/alarm/AlarmHistory.java index b6a8061..ab99c38 100644 --- a/src/main/java/MakeUs/Moira/domain/alarm/AlarmHistory.java +++ b/src/main/java/MakeUs/Moira/domain/alarm/AlarmHistory.java @@ -1,7 +1,7 @@ package MakeUs.Moira.domain.alarm; -import MakeUs.Moira.controller.home.dto.AlarmReadStatusUpdateResponseDto; -import MakeUs.Moira.controller.home.dto.AlarmResponseDto; +import MakeUs.Moira.controller.alarm.dto.AlarmReadStatusUpdateResponseDto; +import MakeUs.Moira.controller.alarm.dto.AlarmResponseDto; import MakeUs.Moira.domain.AuditorEntity; import MakeUs.Moira.domain.chat.ReadStatus; import lombok.Builder; diff --git a/src/main/java/MakeUs/Moira/domain/alarmHistory/AlarmHistory.java b/src/main/java/MakeUs/Moira/domain/alarmHistory/AlarmHistory.java deleted file mode 100644 index 59626c2..0000000 --- a/src/main/java/MakeUs/Moira/domain/alarmHistory/AlarmHistory.java +++ /dev/null @@ -1,72 +0,0 @@ -package MakeUs.Moira.domain.alarmHistory; - -import MakeUs.Moira.controller.home.dto.AlarmReadStatusUpdateResponseDto; -import MakeUs.Moira.controller.home.dto.AlarmResponseDto; -import MakeUs.Moira.domain.AuditorEntity; -import MakeUs.Moira.domain.chat.ReadStatus; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import javax.persistence.*; - -@NoArgsConstructor -@Getter -@Entity -public class AlarmHistory extends AuditorEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - private Long userId; - - @Enumerated(EnumType.STRING) - private AlarmType type; - - private Long alarmTargetId; - - private String alarmTargetImage; - - private String alarmContent; - - @Enumerated(EnumType.STRING) - private ReadStatus readStatus; - - @Builder - public AlarmHistory(Long userId, AlarmType type, Long alarmTargetId, String alarmTargetImage, String alarmContent) { - this.userId = userId; - this.type = type; - this.alarmTargetId = alarmTargetId; - this.alarmTargetImage = alarmTargetImage; - this.alarmContent = alarmContent; - readStatus = ReadStatus.UNREAD; - } - - public AlarmResponseDto toAlarmResponseDto() { - return AlarmResponseDto.builder() - .alarmId(id) - .alarmType(type) - .alarmTargetId(alarmTargetId) - .alarmTargetImage(alarmTargetImage) - .alarmContent(alarmContent) - .readStatus(readStatus) - .writtenTime(getCreatedDate()) - .build(); - } - - public AlarmReadStatusUpdateResponseDto toAlarmReadStatusUpdateResponseDto() { - return AlarmReadStatusUpdateResponseDto.builder() - .alarmId(id) - .read(readStatusToBoolean()) - .build(); - } - - private boolean readStatusToBoolean() { - return this.readStatus.equals(ReadStatus.READ); - } - - public void updateReadStatus() { - this.readStatus = ReadStatus.READ; - } -} \ No newline at end of file diff --git a/src/main/java/MakeUs/Moira/domain/alarmHistory/AlarmHistoryRepo.java b/src/main/java/MakeUs/Moira/domain/alarmHistory/AlarmHistoryRepo.java deleted file mode 100644 index dbe3c7b..0000000 --- a/src/main/java/MakeUs/Moira/domain/alarmHistory/AlarmHistoryRepo.java +++ /dev/null @@ -1,11 +0,0 @@ -package MakeUs.Moira.domain.alarmHistory; - -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface AlarmHistoryRepo extends JpaRepository { - List findByUserId(Long userId); - List findByUserIdOrderByCreatedDateDesc(Long userId, Pageable pageable); -} diff --git a/src/main/java/MakeUs/Moira/domain/alarmHistory/AlarmType.java b/src/main/java/MakeUs/Moira/domain/alarmHistory/AlarmType.java deleted file mode 100644 index e78488f..0000000 --- a/src/main/java/MakeUs/Moira/domain/alarmHistory/AlarmType.java +++ /dev/null @@ -1,24 +0,0 @@ -package MakeUs.Moira.domain.alarmHistory; - -import lombok.Getter; - -@Getter -public enum AlarmType { - /* - 1. 나한테 쪽지옴 - 2. 내가 쓴 모집글에 지원함 - 3. 내가 쓴 모집글에 댓글담 - 4. 내 댓글에 대댓글담 - 5. 내가 지원자이고 팀장한테 초대 받음 - 6. 내가 지원자이고 팀장이 지원 거절함 - 7. 내가 팀장이고 내가 보낸 초대에 지원자가 수락함 - 8. 내가 팀장이고 내가 보낸 초대에 지원자가 거절함 - 9. 나에게 리뷰가 달림 - */ - PROJECT, - APPLY, - APPLY_ANSWER, - INVITE_ANSWER, - REVIEW, - CHATROOM -} diff --git a/src/main/java/MakeUs/Moira/domain/club/Club.java b/src/main/java/MakeUs/Moira/domain/club/Club.java deleted file mode 100644 index 79723c2..0000000 --- a/src/main/java/MakeUs/Moira/domain/club/Club.java +++ /dev/null @@ -1,31 +0,0 @@ -package MakeUs.Moira.domain.club; - -import MakeUs.Moira.domain.user.UserHistory; - -import javax.persistence.*; -import java.time.LocalDateTime; -import java.util.List; - -@Entity -public class Club { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - private String clubName; - - @OneToMany(mappedBy = "club") - private List clubImageList; - - @Enumerated(EnumType.STRING) - private RecruitStatus recruitStatus; - - private LocalDateTime recruitStartedAt; - - private LocalDateTime recruitFinishedAt; - - private String recruitLink; - - private String recruitContent; -} diff --git a/src/main/java/MakeUs/Moira/domain/club/ClubImage.java b/src/main/java/MakeUs/Moira/domain/club/ClubImage.java deleted file mode 100644 index 8dc0d29..0000000 --- a/src/main/java/MakeUs/Moira/domain/club/ClubImage.java +++ /dev/null @@ -1,17 +0,0 @@ -package MakeUs.Moira.domain.club; - -import javax.persistence.*; - -@Entity -public class ClubImage { - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private Club club; - - private String Image; -} diff --git a/src/main/java/MakeUs/Moira/domain/club/ClubLike.java b/src/main/java/MakeUs/Moira/domain/club/ClubLike.java deleted file mode 100644 index 8583ee8..0000000 --- a/src/main/java/MakeUs/Moira/domain/club/ClubLike.java +++ /dev/null @@ -1,21 +0,0 @@ -package MakeUs.Moira.domain.club; - -import MakeUs.Moira.domain.user.UserHistory; - -import javax.persistence.*; - -@Entity -public class ClubLike { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private UserHistory userHistory; - - @ManyToOne - private Club club; - - private boolean isClubLiked; -} diff --git a/src/main/java/MakeUs/Moira/domain/club/RecruitStatus.java b/src/main/java/MakeUs/Moira/domain/club/RecruitStatus.java deleted file mode 100644 index f57f4a5..0000000 --- a/src/main/java/MakeUs/Moira/domain/club/RecruitStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package MakeUs.Moira.domain.club; - -public enum RecruitStatus { - OPEN, CLOSE -} diff --git a/src/main/java/MakeUs/Moira/domain/inquiry/Inquiry.java b/src/main/java/MakeUs/Moira/domain/inquiry/Inquiry.java index 3693b22..32525cc 100644 --- a/src/main/java/MakeUs/Moira/domain/inquiry/Inquiry.java +++ b/src/main/java/MakeUs/Moira/domain/inquiry/Inquiry.java @@ -1,6 +1,6 @@ package MakeUs.Moira.domain.inquiry; -import MakeUs.Moira.domain.user.UserHistory; +import MakeUs.Moira.domain.userHistory.UserHistory; import javax.persistence.*; diff --git a/src/main/java/MakeUs/Moira/domain/project/Project.java b/src/main/java/MakeUs/Moira/domain/project/Project.java index 714c7d4..153f589 100644 --- a/src/main/java/MakeUs/Moira/domain/project/Project.java +++ b/src/main/java/MakeUs/Moira/domain/project/Project.java @@ -1,14 +1,15 @@ package MakeUs.Moira.domain.project; import MakeUs.Moira.domain.AuditorEntity; -import MakeUs.Moira.domain.project.projectDetail.ProjectDetail; -import MakeUs.Moira.domain.user.UserProject; +import MakeUs.Moira.domain.projectDetail.ProjectDetail; +import MakeUs.Moira.domain.projectHashtag.ProjectHashtag; +import MakeUs.Moira.domain.projectImage.ProjectImage; +import MakeUs.Moira.domain.userProject.UserProject; import lombok.*; import javax.persistence.*; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; @Entity @Getter diff --git a/src/main/java/MakeUs/Moira/domain/project/ProjectHashtag.java b/src/main/java/MakeUs/Moira/domain/project/ProjectHashtag.java deleted file mode 100644 index 43e1510..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/ProjectHashtag.java +++ /dev/null @@ -1,34 +0,0 @@ -package MakeUs.Moira.domain.project; - -import MakeUs.Moira.domain.hashtag.Hashtag; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import javax.persistence.*; - -@Entity -@Getter -@NoArgsConstructor -public class ProjectHashtag { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private Project project; - - @ManyToOne - private Hashtag projectHashtag; - - @Builder - public ProjectHashtag(Project project, Hashtag projectHashtag) { - this.project = project; - this.projectHashtag = projectHashtag; - } - - public void updateProject(Project project){ - this.project = project; - } -} diff --git a/src/main/java/MakeUs/Moira/domain/project/ProjectHashtagRepo.java b/src/main/java/MakeUs/Moira/domain/project/ProjectHashtagRepo.java deleted file mode 100644 index bddd8a2..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/ProjectHashtagRepo.java +++ /dev/null @@ -1,10 +0,0 @@ -package MakeUs.Moira.domain.project; - -import MakeUs.Moira.domain.project.ProjectHashtag; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface ProjectHashtagRepo extends JpaRepository { - -} diff --git a/src/main/java/MakeUs/Moira/domain/project/ProjectImage.java b/src/main/java/MakeUs/Moira/domain/project/ProjectImage.java deleted file mode 100644 index 78491fb..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/ProjectImage.java +++ /dev/null @@ -1,30 +0,0 @@ -package MakeUs.Moira.domain.project; - -import lombok.Getter; -import lombok.NoArgsConstructor; - -import javax.persistence.*; - -@Entity -@Getter -@NoArgsConstructor -public class ProjectImage { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private Project project; - - private String projectImageUrl; - - // S3에 저장할 파일 명 - private String imageKey; - - public ProjectImage(Project project, String projectImageUrl, String imageKey){ - this.project = project; - this.projectImageUrl = projectImageUrl; - this.imageKey = imageKey; - } -} diff --git a/src/main/java/MakeUs/Moira/domain/project/ProjectImageRepo.java b/src/main/java/MakeUs/Moira/domain/project/ProjectImageRepo.java deleted file mode 100644 index be5f609..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/ProjectImageRepo.java +++ /dev/null @@ -1,6 +0,0 @@ -package MakeUs.Moira.domain.project; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ProjectImageRepo extends JpaRepository { -} diff --git a/src/main/java/MakeUs/Moira/domain/project/ProjectLike.java b/src/main/java/MakeUs/Moira/domain/project/ProjectLike.java deleted file mode 100644 index 7e507e7..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/ProjectLike.java +++ /dev/null @@ -1,46 +0,0 @@ -package MakeUs.Moira.domain.project; - -import MakeUs.Moira.domain.user.UserHistory; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import javax.persistence.*; - -@Entity -@Getter -@NoArgsConstructor -public class ProjectLike { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private UserHistory userHistory; - - @ManyToOne - private Project project; - - private boolean isProjectLiked; - - @Builder - public ProjectLike(UserHistory userHistory, Project project){ - this.userHistory = userHistory; - this.project = project; - isProjectLiked = true; - } - - public void changeProjectLiked(){ - if(isProjectLiked){ - project.cancelLike(); - userHistory.removeProjectLike(this); - } - else{ - project.addLike(); - userHistory.addProjectLike(this); - } - isProjectLiked = !isProjectLiked; - } - -} diff --git a/src/main/java/MakeUs/Moira/domain/project/ProjectLikeRepo.java b/src/main/java/MakeUs/Moira/domain/project/ProjectLikeRepo.java deleted file mode 100644 index 4fb93d8..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/ProjectLikeRepo.java +++ /dev/null @@ -1,10 +0,0 @@ -package MakeUs.Moira.domain.project; - -import MakeUs.Moira.domain.user.UserHistory; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.Optional; - -public interface ProjectLikeRepo extends JpaRepository { - public Optional findByUserHistoryAndProject(UserHistory userHistory, Project project); -} diff --git a/src/main/java/MakeUs/Moira/domain/project/projectApply/OptionalApplyInfo.java b/src/main/java/MakeUs/Moira/domain/project/projectApply/OptionalApplyInfo.java deleted file mode 100644 index cc3aa62..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/projectApply/OptionalApplyInfo.java +++ /dev/null @@ -1,33 +0,0 @@ -package MakeUs.Moira.domain.project.projectApply; - -import MakeUs.Moira.domain.userPortfolio.UserPortfolioType; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import javax.persistence.*; - -@Entity -@Getter -@NoArgsConstructor -public class OptionalApplyInfo { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private ProjectApply projectApply; - - @Enumerated(EnumType.STRING) - private UserPortfolioType userPortfolioType; - - private Long UserSelectedPortfolioId; - - @Builder - public OptionalApplyInfo(ProjectApply projectApply, UserPortfolioType userPortfolioType, Long userSelectedPortfolioId) { - this.projectApply = projectApply; - this.userPortfolioType = userPortfolioType; - this.UserSelectedPortfolioId = userSelectedPortfolioId; - } -} diff --git a/src/main/java/MakeUs/Moira/domain/project/projectApply/ProjectApply.java b/src/main/java/MakeUs/Moira/domain/project/projectApply/ProjectApply.java deleted file mode 100644 index 34a2956..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/projectApply/ProjectApply.java +++ /dev/null @@ -1,57 +0,0 @@ -package MakeUs.Moira.domain.project.projectApply; - -import MakeUs.Moira.domain.AuditorEntity; -import MakeUs.Moira.domain.position.UserPosition; -import MakeUs.Moira.domain.project.projectDetail.ProjectDetail; -import MakeUs.Moira.domain.user.User; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Getter -@Entity -@NoArgsConstructor -public class ProjectApply extends AuditorEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private ProjectDetail projectDetail; - - @ManyToOne - private User applicant; - - @ManyToOne - private UserPosition userPosition; - - @OneToMany(mappedBy = "projectApply", cascade = CascadeType.ALL) - private List optionalApplyInfoList = new ArrayList<>(); - - @Enumerated(EnumType.STRING) - private ProjectApplyStatus projectApplyStatus; - - @Builder - public ProjectApply(ProjectDetail projectDetail, User applicant, UserPosition userPosition, List optionalApplyInfoList, ProjectApplyStatus projectApplyStatus) { - this.projectDetail = projectDetail; - this.applicant = applicant; - this.userPosition = userPosition; - this.projectApplyStatus = projectApplyStatus; - } - - public void addOptionalApplyInfo(OptionalApplyInfo optionalApplyInfo){ - this.optionalApplyInfoList.add(optionalApplyInfo); - } - - public void updateProjectApplyStatus(ProjectApplyStatus projectApplyStatus){ - this.projectApplyStatus = projectApplyStatus; - } -} - - - diff --git a/src/main/java/MakeUs/Moira/domain/project/projectApply/ProjectApplyRepo.java b/src/main/java/MakeUs/Moira/domain/project/projectApply/ProjectApplyRepo.java deleted file mode 100644 index f1ddf43..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/projectApply/ProjectApplyRepo.java +++ /dev/null @@ -1,11 +0,0 @@ -package MakeUs.Moira.domain.project.projectApply; - -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; -import java.util.Optional; - -public interface ProjectApplyRepo extends JpaRepository { - List findAllByApplicant_Id(Long applicantId); - int countByApplicant_Id(Long applicantId); -} diff --git a/src/main/java/MakeUs/Moira/domain/project/projectApply/ProjectApplyStatus.java b/src/main/java/MakeUs/Moira/domain/project/projectApply/ProjectApplyStatus.java deleted file mode 100644 index 793bb80..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/projectApply/ProjectApplyStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package MakeUs.Moira.domain.project.projectApply; - -public enum ProjectApplyStatus { - USER_APPLIED, APPLY_REJECTED, TEAM_INVITED, USER_ACCEPTED, USER_REJECTED -} diff --git a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectComment.java b/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectComment.java deleted file mode 100644 index d5c14b2..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectComment.java +++ /dev/null @@ -1,39 +0,0 @@ -package MakeUs.Moira.domain.project.projectDetail; - -import MakeUs.Moira.domain.AuditorEntity; -import MakeUs.Moira.domain.user.User; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import javax.persistence.*; - -@Entity -@Getter -@NoArgsConstructor -public class ProjectComment extends AuditorEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private ProjectDetail projectDetail; - - @ManyToOne - private User writer; - - private String comment; - - // 셀프 양방향 관계 - @ManyToOne - private ProjectComment parentComment; - - @Builder - public ProjectComment(ProjectDetail projectDetail, User writer, String comment, ProjectComment parentComment){ - this.projectDetail = projectDetail; - this.writer = writer; - this.comment = comment; - this.parentComment = parentComment; - } -} diff --git a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectCommentRepo.java b/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectCommentRepo.java deleted file mode 100644 index bf13b99..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectCommentRepo.java +++ /dev/null @@ -1,9 +0,0 @@ -package MakeUs.Moira.domain.project.projectDetail; - -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface ProjectCommentRepo extends JpaRepository { - public List findAllByProjectDetailOrderByCreatedDate(ProjectDetail projectDetail); -} diff --git a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectDetail.java b/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectDetail.java deleted file mode 100644 index 3711611..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectDetail.java +++ /dev/null @@ -1,72 +0,0 @@ -package MakeUs.Moira.domain.project.projectDetail; - -import MakeUs.Moira.domain.project.*; -import MakeUs.Moira.domain.project.projectApply.ProjectApply; -import lombok.*; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Getter -@NoArgsConstructor -public class ProjectDetail { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @OneToOne(mappedBy = "projectDetail") - private Project project; - - @OneToMany(mappedBy = "projectDetail", cascade = CascadeType.ALL) - private List projectCommentList = new ArrayList<>(); - - @OneToMany(mappedBy = "projectDetail", cascade = CascadeType.ALL) - private List projectApplyList = new ArrayList<>(); - - @OneToMany(mappedBy = "projectDetail", cascade = CascadeType.ALL) - private List projectPositionList = new ArrayList<>(); - - private String projectContent; - - @Enumerated(EnumType.STRING) - private ProjectDuration projectDuration; - - @Enumerated(EnumType.STRING) - private ProjectLocalType projectLocalType; - - @Builder - public ProjectDetail(Project project, String projectContent, ProjectDuration projectDuration, ProjectLocalType projectLocalType) { - this.project = project; - this.projectContent = projectContent; - this.projectDuration = projectDuration; - this.projectLocalType = projectLocalType; - } - - public void addProjectComment(ProjectComment projectComment){ - projectCommentList.add(projectComment); - } - - public void addProjectApply(ProjectApply projectApply){ - projectApplyList.add(projectApply); - } - - public void removeProjectComment(ProjectComment projectComment){ - projectCommentList.remove(projectComment); - } - - public void removeProjectApply(ProjectApply projectApply){ - projectApplyList.remove(projectApply); - } - - public void addProjectPosition(ProjectPosition projectPosition){ - projectPositionList.add(projectPosition); - } - - public void updateProjectContent(String projectContent){ - this.projectContent = projectContent; - } - -} diff --git a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectDetailRepo.java b/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectDetailRepo.java deleted file mode 100644 index 004e5a1..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectDetailRepo.java +++ /dev/null @@ -1,9 +0,0 @@ -package MakeUs.Moira.domain.project.projectDetail; - -import MakeUs.Moira.domain.project.projectDetail.ProjectDetail; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface ProjectDetailRepo extends JpaRepository { -} diff --git a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectDuration.java b/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectDuration.java deleted file mode 100644 index 6aec34a..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectDuration.java +++ /dev/null @@ -1,5 +0,0 @@ -package MakeUs.Moira.domain.project.projectDetail; - -public enum ProjectDuration { - 한달_미만, 세달_미만, 여섯달_미만, 여섯달_이상 -} diff --git a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectLocalType.java b/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectLocalType.java deleted file mode 100644 index 961c5d6..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectLocalType.java +++ /dev/null @@ -1,5 +0,0 @@ -package MakeUs.Moira.domain.project.projectDetail; - -public enum ProjectLocalType { - 서울_인천_경기, 대전_충북_충남_세종, 광주_전남_전북, 부산_울산_경남, 강원, 대구_경북, 제주, 온라인 -} diff --git a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectPosition.java b/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectPosition.java deleted file mode 100644 index 1c50af4..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectPosition.java +++ /dev/null @@ -1,38 +0,0 @@ -package MakeUs.Moira.domain.project.projectDetail; - -import MakeUs.Moira.domain.position.PositionCategory; -import MakeUs.Moira.domain.position.UserPosition; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import javax.persistence.*; - -@Entity -@Getter -@NoArgsConstructor -public class ProjectPosition { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private ProjectDetail projectDetail; - - @ManyToOne - private PositionCategory recruitUserPositionCategory; - - private int recruitPositionCount; - - @Builder - public ProjectPosition(ProjectDetail projectDetail, PositionCategory recruitUserPositionCategory, int recruitPositionCount){ - this.projectDetail = projectDetail; - this.recruitUserPositionCategory = recruitUserPositionCategory; - this.recruitPositionCount = recruitPositionCount; - } - - public String getRecruitingPositionCategoryName(){ - return this.getRecruitUserPositionCategory().getCategoryName(); - } -} diff --git a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectPositonRepo.java b/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectPositonRepo.java deleted file mode 100644 index 82e7f92..0000000 --- a/src/main/java/MakeUs/Moira/domain/project/projectDetail/ProjectPositonRepo.java +++ /dev/null @@ -1,7 +0,0 @@ -package MakeUs.Moira.domain.project.projectDetail; - -import MakeUs.Moira.domain.project.projectDetail.ProjectPosition; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ProjectPositonRepo extends JpaRepository { -} diff --git a/src/main/java/MakeUs/Moira/domain/projectApply/ProjectApply.java b/src/main/java/MakeUs/Moira/domain/projectApply/ProjectApply.java index d52f69c..5557793 100644 --- a/src/main/java/MakeUs/Moira/domain/projectApply/ProjectApply.java +++ b/src/main/java/MakeUs/Moira/domain/projectApply/ProjectApply.java @@ -30,24 +30,17 @@ public class ProjectApply extends AuditorEntity { @ManyToOne private UserPosition userPosition; - @OneToMany(mappedBy = "projectApply", cascade = CascadeType.ALL) - private List optionalApplyInfoList = new ArrayList<>(); - @Enumerated(EnumType.STRING) private ProjectApplyStatus projectApplyStatus; @Builder - public ProjectApply(ProjectDetail projectDetail, User applicant, UserPosition userPosition, List optionalApplyInfoList, ProjectApplyStatus projectApplyStatus) { + public ProjectApply(ProjectDetail projectDetail, User applicant, UserPosition userPosition, ProjectApplyStatus projectApplyStatus) { this.projectDetail = projectDetail; this.applicant = applicant; this.userPosition = userPosition; this.projectApplyStatus = projectApplyStatus; } - public void addOptionalApplyInfo(OptionalApplyInfo optionalApplyInfo){ - this.optionalApplyInfoList.add(optionalApplyInfo); - } - public void updateProjectApplyStatus(ProjectApplyStatus projectApplyStatus){ this.projectApplyStatus = projectApplyStatus; } diff --git a/src/main/java/MakeUs/Moira/domain/projectDetail/ProjectDetail.java b/src/main/java/MakeUs/Moira/domain/projectDetail/ProjectDetail.java index ce1a420..5e81d6b 100644 --- a/src/main/java/MakeUs/Moira/domain/projectDetail/ProjectDetail.java +++ b/src/main/java/MakeUs/Moira/domain/projectDetail/ProjectDetail.java @@ -36,15 +36,11 @@ public class ProjectDetail { @Enumerated(EnumType.STRING) private ProjectDuration projectDuration; - @Enumerated(EnumType.STRING) - private ProjectLocalType projectLocalType; - @Builder - public ProjectDetail(Project project, String projectContent, ProjectDuration projectDuration, ProjectLocalType projectLocalType) { + public ProjectDetail(Project project, String projectContent, ProjectDuration projectDuration) { this.project = project; this.projectContent = projectContent; this.projectDuration = projectDuration; - this.projectLocalType = projectLocalType; } public void addProjectComment(ProjectComment projectComment){ diff --git a/src/main/java/MakeUs/Moira/domain/report/Report.java b/src/main/java/MakeUs/Moira/domain/report/Report.java index 5b5fd9b..cbefac0 100644 --- a/src/main/java/MakeUs/Moira/domain/report/Report.java +++ b/src/main/java/MakeUs/Moira/domain/report/Report.java @@ -1,7 +1,6 @@ package MakeUs.Moira.domain.report; -import MakeUs.Moira.domain.user.User; -import MakeUs.Moira.domain.user.UserHistory; +import MakeUs.Moira.domain.userHistory.UserHistory; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/MakeUs/Moira/domain/security/token/TokenProvider.java b/src/main/java/MakeUs/Moira/domain/security/token/TokenProvider.java deleted file mode 100644 index 7f2c2f0..0000000 --- a/src/main/java/MakeUs/Moira/domain/security/token/TokenProvider.java +++ /dev/null @@ -1,6 +0,0 @@ -package MakeUs.Moira.domain.security.token; - -public interface TokenProvider { - String getProviderName(); - String getUserSocialId(String accessToken); -} diff --git a/src/main/java/MakeUs/Moira/domain/security/token/TokenProviderFactory.java b/src/main/java/MakeUs/Moira/domain/security/token/TokenProviderFactory.java deleted file mode 100644 index 25c9560..0000000 --- a/src/main/java/MakeUs/Moira/domain/security/token/TokenProviderFactory.java +++ /dev/null @@ -1,22 +0,0 @@ -package MakeUs.Moira.domain.security.token; - -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -@RequiredArgsConstructor -public class TokenProviderFactory { - - private final List tokenProviderList; - - public TokenProvider getTokenProvider(String providerName) { - return tokenProviderList.stream() - .filter(tokenProvider -> tokenProvider.getProviderName().equals(providerName)) - .findFirst() - .orElseThrow(() -> new CustomException(ErrorCode.INVALID_TOKEN_PROVIDER)); - } -} diff --git a/src/main/java/MakeUs/Moira/domain/security/token/kakaoTokenProvider.java b/src/main/java/MakeUs/Moira/domain/security/token/kakaoTokenProvider.java deleted file mode 100644 index 468aab3..0000000 --- a/src/main/java/MakeUs/Moira/domain/security/token/kakaoTokenProvider.java +++ /dev/null @@ -1,41 +0,0 @@ -package MakeUs.Moira.domain.security.token; - - -import org.json.JSONObject; -import org.springframework.http.*; -import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; - - -@Component -public class kakaoTokenProvider implements TokenProvider{ - - private String providerName = "kakao"; - - @Override - public String getProviderName() { - return this.providerName; - } - - @Override - public String getUserSocialId(String accessToken) { - - ResponseEntity responseHttpEntity = requestByAccessToken(accessToken); - - String response = responseHttpEntity.getBody(); - JSONObject jObject = new JSONObject(response); - - return String.valueOf(jObject.getInt("id")); - } - - private ResponseEntity requestByAccessToken(String accessToken){ - RestTemplate rest = new RestTemplate(); - HttpHeaders headers = new HttpHeaders(); - headers.add("Authorization", "Bearer " + accessToken); - String body = ""; - - HttpEntity requestEntity = new HttpEntity<>(body, headers); - ResponseEntity responseEntity = rest.exchange("https://kapi.kakao.com/v1/user/access_token_info", HttpMethod.GET, requestEntity, String.class); - return responseEntity; - } -} diff --git a/src/main/java/MakeUs/Moira/domain/user/User.java b/src/main/java/MakeUs/Moira/domain/user/User.java index 9805597..8216e52 100644 --- a/src/main/java/MakeUs/Moira/domain/user/User.java +++ b/src/main/java/MakeUs/Moira/domain/user/User.java @@ -4,6 +4,7 @@ import MakeUs.Moira.controller.myPageEdit.dto.MyPageEditNicknameResponseDto; import MakeUs.Moira.controller.myPageEdit.dto.MyPageEditPositionResponseDto; import MakeUs.Moira.domain.position.UserPosition; +import MakeUs.Moira.domain.userHistory.UserHistory; import MakeUs.Moira.domain.userPool.UserPool; import MakeUs.Moira.domain.userPortfolio.UserPortfolio; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/MakeUs/Moira/domain/user/UserFcmInfo.java b/src/main/java/MakeUs/Moira/domain/user/UserFcmInfo.java deleted file mode 100644 index 23d4b3b..0000000 --- a/src/main/java/MakeUs/Moira/domain/user/UserFcmInfo.java +++ /dev/null @@ -1,33 +0,0 @@ -package MakeUs.Moira.domain.user; - -import MakeUs.Moira.domain.user.User; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import javax.persistence.*; - -@Entity -@Getter -@NoArgsConstructor -public class UserFcmInfo { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private User user; - - private String fcmToken; - - @Builder - public UserFcmInfo(Long id, User user, String fcmToken) { - this.user = user; - this.fcmToken = fcmToken; - } - - public void updateFcmToken(String fcmToken) { - this.fcmToken = fcmToken; - } -} diff --git a/src/main/java/MakeUs/Moira/domain/user/UserFcmInfoRepo.java b/src/main/java/MakeUs/Moira/domain/user/UserFcmInfoRepo.java deleted file mode 100644 index 90c9b27..0000000 --- a/src/main/java/MakeUs/Moira/domain/user/UserFcmInfoRepo.java +++ /dev/null @@ -1,10 +0,0 @@ -package MakeUs.Moira.domain.user; - -import MakeUs.Moira.domain.user.UserFcmInfo; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.Optional; - -public interface UserFcmInfoRepo extends JpaRepository { - Optional findByUser_Id(Long userId); -} diff --git a/src/main/java/MakeUs/Moira/domain/user/UserHashtag.java b/src/main/java/MakeUs/Moira/domain/user/UserHashtag.java deleted file mode 100644 index 0e18e02..0000000 --- a/src/main/java/MakeUs/Moira/domain/user/UserHashtag.java +++ /dev/null @@ -1,39 +0,0 @@ -package MakeUs.Moira.domain.user; - -import MakeUs.Moira.domain.hashtag.Hashtag; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import javax.persistence.*; - -@NoArgsConstructor -@Getter -@Entity -public class UserHashtag { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private UserHistory userHistory; - - @ManyToOne - private Hashtag hashtag; - - public UserHashtag updateUserHistory(UserHistory userHistory) { - if (this.userHistory != null) { - this.userHistory.getUserHashtags() - .remove(this); - } - this.userHistory = userHistory; - userHistory.getUserHashtags() - .add(this); - return this; - } - - public UserHashtag updateHashtag(Hashtag hashtag) { - this.hashtag = hashtag; - return this; - } -} diff --git a/src/main/java/MakeUs/Moira/domain/user/UserHashtagRepo.java b/src/main/java/MakeUs/Moira/domain/user/UserHashtagRepo.java deleted file mode 100644 index a59c91c..0000000 --- a/src/main/java/MakeUs/Moira/domain/user/UserHashtagRepo.java +++ /dev/null @@ -1,12 +0,0 @@ -package MakeUs.Moira.domain.user; - -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - - -public interface UserHashtagRepo extends JpaRepository { - List findAllByUserHistoryId(Long userHistoryId); - void deleteAllByUserHistoryId(Long userHistoryId); -} - diff --git a/src/main/java/MakeUs/Moira/domain/user/UserHistory.java b/src/main/java/MakeUs/Moira/domain/user/UserHistory.java deleted file mode 100644 index e003369..0000000 --- a/src/main/java/MakeUs/Moira/domain/user/UserHistory.java +++ /dev/null @@ -1,92 +0,0 @@ -package MakeUs.Moira.domain.user; - -import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; -import MakeUs.Moira.controller.myPageEdit.dto.MyPageEditHashtagResponseDto; -import MakeUs.Moira.domain.club.ClubLike; -import MakeUs.Moira.domain.inquiry.Inquiry; -import MakeUs.Moira.domain.project.ProjectLike; -import MakeUs.Moira.domain.report.Report; -import MakeUs.Moira.domain.userPool.UserPoolLike; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -@NoArgsConstructor -@Getter -@Entity -public class UserHistory { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @OneToOne(mappedBy = "userHistory") - private User user; - - @OneToMany(mappedBy = "userHistory", cascade = CascadeType.ALL, orphanRemoval = true) - private List userHashtags = new ArrayList<>(); - - @OneToMany(mappedBy = "userHistory", cascade = CascadeType.ALL, orphanRemoval = true) - private List userProjects = new ArrayList<>(); - - @OneToMany(mappedBy = "userHistory") - private List projectLikes = new ArrayList<>(); - - @OneToMany(mappedBy = "userHistory", cascade = CascadeType.ALL, orphanRemoval = true) - private List userPoolLikes = new ArrayList<>(); - - @OneToMany(mappedBy = "userHistory") - private List clubLikes = new ArrayList<>(); - - @OneToMany(mappedBy = "userHistory") - private List reports = new ArrayList<>(); - - @OneToMany(mappedBy = "userHistory") - private List inquiries = new ArrayList<>(); - - private int participationCount = 0; - - private int completionCount = 0; - - public UserHistory updateUser(User user) { - this.user = user; - return this; - } - - public void addUserProject(UserProject userProject) { - userProjects.add(userProject); - } - - public void removeUserProject(UserProject userProject) { - userProjects.remove(userProject); - } - - public void addProjectLike(ProjectLike projectLike) { - projectLikes.add(projectLike); - } - - public void removeProjectLike(ProjectLike projectLike) { - projectLikes.remove(projectLike); - } - - public MyPageEditHashtagResponseDto toMyPageEditHashtagResponseDto() { - return MyPageEditHashtagResponseDto.builder() - .userId(id) - .hashtagList(userHashtags.stream() - .map(HashtagResponseDto::new) - .collect(Collectors.toList())) - .build(); - } - - public void addParticipationCount(){ - participationCount++; - } - - public void addCompletionCount(){ - completionCount++; - } -} diff --git a/src/main/java/MakeUs/Moira/domain/user/UserHistoryRepo.java b/src/main/java/MakeUs/Moira/domain/user/UserHistoryRepo.java deleted file mode 100644 index 33a8c4b..0000000 --- a/src/main/java/MakeUs/Moira/domain/user/UserHistoryRepo.java +++ /dev/null @@ -1,11 +0,0 @@ -package MakeUs.Moira.domain.user; - -import MakeUs.Moira.domain.user.User; -import MakeUs.Moira.domain.user.UserHistory; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.Optional; - -public interface UserHistoryRepo extends JpaRepository { - public Optional findByUserId(Long userId); -} diff --git a/src/main/java/MakeUs/Moira/domain/user/UserProject.java b/src/main/java/MakeUs/Moira/domain/user/UserProject.java deleted file mode 100644 index 62c0f03..0000000 --- a/src/main/java/MakeUs/Moira/domain/user/UserProject.java +++ /dev/null @@ -1,54 +0,0 @@ -package MakeUs.Moira.domain.user; - -import MakeUs.Moira.domain.position.UserPosition; -import MakeUs.Moira.domain.project.Project; -import MakeUs.Moira.domain.userReview.UserReview; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Getter -@NoArgsConstructor -public class UserProject { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private UserHistory userHistory; - - @OneToMany(mappedBy = "userProject", cascade = CascadeType.ALL, orphanRemoval = true) - private List reviews = new ArrayList<>(); - - @ManyToOne - private Project project; - - @Enumerated(EnumType.STRING) - private UserProjectRoleType roleType; - - @ManyToOne - private UserPosition userPosition; - - @Enumerated(EnumType.STRING) - private UserProjectStatus userProjectStatus; - - @Builder - public UserProject(UserHistory userHistory, Project project, UserProjectRoleType roleType, UserPosition userPosition, UserProjectStatus userProjectStatus){ - this.userHistory = userHistory; - this.project = project; - this.roleType = roleType; - this.userPosition = userPosition; - this.userProjectStatus = userProjectStatus; - } - - public void updateUserProjectStatus(UserProjectStatus userProjectStatus){ - this.userProjectStatus = userProjectStatus; - } - -} diff --git a/src/main/java/MakeUs/Moira/domain/user/UserProjectRepo.java b/src/main/java/MakeUs/Moira/domain/user/UserProjectRepo.java deleted file mode 100644 index e7a8610..0000000 --- a/src/main/java/MakeUs/Moira/domain/user/UserProjectRepo.java +++ /dev/null @@ -1,13 +0,0 @@ -package MakeUs.Moira.domain.user; - - -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; -import java.util.Optional; - -public interface UserProjectRepo extends JpaRepository { - Optional findByUserHistoryIdAndProjectId(Long userHistoryId, Long projectId); - - List findAllByProject_Id(Long projectId); -} diff --git a/src/main/java/MakeUs/Moira/domain/user/UserProjectRoleType.java b/src/main/java/MakeUs/Moira/domain/user/UserProjectRoleType.java deleted file mode 100644 index aca2201..0000000 --- a/src/main/java/MakeUs/Moira/domain/user/UserProjectRoleType.java +++ /dev/null @@ -1,5 +0,0 @@ -package MakeUs.Moira.domain.user; - -public enum UserProjectRoleType { - LEADER, MEMBER -} diff --git a/src/main/java/MakeUs/Moira/domain/user/UserProjectStatus.java b/src/main/java/MakeUs/Moira/domain/user/UserProjectStatus.java deleted file mode 100644 index 1a23040..0000000 --- a/src/main/java/MakeUs/Moira/domain/user/UserProjectStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package MakeUs.Moira.domain.user; - -public enum UserProjectStatus { - PROGRESS, DROP, COMPLETE -} diff --git a/src/main/java/MakeUs/Moira/domain/userHistory/UserHistory.java b/src/main/java/MakeUs/Moira/domain/userHistory/UserHistory.java index 01f5742..ac51b05 100644 --- a/src/main/java/MakeUs/Moira/domain/userHistory/UserHistory.java +++ b/src/main/java/MakeUs/Moira/domain/userHistory/UserHistory.java @@ -2,7 +2,6 @@ import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; import MakeUs.Moira.controller.myPageEdit.dto.MyPageEditHashtagResponseDto; -import MakeUs.Moira.domain.club.ClubLike; import MakeUs.Moira.domain.inquiry.Inquiry; import MakeUs.Moira.domain.projectLike.ProjectLike; import MakeUs.Moira.domain.report.Report; @@ -42,9 +41,6 @@ public class UserHistory { @OneToMany(mappedBy = "userHistory", cascade = CascadeType.ALL, orphanRemoval = true) private List userPoolLikes = new ArrayList<>(); - @OneToMany(mappedBy = "userHistory") - private List clubLikes = new ArrayList<>(); - @OneToMany(mappedBy = "userHistory") private List reports = new ArrayList<>(); @@ -80,7 +76,10 @@ public MyPageEditHashtagResponseDto toMyPageEditHashtagResponseDto() { return MyPageEditHashtagResponseDto.builder() .userId(id) .hashtagList(userHashtags.stream() - .map(HashtagResponseDto::new) + .map(userHashtag -> HashtagResponseDto.builder() + .hashtagId(userHashtag.getHashtag().getId()) + .hashtagName(userHashtag.getHashtag().getHashtagName()) + .build()) .collect(Collectors.toList())) .build(); } diff --git a/src/main/java/MakeUs/Moira/domain/userPool/UserPool.java b/src/main/java/MakeUs/Moira/domain/userPool/UserPool.java index 9ac623d..4e5b412 100644 --- a/src/main/java/MakeUs/Moira/domain/userPool/UserPool.java +++ b/src/main/java/MakeUs/Moira/domain/userPool/UserPool.java @@ -4,6 +4,7 @@ import MakeUs.Moira.domain.AuditorEntity; import MakeUs.Moira.domain.user.User; +import MakeUs.Moira.domain.userPoolOffer.UserPoolOffer; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/MakeUs/Moira/domain/userPool/UserPoolLike.java b/src/main/java/MakeUs/Moira/domain/userPool/UserPoolLike.java deleted file mode 100644 index f49918f..0000000 --- a/src/main/java/MakeUs/Moira/domain/userPool/UserPoolLike.java +++ /dev/null @@ -1,52 +0,0 @@ -package MakeUs.Moira.domain.userPool; - -import MakeUs.Moira.domain.user.UserHistory; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import javax.persistence.*; - -@NoArgsConstructor -@Getter -@Entity -public class UserPoolLike { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private UserHistory userHistory; - - @ManyToOne - private UserPool userPool; - - private boolean isUserPoolLiked = true; - - public UserPoolLike updateUserHistory(UserHistory userHistory) { - if (this.userHistory != null) { - this.userHistory.getUserPoolLikes() - .remove(this); - } - this.userHistory = userHistory; - userHistory.getUserPoolLikes() - .add(this); - return this; - } - - public UserPoolLike updateUserPool(UserPool userPool) { - this.userPool = userPool; - return this; - } - - public UserPoolLike switchIsLiked() { - this.isUserPoolLiked = !this.isUserPoolLiked; - - if (this.isUserPoolLiked) { - this.userPool.updateLikeCount(+1); - } else { - this.userPool.updateLikeCount(-1); - } - return this; - } -} diff --git a/src/main/java/MakeUs/Moira/domain/userPool/UserPoolLikeRepo.java b/src/main/java/MakeUs/Moira/domain/userPool/UserPoolLikeRepo.java deleted file mode 100644 index ad50ada..0000000 --- a/src/main/java/MakeUs/Moira/domain/userPool/UserPoolLikeRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package MakeUs.Moira.domain.userPool; - -import org.springframework.data.jpa.repository.JpaRepository; - - -public interface UserPoolLikeRepo extends JpaRepository { - UserPoolLike findByUserHistory_IdAndUserPool_Id(Long userHistoryId, Long userPoolId); -} diff --git a/src/main/java/MakeUs/Moira/domain/userPool/UserPoolOffer.java b/src/main/java/MakeUs/Moira/domain/userPool/UserPoolOffer.java deleted file mode 100644 index 1d3227e..0000000 --- a/src/main/java/MakeUs/Moira/domain/userPool/UserPoolOffer.java +++ /dev/null @@ -1,22 +0,0 @@ -package MakeUs.Moira.domain.userPool; - -import MakeUs.Moira.domain.user.User; - -import javax.persistence.*; - -@Entity -public class UserPoolOffer { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private UserPool userPool; - - @ManyToOne - private User suggestor; - - @Enumerated(EnumType.STRING) - private UserPoolOfferStatus userPoolOfferStatus; -} diff --git a/src/main/java/MakeUs/Moira/domain/userPool/UserPoolOfferStatus.java b/src/main/java/MakeUs/Moira/domain/userPool/UserPoolOfferStatus.java deleted file mode 100644 index 674e267..0000000 --- a/src/main/java/MakeUs/Moira/domain/userPool/UserPoolOfferStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package MakeUs.Moira.domain.userPool; - -public enum UserPoolOfferStatus { - OFFER, ACCEPT, REJECT -} diff --git a/src/main/java/MakeUs/Moira/domain/userPool/UserPoolOptionalInfo.java b/src/main/java/MakeUs/Moira/domain/userPool/UserPoolOptionalInfo.java deleted file mode 100644 index e9ab5dd..0000000 --- a/src/main/java/MakeUs/Moira/domain/userPool/UserPoolOptionalInfo.java +++ /dev/null @@ -1,21 +0,0 @@ -package MakeUs.Moira.domain.userPool; - -import MakeUs.Moira.domain.userPortfolio.UserPortfolioType; - -import javax.persistence.*; - -@Entity -public class UserPoolOptionalInfo { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private UserPool userPool; - - @Enumerated(EnumType.STRING) - private UserPortfolioType userPortfolioType; - - private Long UserSelectedPortfolioId; -} diff --git a/src/main/java/MakeUs/Moira/domain/userReview/UserReview.java b/src/main/java/MakeUs/Moira/domain/userReview/UserReview.java index 48ef522..11ba7de 100644 --- a/src/main/java/MakeUs/Moira/domain/userReview/UserReview.java +++ b/src/main/java/MakeUs/Moira/domain/userReview/UserReview.java @@ -4,7 +4,7 @@ import MakeUs.Moira.controller.review.dto.UserReviewDetailResponseDto; import MakeUs.Moira.domain.AuditorEntity; import MakeUs.Moira.domain.user.User; -import MakeUs.Moira.domain.user.UserProject; +import MakeUs.Moira.domain.userProject.UserProject; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/MakeUs/Moira/domain/userReviewComplimentMark/UserReviewComplimentMark.java b/src/main/java/MakeUs/Moira/domain/userReviewComplimentMark/UserReviewComplimentMark.java deleted file mode 100644 index a97b028..0000000 --- a/src/main/java/MakeUs/Moira/domain/userReviewComplimentMark/UserReviewComplimentMark.java +++ /dev/null @@ -1,42 +0,0 @@ -package MakeUs.Moira.domain.userReviewComplimentMark; - -import MakeUs.Moira.domain.AuditorEntity; -import MakeUs.Moira.domain.complimentMark.ComplimentMarkInfo; -import MakeUs.Moira.domain.userReview.UserReview; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import javax.persistence.*; - -@NoArgsConstructor -@Getter -@Entity -public class UserReviewComplimentMark extends AuditorEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @ManyToOne - private UserReview userReview; - - @ManyToOne - private ComplimentMarkInfo complimentMarkInfo; - - - public UserReviewComplimentMark updateUserReview(UserReview userReview) { - if (this.userReview != null) { - this.userReview.getUserReviewComplimentMarkList() - .remove(this); - } - this.userReview = userReview; - userReview.getUserReviewComplimentMarkList() - .add(this); - return this; - } - - public UserReviewComplimentMark updateComplimentMarkInfo(ComplimentMarkInfo complimentMarkInfo) { - this.complimentMarkInfo = complimentMarkInfo; - return this; - } -} diff --git a/src/main/java/MakeUs/Moira/domain/userReviewComplimentMark/UserReviewComplimentMarkRepo.java b/src/main/java/MakeUs/Moira/domain/userReviewComplimentMark/UserReviewComplimentMarkRepo.java deleted file mode 100644 index 9e5cd83..0000000 --- a/src/main/java/MakeUs/Moira/domain/userReviewComplimentMark/UserReviewComplimentMarkRepo.java +++ /dev/null @@ -1,6 +0,0 @@ -package MakeUs.Moira.domain.userReviewComplimentMark; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface UserReviewComplimentMarkRepo extends JpaRepository { -} diff --git a/src/main/java/MakeUs/Moira/response/ResponseService.java b/src/main/java/MakeUs/Moira/response/ResponseService.java deleted file mode 100644 index 2c836b7..0000000 --- a/src/main/java/MakeUs/Moira/response/ResponseService.java +++ /dev/null @@ -1,47 +0,0 @@ -package MakeUs.Moira.response; - -import MakeUs.Moira.response.model.CommonResult; -import MakeUs.Moira.response.model.ListResult; -import MakeUs.Moira.response.model.SingleResult; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class ResponseService { - - // 공통 결과를 처리하는 메소드 - private void setCommonResult(CommonResult result, boolean isSuccess, int code, String msg) { - result.setSucceed(isSuccess); - result.setCode(code); - result.setMsg(msg); - } - - // 단일건 결과를 처리하는 메소드 - public SingleResult mappingSingleResult(T data, String msg) { - SingleResult result = new SingleResult<>(); - result.setData(data); - setCommonResult(result, true, 200, msg); - return result; - } - // 다중건 결과를 처리하는 메소드 - public ListResult mappingListResult(List list, String msg) { - ListResult result = new ListResult<>(); - result.setList(list); - setCommonResult(result, true, 200, msg); - return result; - } - // 결과만 처리하는 메소드 - 성공 - public CommonResult mappingSuccessCommonResultOnly(String msg) { - CommonResult result = new CommonResult(); - setCommonResult(result, true, 200, msg); - return result; - } - - // 결과만 처리하는 메소드 - 실패 - public CommonResult mappingFailCommonResultOnly(int errorcode, String msg) { - CommonResult result = new CommonResult(); - setCommonResult(result, false, errorcode, msg); - return result; - } -} diff --git a/src/main/java/MakeUs/Moira/response/model/CommonResult.java b/src/main/java/MakeUs/Moira/response/model/CommonResult.java deleted file mode 100644 index 1e801cb..0000000 --- a/src/main/java/MakeUs/Moira/response/model/CommonResult.java +++ /dev/null @@ -1,21 +0,0 @@ -package MakeUs.Moira.response.model; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; - - -@Getter -@Setter -public class CommonResult { - - @ApiModelProperty(value = "응답 성공여부 : true/false") - private boolean isSucceed; - - @ApiModelProperty(value = "성공 : 200 / 실패 : errorcode(음수)") - private int code; - - @ApiModelProperty(value = "응답 메시지") - private String msg; -} \ No newline at end of file diff --git a/src/main/java/MakeUs/Moira/response/model/ListResult.java b/src/main/java/MakeUs/Moira/response/model/ListResult.java deleted file mode 100644 index 67079ca..0000000 --- a/src/main/java/MakeUs/Moira/response/model/ListResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package MakeUs.Moira.response.model; - -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -@Getter -@Setter -public class ListResult extends CommonResult { - private List list; -} diff --git a/src/main/java/MakeUs/Moira/response/model/SingleResult.java b/src/main/java/MakeUs/Moira/response/model/SingleResult.java deleted file mode 100644 index 37acba9..0000000 --- a/src/main/java/MakeUs/Moira/response/model/SingleResult.java +++ /dev/null @@ -1,10 +0,0 @@ -package MakeUs.Moira.response.model; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class SingleResult extends CommonResult { - private T data; -} diff --git a/src/main/java/MakeUs/Moira/service/S3Service.java b/src/main/java/MakeUs/Moira/service/S3Service.java index 4e6fd2c..6258a27 100644 --- a/src/main/java/MakeUs/Moira/service/S3Service.java +++ b/src/main/java/MakeUs/Moira/service/S3Service.java @@ -1,7 +1,7 @@ package MakeUs.Moira.service; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.auth.BasicAWSCredentials; diff --git a/src/main/java/MakeUs/Moira/service/alarm/AlarmService.java b/src/main/java/MakeUs/Moira/service/alarm/AlarmService.java index 9461c94..017226f 100644 --- a/src/main/java/MakeUs/Moira/service/alarm/AlarmService.java +++ b/src/main/java/MakeUs/Moira/service/alarm/AlarmService.java @@ -3,17 +3,17 @@ import MakeUs.Moira.domain.alarm.AlarmHistory; import MakeUs.Moira.domain.alarm.AlarmHistoryRepo; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.chat.dto.ChatMessageSendResponseDto; import MakeUs.Moira.controller.review.dto.UserReviewAddResponseDto; import MakeUs.Moira.domain.chat.ChatRoom; import MakeUs.Moira.domain.chat.ChatRoomRepo; import MakeUs.Moira.domain.user.User; -import MakeUs.Moira.domain.user.UserProject; -import MakeUs.Moira.domain.user.UserProjectRepo; import MakeUs.Moira.domain.user.UserRepo; import MakeUs.Moira.domain.alarm.AlarmType; +import MakeUs.Moira.domain.userProject.UserProject; +import MakeUs.Moira.domain.userProject.UserProjectRepo; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,7 +26,7 @@ public class AlarmService { private final UserRepo userRepo; private final ChatRoomRepo chatRoomRepo; private final AlarmHistoryRepo alarmHistoryRepo; - private final UserProjectRepo userProjectRepo; + private final UserProjectRepo userProjectRepo; @Transactional diff --git a/src/main/java/MakeUs/Moira/service/chat/ChatService.java b/src/main/java/MakeUs/Moira/service/chat/ChatService.java index e4c20a7..becea42 100644 --- a/src/main/java/MakeUs/Moira/service/chat/ChatService.java +++ b/src/main/java/MakeUs/Moira/service/chat/ChatService.java @@ -1,7 +1,5 @@ package MakeUs.Moira.service.chat; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.chat.dto.ChatMessageResponseDto; import MakeUs.Moira.controller.chat.dto.ChatMessageSendRequestDto; import MakeUs.Moira.controller.chat.dto.ChatMessageSendResponseDto; @@ -9,6 +7,8 @@ import MakeUs.Moira.domain.chat.*; import MakeUs.Moira.domain.user.User; import MakeUs.Moira.domain.user.UserRepo; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/MakeUs/Moira/service/complimentMark/ComplimentMarkInfoService.java b/src/main/java/MakeUs/Moira/service/complimentMark/ComplimentMarkInfoService.java deleted file mode 100644 index d467cc3..0000000 --- a/src/main/java/MakeUs/Moira/service/complimentMark/ComplimentMarkInfoService.java +++ /dev/null @@ -1,23 +0,0 @@ -package MakeUs.Moira.service.complimentMark; - -import MakeUs.Moira.controller.complimentMark.dto.ComplimentMarkInfoResponseDto; -import MakeUs.Moira.domain.complimentMark.ComplimentMarkInfoRepo; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.stream.Collectors; - -@RequiredArgsConstructor -@Service -public class ComplimentMarkInfoService { - - private final ComplimentMarkInfoRepo complimentMarkInfoRepo; - - public List getComplimentMark() { - return complimentMarkInfoRepo.findAll() - .stream() - .map(ComplimentMarkInfoResponseDto::new) - .collect(Collectors.toList()); - } -} diff --git a/src/main/java/MakeUs/Moira/service/home/HomeService.java b/src/main/java/MakeUs/Moira/service/home/HomeService.java index 44800e4..425fb77 100644 --- a/src/main/java/MakeUs/Moira/service/home/HomeService.java +++ b/src/main/java/MakeUs/Moira/service/home/HomeService.java @@ -1,15 +1,15 @@ package MakeUs.Moira.service.home; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; -import MakeUs.Moira.controller.home.dto.AlarmReadStatusUpdateResponseDto; -import MakeUs.Moira.controller.home.dto.AlarmResponseDto; +import MakeUs.Moira.controller.alarm.dto.AlarmReadStatusUpdateResponseDto; +import MakeUs.Moira.controller.alarm.dto.AlarmResponseDto; import MakeUs.Moira.controller.home.dto.HomeResponseDto; import MakeUs.Moira.domain.alarm.AlarmHistory; import MakeUs.Moira.domain.alarm.AlarmHistoryRepo; import MakeUs.Moira.domain.chat.ChatRoom; import MakeUs.Moira.domain.chat.ChatRoomRepo; import MakeUs.Moira.domain.chat.ReadStatus; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/MakeUs/Moira/service/jwt/CustomUserDetailService.java b/src/main/java/MakeUs/Moira/service/jwt/CustomUserDetailService.java index 248a388..dcdc7fd 100644 --- a/src/main/java/MakeUs/Moira/service/jwt/CustomUserDetailService.java +++ b/src/main/java/MakeUs/Moira/service/jwt/CustomUserDetailService.java @@ -1,8 +1,8 @@ package MakeUs.Moira.service.jwt; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.domain.user.UserRepo; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/java/MakeUs/Moira/service/jwt/JwtService.java b/src/main/java/MakeUs/Moira/service/jwt/JwtService.java index 1cc038e..e9929fd 100644 --- a/src/main/java/MakeUs/Moira/service/jwt/JwtService.java +++ b/src/main/java/MakeUs/Moira/service/jwt/JwtService.java @@ -4,11 +4,12 @@ import MakeUs.Moira.config.security.JwtTokenProvider; import MakeUs.Moira.controller.jwt.dto.LoginRequestDto; import MakeUs.Moira.controller.jwt.dto.LoginResponseDto; -import MakeUs.Moira.domain.security.token.TokenProvider; -import MakeUs.Moira.domain.security.token.TokenProviderFactory; import MakeUs.Moira.domain.user.*; +import MakeUs.Moira.domain.userHistory.UserHistory; import MakeUs.Moira.domain.userPool.UserPool; import MakeUs.Moira.domain.userPortfolio.UserPortfolio; +import MakeUs.Moira.util.token.TokenProvider; +import MakeUs.Moira.util.token.TokenProviderFactory; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/MakeUs/Moira/service/myPage/MyPageService.java b/src/main/java/MakeUs/Moira/service/myPage/MyPageService.java index 2771990..56f762a 100644 --- a/src/main/java/MakeUs/Moira/service/myPage/MyPageService.java +++ b/src/main/java/MakeUs/Moira/service/myPage/MyPageService.java @@ -1,18 +1,21 @@ package MakeUs.Moira.service.myPage; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; - import MakeUs.Moira.controller.myPage.dto.*; import MakeUs.Moira.domain.AuditorEntity; import MakeUs.Moira.domain.project.Project; -import MakeUs.Moira.domain.project.ProjectLike; -import MakeUs.Moira.domain.project.projectApply.ProjectApply; -import MakeUs.Moira.domain.project.projectApply.ProjectApplyRepo; +import MakeUs.Moira.domain.projectApply.ProjectApply; +import MakeUs.Moira.domain.projectApply.ProjectApplyRepo; +import MakeUs.Moira.domain.projectLike.ProjectLike; import MakeUs.Moira.domain.user.*; +import MakeUs.Moira.domain.userHistory.UserHistory; +import MakeUs.Moira.domain.userHistory.UserHistoryRepo; import MakeUs.Moira.domain.userPool.UserPool; -import MakeUs.Moira.domain.userPool.UserPoolLike; import MakeUs.Moira.domain.userPool.UserPoolRepo; +import MakeUs.Moira.domain.userPoolLike.UserPoolLike; +import MakeUs.Moira.domain.userProject.UserProject; +import MakeUs.Moira.domain.userProject.UserProjectRoleType; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -27,7 +30,7 @@ public class MyPageService { private final UserRepo userRepo; - private final UserHistoryRepo userHistoryRepo; + private final UserHistoryRepo userHistoryRepo; private final ProjectApplyRepo projectApplyRepo; private final UserPoolRepo userPoolRepo; diff --git a/src/main/java/MakeUs/Moira/service/myPageEdit/MyPageEditService.java b/src/main/java/MakeUs/Moira/service/myPageEdit/MyPageEditService.java index 3550a1e..7229c51 100644 --- a/src/main/java/MakeUs/Moira/service/myPageEdit/MyPageEditService.java +++ b/src/main/java/MakeUs/Moira/service/myPageEdit/MyPageEditService.java @@ -1,13 +1,16 @@ package MakeUs.Moira.service.myPageEdit; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.myPageEdit.dto.*; import MakeUs.Moira.domain.hashtag.HashtagRepo; import MakeUs.Moira.domain.position.PositionRepo; import MakeUs.Moira.domain.position.UserPosition; import MakeUs.Moira.domain.user.*; +import MakeUs.Moira.domain.userHashtag.UserHashtag; +import MakeUs.Moira.domain.userHashtag.UserHashtagRepo; +import MakeUs.Moira.domain.userHistory.UserHistory; import MakeUs.Moira.domain.userPortfolio.UserPortfolio; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import MakeUs.Moira.service.S3Service; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/MakeUs/Moira/service/myProject/MyProjectService.java b/src/main/java/MakeUs/Moira/service/myProject/MyProjectService.java index 1156ec5..dfce5b7 100644 --- a/src/main/java/MakeUs/Moira/service/myProject/MyProjectService.java +++ b/src/main/java/MakeUs/Moira/service/myProject/MyProjectService.java @@ -1,13 +1,18 @@ package MakeUs.Moira.service.myProject; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.myProject.dto.MyProjectResponseDTO; import MakeUs.Moira.controller.myProject.dto.MyProjectTeammateResponseDTO; import MakeUs.Moira.controller.myProject.dto.MyProjectsResponseDTO; import MakeUs.Moira.domain.project.Project; import MakeUs.Moira.domain.project.ProjectRepo; import MakeUs.Moira.domain.user.*; +import MakeUs.Moira.domain.userHistory.UserHistory; +import MakeUs.Moira.domain.userHistory.UserHistoryRepo; +import MakeUs.Moira.domain.userProject.UserProject; +import MakeUs.Moira.domain.userProject.UserProjectRoleType; +import MakeUs.Moira.domain.userProject.UserProjectStatus; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -123,7 +128,7 @@ private UserHistory getValidUserHistory(Long userId){ private int getMemberCount(Project projectEntity){ Long memberCount = projectEntity.getUserProjectList() .stream() - .filter(myUserProject -> myUserProject.getUserProjectStatus() != UserProjectStatus.DROP) + .filter(myUserProject -> myUserProject.getUserProjectStatus() != UserProjectStatus.DROPPED) .count(); return memberCount.intValue(); } diff --git a/src/main/java/MakeUs/Moira/service/project/ProjectService.java b/src/main/java/MakeUs/Moira/service/project/ProjectService.java index 45616e1..0d10d72 100644 --- a/src/main/java/MakeUs/Moira/service/project/ProjectService.java +++ b/src/main/java/MakeUs/Moira/service/project/ProjectService.java @@ -1,15 +1,26 @@ package MakeUs.Moira.service.project; -import MakeUs.Moira.advice.exception.ErrorCode; -import MakeUs.Moira.advice.exception.CustomException; import MakeUs.Moira.controller.project.dto.*; import MakeUs.Moira.domain.hashtag.Hashtag; import MakeUs.Moira.domain.hashtag.HashtagRepo; import MakeUs.Moira.domain.position.PositionCategory; import MakeUs.Moira.domain.position.PositionCategoryRepo; import MakeUs.Moira.domain.project.*; -import MakeUs.Moira.domain.project.projectDetail.*; +import MakeUs.Moira.domain.projectDetail.ProjectDetail; +import MakeUs.Moira.domain.projectHashtag.ProjectHashtag; +import MakeUs.Moira.domain.projectImage.ProjectImage; +import MakeUs.Moira.domain.projectLike.ProjectLike; +import MakeUs.Moira.domain.projectLike.ProjectLikeRepo; +import MakeUs.Moira.domain.projectPosition.ProjectPosition; import MakeUs.Moira.domain.user.*; +import MakeUs.Moira.domain.userHistory.UserHistory; +import MakeUs.Moira.domain.userHistory.UserHistoryRepo; +import MakeUs.Moira.domain.userProject.UserProject; +import MakeUs.Moira.domain.userProject.UserProjectRepo; +import MakeUs.Moira.domain.userProject.UserProjectRoleType; +import MakeUs.Moira.domain.userProject.UserProjectStatus; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import MakeUs.Moira.service.S3Service; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; @@ -33,10 +44,10 @@ public class ProjectService { private final HashtagRepo hashtagRepo; private final ProjectRepo projectRepo; private final UserRepo userRepo; - private final UserHistoryRepo userHistoryRepo; - private final UserProjectRepo userProjectRepo; + private final UserHistoryRepo userHistoryRepo; + private final UserProjectRepo userProjectRepo; private final PositionCategoryRepo positionCategoryRepo; - private final ProjectLikeRepo projectLikeRepo; + private final ProjectLikeRepo projectLikeRepo; private final S3Service s3Service; @@ -69,7 +80,6 @@ public Long createProject(ProjectRequestDTO projectRequestDTO, Long userId) { .project(projectEntity) .projectContent(projectRequestDTO.getContent()) .projectDuration(projectRequestDTO.getDuration()) - .projectLocalType(projectRequestDTO.getLocalType()) .build(); @@ -94,7 +104,7 @@ public Long createProject(ProjectRequestDTO projectRequestDTO, Long userId) { // UserProject 양방향 추가 UserProject userProject = UserProject.builder() .project(projectEntity) - .userProjectStatus(UserProjectStatus.PROGRESS) + .userProjectStatus(UserProjectStatus.PROGRESSING) .userHistory(userHistoryEntity) .roleType(UserProjectRoleType.LEADER) .userPosition(userEntity.getUserPosition()) @@ -165,11 +175,11 @@ public void changeProjectStatus(Long projectId, ProjectStatus status, Long userI if (status == ProjectStatus.COMPLETED) { projectEntity.getUserProjectList() .stream() - .filter(userProject -> userProject.getUserProjectStatus() != UserProjectStatus.DROP) + .filter(userProject -> userProject.getUserProjectStatus() != UserProjectStatus.DROPPED) .forEach(userProject -> { userProject.getUserHistory() .addCompletionCount(); - userProject.updateUserProjectStatus(UserProjectStatus.COMPLETE); + userProject.updateUserProjectStatus(UserProjectStatus.COMPLETED); }); } @@ -296,8 +306,6 @@ public ProjectResponseDTO getProject(Long projectId, Long userId) { .likeCount(projectEntity.getLikeCount()) .duration(projectEntity.getProjectDetail() .getProjectDuration()) - .location(projectEntity.getProjectDetail() - .getProjectLocalType()) .positionCategoryList(getProjectPositionCategoryList(projectEntity.getProjectDetail() .getProjectPositionList())) .time(getTime(projectEntity.getModifiedDate())) diff --git a/src/main/java/MakeUs/Moira/service/projectApply/ProjectApplyService.java b/src/main/java/MakeUs/Moira/service/projectApply/ProjectApplyService.java index b036922..c7e21c7 100644 --- a/src/main/java/MakeUs/Moira/service/projectApply/ProjectApplyService.java +++ b/src/main/java/MakeUs/Moira/service/projectApply/ProjectApplyService.java @@ -1,16 +1,18 @@ package MakeUs.Moira.service.projectApply; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.projectApply.dto.ProjectApplicantsResponseDTO; import MakeUs.Moira.controller.projectApply.dto.ProjectApplyRequestDTO; import MakeUs.Moira.controller.projectApply.dto.ProjectApplyResponseDTO; import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; import MakeUs.Moira.domain.project.Project; import MakeUs.Moira.domain.project.ProjectRepo; -import MakeUs.Moira.domain.project.projectApply.*; -import MakeUs.Moira.domain.project.projectDetail.ProjectDetail; +import MakeUs.Moira.domain.projectApply.ProjectApply; +import MakeUs.Moira.domain.projectApply.ProjectApplyRepo; +import MakeUs.Moira.domain.projectApply.ProjectApplyStatus; +import MakeUs.Moira.domain.projectDetail.ProjectDetail; import MakeUs.Moira.domain.user.*; +import MakeUs.Moira.domain.userHistory.UserHistory; +import MakeUs.Moira.domain.userHistory.UserHistoryRepo; import MakeUs.Moira.domain.userPortfolio.UserPortfolioType; import MakeUs.Moira.domain.userPortfolio.userAward.UserAward; import MakeUs.Moira.domain.userPortfolio.userAward.UserAwardRepo; @@ -28,6 +30,12 @@ import MakeUs.Moira.controller.userPortfolio.userSchool.dto.UserSchoolResponseDto; import MakeUs.Moira.domain.userPortfolio.userSchool.UserSchoolRepo; import MakeUs.Moira.domain.alarm.AlarmType; +import MakeUs.Moira.domain.userProject.UserProject; +import MakeUs.Moira.domain.userProject.UserProjectRepo; +import MakeUs.Moira.domain.userProject.UserProjectRoleType; +import MakeUs.Moira.domain.userProject.UserProjectStatus; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import MakeUs.Moira.service.alarm.AlarmService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -45,8 +53,8 @@ public class ProjectApplyService { private final UserRepo userRepo; - private final UserHistoryRepo userHistoryRepo; - private final UserProjectRepo userProjectRepo; + private final UserHistoryRepo userHistoryRepo; + private final UserProjectRepo userProjectRepo; private final ProjectRepo projectRepo; private final ProjectApplyRepo projectApplyRepo; private final UserSchoolRepo userSchoolRepo; @@ -82,9 +90,6 @@ public void applyProject(ProjectApplyRequestDTO projectApplyRequestDTO, Long use .build(); projectApplyRepo.save(projectApplyEntity); - // 선택 사항 추가 - addOptionalApplyInfo(projectApplyRequestDTO, userEntity, projectApplyEntity); - // Project에 ProjectApply 추가 projectEntity.getProjectDetail() .addProjectApply(projectApplyEntity); @@ -127,31 +132,12 @@ public ProjectApplyResponseDTO getApplyProject(Long projectApplyId, Long userId) } } - // 해시태그 - List hashtagResponseDtoList = projectEntity.getProjectHashtagList() - .stream() - .map(HashtagResponseDto::new) - .collect(Collectors.toList()); - - // 포트폴리오 - List userSchoolResponseDtoList = new ArrayList<>(); - List userCareerResponseDtoList = new ArrayList<>(); - List userLicenseResponseDtoList = new ArrayList<>(); - List userAwardResponseDtoList = new ArrayList<>(); - List userLinkResponseDtoList = new ArrayList<>(); - setUserPortfolio(projectApplyEntity, userSchoolResponseDtoList, userCareerResponseDtoList, userLicenseResponseDtoList, userAwardResponseDtoList, userLinkResponseDtoList); return ProjectApplyResponseDTO.builder() .userId(userEntity.getId()) .nickname(userEntity.getNickname()) .imageUrl(userEntity.getProfileImage()) .shortIntroduction(userEntity.getShortIntroduction()) - .userSchoolResponseDtoList(userSchoolResponseDtoList) - .userCareerResponseDtoList(userCareerResponseDtoList) - .userLicenseResponseDtoList(userLicenseResponseDtoList) - .userAwardResponseDtoList(userAwardResponseDtoList) - .userLinkResponseDtoList(userLinkResponseDtoList) - .hashtagResponseDtoList(hashtagResponseDtoList) .build(); } @@ -198,7 +184,7 @@ public void changeProjectApplyStatus(Long projectApplyId, Long userId, ProjectAp if (!isExistUserProject(projectApplyEntity.getApplicant().getId(), projectEntity.getId())) { UserProject userProjectEntity = UserProject.builder() .project(projectEntity) - .userProjectStatus(UserProjectStatus.PROGRESS) + .userProjectStatus(UserProjectStatus.PROGRESSING) .userHistory(projectApplyEntity.getApplicant().getUserHistory()) .roleType(UserProjectRoleType.MEMBER) .userPosition(projectApplyEntity.getUserPosition()) @@ -255,7 +241,7 @@ public void changeProjectApplyStatus(Long projectApplyId, Long userId, ProjectAp if (!isExistUserProject(userHistoryEntity.getId(), projectEntity.getId())) { UserProject userProjectEntity = UserProject.builder() .project(projectEntity) - .userProjectStatus(UserProjectStatus.PROGRESS) + .userProjectStatus(UserProjectStatus.PROGRESSING) .userHistory(userHistoryEntity) .roleType(UserProjectRoleType.MEMBER) .userPosition(projectApplyEntity.getUserPosition()) @@ -361,78 +347,6 @@ public List getProjectApplicants(Long projectId, L } - public void addOptionalApplyInfo(ProjectApplyRequestDTO projectApplyRequestDTO, - User userEntity, - ProjectApply projectApplyEntity) - { - if(projectApplyRequestDTO.getUserPortfolioTypeList() != null) { - for (UserPortfolioType userPortfolioType : projectApplyRequestDTO.getUserPortfolioTypeList()) { - switch (userPortfolioType) { - case SCHOOL: - for (UserSchool userSchool : userEntity.getUserPortfolio() - .getUserSchoolList()) { - projectApplyEntity.addOptionalApplyInfo( - OptionalApplyInfo.builder() - .userPortfolioType(UserPortfolioType.SCHOOL) - .userSelectedPortfolioId(userSchool.getId()) - .projectApply(projectApplyEntity) - .build() - ); - } - break; - case CAREER: - for (UserCareer userCareer : userEntity.getUserPortfolio() - .getUserCareerList()) { - projectApplyEntity.addOptionalApplyInfo( - OptionalApplyInfo.builder() - .userPortfolioType(UserPortfolioType.CAREER) - .userSelectedPortfolioId(userCareer.getId()) - .projectApply(projectApplyEntity) - .build() - ); - } - break; - case LICENSE: - for (UserLicense userLicense : userEntity.getUserPortfolio() - .getUserLicenseList()) { - projectApplyEntity.addOptionalApplyInfo( - OptionalApplyInfo.builder() - .userPortfolioType(UserPortfolioType.LICENSE) - .userSelectedPortfolioId(userLicense.getId()) - .projectApply(projectApplyEntity) - .build() - ); - } - break; - case AWARD: - for (UserAward userAward : userEntity.getUserPortfolio() - .getUserAwardList()) { - projectApplyEntity.addOptionalApplyInfo( - OptionalApplyInfo.builder() - .userPortfolioType(UserPortfolioType.AWARD) - .userSelectedPortfolioId(userAward.getId()) - .projectApply(projectApplyEntity) - .build() - ); - } - break; - case LINK: - for (UserLink userLink : userEntity.getUserPortfolio() - .getUserLinkList()) { - projectApplyEntity.addOptionalApplyInfo( - OptionalApplyInfo.builder() - .userPortfolioType(UserPortfolioType.LINK) - .userSelectedPortfolioId(userLink.getId()) - .projectApply(projectApplyEntity) - .build() - ); - } - } - } - } - } - - private String getTime(LocalDateTime localDateTime) { String time; if (ChronoUnit.YEARS.between(localDateTime, LocalDateTime.now()) >= 1) { @@ -568,46 +482,6 @@ private void checkValidProjectApplyStatus(ProjectApplyStatus actualStatus, Proje } - private void setUserPortfolio(ProjectApply projectApplyEntity, - List userSchoolResponseDtoList, - List userCareerResponseDtoList, - List userLicenseResponseDtoList, - List userAwardResponseDtoList, - List userLinkResponseDtoList) - { - projectApplyEntity.getOptionalApplyInfoList() - .forEach(optionalApplyInfo -> { - switch (optionalApplyInfo.getUserPortfolioType()) { - case SCHOOL: - userSchoolResponseDtoList.add( - new UserSchoolResponseDto(getValidUserSchool(optionalApplyInfo.getUserSelectedPortfolioId())) - ); - break; - case CAREER: - userCareerResponseDtoList.add( - new UserCareerResponseDto(getValidUserCareer(optionalApplyInfo.getUserSelectedPortfolioId())) - ); - break; - case LICENSE: - userLicenseResponseDtoList.add( - new UserLicenseResponseDto(getValidUserLicense(optionalApplyInfo.getUserSelectedPortfolioId())) - ); - break; - case AWARD: - userAwardResponseDtoList.add( - new UserAwardResponseDto(getValidUserAward(optionalApplyInfo.getUserSelectedPortfolioId())) - ); - break; - case LINK: - userLinkResponseDtoList.add( - new UserLinkResponseDto(getValidUserLink(optionalApplyInfo.getUserSelectedPortfolioId())) - ); - break; - } - }); - } - - private String getProjectTitle(String projectTitle) { if (projectTitle.length() > 10) { projectTitle = projectTitle.substring(0, 10) + "..."; diff --git a/src/main/java/MakeUs/Moira/service/projectComment/ProjectCommentService.java b/src/main/java/MakeUs/Moira/service/projectComment/ProjectCommentService.java index f29615a..b8b9f8b 100644 --- a/src/main/java/MakeUs/Moira/service/projectComment/ProjectCommentService.java +++ b/src/main/java/MakeUs/Moira/service/projectComment/ProjectCommentService.java @@ -1,17 +1,17 @@ package MakeUs.Moira.service.projectComment; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.projectComment.dto.ProjectCommentRequestDTO; import MakeUs.Moira.controller.projectComment.dto.ProjectCommentResponseDTO; import MakeUs.Moira.domain.project.Project; import MakeUs.Moira.domain.project.ProjectRepo; -import MakeUs.Moira.domain.project.projectDetail.ProjectComment; -import MakeUs.Moira.domain.project.projectDetail.ProjectCommentRepo; -import MakeUs.Moira.domain.project.projectDetail.ProjectDetail; +import MakeUs.Moira.domain.projectComment.ProjectComment; +import MakeUs.Moira.domain.projectComment.ProjectCommentRepo; +import MakeUs.Moira.domain.projectDetail.ProjectDetail; import MakeUs.Moira.domain.user.User; -import MakeUs.Moira.domain.user.UserProjectRoleType; import MakeUs.Moira.domain.user.UserRepo; +import MakeUs.Moira.domain.userProject.UserProjectRoleType; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import MakeUs.Moira.service.alarm.AlarmService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/MakeUs/Moira/service/report/ReportService.java b/src/main/java/MakeUs/Moira/service/report/ReportService.java index 8edd2d2..c5197e4 100644 --- a/src/main/java/MakeUs/Moira/service/report/ReportService.java +++ b/src/main/java/MakeUs/Moira/service/report/ReportService.java @@ -1,19 +1,19 @@ package MakeUs.Moira.service.report; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.report.dto.ReportRequestDTO; import MakeUs.Moira.domain.chat.ChatRoomRepo; import MakeUs.Moira.domain.project.Project; import MakeUs.Moira.domain.project.ProjectRepo; -import MakeUs.Moira.domain.project.projectDetail.ProjectComment; -import MakeUs.Moira.domain.project.projectDetail.ProjectCommentRepo; +import MakeUs.Moira.domain.projectComment.ProjectComment; +import MakeUs.Moira.domain.projectComment.ProjectCommentRepo; import MakeUs.Moira.domain.report.Report; import MakeUs.Moira.domain.report.ReportRepo; import MakeUs.Moira.domain.report.ReportStatus; -import MakeUs.Moira.domain.user.UserHistory; -import MakeUs.Moira.domain.user.UserHistoryRepo; -import MakeUs.Moira.domain.user.UserProjectRoleType; +import MakeUs.Moira.domain.userHistory.UserHistory; +import MakeUs.Moira.domain.userHistory.UserHistoryRepo; +import MakeUs.Moira.domain.userProject.UserProjectRoleType; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -52,7 +52,7 @@ public void createReport(Long userId, ReportRequestDTO reportRequestDTO){ case COMMENT: ProjectComment projectComment = projectCommentRepo.findById(reportRequestDTO.getTargetId()) - .orElseThrow(() -> new CustomException(ErrorCode.INVALID_COMMENT)); + .orElseThrow(() -> new CustomException(ErrorCode.INVALID_COMMENT)); targetUserId = projectComment.getWriter().getId(); if(targetUserId.equals(userId)){ throw new CustomException(ErrorCode.UNAUTHORIZED_REPORT_COMMENT); diff --git a/src/main/java/MakeUs/Moira/service/review/ReviewService.java b/src/main/java/MakeUs/Moira/service/review/ReviewService.java index a8c6b58..83b55c9 100644 --- a/src/main/java/MakeUs/Moira/service/review/ReviewService.java +++ b/src/main/java/MakeUs/Moira/service/review/ReviewService.java @@ -1,8 +1,7 @@ package MakeUs.Moira.service.review; +import MakeUs.Moira.controller.review.dto.ComplimentMarkInfoResponseDto; import MakeUs.Moira.controller.userPool.dto.ComplimentMarkWithCountDto; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.review.dto.UserReviewAddRequestDto; import MakeUs.Moira.controller.review.dto.UserReviewAddResponseDto; import MakeUs.Moira.controller.review.dto.UserReviewDetailResponseDto; @@ -11,9 +10,14 @@ import MakeUs.Moira.domain.complimentMark.ComplimentMarkInfo; import MakeUs.Moira.domain.complimentMark.ComplimentMarkInfoRepo; import MakeUs.Moira.domain.user.*; +import MakeUs.Moira.domain.userHistory.UserHistory; +import MakeUs.Moira.domain.userProject.UserProject; +import MakeUs.Moira.domain.userProject.UserProjectRepo; import MakeUs.Moira.domain.userReview.UserReview; import MakeUs.Moira.domain.userReview.UserReviewComplimentMark; import MakeUs.Moira.domain.userReview.UserReviewRepo; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,7 +33,7 @@ public class ReviewService { private final UserRepo userRepo; - private final UserProjectRepo userProjectRepo; + private final UserProjectRepo userProjectRepo; private final UserReviewRepo userReviewRepo; private final ComplimentMarkInfoRepo complimentMarkInfoRepo; @@ -111,4 +115,11 @@ private void sortUserReviewListByKeyword(List userReviewList, String throw new CustomException(ErrorCode.INVALID_SORT); } } + + public List getComplimentMark() { + return complimentMarkInfoRepo.findAll() + .stream() + .map(ComplimentMarkInfoResponseDto::new) + .collect(Collectors.toList()); + } } diff --git a/src/main/java/MakeUs/Moira/service/user/UserService.java b/src/main/java/MakeUs/Moira/service/user/UserService.java index b34d9d5..48c1b74 100644 --- a/src/main/java/MakeUs/Moira/service/user/UserService.java +++ b/src/main/java/MakeUs/Moira/service/user/UserService.java @@ -1,8 +1,5 @@ package MakeUs.Moira.service.user; - -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; import MakeUs.Moira.controller.signup.dto.PositionResponseDto; import MakeUs.Moira.controller.signup.dto.SignupResponseDto; @@ -11,6 +8,12 @@ import MakeUs.Moira.domain.position.PositionRepo; import MakeUs.Moira.domain.position.UserPosition; import MakeUs.Moira.domain.user.*; +import MakeUs.Moira.domain.userHashtag.UserHashtag; +import MakeUs.Moira.domain.userHashtag.UserHashtagRepo; +import MakeUs.Moira.domain.userHistory.UserHistory; +import MakeUs.Moira.domain.userHistory.UserHistoryRepo; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/MakeUs/Moira/service/userPool/UserPoolService.java b/src/main/java/MakeUs/Moira/service/userPool/UserPoolService.java index 105a858..e2427ff 100644 --- a/src/main/java/MakeUs/Moira/service/userPool/UserPoolService.java +++ b/src/main/java/MakeUs/Moira/service/userPool/UserPoolService.java @@ -1,8 +1,5 @@ package MakeUs.Moira.service.userPool; - -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.userPool.dto.UserPoolDetailReviewDetailResponseDto; import MakeUs.Moira.controller.userPool.dto.*; @@ -10,14 +7,17 @@ import MakeUs.Moira.domain.complimentMark.ComplimentMarkInfo; import MakeUs.Moira.domain.complimentMark.ComplimentMarkInfoRepo; import MakeUs.Moira.domain.user.*; +import MakeUs.Moira.domain.userHistory.UserHistory; import MakeUs.Moira.domain.userPool.UserPool; -import MakeUs.Moira.domain.userPool.UserPoolLike; -import MakeUs.Moira.domain.userPool.UserPoolLikeRepo; import MakeUs.Moira.domain.userPool.UserPoolRepo; +import MakeUs.Moira.domain.userPoolLike.UserPoolLike; +import MakeUs.Moira.domain.userPoolLike.UserPoolLikeRepo; import MakeUs.Moira.domain.userPortfolio.UserPortfolio; import MakeUs.Moira.domain.userReview.UserReview; import MakeUs.Moira.domain.userReview.UserReviewRepo; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -35,7 +35,7 @@ public class UserPoolService { private final UserRepo userRepo; private final UserPoolRepo userPoolRepo; - private final UserPoolLikeRepo userPoolLikeRepo; + private final UserPoolLikeRepo userPoolLikeRepo; private final UserReviewRepo userReviewRepo; private final ComplimentMarkInfoRepo complimentMarkInfoRepo; diff --git a/src/main/java/MakeUs/Moira/service/userPortfolio/UserAwardService.java b/src/main/java/MakeUs/Moira/service/userPortfolio/UserAwardService.java index 727a601..dd5739f 100644 --- a/src/main/java/MakeUs/Moira/service/userPortfolio/UserAwardService.java +++ b/src/main/java/MakeUs/Moira/service/userPortfolio/UserAwardService.java @@ -1,7 +1,5 @@ package MakeUs.Moira.service.userPortfolio; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.userPortfolio.userAward.dto.UserAwardAddRequestDto; import MakeUs.Moira.controller.userPortfolio.userAward.dto.UserAwardResponseDto; import MakeUs.Moira.domain.user.User; @@ -9,6 +7,8 @@ import MakeUs.Moira.domain.userPortfolio.UserPortfolio; import MakeUs.Moira.domain.userPortfolio.userAward.UserAward; import MakeUs.Moira.domain.userPortfolio.userAward.UserAwardRepo; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/MakeUs/Moira/service/userPortfolio/UserCareerService.java b/src/main/java/MakeUs/Moira/service/userPortfolio/UserCareerService.java index 7716cac..7c0c9da 100644 --- a/src/main/java/MakeUs/Moira/service/userPortfolio/UserCareerService.java +++ b/src/main/java/MakeUs/Moira/service/userPortfolio/UserCareerService.java @@ -1,7 +1,5 @@ package MakeUs.Moira.service.userPortfolio; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.userPortfolio.userCareer.dto.UserCareerAddRequestDto; import MakeUs.Moira.controller.userPortfolio.userCareer.dto.UserCareerResponseDto; import MakeUs.Moira.domain.user.User; @@ -9,6 +7,8 @@ import MakeUs.Moira.domain.userPortfolio.UserPortfolio; import MakeUs.Moira.domain.userPortfolio.userCareer.UserCareer; import MakeUs.Moira.domain.userPortfolio.userCareer.UserCareerRepo; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/MakeUs/Moira/service/userPortfolio/UserLicenseService.java b/src/main/java/MakeUs/Moira/service/userPortfolio/UserLicenseService.java index 1061afe..a70ea36 100644 --- a/src/main/java/MakeUs/Moira/service/userPortfolio/UserLicenseService.java +++ b/src/main/java/MakeUs/Moira/service/userPortfolio/UserLicenseService.java @@ -1,8 +1,5 @@ package MakeUs.Moira.service.userPortfolio; - -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.userPortfolio.userLicense.dto.UserLicenseAddRequestDto; import MakeUs.Moira.controller.userPortfolio.userLicense.dto.UserLicenseResponseDto; import MakeUs.Moira.domain.user.User; @@ -10,6 +7,8 @@ import MakeUs.Moira.domain.userPortfolio.UserPortfolio; import MakeUs.Moira.domain.userPortfolio.userLicense.UserLicense; import MakeUs.Moira.domain.userPortfolio.userLicense.UserLicenseRepo; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/MakeUs/Moira/service/userPortfolio/UserLinkService.java b/src/main/java/MakeUs/Moira/service/userPortfolio/UserLinkService.java index ad2a113..8c6c1d8 100644 --- a/src/main/java/MakeUs/Moira/service/userPortfolio/UserLinkService.java +++ b/src/main/java/MakeUs/Moira/service/userPortfolio/UserLinkService.java @@ -1,8 +1,5 @@ package MakeUs.Moira.service.userPortfolio; - -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.userPortfolio.userLink.dto.UserLinkAddRequestDto; import MakeUs.Moira.controller.userPortfolio.userLink.dto.UserLinkResponseDto; import MakeUs.Moira.domain.user.User; @@ -10,6 +7,8 @@ import MakeUs.Moira.domain.userPortfolio.UserPortfolio; import MakeUs.Moira.domain.userPortfolio.userLink.UserLink; import MakeUs.Moira.domain.userPortfolio.userLink.UserLinkRepo; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/MakeUs/Moira/service/userPortfolio/UserSchoolService.java b/src/main/java/MakeUs/Moira/service/userPortfolio/UserSchoolService.java index ff037f9..c12f415 100644 --- a/src/main/java/MakeUs/Moira/service/userPortfolio/UserSchoolService.java +++ b/src/main/java/MakeUs/Moira/service/userPortfolio/UserSchoolService.java @@ -1,7 +1,5 @@ package MakeUs.Moira.service.userPortfolio; -import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.userPortfolio.userSchool.dto.UserSchoolAddRequestDto; import MakeUs.Moira.controller.userPortfolio.userSchool.dto.UserSchoolResponseDto; import MakeUs.Moira.controller.userPortfolio.userSchool.dto.MajorInfoResponseDto; @@ -10,6 +8,8 @@ import MakeUs.Moira.domain.user.UserRepo; import MakeUs.Moira.domain.userPortfolio.UserPortfolio; import MakeUs.Moira.domain.userPortfolio.userSchool.*; +import MakeUs.Moira.exception.CustomException; +import MakeUs.Moira.exception.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional;