[CMAT-41] CICD 구축

.github/workflows/deploy.yml

@@ -0,0 +1,67 @@
+name: Spring Boot & Gradle CI/CD
+
+on:
+  push:
+    branches: 
+      - develop
+  pull_request:
+    branches:
+      - develop
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      # JDK 17 설치
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: make application.yml
+        run: |
+          cd ./src/main/resources
+          touch ./application-dev.yml
+          echo "${{ secrets.APPLICATION_DEV_YML }}" >> ./application-dev.yml
+        shell: bash
+
+      # gradlew에 실행 권한을 부여합니다.
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+        # test는 CI 과정에서 수행되므로 여기서는 `-x`로 테스트를 생략했습니다.
+        # `--stacktrace`로 더 자세한 로그가 출력되게 해줍니다.
+      - name: Build with Gradle (without Test)
+        run: ./gradlew clean build -x test --stacktrace
+
+        # docker hub에 로그인하고 이미지를 빌드합니다. 이후에 push를 진행합니다.
+        # docker_username을 적지 않으면 push 시에 요청이 거부될 수 있습니다.
+      - name: Docker Hub build & push
+        run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -t ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }} .
+          docker push ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }}
+
+        # EC2에 접속하고 배포합니다.
+      - name: Deploy
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+
+          script: |
+            cd /home/ubuntu/Server
+            sudo docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+            sudo docker rm -f $(sudo docker ps -qa)
+            sudo docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }}
+            sudo docker-compose up -d
+            sudo docker image prune -f

.gitignore

@@ -36,4 +36,4 @@ out/
 ### VS Code ###
 .vscode/
 
-application.yml
+application-dev.yml

Dockerfile

@@ -0,0 +1,4 @@
+FROM openjdk:17
+ARG JAR_FILE=build/libs/*.jar
+COPY ${JAR_FILE} app.jar
+ENTRYPOINT ["java","-jar","-Dspring.profiles.active=dev","/app.jar"]

docker-compose.yml

@@ -0,0 +1,15 @@
+version: '3'
+
+services:
+  redis:
+    image: redis
+    ports:
+      - "6379:6379"
+
+  application:
+    container_name: springboot
+    image: ${DOCKER_USERNAME}/${DOCKER_REPO}
+    ports:
+      - "8080:8080"
+    expose:
+      - "8080"

src/main/java/UMC/career_mate/domain/answer/controller/AnswerController.java

@@ -5,7 +5,9 @@
 import UMC.career_mate.domain.answer.dto.response.AnswerInfoListDTO;
 import UMC.career_mate.domain.answer.service.AnswerCommandService;
 import UMC.career_mate.domain.answer.service.AnswerQueryService;
+import UMC.career_mate.domain.member.Member;
 import UMC.career_mate.domain.template.enums.TemplateType;
+import UMC.career_mate.global.annotation.LoginMember;
 import UMC.career_mate.global.response.ApiResponse;
 import UMC.career_mate.global.response.result.code.CommonResultCode;
 import io.swagger.v3.oas.annotations.Operation;
@@ -107,9 +109,9 @@ public class AnswerController {
                             ```
                             """
     )
-    public ApiResponse<CommonResultCode> saveAnswerList(@RequestParam Long memberId,
+    public ApiResponse<CommonResultCode> saveAnswerList(@LoginMember Member member,
                                                         @Valid @RequestBody AnswerCreateOrUpdateDTO answerCreateOrUpdateDTO) {
-        answerCommandService.saveAnswerList(memberId, answerCreateOrUpdateDTO);
+        answerCommandService.saveAnswerList(member, answerCreateOrUpdateDTO);
         return ApiResponse.onSuccess(CREATE_ANSWER_LIST);
     }
 
@@ -205,9 +207,9 @@ public ApiResponse<List<AnswerInfoListDTO>> getAnswerList(@RequestParam Long mem
                             ```
                             """
     )
-    public ApiResponse<CommonResultCode> updateAnswerList(@RequestParam Long memberId,
+    public ApiResponse<CommonResultCode> updateAnswerList(@LoginMember Member member,
                                                           @Valid @RequestBody AnswerCreateOrUpdateDTO answerCreateOrUpdateDTO) {
-        answerCommandService.updateAnswerList(memberId, answerCreateOrUpdateDTO);
+        answerCommandService.updateAnswerList(member, answerCreateOrUpdateDTO);
         return ApiResponse.onSuccess(UPDATE_ANSWER_LIST);
     }
 
@@ -259,7 +261,7 @@ public ApiResponse<CommonResultCode> updateAnswerList(@RequestParam Long memberI
                             ```
                             """
     )
-    public ApiResponse<AnswerCompletionStatusInfoListDTO> getAnswerCompletionStatus(@RequestParam Long memberId) {
-        return ApiResponse.onSuccess(GET_ANSWER_COMPLETION_STATUS, answerQueryService.getAnswerCompletionStatus(memberId));
+    public ApiResponse<AnswerCompletionStatusInfoListDTO> getAnswerCompletionStatus(@LoginMember Member member) {
+        return ApiResponse.onSuccess(GET_ANSWER_COMPLETION_STATUS, answerQueryService.getAnswerCompletionStatus(member));
     }
 }

src/main/java/UMC/career_mate/domain/answer/converter/AnswerConverter.java

@@ -14,7 +14,6 @@
 import java.util.stream.Collectors;
 
 public class AnswerConverter {
-
     public static Answer toAnswer(AnswerCreateOrUpdateDTO.AnswerInfo answerInfo, Member member, Question question, long sequence) {
         return Answer.builder()
                 .content(answerInfo.content())

src/main/java/UMC/career_mate/domain/answer/service/AnswerCommandService.java

@@ -24,12 +24,9 @@ public class AnswerCommandService {
     private final MemberRepository memberRepository;
 
     @Transactional
-    public void saveAnswerList(Long memberId, AnswerCreateOrUpdateDTO answerCreateOrUpdateDTO) {
+    public void saveAnswerList(Member member, AnswerCreateOrUpdateDTO answerCreateOrUpdateDTO) {
         long start_sequence = 1L;
 
-        Member member = memberRepository.findById(memberId)
-                .orElseThrow(() -> new GeneralException(CommonErrorCode.BAD_REQUEST));
-
         for (AnswerList answerList : answerCreateOrUpdateDTO.answerList()) {
             for (AnswerInfo answerInfo : answerList.answerInfoList()) {
                 Question question = questionRepository.findById(answerInfo.questionId())
@@ -43,10 +40,7 @@ public void saveAnswerList(Long memberId, AnswerCreateOrUpdateDTO answerCreateOr
     }
 
     @Transactional
-    public void updateAnswerList(Long memberId, AnswerCreateOrUpdateDTO request) {
-        Member member = memberRepository.findById(memberId)
-                .orElseThrow(() -> new GeneralException(CommonErrorCode.BAD_REQUEST));
-
+    public void updateAnswerList(Member member, AnswerCreateOrUpdateDTO request) {
         for (AnswerList answerList : request.answerList()) {
             for (AnswerInfo answerInfo : answerList.answerInfoList()) {
                 Question question = questionRepository.findById(answerInfo.questionId())

src/main/java/UMC/career_mate/domain/answer/service/AnswerQueryService.java

@@ -43,10 +43,7 @@ public List<AnswerInfoListDTO> getAnswersByTemplateType(Long memberId, TemplateT
     }
 
     @Transactional(readOnly = true)
-    public AnswerCompletionStatusInfoListDTO getAnswerCompletionStatus(Long memberId) {
-        Member member = memberRepository.findById(memberId)
-                .orElseThrow(() -> new GeneralException(CommonErrorCode.BAD_REQUEST));
-
+    public AnswerCompletionStatusInfoListDTO getAnswerCompletionStatus(Member member) {
         List<AnswerCompletionStatusInfoDTO> answerCompletionStatusInfoDTOList = new ArrayList<>();
         boolean isAllCompleted = true;