Merge remote-tracking branch 'origin/main'

kea-momentum · Aug 26, 2023 · b4a2035 · b4a2035
2 parents c1c8ff6 + 0fa7a2d
commit b4a2035
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -6,13 +6,13 @@ on:
   # Triggers the workflow on push or pull request events but only for the "main" branch
   push:
     branches:
-      - develop
+      - main
 
 env:
   AWS_REGION: ap-northeast-2
   S3_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
-  CODE_DEPLOY_APPLICATION_NAME: releaser-codedeploy-app
-  CODE_DEPLOY_DEPLOYMENT_GROUP_NAME: releaser-codedeploy-app-group
+  CODE_DEPLOY_APPLICATION_NAME: gcu_hac_007
+  CODE_DEPLOY_DEPLOYMENT_GROUP_NAME: gcu_hac_007
 
 permissions:
   contents: read
@@ -121,8 +121,8 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-region: ${{ env.AWS_REGION }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-access-key-id: ${{ secrets.AWS_IAM_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.AWS_IAM_SECRET_KEY }}
 
       # 빌드 결과물을 S3에 업로드
       - name: Upload to AWS S3

diff --git a/src/main/java/com/momentum/releaser/domain/issue/application/IssueServiceImpl.java b/src/main/java/com/momentum/releaser/domain/issue/application/IssueServiceImpl.java
@@ -731,6 +731,7 @@ private String changeLifeCycle(Issue issue, Integer index, String destLifeCycle)
 
                 // 변경할 순서인덱스가 0이상이고 이슈 리스트보다 작을 경우
                 if (index >= 0 && index < issueList.size()) {
+
                     // 변경당할 인덱스를 가진 이슈 정보
                     IssueStatus targetIssue = issueList.stream().filter(sameIssue -> sameIssue.getIssueId().equals(issue.getIssueId())).findFirst().get();
                     // 해당 Index를 가진 기존 이슈 정보

diff --git a/src/main/java/com/momentum/releaser/domain/user/application/AuthServiceImpl.java b/src/main/java/com/momentum/releaser/domain/user/application/AuthServiceImpl.java
@@ -79,6 +79,7 @@ public class AuthServiceImpl implements AuthService {
     public UserInfoResponseDTO addSignUpUser(UserInfoReqestDTO userInfoReq) {
         // Email 중복 체크
         validateUniqueEmail(userInfoReq.getEmail());
+        log.info("회원가입 중복 체크");
         // 사용자 정보 저장
         User user = createUser(userInfoReq);
         // 패스워드 암호화 후 저장
@@ -99,6 +100,7 @@ public UserInfoResponseDTO addSignUpUser(UserInfoReqestDTO userInfoReq) {
     public TokenDto saveLoginUser(UserLoginReqestDTO userLoginReq) {
         // 로그인한 유저 정보 저장
         Authentication authentication = authenticateUser(userLoginReq.getEmail(), userLoginReq.getPassword());
+        log.info("유저 정보 저장");
         // Token 생성
         TokenDto tokenDto = jwtTokenProvider.generateToken(authentication);
         // Refresh Token 관리

diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
@@ -4,9 +4,10 @@
     <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
 
     <!-- 환경 변수 -->
-    <property name="CONSOLE_LOG_PATTERN" value="%d{HH:mm:ss.SSS, ${logback.timezone:-Asia/Seoul}} [%thread] %clr(%5level) %cyan(%logger) - %msg%n"/>
-    <property name="FILE_LOG_PATTERN" value="%d{HH:mm:ss.SSS, ${logback.timezone:-Asia/Seoul}} [%thread] %5level %logger - %msg%n"/>
-    <property name="SLACK_LOG_PATTERN" value="%d{HH:mm:ss.SSS, ${logback.timezone:-Asia/Seoul}} [%thread] %5level %logger %n %n %msg %n"/>
+    <property name="CONSOLE_LOG_PATTERN"
+              value="%d{yyyy-MM-dd HH:mm:ss.SSS, ${logback.timezone:-Asia/Seoul}} [%thread] %clr(%5level) %cyan(%logger) - %msg%n"/>
+    <property name="FILE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS, ${logback.timezone:-Asia/Seoul}} [%thread] %5level %logger - %msg%n"/>
+    <property name="SLACK_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS, ${logback.timezone:-Asia/Seoul}} [%thread] %5level %logger %n %n %msg %n"/>
     <springProperty name="SLACK_WEBHOOK_URL_DEV_WARN" source="logging.slack.webhook-url-dev-warn"/>
     <springProperty name="SLACK_WEBHOOK_URL_DEV_ERROR" source="logging.slack.webhook-url-dev-error"/>
     <springProperty name="SLACK_WEBHOOK_URL_PROD_ERROR" source="logging.slack.webhook-url-prod-error"/>
@@ -32,8 +33,11 @@
                 <pattern>
                     <pattern>
                         {
-                        "timestamp": "%date{yyyyMMdd HHmmss.SSSSSS}",
-                        "message": "%message"
+                        "timestamp": "%d{yyyy-MM-dd HH:mm:ss.SSS, ${logback.timezone:-Asia/Seoul}}",
+                        "log.level": "%-5level",
+                        "message": "%message",
+                        "process.thread.name": "%t",
+                        "log.logger": "%C{2}"
                         }
                     </pattern>
                 </pattern>
@@ -45,7 +49,7 @@
         </encoder>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>./logs/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>./logs/info-%d{yyyy-MM-dd, ${logback.timezone:-Asia/Seoul}}.%i.log</fileNamePattern>
             <maxFileSize>100MB</maxFileSize>
             <maxHistory>30</maxHistory>
         </rollingPolicy>
@@ -65,8 +69,11 @@
                 <pattern>
                     <pattern>
                         {
-                        "timestamp": "%date{yyyyMMdd HHmmss.SSSSSS}",
+                        "timestamp": "%d{yyyy-MM-dd HH:mm:ss.SSS, ${logback.timezone:-Asia/Seoul}}",
+                        "log.level": "%-5level",
                         "message": "%yellow(%message)",
+                        "process.thread.name": "%t",
+                        "log.logger": "%C{2}",
                         "stacktrace": "%rEx"
                         }
                     </pattern>
@@ -79,7 +86,7 @@
         </encoder>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>./logs/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>./logs/warn-%d{yyyy-MM-dd, ${logback.timezone:-Asia/Seoul}}.%i.log</fileNamePattern>
             <maxFileSize>100MB</maxFileSize>
             <maxHistory>30</maxHistory>
         </rollingPolicy>
@@ -99,8 +106,11 @@
                 <pattern>
                     <pattern>
                         {
-                        "timestamp": "%date{yyyyMMdd HHmmss.SSSSSS}",
+                        "timestamp": "%d{yyyy-MM-dd HH:mm:ss.SSS, ${logback.timezone:-Asia/Seoul}}",
+                        "log.level": "%-5level",
                         "message": "%message",
+                        "process.thread.name": "%t",
+                        "log.logger": "%C{2}",
                         "stacktrace": "%rEx"
                         }
                     </pattern>
@@ -113,7 +123,7 @@
         </encoder>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>./logs/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>./logs/error-%d{yyyy-MM-dd, ${logback.timezone:-Asia/Seoul}}.%i.log</fileNamePattern>
             <maxFileSize>100MB</maxFileSize>
             <maxHistory>30</maxHistory>
         </rollingPolicy>