Merge branch 'release' into develop

Team-Shaka · Jul 21, 2024 · 10d403e · 10d403e
2 parents d1cff93 + 890b21f
commit 10d403e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/...rc/main/java/com/example/briefingapi/briefing/implement/service/BriefingQueryAdapter.java b/...rc/main/java/com/example/briefingapi/briefing/implement/service/BriefingQueryAdapter.java
@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingQueryAdapter.java
 package com.example.briefingapi.briefing.implement.service;
+========
+package briefing.briefing.application.service;
+>>>>>>>> release:Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingQueryService.java
 
 import java.util.List;
 
@@ -11,9 +15,23 @@
 import com.example.briefingcommon.entity.Briefing;
 import com.example.briefingcommon.entity.enums.APIVersion;
 import org.springframework.stereotype.Service;
+<<<<<<<< HEAD:Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingQueryAdapter.java
 import lombok.RequiredArgsConstructor;
 
 @Adapter
+========
+
+import briefing.briefing.application.context.BriefingQueryContext;
+import briefing.briefing.application.context.BriefingQueryContextFactory;
+import briefing.briefing.application.dto.BriefingRequestParam;
+import briefing.briefing.domain.Briefing;
+import briefing.common.enums.APIVersion;
+import briefing.exception.ErrorCode;
+import briefing.exception.handler.BriefingException;
+import lombok.RequiredArgsConstructor;
+
+@Service
+>>>>>>>> release:Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingQueryService.java
 @RequiredArgsConstructor
 public class BriefingQueryAdapter {
 

diff --git a/src/test/java/briefing/briefing/application/BriefingQueryServiceTest.java b/src/test/java/briefing/briefing/application/BriefingQueryServiceTest.java
@@ -18,6 +18,7 @@
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
 
+import briefing.briefing.application.service.BriefingQueryService;
 import briefing.briefing.domain.Article;
 import briefing.briefing.domain.Briefing;
 import briefing.briefing.domain.BriefingArticle;