♻️ Refactor: Briefing V2 API Facade 추가

Team-Shaka · Jan 14, 2024 · 8572f8b · 8572f8b
1 parent d03d225
commit 8572f8b
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 35 deletions.
diff --git a/src/main/java/briefing/briefing/api/BriefingApi.java b/src/main/java/briefing/briefing/api/BriefingApi.java
@@ -10,7 +10,6 @@
 import briefing.briefing.application.BriefingFacade;
 import briefing.briefing.application.dto.*;
 import briefing.common.aop.annotation.CacheEvictByBriefingId;
-import briefing.common.enums.APIVersion;
 import briefing.common.response.CommonResponse;
 import briefing.member.domain.Member;
 import briefing.security.handler.annotation.AuthMember;
@@ -31,15 +30,15 @@ public class BriefingApi {
     @Operation(summary = "03-01Briefing \uD83D\uDCF0  브리핑 목록 조회 V1", description = "")
     public CommonResponse<BriefingResponseDTO.BriefingPreviewListDTO> findBriefings(
             @ParameterObject @ModelAttribute BriefingRequestParam.BriefingPreviewListParam params) {
-        return CommonResponse.onSuccess(briefingFacade.findBriefings(params, APIVersion.V1));
+        return CommonResponse.onSuccess(briefingFacade.findBriefings(params));
     }
 
     @GetMapping("/briefings/{id}")
     @Parameter(name = "member", hidden = true)
     @Operation(summary = "03-02Briefing \uD83D\uDCF0  브리핑 단건 조회 V1", description = "")
     public CommonResponse<BriefingResponseDTO.BriefingDetailDTO> findBriefing(
             @PathVariable final Long id, @AuthMember Member member) {
-        return CommonResponse.onSuccess(briefingFacade.findBriefing(id, APIVersion.V1, member));
+        return CommonResponse.onSuccess(briefingFacade.findBriefing(id, member));
     }
 
     @CacheEvict(value = "findBriefingsV2", key = "#request.getBriefingType()")

diff --git a/src/main/java/briefing/briefing/api/BriefingV2Api.java b/src/main/java/briefing/briefing/api/BriefingV2Api.java
@@ -1,21 +1,14 @@
 package briefing.briefing.api;
 
-import java.util.List;
-import java.util.Optional;
-
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.*;
 
+import briefing.briefing.application.BriefingV2Facade;
 import briefing.briefing.application.dto.BriefingRequestParam;
 import briefing.briefing.application.dto.BriefingResponseDTO;
-import briefing.briefing.application.service.BriefingCommandService;
-import briefing.briefing.application.service.BriefingQueryService;
-import briefing.briefing.domain.Briefing;
-import briefing.common.enums.APIVersion;
 import briefing.common.response.CommonResponse;
 import briefing.member.domain.Member;
-import briefing.scrap.application.ScrapQueryService;
 import briefing.security.handler.annotation.AuthMember;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -27,39 +20,21 @@
 @RequiredArgsConstructor
 @RequestMapping("/v2")
 public class BriefingV2Api {
-    private final BriefingQueryService briefingQueryService;
-    private final BriefingCommandService briefingCommandService;
-    private final ScrapQueryService scrapQueryService;
+    private final BriefingV2Facade briefingFacade;
 
     @GetMapping("/briefings")
     @Operation(summary = "03-01Briefing \uD83D\uDCF0  브리핑 목록 조회 V2", description = "")
     @Cacheable(value = "findBriefingsV2", key = "#params.getType()")
     public CommonResponse<BriefingResponseDTO.BriefingPreviewListDTOV2> findBriefingsV2(
             @ParameterObject @ModelAttribute BriefingRequestParam.BriefingPreviewListParam params) {
-        List<Briefing> briefingList = briefingQueryService.findBriefings(params, APIVersion.V2);
-        return CommonResponse.onSuccess(
-                BriefingConverter.toBriefingPreviewListDTOV2(params.getDate(), briefingList));
+        return CommonResponse.onSuccess(briefingFacade.findBriefings(params));
     }
 
     @GetMapping("/briefings/{id}")
     @Operation(summary = "03-02Briefing \uD83D\uDCF0  브리핑 단건 조회 V2", description = "")
     @Parameter(name = "member", hidden = true)
     public CommonResponse<BriefingResponseDTO.BriefingDetailDTOV2> findBriefingV2(
             @PathVariable final Long id, @AuthMember Member member) {
-
-        Boolean isScrap =
-                Optional.ofNullable(member)
-                        .map(m -> scrapQueryService.existsByMemberIdAndBriefingId(m.getId(), id))
-                        .orElseGet(() -> Boolean.FALSE);
-
-        Boolean isBriefingOpen = false;
-        Boolean isWarning = false;
-
-        return CommonResponse.onSuccess(
-                BriefingConverter.toBriefingDetailDTOV2(
-                        briefingQueryService.findBriefing(id, APIVersion.V2),
-                        isScrap,
-                        isBriefingOpen,
-                        isWarning));
+        return CommonResponse.onSuccess(briefingFacade.findBriefing(id, member));
     }
 }
diff --git a/src/main/java/briefing/briefing/application/BriefingFacade.java b/src/main/java/briefing/briefing/application/BriefingFacade.java
@@ -30,17 +30,17 @@ public class BriefingFacade {
     private final BriefingCommandService briefingCommandService;
     private final ArticleCommandService articleCommandService;
     private final BriefingArticleCommandService briefingArticleCommandService;
+    private static final APIVersion version = APIVersion.V1;
 
     @Transactional(readOnly = true)
     public BriefingResponseDTO.BriefingPreviewListDTO findBriefings(
-            BriefingRequestParam.BriefingPreviewListParam params, APIVersion version) {
+            BriefingRequestParam.BriefingPreviewListParam params) {
         List<Briefing> briefingList = briefingQueryService.findBriefings(params, version);
         return BriefingConverter.toBriefingPreviewListDTO(params.getDate(), briefingList);
     }
 
     @Transactional(readOnly = true)
-    public BriefingResponseDTO.BriefingDetailDTO findBriefing(
-            final Long id, final APIVersion version, Member member) {
+    public BriefingResponseDTO.BriefingDetailDTO findBriefing(final Long id, Member member) {
         Boolean isScrap =
                 Optional.ofNullable(member)
                         .map(m -> scrapQueryService.existsByMemberIdAndBriefingId(m.getId(), id))

diff --git a/src/main/java/briefing/briefing/application/BriefingV2Facade.java b/src/main/java/briefing/briefing/application/BriefingV2Facade.java
@@ -0,0 +1,47 @@
+package briefing.briefing.application;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import briefing.briefing.api.BriefingConverter;
+import briefing.briefing.application.dto.BriefingRequestParam;
+import briefing.briefing.application.dto.BriefingResponseDTO;
+import briefing.briefing.application.service.BriefingQueryService;
+import briefing.briefing.domain.Briefing;
+import briefing.common.enums.APIVersion;
+import briefing.member.domain.Member;
+import briefing.scrap.application.ScrapQueryService;
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class BriefingV2Facade {
+
+    private final BriefingQueryService briefingQueryService;
+    private final ScrapQueryService scrapQueryService;
+    private static final APIVersion version = APIVersion.V2;
+
+    @Transactional(readOnly = true)
+    public BriefingResponseDTO.BriefingPreviewListDTOV2 findBriefings(
+            BriefingRequestParam.BriefingPreviewListParam params) {
+        List<Briefing> briefingList = briefingQueryService.findBriefings(params, version);
+        return BriefingConverter.toBriefingPreviewListDTOV2(params.getDate(), briefingList);
+    }
+
+    @Transactional(readOnly = true)
+    public BriefingResponseDTO.BriefingDetailDTOV2 findBriefing(final Long id, Member member) {
+        Boolean isScrap =
+                Optional.ofNullable(member)
+                        .map(m -> scrapQueryService.existsByMemberIdAndBriefingId(m.getId(), id))
+                        .orElseGet(() -> Boolean.FALSE);
+
+        Boolean isBriefingOpen = false;
+        Boolean isWarning = false;
+
+        return BriefingConverter.toBriefingDetailDTOV2(
+                briefingQueryService.findBriefing(id, version), isScrap, isBriefingOpen, isWarning);
+    }
+}