Update : CI-CD pipeline update

MADA-UMC · Mar 8, 2024 · 5657e52 · 5657e52
1 parent 2b37683
commit 5657e52
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 42 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -33,7 +33,21 @@ jobs:
         with:
           java-version: '17'
           distribution: 'temurin'
-
+      - name: copy properties
+        run: |
+          cd ./src/main
+          mkdir resources
+          cd ./resources
+          touch ./application.properties
+          touch ./application-DB.properties
+          touch ./application-jwt.properties
+          touch ./application-oauth2.properties
+          touch ./application-s3.properties
+          echo "${{secrets.APPLICATION_PROPERTIES}}" > ./application.properties
+          echo "&{{secrets.APPLICATION_DB_PROPERTIES}}" > ./application-DB.properties
+          echo "&{{secrets.APPLICATION_JWT_PROPERTIES}}" > ./application-jwt.properties
+          echo "&{{secrets.APPLICATION_S3_PROPERTIES}}" > ./application-s3.properties
+          echo "&{{secrets.APPLICATION_OAUTH2_PROPERTIES}}" > ./application-oauth2.properties
       # gradle wrapper 파일에 실행 권한을 부여
       # gradle wrapper = 개발자가 특정 버전의 Gradle을 미리 설치하지 않고도 Gradle 빌드를 실행할 수 있게 해주는 편리한 도구
       - name: Grant execute permission for gradlew
@@ -47,15 +61,9 @@ jobs:
       - name: Create Docker Images
         run : |
           docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker build -t ${{ secrets.DOCKER_USERNAME }}/mada-project .
-          docker push ${{ secrets.DOCKER_USERNAME }}/mada-project
+          docker build -t ${{ secrets.DOCKER_USERNAME }}/mada-project:latest .
+          docker push ${{ secrets.DOCKER_USERNAME }}/mada-project:latest
 
-      # 빌드해서 생긴 JAR 파일을 깃허브 아티팩트로 업로드!!
-      #- name: Upload build artifact
-      #  uses: actions/upload-artifact@v4
-      #  with:
-      #    name: trelloServer
-      #    path: build/libs/trelloServer-0.0.1-SNAPSHOT.jar
 
   # 배포 **
   deploy:
@@ -72,19 +80,7 @@ jobs:
           username: ${{ secrets.EC2_USERNAME }}
           key: ${{ secrets.EC2_SSH_KEY }}
           script: |
-            sudo docker ps
-            sudo docker pull ${{ secrets.DOCKER_USERNAME }}/mada-project
-            sudo docker run -d -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/mada-project
-            sudo docker image prune -f
-      # EC2에 배포
-      # EC2 SSH 키를 private_key.pem 파일로 저장 ( 위치는 GitHub 서버 )
-      # SCP를 사용하여 JAR 파일을 EC2 서버로 복사
-      # SSH를 사용하여 EC2 서버에 연결하고 현재 실행 중인 Java 프로세스를 종료한 다음 새로운 Java 프로세스 생성 및 실행!!
-      ## NLP 적용하면 IP -> 도메인으로 수정 + EC2 늘리면 run 추가
-      #- name: Deploy to EC2
-      #  run: |
-      #    echo "${{ secrets.EC2_SSH_KEY }}" > private_key.pem
-      #    chmod 600 private_key.pem
-      #    scp -i private_key.pem -o StrictHostKeyChecking=no build/libs/trelloServer-0.0.1-SNAPSHOT.jar ${{ secrets.EC2_USERNAME }}@${{ secrets.EC2_HOST }}:/home/${{ secrets.EC2_USERNAME }}/trelloServer.jar
-      #    ssh -i private_key.pem -o StrictHostKeyChecking=no ${{ secrets.EC2_USERNAME }}@${{ secrets.EC2_HOST }} "pgrep java | xargs kill -9; nohup java -jar /home/${{ secrets.EC2_USERNAME }}/trelloServer.jar > app.log 2>&1 &"
-      #    rm -f private_key.pem
+            sudo docker pull ${{ secrets.DOCKER_USERNAME }}/mada-project:latest
+            sudo docker stop $(docker ps -a -q)
+            sudo docker run -d -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/mada-project:latest
+            docker image prune -a -f
diff --git a/src/main/java/com/umc/mada/calendar/service/CalendarService.java b/src/main/java/com/umc/mada/calendar/service/CalendarService.java
@@ -10,14 +10,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
+@Transactional
 public class CalendarService {
     private final CalendarRepository calendarRepository;
-
     private final UserRepository userRepository;
 
 
@@ -27,11 +28,6 @@ public CalendarService(CalendarRepository calendarRepository ,UserRepository use
         this.userRepository = userRepository;
     }
 
-//
-//    public Map<String ,Object> getCalendar(Authentication authentication,CalendarRequestDto calendarRequestDto){
-//        calendarRepository.find
-//    }
-
 
     public Map<String, Object> readDday(Authentication authentication){
         User user = this.getUser(authentication);
@@ -87,17 +83,6 @@ public Map<String,Object> readDayCalendars(Authentication authentication, LocalD
     }
 
 
-//    public Map<String,Object> readRepeats(Authentication authentication) {
-//        User user = this.getUser(authentication);
-//        List<Calendar> calendarList = calendarRepository.findCalendarsByUserAndRepeatIsNotContaining(user,"No").stream().filter(calendar -> !calendar.isExpired()).collect(Collectors.toList());
-//        List<CalendarResponseDto> calendarResponseDtoList =  calendarList.stream().map(this::calendarToDto).collect(Collectors.toList());
-//        Map<String, Object> map = new LinkedHashMap<>();
-//        Map<String ,Object> data = new LinkedHashMap<>();
-//        data.put("startTodoAtMonday",user.isStartTodoAtMonday());
-//        data.put("calendars",calendarResponseDtoList);
-//        map.put("data",data);
-//        return map;
-//    }
     public Map<String, Object> readCalendars(Authentication authentication) {
         User user = this.getUser(authentication);
         List<Calendar> calendarList = calendarRepository.findAllByUser(user).stream().filter(calendar -> !calendar.isExpired()).collect(Collectors.toList());;