Merge pull request #77 from Team-B1ND/Refactor/#76

Refactor/#76
Team-B1ND · Jun 11, 2024 · c63d76c · c63d76c
2 parents 13bba91 + 40ebcc7
commit c63d76c
Show file tree

Hide file tree

Showing 43 changed files with 438 additions and 330 deletions.
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/auth/handler/AuthController.java b/dodam-api/src/main/java/b1nd/dodamapi/auth/handler/AuthController.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.auth.handler;
 
 import b1nd.dodamapi.auth.usecase.AuthUseCase;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.auth.application.dto.req.LoginReq;
 import b1nd.dodamcore.auth.application.dto.req.ReissueTokenReq;
 import b1nd.dodamcore.auth.application.dto.res.LoginRes;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/auth/usecase/AuthUseCase.java b/dodam-api/src/main/java/b1nd/dodamapi/auth/usecase/AuthUseCase.java
@@ -1,6 +1,6 @@
 package b1nd.dodamapi.auth.usecase;
 
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.auth.application.PasswordEncoder;
 import b1nd.dodamcore.auth.application.TokenClient;
 import b1nd.dodamcore.auth.application.dto.req.LoginReq;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/banner/BannerController.java b/dodam-api/src/main/java/b1nd/dodamapi/banner/BannerController.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.banner;
 
-import b1nd.dodamapi.common.response.Response;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.Response;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.banner.application.BannerService;
 import b1nd.dodamcore.banner.application.dto.req.BannerReq;
 import b1nd.dodamcore.banner.domain.entity.Banner;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/bus/BusController.java b/dodam-api/src/main/java/b1nd/dodamapi/bus/BusController.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.bus;
 
-import b1nd.dodamapi.common.response.Response;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.Response;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.bus.application.BusService;
 import b1nd.dodamcore.bus.application.dto.req.BusReq;
 import b1nd.dodamcore.bus.application.dto.res.BusRes;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/common/exception/CustomExceptionHandler.java b/dodam-api/src/main/java/b1nd/dodamapi/common/exception/CustomExceptionHandler.java
@@ -1,6 +1,6 @@
 package b1nd.dodamapi.common.exception;
 
-import b1nd.dodamcore.common.exception.ErrorResponseEntity;
+import b1nd.dodamcore.common.response.ErrorResponseEntity;
 import b1nd.dodamcore.common.exception.ExceptionCode;
 import b1nd.dodamcore.common.exception.GlobalExceptionCode;
 import b1nd.dodamcore.common.exception.CustomException;
@@ -43,14 +43,14 @@ protected ResponseEntity<ErrorResponseEntity> handleValidException(MethodArgumen
         log.error("Valid Fail Object : {}", e.getObjectName());
         log.error("Valid Fail Message : \"{}\"", message);
 
+        ErrorResponseEntity.of(e.getStatusCode().value(), GlobalExceptionCode.PARAMETER_NOT_VALID.name(),message);
         return ResponseEntity
                 .status(e.getStatusCode())
-                .body(ErrorResponseEntity.builder()
-                        .status(e.getStatusCode().value())
-                        .code(GlobalExceptionCode.PARAMETER_NOT_VALID.name())
-                        .message(message)
-                        .build()
-                );
+                .body(ErrorResponseEntity.of(
+                        e.getStatusCode().value(),
+                        GlobalExceptionCode.PARAMETER_NOT_VALID.name(),
+                        message
+                ));
     }
 
     private String getValidExceptionMessages(List<ObjectError> errors) {
@@ -65,70 +65,70 @@ private String getValidExceptionMessages(List<ObjectError> errors) {
 
     @ExceptionHandler(MissingServletRequestParameterException.class)
     protected ResponseEntity<ErrorResponseEntity> handleMissingServletRequestParameterException(MissingServletRequestParameterException e) {
+
         return ResponseEntity
                 .status(400)
-                .body(ErrorResponseEntity.builder()
-                        .status(GlobalExceptionCode.PARAMETER_NOT_FOUND.getStatus().value())
-                        .code(GlobalExceptionCode.PARAMETER_NOT_FOUND.name())
-                        .message(GlobalExceptionCode.PARAMETER_NOT_FOUND.getMessage())
-                        .build());
+                .body(ErrorResponseEntity.of(
+                        GlobalExceptionCode.PARAMETER_NOT_FOUND.getStatus().value(),
+                        GlobalExceptionCode.PARAMETER_NOT_FOUND.name(),
+                        GlobalExceptionCode.PARAMETER_NOT_FOUND.getMessage()
+                ));
     }
 
     @ExceptionHandler(HttpMessageNotReadableException.class)
     protected ResponseEntity<ErrorResponseEntity> handleHttpMessageNotReadableException(HttpMessageNotReadableException e) {
         return ResponseEntity
                 .status(400)
-                .body(ErrorResponseEntity.builder()
-                        .status(GlobalExceptionCode.PARAMETER_NOT_FOUND.getStatus().value())
-                        .code(GlobalExceptionCode.PARAMETER_NOT_FOUND.name())
-                        .message(GlobalExceptionCode.PARAMETER_NOT_FOUND.getMessage())
-                        .build());
+                .body(ErrorResponseEntity.of(
+                        GlobalExceptionCode.PARAMETER_NOT_FOUND.getStatus().value(),
+                        GlobalExceptionCode.PARAMETER_NOT_FOUND.name(),
+                        GlobalExceptionCode.PARAMETER_NOT_FOUND.getMessage()
+                ));
     }
 
     @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
     protected ResponseEntity<ErrorResponseEntity> handleHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) {
         return ResponseEntity
                 .status(400)
-                .body(ErrorResponseEntity.builder()
-                        .status(GlobalExceptionCode.METHOD_NOT_SUPPORTED.getStatus().value())
-                        .code(GlobalExceptionCode.METHOD_NOT_SUPPORTED.name())
-                        .message(GlobalExceptionCode.METHOD_NOT_SUPPORTED.getMessage())
-                        .build());
+                .body(ErrorResponseEntity.of(
+                        GlobalExceptionCode.METHOD_NOT_SUPPORTED.getStatus().value(),
+                        GlobalExceptionCode.METHOD_NOT_SUPPORTED.name(),
+                        GlobalExceptionCode.METHOD_NOT_SUPPORTED.getMessage()
+                ));
     }
 
     @ExceptionHandler(HttpMediaTypeNotSupportedException.class)
     protected ResponseEntity<ErrorResponseEntity> handleHttpMediaTypeNotSupportedException() {
         return ResponseEntity
                 .status(400)
-                .body(ErrorResponseEntity.builder()
-                        .status(GlobalExceptionCode.MEDIA_TYPE_NOT_SUPPORTED.getStatus().value())
-                        .code(GlobalExceptionCode.MEDIA_TYPE_NOT_SUPPORTED.name())
-                        .message(GlobalExceptionCode.MEDIA_TYPE_NOT_SUPPORTED.getMessage())
-                        .build());
+                .body(ErrorResponseEntity.of(
+                        GlobalExceptionCode.MEDIA_TYPE_NOT_SUPPORTED.getStatus().value(),
+                        GlobalExceptionCode.MEDIA_TYPE_NOT_SUPPORTED.name(),
+                        GlobalExceptionCode.MEDIA_TYPE_NOT_SUPPORTED.getMessage()
+                ));
     }
 
     @ExceptionHandler(MethodArgumentTypeMismatchException.class)
     protected ResponseEntity<ErrorResponseEntity> handleMethodArgumentTypeMismatchException() {
         return ResponseEntity
                 .status(400)
-                .body(ErrorResponseEntity.builder()
-                        .status(GlobalExceptionCode.MEDIA_TYPE_MISS_MATCHED.getStatus().value())
-                        .code(GlobalExceptionCode.MEDIA_TYPE_MISS_MATCHED.name())
-                        .message(GlobalExceptionCode.MEDIA_TYPE_MISS_MATCHED.getMessage())
-                        .build());
+                .body(ErrorResponseEntity.of(
+                        GlobalExceptionCode.MEDIA_TYPE_MISS_MATCHED.getStatus().value(),
+                        GlobalExceptionCode.MEDIA_TYPE_MISS_MATCHED.name(),
+                        GlobalExceptionCode.MEDIA_TYPE_MISS_MATCHED.getMessage()
+                ));
     }
 
     @ExceptionHandler(Exception.class)
-    protected ResponseEntity<ErrorResponseEntity> handleException(Exception e, HttpServletRequest request){
+    protected ResponseEntity<ErrorResponseEntity> handleException(Exception e, HttpServletRequest request) {
         sendErrorNotice(e, request);
-
         return ResponseEntity
                 .status(500)
-                .body(ErrorResponseEntity.builder()
-                        .status(GlobalExceptionCode.INTERNAL_SERVER.getStatus().value())
-                        .code(GlobalExceptionCode.INTERNAL_SERVER.name())
-                        .message(GlobalExceptionCode.INTERNAL_SERVER.getMessage())
-                        .build());
+                .body(ErrorResponseEntity.of(
+                        GlobalExceptionCode.INTERNAL_SERVER.getStatus().value(),
+                        GlobalExceptionCode.INTERNAL_SERVER.name(),
+                        GlobalExceptionCode.INTERNAL_SERVER.getMessage()
+                ));
     }
 
     private void sendErrorNotice(Exception e, HttpServletRequest request) {

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/common/util/YoutubeApiUtil.java b/dodam-api/src/main/java/b1nd/dodamapi/common/util/YoutubeApiUtil.java
@@ -0,0 +1,37 @@
+package b1nd.dodamapi.common.util;
+
+import b1nd.dodamcore.common.util.HtmlConverter;
+import b1nd.dodamcore.wakeupsong.application.dto.res.YoutubeApiRes;
+import b1nd.dodamcore.wakeupsong.application.dto.res.YoutubeRes;
+import b1nd.dodamcore.wakeupsong.domain.exception.WakeupSongUrlMalformedException;
+
+import java.util.Optional;
+
+public final class YoutubeApiUtil {
+
+    private YoutubeApiUtil() {
+    }
+
+    static public YoutubeApiRes.Thumbnail getThumbnailUrl(YoutubeApiRes.Snippet snippet) {
+        Optional<YoutubeApiRes.Thumbnail> standard = Optional.ofNullable(snippet.getThumbnails().getStandard());
+        return standard.orElseGet(() -> snippet.getThumbnails().getHigh());
+    }
+
+    static public String getVideoId(String videoUrl){
+        try {
+            return videoUrl.split("/?v=")[1].split("&")[0];
+        } catch (IndexOutOfBoundsException e) {
+            throw new WakeupSongUrlMalformedException();
+        }
+    }
+
+    static public YoutubeRes getYoutubeRes(YoutubeApiRes.SearchItem item) {
+        return new YoutubeRes(
+                HtmlConverter.of(item.getSnippet().getTitle()),
+                item.getId().getVideoId(),
+                "https://www.youtube.com/watch?v=" + item.getId().getVideoId(),
+                item.getSnippet().getChannelTitle(),
+                YoutubeApiUtil.getThumbnailUrl(item.getSnippet()).getUrl()
+        );
+    }
+}
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/conference/handler/ConferenceController.java b/dodam-api/src/main/java/b1nd/dodamapi/conference/handler/ConferenceController.java
@@ -1,6 +1,6 @@
 package b1nd.dodamapi.conference.handler;
 
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamapi.conference.usecase.ConferenceUseCase;
 import b1nd.dodamcore.conference.application.dto.res.ConferenceRes;
 import lombok.RequiredArgsConstructor;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/conference/usecase/ConferenceUseCase.java b/dodam-api/src/main/java/b1nd/dodamapi/conference/usecase/ConferenceUseCase.java
@@ -1,6 +1,6 @@
 package b1nd.dodamapi.conference.usecase;
 
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.conference.application.ConferenceClient;
 import b1nd.dodamcore.conference.application.dto.res.ConferenceRes;
 import lombok.RequiredArgsConstructor;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/meal/MealController.java b/dodam-api/src/main/java/b1nd/dodamapi/meal/MealController.java
@@ -1,6 +1,6 @@
 package b1nd.dodamapi.meal;
 
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.meal.application.MealService;
 import b1nd.dodamcore.meal.application.dto.Meal;
 import lombok.RequiredArgsConstructor;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/member/handler/MemberController.java b/dodam-api/src/main/java/b1nd/dodamapi/member/handler/MemberController.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.member.handler;
 
-import b1nd.dodamapi.common.response.Response;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.Response;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamapi.member.usecase.MemberCommandUseCase;
 import b1nd.dodamapi.member.usecase.MemberQueryUseCase;
 import b1nd.dodamapi.member.usecase.req.*;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/member/usecase/MemberCommandUseCase.java b/dodam-api/src/main/java/b1nd/dodamapi/member/usecase/MemberCommandUseCase.java
@@ -1,6 +1,6 @@
 package b1nd.dodamapi.member.usecase;
 
-import b1nd.dodamapi.common.response.Response;
+import b1nd.dodamcore.common.response.Response;
 import b1nd.dodamapi.member.usecase.req.*;
 import b1nd.dodamcore.auth.application.PasswordEncoder;
 import b1nd.dodamcore.member.application.MemberService;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/member/usecase/MemberQueryUseCase.java b/dodam-api/src/main/java/b1nd/dodamapi/member/usecase/MemberQueryUseCase.java
@@ -1,6 +1,6 @@
 package b1nd.dodamapi.member.usecase;
 
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.member.application.MemberService;
 import b1nd.dodamcore.member.application.MemberSessionHolder;
 import b1nd.dodamcore.member.domain.entity.Member;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/nightstudy/handler/NightStudyController.java b/dodam-api/src/main/java/b1nd/dodamapi/nightstudy/handler/NightStudyController.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.nightstudy.handler;
 
-import b1nd.dodamapi.common.response.Response;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.Response;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamapi.nightstudy.usecase.NightStudyUseCase;
 import b1nd.dodamapi.nightstudy.usecase.dto.req.ApplyNightStudyReq;
 import b1nd.dodamapi.nightstudy.usecase.dto.req.RejectNightStudyReq;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/nightstudy/usecase/NightStudyUseCase.java b/dodam-api/src/main/java/b1nd/dodamapi/nightstudy/usecase/NightStudyUseCase.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.nightstudy.usecase;
 
-import b1nd.dodamapi.common.response.Response;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.Response;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.common.util.ZonedDateTimeUtil;
 import b1nd.dodamcore.member.application.MemberService;
 import b1nd.dodamcore.member.domain.entity.Student;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/outgoing/handler/OutGoingController.java b/dodam-api/src/main/java/b1nd/dodamapi/outgoing/handler/OutGoingController.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.outgoing.handler;
 
-import b1nd.dodamapi.common.response.Response;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.Response;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamapi.outgoing.usecase.OutGoingUseCase;
 import b1nd.dodamapi.outgoing.usecase.dto.req.RejectOutGoingReq;
 import b1nd.dodamapi.outgoing.usecase.dto.res.OutGoingRes;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/outgoing/usecase/OutGoingUseCase.java b/dodam-api/src/main/java/b1nd/dodamapi/outgoing/usecase/OutGoingUseCase.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.outgoing.usecase;
 
-import b1nd.dodamapi.common.response.Response;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.Response;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.common.util.ZonedDateTimeUtil;
 import b1nd.dodamcore.member.application.MemberService;
 import b1nd.dodamcore.member.domain.entity.Student;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/outsleeping/handler/OutSleepingController.java b/dodam-api/src/main/java/b1nd/dodamapi/outsleeping/handler/OutSleepingController.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.outsleeping.handler;
 
-import b1nd.dodamapi.common.response.Response;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.Response;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamapi.outsleeping.usecase.OutSleepingUseCase;
 import b1nd.dodamapi.outsleeping.usecase.dto.req.ApplyOutSleepingReq;
 import b1nd.dodamapi.outsleeping.usecase.dto.req.RejectOutSleepingReq;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/outsleeping/usecase/OutSleepingUseCase.java b/dodam-api/src/main/java/b1nd/dodamapi/outsleeping/usecase/OutSleepingUseCase.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.outsleeping.usecase;
 
-import b1nd.dodamapi.common.response.Response;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.Response;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.common.util.ZonedDateTimeUtil;
 import b1nd.dodamcore.member.application.MemberService;
 import b1nd.dodamcore.member.domain.entity.Student;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/point/handler/PointController.java b/dodam-api/src/main/java/b1nd/dodamapi/point/handler/PointController.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.point.handler;
 
-import b1nd.dodamapi.common.response.Response;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.Response;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamapi.point.usecase.PointReasonUseCase;
 import b1nd.dodamapi.point.usecase.PointUseCase;
 import b1nd.dodamapi.point.usecase.req.IssuePointReq;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/point/usecase/PointReasonUseCase.java b/dodam-api/src/main/java/b1nd/dodamapi/point/usecase/PointReasonUseCase.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.point.usecase;
 
-import b1nd.dodamapi.common.response.Response;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.Response;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.point.application.PointReasonService;
 import b1nd.dodamapi.point.usecase.req.ModifyPointReasonReq;
 import b1nd.dodamapi.point.usecase.req.RegisterPointReasonReq;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/point/usecase/PointUseCase.java b/dodam-api/src/main/java/b1nd/dodamapi/point/usecase/PointUseCase.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.point.usecase;
 
-import b1nd.dodamapi.common.response.Response;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.Response;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.member.application.MemberService;
 import b1nd.dodamcore.member.domain.entity.Member;
 import b1nd.dodamcore.member.domain.entity.Student;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/recruit/RecruitController.java b/dodam-api/src/main/java/b1nd/dodamapi/recruit/RecruitController.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.recruit;
 
-import b1nd.dodamapi.common.response.Response;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.Response;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.recruit.application.RecruitService;
 import b1nd.dodamcore.recruit.application.dto.req.RecruitReq;
 import b1nd.dodamcore.recruit.application.dto.res.RecruitPageRes;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/schedule/ScheduleController.java b/dodam-api/src/main/java/b1nd/dodamapi/schedule/ScheduleController.java
@@ -1,7 +1,7 @@
 package b1nd.dodamapi.schedule;
 
-import b1nd.dodamapi.common.response.Response;
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.Response;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.schedule.application.ScheduleService;
 import b1nd.dodamcore.schedule.application.dto.req.ScheduleReq;
 import b1nd.dodamcore.schedule.application.dto.res.ScheduleRes;

diff --git a/dodam-api/src/main/java/b1nd/dodamapi/upload/UploadController.java b/dodam-api/src/main/java/b1nd/dodamapi/upload/UploadController.java
@@ -1,6 +1,6 @@
 package b1nd.dodamapi.upload;
 
-import b1nd.dodamapi.common.response.ResponseData;
+import b1nd.dodamcore.common.response.ResponseData;
 import b1nd.dodamcore.upload.application.UploadService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;