[Release] 기능 추가 및 리팩토링 코드 배포

.github/workflows/ci.yml

@@ -7,6 +7,89 @@ on:
       - main
 
 jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    services:
+      mysql:
+        image: mysql:8.0
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_ROOT_PASSWORD: ${{ secrets.TEST_DB_PASSWORD}}
+          MYSQL_DATABASE: test
+          MYSQL_USER: tester
+          MYSQL_PASSWORD: ${{ secrets.TEST_DB_PASSWORD}}
+        options: >-
+          --health-cmd "mysqladmin ping -h localhost"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+      redis:
+        image: redis:7.0
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          submodules: 'recursive'
+          token: ${{ secrets.ACTION_TOKEN }}
+
+      - name: MySQL 연결 확인
+        run: |
+          sudo apt-get update && sudo apt-get install -y mysql-client
+          mysql -h127.0.0.1 -P3306 -utester -p${{ secrets.TEST_DB_PASSWORD }} -e "SHOW DATABASES;"
+
+      - name: Redis 연결 확인
+        run: |
+          sudo apt-get update && sudo apt-get install -y redis-tools
+          redis-cli -h localhost ping
+
+      - name: Copy private ci resources
+        run: ./gradlew copyCiYml --no-daemon
+
+      - name: Create Firebase JSON file
+        run: |
+          echo '{
+              "type": "${{ secrets.FIREBASE_TYPE }}",
+              "project_id": "${{ secrets.FIREBASE_PROJECT_ID }}",
+              "private_key_id": "${{ secrets.FIREBASE_PRIVATE_KEY_ID }}",
+              "private_key": "${{ secrets.FIREBASE_PRIVATE_KEY }}",
+              "client_email": "${{ secrets.FIREBASE_CLIENT_EMAIL }}",
+              "client_id": "${{ secrets.FIREBASE_CLIENT_ID }}",
+              "auth_uri": "${{ secrets.FIREBASE_AUTH_URI }}",
+              "token_uri": "${{ secrets.FIREBASE_TOKEN_URI }}",
+              "auth_provider_x509_cert_url": "${{ secrets.FIREBASE_AUTH_PROVIDER_CERT_URL }}",
+              "client_x509_cert_url": "${{ secrets.FIREBASE_CLIENT_CERT_URL }}",
+              "universe_domain": "${{ secrets.FIREBASE_UNIVERSE_DOMAIN }}"
+            }' > src/main/resources/ori-push-notification-firebase-adminsdk-k9qqe-d0581b0c52.json
+
+      - name: 테스트 실행
+        run: ./gradlew test
+        env:
+          SPRING_PROFILES_ACTIVE: ci
+          DB_HOST: 127.0.0.1
+          DB_PORT: 3306
+          DB_NAME: test
+          DB_USER: tester
+          DB_PASSWORD: ${{ secrets.TEST_DB_PASSWORD }}
+          REDIS_HOST: 127.0.0.1
+          REDIS_PORT: 6379
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x ./gradlew
+
+      - name: 어플리케이션 실행 테스트(테스트 코드 제외하고 실행)
+        run: ./gradlew clean build --exclude-task test
+
   build:
     name: Run on Ubuntu
     runs-on: ubuntu-latest
@@ -28,8 +111,10 @@ jobs:
         run: chmod +x ./gradlew
 
       - name: Copy private resources
-        run: |
-          ./gradlew copyYml --no-daemon
+        run: ./gradlew copyYml --no-daemon
+
+      - name: Copy private logback config
+        run: ./gradlew copyLog --no-daemon
 
       - name: Create Firebase JSON file
         run: |
@@ -58,7 +143,6 @@ jobs:
         if: github.ref == 'refs/heads/main'
         run: docker build . --tag ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY_NAME }}:prod -f Dockerfile.prod
 
-
       - name: Push Dev Docker image
         if: github.ref == 'refs/heads/dev'
         run: |
@@ -70,7 +154,6 @@ jobs:
         run: |
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
           docker push ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY_NAME }}:prod
-
 
   deploy:
     runs-on: ubuntu-latest
@@ -95,11 +178,10 @@ jobs:
           username: ${{ secrets.DEV_USERNAME }}
           key: ${{ secrets.DEV_PRIVATE_KEY }}
           script: |
-            # 도커 컨테이너 재배포
             sudo docker stop ${{ secrets.DOCKER_CONTAINER_NAME }}
             sudo docker rm ${{ secrets.DOCKER_CONTAINER_NAME }}
             sudo docker rmi ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY_NAME }}:dev
-            sudo docker run -d --name ${{ secrets.DOCKER_CONTAINER_NAME }} --network ${{ secrets.DOCKER_NETWORK_NAME }} -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY_NAME }}:dev
+            sudo docker run -d --name ${{ secrets.DOCKER_CONTAINER_NAME }} --volume /ori/log:/ori/log --network ${{ secrets.DOCKER_NETWORK_NAME }} -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY_NAME }}:dev
 
       - name: Deploy to Main Server
         if: github.ref == 'refs/heads/main'
@@ -109,8 +191,7 @@ jobs:
           username: ${{ secrets.PROD_USERNAME }}
           key: ${{ secrets.PROD_PRIVATE_KEY }}
           script: |
-            # 도커 컨테이너 재배포
             sudo docker stop ${{ secrets.DOCKER_CONTAINER_NAME }}
             sudo docker rm ${{ secrets.DOCKER_CONTAINER_NAME }}
             sudo docker rmi ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY_NAME }}:prod
-            sudo docker run -d --name ${{ secrets.DOCKER_CONTAINER_NAME }} --network ${{ secrets.DOCKER_NETWORK_NAME }} -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY_NAME }}:prod
+            sudo docker run -d --name ${{ secrets.DOCKER_CONTAINER_NAME }} --network ${{ secrets.DOCKER_NETWORK_NAME }} -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY_NAME }}:prod

.gitignore

@@ -37,6 +37,7 @@ out/
 ### YAML Settings ###
 /src/main/resources/*.yml
 /src/test/resources/application-test.yml
+/src/main/resources/logback-spring.xml
 
 ### VS Code ###
 .vscode/

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'org.springframework.boot' version '3.3.4'
     id 'io.spring.dependency-management' version '1.1.6'
-    id 'org.flywaydb.flyway' version '8.5.13'
+    id 'org.flywaydb.flyway' version '11.10.0'
 }
 
 group = 'org.example'
@@ -26,9 +26,12 @@ repositories {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation ('org.springframework.boot:spring-boot-starter-web') {
+        exclude module: 'commons-logging'
+    }
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
     implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-webflux'
 
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
@@ -44,11 +47,14 @@ dependencies {
     implementation 'io.micrometer:micrometer-registry-prometheus'
 
     // Flyway 라이브러리 사용을 위한 기본적인 의존성 추가
-    implementation 'org.flywaydb:flyway-core'
+    implementation 'org.flywaydb:flyway-core:11.10.0'
 
     // MySQL 을 사용해야한다면 추가
     implementation 'org.flywaydb:flyway-mysql'
 
+    // Github API 사용을 위해 추가
+    implementation 'org.kohsuke:github-api:1.327'
+
 
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.mysql:mysql-connector-j'
@@ -68,3 +74,17 @@ tasks.register('copyYml', Copy) {
         into 'src/main/resources'
     }
 }
+
+tasks.register('copyCiYml', Copy) {
+    from 'security_setting'
+    include 'application-ci.yml'
+    into 'src/test/resources'
+}
+
+tasks.register('copyLog', Copy) {
+    copy {
+        from 'security_setting'
+        include "logback-spring.xml"
+        into 'src/main/resources'
+    }
+}

src/main/java/org/example/autoreview/domain/bookmark/CodePostBookmark/controller/CodePostBookmarkController.java

@@ -0,0 +1,50 @@
+package org.example.autoreview.domain.bookmark.CodePostBookmark.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.example.autoreview.domain.bookmark.CodePostBookmark.dto.request.CodePostBookmarkSaveRequestDto;
+import org.example.autoreview.domain.bookmark.CodePostBookmark.dto.response.CodePostBookmarkListResponseDto;
+import org.example.autoreview.domain.bookmark.CodePostBookmark.service.CodePostBookmarkService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "Code Post Bookmark API", description = "Code Post Bookmark API")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/v1/api/post/code/bookmark")
+public class CodePostBookmarkController {
+
+    private final CodePostBookmarkService codePostBookmarkService;
+
+    @Operation(summary = "북마크 저장 또는 수정", description = "soft delete 되었다면 수정, 존재하지 않는다면 저장")
+    @PutMapping
+    public ResponseEntity<Long> saveOrUpdate(@RequestBody CodePostBookmarkSaveRequestDto requestDto,
+                                             @AuthenticationPrincipal UserDetails userDetails) {
+        return ResponseEntity.ok().body(codePostBookmarkService.saveOrUpdate(requestDto, userDetails.getUsername()));
+    }
+
+    @Operation(summary = "북마크 전체 조회")
+    @GetMapping("/list")
+    public ResponseEntity<CodePostBookmarkListResponseDto> findAll(@AuthenticationPrincipal UserDetails userDetails,
+                                                                   @PageableDefault(page = 0, size = 10) Pageable pageable) {
+        return ResponseEntity.ok().body(codePostBookmarkService.findAllByEmail(userDetails.getUsername(), pageable));
+    }
+
+    @Operation(summary = "북마크 삭제")
+    @DeleteMapping
+    public ResponseEntity<String> deleteExpiredSoftDeletedBookmarks() {
+        codePostBookmarkService.deleteExpiredSoftDeletedBookmarks();
+        return ResponseEntity.ok().body("Success Hard Delete");
+    }
+
+}

src/main/java/org/example/autoreview/domain/bookmark/CodePostBookmark/dto/request/CodePostBookmarkSaveRequestDto.java

@@ -0,0 +1,10 @@
+package org.example.autoreview.domain.bookmark.CodePostBookmark.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record CodePostBookmarkSaveRequestDto(
+
+        @Schema(description = "코드 포스트 아이디", example = "1")
+        Long codePostId
+) {
+}

src/main/java/org/example/autoreview/domain/bookmark/CodePostBookmark/dto/response/CodePostBookmarkListResponseDto.java

@@ -0,0 +1,9 @@
+package org.example.autoreview.domain.bookmark.CodePostBookmark.dto.response;
+
+import java.util.List;
+
+public record CodePostBookmarkListResponseDto(
+        List<CodePostBookmarkResponseDto> dtoList,
+        int totalPage
+) {
+}

src/main/java/org/example/autoreview/domain/bookmark/CodePostBookmark/dto/response/CodePostBookmarkResponseDto.java

@@ -0,0 +1,27 @@
+package org.example.autoreview.domain.bookmark.CodePostBookmark.dto.response;
+
+import java.time.LocalDateTime;
+import lombok.Getter;
+import org.example.autoreview.domain.bookmark.CodePostBookmark.entity.CodePostBookmark;
+import org.example.autoreview.domain.codepost.entity.CodePost;
+import org.example.autoreview.domain.member.entity.Member;
+
+@Getter
+public class CodePostBookmarkResponseDto {
+
+    private final Long id;
+    private final Long codePostId;
+    private final String codePostTitle;
+    private final int commentCount;
+    private final String writer;
+    private final LocalDateTime updateAt;
+
+    public CodePostBookmarkResponseDto(CodePostBookmark bookmark, CodePost codePost, Member member) {
+        this.id = bookmark.getId();
+        this.codePostId = codePost.getId();
+        this.codePostTitle = codePost.getTitle();
+        this.commentCount = codePost.getCodePostCommentList().size();
+        this.writer = member.getNickname();
+        this.updateAt = bookmark.getUpdateDate();
+    }
+}

src/main/java/org/example/autoreview/domain/bookmark/CodePostBookmark/entity/CodePostBookmark.java

@@ -0,0 +1,49 @@
+package org.example.autoreview.domain.bookmark.CodePostBookmark.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.example.autoreview.global.common.basetime.BaseEntity;
+import org.hibernate.annotations.ColumnDefault;
+
+@Getter
+@NoArgsConstructor
+@Table(uniqueConstraints = {@UniqueConstraint(name = "uq_email_codepost",
+        columnNames = {"email", "code_post_id"})}
+)
+@Entity
+public class CodePostBookmark extends BaseEntity {
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private String email;
+
+    @Column(nullable = false)
+    private Long codePostId;
+
+    @ColumnDefault("false")
+    @Column(nullable = false)
+    private boolean isDeleted;
+
+    @Builder
+    public CodePostBookmark(Long codePostId, String email, boolean isDeleted) {
+        this.codePostId = codePostId;
+        this.email = email;
+        this.isDeleted = isDeleted;
+    }
+
+    public Long update() {
+        this.isDeleted = !this.isDeleted;
+        return this.id;
+    }
+
+}

src/main/java/org/example/autoreview/domain/bookmark/CodePostBookmark/entity/CodePostBookmarkRepository.java

@@ -0,0 +1,34 @@
+package org.example.autoreview.domain.bookmark.CodePostBookmark.entity;
+
+import io.lettuce.core.dynamic.annotation.Param;
+import java.util.Optional;
+import org.example.autoreview.domain.bookmark.CodePostBookmark.dto.response.CodePostBookmarkResponseDto;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+public interface CodePostBookmarkRepository extends JpaRepository<CodePostBookmark,Long> {
+
+    @Modifying
+    @Query(
+        value = " INSERT INTO code_post_bookmark (email, code_post_id, is_deleted, create_date, update_date) " +
+                " VALUES (:email, :codePostId, false, NOW(), NOW()) " +
+                " ON DUPLICATE KEY UPDATE is_deleted = NOT is_deleted, update_date = NOW() ",
+        nativeQuery = true
+    )
+    void upsert(@Param("email") String email, @Param("codePostId") Long codePostId);
+
+
+    @Query("SELECT b FROM CodePostBookmark b WHERE b.email = :email AND b.codePostId = :codePostId")
+    Optional<CodePostBookmark> findById(@Param("email") String email, @Param("codePostId") Long codePostId);
+
+    @Query("SELECT new org.example.autoreview.domain.bookmark.CodePostBookmark.dto.response.CodePostBookmarkResponseDto(b,c,m) from CodePostBookmark b "
+            + "JOIN CodePost c ON b.codePostId = c.id JOIN Member m ON m.id = c.writerId WHERE b.isDeleted = FALSE AND b.email = :email")
+    Page<CodePostBookmarkResponseDto> findAllByEmail(@Param("email") String email, Pageable pageable);
+
+    @Modifying
+    @Query("DELETE FROM CodePostBookmark b WHERE b.isDeleted = TRUE")
+    void deleteExpiredSoftDeletedBookmarks();
+}