Merge branch 'dev/be' into test/767-category-controller-test

woowacourse-teams · Oct 17, 2024 · 116c087 · 116c087
2 parents 829b024 + 7535f77
commit 116c087
Show file tree

Hide file tree

Showing 38 changed files with 106 additions and 85 deletions.
diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml
@@ -22,11 +22,7 @@ jobs:
           mysql version: ${{ secrets.MYSQL_VERSION }}
           mysql database: ${{ secrets.MYSQL_DATABASE }}
           mysql root password: ${{ secrets.MYSQL_PASSWORD }}
-
-      - name: DB 설정 파일 가져오기
-        working-directory: ./backend/src/main/resources
-        run: echo "${{ secrets.APPLICATION_DB_YAML }}" > application-db.yml
-
+
       - name: gradle 캐싱
         uses: gradle/actions/setup-gradle@v4
 
@@ -36,6 +32,10 @@ jobs:
           java-version: 17
           distribution: temurin
 
+      - name: 환경변수 주입
+        run: ${{ secrets.APPLICATION_YML }}
+        working-directory: ./backend/src/test/resources
+
       - name: 테스트 코드 실행
         run: ./gradlew test
         working-directory: ./backend
diff --git a/backend/.gitignore b/backend/.gitignore
@@ -20,7 +20,7 @@ out/
 .DS_Store
 
 ### YAML ###
-application-db.yml
+src/test/resources/application.yml
 
 ### compose ###
 docker/app/*.jar

diff --git a/backend/src/main/java/codezap/global/exception/GlobalExceptionHandler.java b/backend/src/main/java/codezap/global/exception/GlobalExceptionHandler.java
@@ -2,12 +2,14 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ProblemDetail;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.lang.Nullable;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.MethodArgumentNotValidException;
@@ -16,6 +18,9 @@
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonMappingException.Reference;
+
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -51,6 +56,23 @@ protected ResponseEntity<Object> handleMethodArgumentNotValid(
                 .body(codeZapException.toProblemDetail());
     }
 
+    @Override
+    protected ResponseEntity<Object> handleHttpMessageNotReadable(
+            HttpMessageNotReadableException ex, HttpHeaders headers, HttpStatusCode status, WebRequest request) {
+        String exceptionMessage = "잘못된 JSON 형식입니다.";
+        if (ex.getCause() instanceof JsonMappingException jsonMappingException) {
+            exceptionMessage = jsonMappingException.getPath().stream()
+                    .map(Reference::getFieldName)
+                    .collect(Collectors.joining(" ")) + " 필드의 형식이 잘못되었습니다.";
+        }
+
+        CodeZapException codeZapException =
+                new CodeZapException(ErrorCode.INVALID_REQUEST, String.join("\n", exceptionMessage));
+
+        return ResponseEntity.status(codeZapException.getErrorCode().getHttpStatus())
+                .body(codeZapException.toProblemDetail());
+    }
+
     @ExceptionHandler
     public ResponseEntity<ProblemDetail> handleException(Exception exception) {
         log.error("[Exception] 예상치 못한 오류 {} 가 발생했습니다.", exception.getClass().getName(), exception);

diff --git a/backend/src/main/java/codezap/global/rds/DataSourceConfig.java b/backend/src/main/java/codezap/global/rds/DataSourceConfig.java
@@ -21,7 +21,6 @@
 
 @Configuration
 @RequiredArgsConstructor
-@Profile("prod")
 @EnableJpaRepositories(basePackages = "codezap")
 public class DataSourceConfig {
 

diff --git a/backend/src/main/java/codezap/likes/repository/LikesJpaRepository.java b/backend/src/main/java/codezap/likes/repository/LikesJpaRepository.java
@@ -13,5 +13,5 @@ public interface LikesJpaRepository extends LikesRepository, JpaRepository<Likes
 
     @Modifying(clearAutomatically = true)
     @Query("DELETE FROM Likes l WHERE l.template.id in :templateIds")
-    void deleteByTemplateIds(@Param(value = "templateIds") List<Long> templateIds);
+    void deleteAllByTemplateIds(@Param(value = "templateIds") List<Long> templateIds);
 }
diff --git a/backend/src/main/java/codezap/likes/repository/LikesRepository.java b/backend/src/main/java/codezap/likes/repository/LikesRepository.java
@@ -16,5 +16,5 @@ public interface LikesRepository {
 
     void deleteByMemberAndTemplate(Member member, Template template);
 
-    void deleteByTemplateIds(List<Long> templateIds);
+    void deleteAllByTemplateIds(List<Long> templateIds);
 }
diff --git a/backend/src/main/java/codezap/likes/service/LikesService.java b/backend/src/main/java/codezap/likes/service/LikesService.java
@@ -42,6 +42,6 @@ public void cancelLike(Member member, long templateId) {
 
     @Transactional
     public void deleteAllByTemplateIds(List<Long> templateIds) {
-        likesRepository.deleteByTemplateIds(templateIds);
+        likesRepository.deleteAllByTemplateIds(templateIds);
     }
 }
diff --git a/backend/src/main/java/codezap/tag/repository/TemplateTagJpaRepository.java b/backend/src/main/java/codezap/tag/repository/TemplateTagJpaRepository.java
@@ -20,23 +20,23 @@ public interface TemplateTagJpaRepository extends TemplateTagRepository, JpaRepo
             JOIN TemplateTag tt ON t.id = tt.id.tagId
             WHERE tt.template = :template
             """)
-    List<Tag> findAllTagsByTemplate(Template template);
+    List<Tag> findAllTagsByTemplate(@Param("template") Template template);
 
     @Query("""
             SELECT tt, t
             FROM TemplateTag tt
             JOIN FETCH tt.tag t
             WHERE tt.id.templateId = :templateId
             """)
-    List<TemplateTag> findAllByTemplateId(Long templateId);
+    List<TemplateTag> findAllByTemplateId(@Param("templateId") Long templateId);
 
     @Query("""
             SELECT tt, t
             FROM TemplateTag tt
             JOIN FETCH tt.tag t
             WHERE tt.id.templateId in :templateIds
             """)
-    List<TemplateTag> findAllByTemplateIdsIn(List<Long> templateIds);
+    List<TemplateTag> findAllByTemplateIdsIn(@Param("templateIds") List<Long> templateIds);
 
     @Query("""
             SELECT DISTINCT t
@@ -49,9 +49,9 @@ WHERE tt.id.templateId IN (
                 )
             )
             """)
-    List<Tag> findAllTagDistinctByMemberId(Long memberId);
+    List<Tag> findAllTagDistinctByMemberId(@Param("memberId") Long memberId);
 
     @Modifying(clearAutomatically = true)
     @Query("DELETE FROM TemplateTag t WHERE t.template.id in :templateIds")
-    void deleteByTemplateIds(@Param("templateIds") List<Long> templateIds);
+    void deleteAllByTemplateIds(@Param("templateIds") List<Long> templateIds);
 }
diff --git a/backend/src/main/java/codezap/tag/repository/TemplateTagRepository.java b/backend/src/main/java/codezap/tag/repository/TemplateTagRepository.java
@@ -24,5 +24,5 @@ public interface TemplateTagRepository {
 
     void deleteAllByTemplateId(Long templateId);
 
-    void deleteByTemplateIds(List<Long> templateIds);
+    void deleteAllByTemplateIds(List<Long> templateIds);
 }
diff --git a/backend/src/main/java/codezap/tag/service/TagService.java b/backend/src/main/java/codezap/tag/service/TagService.java
@@ -72,6 +72,6 @@ public void updateTags(Template template, List<String> tags) {
 
     @Transactional
     public void deleteAllByTemplateIds(List<Long> templateIds) {
-        templateTagRepository.deleteByTemplateIds(templateIds);
+        templateTagRepository.deleteAllByTemplateIds(templateIds);
     }
 }
diff --git a/backend/src/main/java/codezap/template/controller/TemplateController.java b/backend/src/main/java/codezap/template/controller/TemplateController.java
@@ -109,7 +109,7 @@ public ResponseEntity<Void> deleteTemplates(
             @AuthenticationPrinciple Member member,
             @PathVariable List<Long> ids
     ) {
-        templateApplicationService.deleteByMemberAndIds(member, ids);
+        templateApplicationService.deleteAllByMemberAndTemplateIds(member, ids);
         return ResponseEntity.noContent().build();
     }
 }
diff --git a/backend/src/main/java/codezap/template/repository/SourceCodeJpaRepository.java b/backend/src/main/java/codezap/template/repository/SourceCodeJpaRepository.java
@@ -6,6 +6,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import codezap.global.exception.CodeZapException;
 import codezap.global.exception.ErrorCode;
@@ -37,5 +38,5 @@ default SourceCode fetchByTemplateAndOrdinal(Template template, int ordinal) {
 
     @Modifying(clearAutomatically = true)
     @Query("DELETE FROM SourceCode s WHERE s.template.id in :templateIds")
-    void deleteByTemplateIds(List<Long> templateIds);
+    void deleteAllByTemplateIds(@Param("templateIds") List<Long> templateIds);
 }
diff --git a/backend/src/main/java/codezap/template/repository/SourceCodeRepository.java b/backend/src/main/java/codezap/template/repository/SourceCodeRepository.java
@@ -26,5 +26,5 @@ public interface SourceCodeRepository {
 
     void deleteById(Long id);
 
-    void deleteByTemplateIds(List<Long> templateIds);
+    void deleteAllByTemplateIds(List<Long> templateIds);
 }
diff --git a/backend/src/main/java/codezap/template/repository/ThumbnailJpaRepository.java b/backend/src/main/java/codezap/template/repository/ThumbnailJpaRepository.java
@@ -6,6 +6,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import codezap.global.exception.CodeZapException;
 import codezap.global.exception.ErrorCode;
@@ -28,20 +29,20 @@ default Thumbnail fetchByTemplate(Template template) {
             join fetch t.sourceCode sc
             WHERE t.template = :template
             """)
-    Optional<Thumbnail> findByTemplate(Template template);
+    Optional<Thumbnail> findByTemplate(@Param("template") Template template);
 
 
     @Modifying(clearAutomatically = true)
     @Query("DELETE FROM Thumbnail t WHERE t.template.id in :templateIds")
-    void deleteByTemplateIds(List<Long> templateIds);
+    void deleteAllByTemplateIds(@Param("templateIds") List<Long> templateIds);
 
     @Query("""
             SELECT t, sc
             FROM Thumbnail t
             join fetch t.sourceCode sc
             WHERE t.template.id IN :templateIds
             """)
-    List<Thumbnail> findAllByTemplateIn(List<Long> templateIds);
+    List<Thumbnail> findAllByTemplateIn(@Param("templateIds") List<Long> templateIds);
 
     void deleteByTemplateId(Long id);
 

diff --git a/backend/src/main/java/codezap/template/repository/ThumbnailRepository.java b/backend/src/main/java/codezap/template/repository/ThumbnailRepository.java
@@ -18,5 +18,5 @@ public interface ThumbnailRepository {
 
     Thumbnail save(Thumbnail thumbnail);
 
-    void deleteByTemplateIds(List<Long> ids);
+    void deleteAllByTemplateIds(List<Long> ids);
 }
diff --git a/backend/src/main/java/codezap/template/service/SourceCodeService.java b/backend/src/main/java/codezap/template/service/SourceCodeService.java
@@ -99,7 +99,7 @@ private void validateSourceCodesCount(Template template, UpdateTemplateRequest u
     }
 
     @Transactional
-    public void deleteByTemplateIds(List<Long> templateIds) {
-        sourceCodeRepository.deleteByTemplateIds(templateIds);
+    public void deleteAllByTemplateIds(List<Long> templateIds) {
+        sourceCodeRepository.deleteAllByTemplateIds(templateIds);
     }
 }
diff --git a/backend/src/main/java/codezap/template/service/ThumbnailService.java b/backend/src/main/java/codezap/template/service/ThumbnailService.java
@@ -40,7 +40,7 @@ public ExploreTemplatesResponse findAll() {
     }
 
     @Transactional
-    public void deleteByTemplateIds(List<Long> templateIds) {
-        thumbnailRepository.deleteByTemplateIds(templateIds);
+    public void deleteAllByTemplateIds(List<Long> templateIds) {
+        thumbnailRepository.deleteAllByTemplateIds(templateIds);
     }
 }
diff --git a/backend/src/main/java/codezap/template/service/facade/TemplateApplicationService.java b/backend/src/main/java/codezap/template/service/facade/TemplateApplicationService.java
@@ -144,11 +144,11 @@ public void update(Member member, Long templateId, UpdateTemplateRequest updateT
     }
 
     @Transactional
-    public void deleteByMemberAndIds(Member member, List<Long> ids) {
-        thumbnailService.deleteByTemplateIds(ids);
-        sourceCodeService.deleteByTemplateIds(ids);
-        tagService.deleteAllByTemplateIds(ids);
-        likesService.deleteAllByTemplateIds(ids);
-        templateService.deleteByMemberAndIds(member, ids);
+    public void deleteAllByMemberAndTemplateIds(Member member, List<Long> templateIds) {
+        thumbnailService.deleteAllByTemplateIds(templateIds);
+        sourceCodeService.deleteAllByTemplateIds(templateIds);
+        tagService.deleteAllByTemplateIds(templateIds);
+        likesService.deleteAllByTemplateIds(templateIds);
+        templateService.deleteByMemberAndIds(member, templateIds);
     }
 }
diff --git a/backend/src/main/resources/application-local.yml b/backend/src/main/resources/application-local.yml
@@ -2,5 +2,28 @@ spring:
   output:
     ansi:
       enabled: always
+  datasource:
+    write:
+      jdbc-url: ${MYSQL_WRITER_URL}
+      username: ${MYSQL_USER}
+      password: ${MYSQL_PASSWORD}
+      driver-class-name: com.mysql.cj.jdbc.Driver
+    read:
+      jdbc-url: ${MYSQL_READER_URL}
+      username: ${MYSQL_USER}
+      password: ${MYSQL_PASSWORD}
+      driver-class-name: com.mysql.cj.jdbc.Driver
+  flyway:
+    enabled: false
+    locations: classpath:db/migration
+  jpa:
+    # open-in-view: false
+    hibernate:
+      ddl-auto: create
+    properties:
+      hibernate:
+        dialect: codezap.template.repository.FullTextSearchMySQLDialect
+  data.web.pageable.one-indexed-parameters: true
+
 cors:
   allowed-origins: http://localhost:3000
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
@@ -2,4 +2,3 @@ spring:
   profiles:
     active:
       - local
-      - db
diff --git a/backend/src/main/resources/logger/file/error-appender.xml b/backend/src/main/resources/logger/file/error-appender.xml
@@ -3,7 +3,7 @@
 <included>
     <appender name="error-appender" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
-        <file>${LOG_FILE_PATH}/${DATE_FORMAT}/error.log</file>
+        <file>${LOG_FILE_PATH}/error.log</file>
 
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>ERROR</level>
@@ -16,7 +16,7 @@
         </encoder>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_FILE_PATH}/%d{yyyy-MM-dd}/error/error%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_FILE_PATH}/%d{yyyy-MM-dd}/error.log</fileNamePattern>
             <totalSizeCap>5GB</totalSizeCap>
             <maxHistory>30</maxHistory>
         </rollingPolicy>

diff --git a/backend/src/main/resources/logger/file/info-appender.xml b/backend/src/main/resources/logger/file/info-appender.xml
@@ -3,7 +3,7 @@
 <included>
     <appender name="info-appender" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
-        <file>${LOG_FILE_PATH}/${DATE_FORMAT}/info.log</file>
+        <file>${LOG_FILE_PATH}/info.log</file>
 
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>INFO</level>
@@ -16,7 +16,7 @@
         </encoder>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_FILE_PATH}/%d{yyyy-MM-dd}/info/info%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_FILE_PATH}/%d{yyyy-MM-dd}/info.log</fileNamePattern>
             <totalSizeCap>5GB</totalSizeCap>
             <maxHistory>30</maxHistory>
         </rollingPolicy>

diff --git a/backend/src/main/resources/logger/file/warn-appender.xml b/backend/src/main/resources/logger/file/warn-appender.xml
@@ -3,7 +3,7 @@
 <included>
     <appender name="warn-appender" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
-        <file>${LOG_FILE_PATH}/${DATE_FORMAT}/warn.log</file>
+        <file>${LOG_FILE_PATH}/warn.log</file>
 
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>WARN</level>
@@ -16,7 +16,7 @@
         </encoder>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_FILE_PATH}/%d{yyyy-MM-dd}/warn/warn%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_FILE_PATH}/%d{yyyy-MM-dd}/warn.log</fileNamePattern>
             <totalSizeCap>5GB</totalSizeCap>
             <maxHistory>30</maxHistory>
         </rollingPolicy>

diff --git a/backend/src/test/java/codezap/global/repository/JpaRepositoryTest.java b/backend/src/test/java/codezap/global/repository/JpaRepositoryTest.java
@@ -11,12 +11,13 @@
 
 import codezap.global.DatabaseIsolation;
 import codezap.global.auditing.JpaAuditingConfiguration;
+import codezap.global.rds.DataSourceConfig;
 
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @DataJpaTest
 @DatabaseIsolation
-@Import(JpaAuditingConfiguration.class)
+@Import({JpaAuditingConfiguration.class, DataSourceConfig.class})
 @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
 public @interface JpaRepositoryTest {
 }
diff --git a/backend/src/test/java/codezap/likes/repository/FakeLikeRepository.java b/backend/src/test/java/codezap/likes/repository/FakeLikeRepository.java
@@ -28,6 +28,6 @@ public void deleteByMemberAndTemplate(Member member, Template template) {
     }
 
     @Override
-    public void deleteByTemplateIds(List<Long> templateIds) {
+    public void deleteAllByTemplateIds(List<Long> templateIds) {
     }
 }