v1.2.0

v1.2.0

.github/CODEOWNERS

@@ -1 +1 @@
-* @char-yb @dbscks97 @kwanok
+* @char-yb @dbscks97

.github/workflows/develop-deploy.yml

@@ -0,0 +1,45 @@
+name: Develop Deploy
+
+on:
+  workflow_dispatch:
+    inputs:
+      commit_hash:
+        description: 'commit_hash'
+        required: true
+
+env:
+  DOCKERHUB_IMAGE_NAME: walwal-server
+
+jobs:
+  build-deploy:
+    runs-on: ubuntu-latest
+    environment: DEV
+    steps:
+      # EC2로 배포
+      - name: Deploy to EC2 Server
+        uses: appleboy/[email protected]
+        env:
+          IMAGE_FULL_URL: ${{ steps.metadata.outputs.tags }}
+          DOCKERHUB_IMAGE_NAME: ${{ env.DOCKERHUB_IMAGE_NAME }}
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          envs: IMAGE_FULL_URL, DOCKERHUB_IMAGE_NAME # docker-compose.yml 에서 사용할 환경 변수
+          debug: true
+          script: |
+            echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
+            docker compose up -d
+            docker exec -d nginx nginx -s reload
+            docker image prune -a -f
+
+      ## Slack
+      - name: Slack Alarm
+        uses: 8398a7/action-slack@v3
+        with:
+          status: ${{ job.status }}
+          author_name: GitHub-Actions CI/CD
+          fields: repo,message,commit,author,ref,job,took
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # required
+        if: always() # Pick up events even if the job fails or is canceled.

.github/workflows/production-deploy.yml

@@ -0,0 +1,44 @@
+name: Production Deploy
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'version'
+        required: true
+
+env:
+  DOCKERHUB_IMAGE_NAME: walwal-server
+
+jobs:
+  build-deploy:
+    runs-on: ubuntu-latest
+    environment: PROD
+    steps:
+      - name: Deploy to EC2 Server
+        uses: appleboy/ssh-action@master
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          IMAGE_FULL_URL: ${{ steps.metadata.outputs.tags }}
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          envs: IMAGE_FULL_URL # docker-compose.yaml 에서 사용할 환경 변수
+          script: |
+            aws s3 cp ${{ env.S3_COPY_PATH }} docker-compose.yaml
+            echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
+            docker pull ${{ env.IMAGE_FULL_URL }}
+            docker compose up -d
+            docker image prune -a -f
+
+      ## Slack
+      - name: Slack Alarm
+        uses: 8398a7/action-slack@v3
+        with:
+          status: ${{ job.status }}
+          author_name: GitHub-Actions CI/CD
+          fields: repo,message,commit,author,ref,job,took
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # required
+        if: always() # Pick up events even if the job fails or is canceled.

src/main/java/com/depromeet/stonebed/domain/auth/application/AuthService.java

@@ -8,7 +8,9 @@
 import com.depromeet.stonebed.domain.auth.dto.response.AuthTokenResponse;
 import com.depromeet.stonebed.domain.auth.dto.response.SocialClientResponse;
 import com.depromeet.stonebed.domain.auth.dto.response.TokenPairResponse;
+import com.depromeet.stonebed.domain.comment.dao.CommentRepository;
 import com.depromeet.stonebed.domain.fcm.dao.FcmNotificationRepository;
+import com.depromeet.stonebed.domain.fcm.dao.FcmTokenRepository;
 import com.depromeet.stonebed.domain.member.dao.MemberRepository;
 import com.depromeet.stonebed.domain.member.domain.Member;
 import com.depromeet.stonebed.domain.member.domain.MemberRole;
@@ -38,6 +40,8 @@ public class AuthService {
     private final MemberRepository memberRepository;
     private final MissionRecordRepository missionRecordRepository;
     private final MissionRecordBoostRepository missionRecordBoostRepository;
+    private final FcmTokenRepository fcmTokenRepository;
+    private final CommentRepository commentRepository;
 
     private final AppleClient appleClient;
     private final KakaoClient kakaoClient;
@@ -176,8 +180,9 @@ private void updateMemberNormalStatus(Member member) {
     }
 
     private void withdrawMemberRelationByMemberId(List<Long> recordIds, Long memberId) {
-        missionRecordBoostRepository.deleteAllByMember(recordIds);
+        missionRecordBoostRepository.deleteAllByRecordIds(recordIds);
         missionRecordRepository.deleteAllByMember(memberId);
         fcmNotificationRepository.deleteAllByMember(memberId);
+        fcmTokenRepository.deleteAllByMember(memberId);
     }
 }

src/main/java/com/depromeet/stonebed/domain/comment/api/CommentController.java

@@ -0,0 +1,41 @@
+package com.depromeet.stonebed.domain.comment.api;
+
+import com.depromeet.stonebed.domain.comment.application.CommentService;
+import com.depromeet.stonebed.domain.comment.dto.request.CommentCreateRequest;
+import com.depromeet.stonebed.domain.comment.dto.response.CommentCreateResponse;
+import com.depromeet.stonebed.domain.comment.dto.response.CommentFindResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "9. [댓글]", description = "댓글 관련 API입니다.")
+@RequestMapping("/comments")
+@RestController
+@RequiredArgsConstructor
+public class CommentController {
+
+    private final CommentService commentService;
+
+    @Operation(summary = "댓글 작성", description = "댓글을 작성합니다.")
+    @PostMapping
+    public ResponseEntity<CommentCreateResponse> commentCreate(
+            @RequestBody @Valid CommentCreateRequest request) {
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(commentService.createComment(request));
+    }
+
+    @Operation(summary = "댓글 조회", description = "댓글을 조회합니다.")
+    @GetMapping
+    public CommentFindResponse commentFind(@RequestParam Long recordId) {
+        return commentService.findCommentsByRecordId(recordId);
+    }
+}