CD Workflow 수정 (#21)

* feat: ci workflow 작성 * feat: cd workflow 작성 * fix: mysql actions step 삭제 * fix: docker image 태그 제거 * fix: cd 파이프라인 trigger 브랜치명 수정(develop->dev) * fix: gradle build 과정 추가 * fix: gradle build 과정 추가 * fix: cd 파이프라인 임시 수정 * fix: cd 파이프라인 임시 수정 사항 삭제 * fix: gradlew 권한 수정 * fix: 테스트 실패 오류 해결
CollaBu · Mar 26, 2024 · e09ab66 · e09ab66
1 parent 1b41db4
commit e09ab66
Show file tree

Hide file tree

Showing 8 changed files with 396 additions and 360 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -44,14 +44,21 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      # 3. Docker 이미지 build 및 push
+      # 3. Build Gradle
+      - name: Build Gradle
+        run: |
+          chmod +x ./gradlew
+          ./gradlew build --stacktrace --info -x test
+        shell: bash
+
+      # 4. Docker 이미지 build 및 push
       - name: docker build and push
         run: |
           docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
           docker build -t jinlee1703/pennyway-was .
           docker push jinlee1703/pennyway-was
 
-      # 4. AWS SSM을 통한 Run-Command (Docker 이미지 pull 후 docker-compose를 통한 실행)
+      # 5. AWS SSM을 통한 Run-Command (Docker 이미지 pull 후 docker-compose를 통한 실행)
       - name: AWS SSM Send-Command
         uses: peterkimzz/aws-ssm-send-command@master
         id: ssm

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -46,4 +46,6 @@ jobs:
 
       # 3. Gradle Test 실행
       - name: Test with Gradle
-        run: ./gradlew --info test
+        run: |
+          chmod +x ./gradlew
+          ./gradlew --info test
diff --git a/build.gradle b/build.gradle
@@ -1,50 +1,61 @@
 buildscript {
-	repositories {
-		mavenCentral()
-	}
+    repositories {
+        mavenCentral()
+    }
 }
 
 plugins {
-	id 'java'
-	id 'org.springframework.boot' version '3.2.3'
-	id 'io.spring.dependency-management' version '1.1.4'
+    id 'java'
+    id 'org.springframework.boot' version '3.2.3'
+    id 'io.spring.dependency-management' version '1.1.4'
 }
 
 group = 'kr.co'
 version = '0.0.1-SNAPSHOT'
 
-bootJar {enabled = false}
-jar {enabled = true}
+bootJar { enabled = false }
+jar { enabled = true }
 
 allprojects {
-	group = 'kr.co'
-	version = '0.0.1-SNAPSHOT'
-	sourceCompatibility = '17'
+    group = 'kr.co'
+    version = '0.0.1-SNAPSHOT'
+    sourceCompatibility = '17'
 }
 
 subprojects {
-	apply plugin: "java"
-	apply plugin: 'java-library'
-	apply plugin: "io.spring.dependency-management"
-	apply plugin: "org.springframework.boot"
-
-	repositories {
-		mavenCentral()
-	}
-
-	configurations {
-		compileOnly {
-			extendsFrom annotationProcessor
-		}
-	}
-
-	dependencies {
-		compileOnly 'org.projectlombok:lombok'
-		annotationProcessor 'org.projectlombok:lombok'
-		annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
-
-		testImplementation 'org.springframework.boot:spring-boot-starter-test'
-		testCompileOnly 'org.projectlombok:lombok'
-		testAnnotationProcessor 'org.projectlombok:lombok'
-	}
+    apply plugin: "java"
+    apply plugin: 'java-library'
+    apply plugin: "io.spring.dependency-management"
+    apply plugin: "org.springframework.boot"
+
+    repositories {
+        mavenCentral()
+    }
+
+    configurations {
+        compileOnly {
+            extendsFrom annotationProcessor
+        }
+    }
+
+    dependencies {
+        compileOnly 'org.projectlombok:lombok'
+        annotationProcessor 'org.projectlombok:lombok'
+        annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
+
+        testImplementation 'org.springframework.boot:spring-boot-starter-test'
+        testCompileOnly 'org.projectlombok:lombok'
+        testAnnotationProcessor 'org.projectlombok:lombok'
+    }
+
+    test {
+        useJUnitPlatform()
+        testLogging {
+            showStandardStreams = true
+            showCauses = true
+            showExceptions = true
+            showStackTraces = true
+            exceptionFormat = 'full'
+        }
+    }
 }
diff --git a/...ay-app-external-api/src/main/java/kr/co/pennyway/api/apis/auth/helper/UserSyncHelper.java b/...ay-app-external-api/src/main/java/kr/co/pennyway/api/apis/auth/helper/UserSyncHelper.java
@@ -14,29 +14,31 @@
 @Helper
 @RequiredArgsConstructor
 public class UserSyncHelper {
-    private final UserService userService;
 
-    /**
-     * 일반 회원가입 시 이미 가입된 회원인지 확인
-     *
-     * @param phone String : 전화번호
-     * @return Pair<Boolean, String> : 이미 가입된 회원인지 여부 (TRUE: 가입되지 않은 회원, FALSE: 가입된 회원), 가입된 회원인 경우 회원 ID 반환
-     * @throws UserErrorException : 이미 일반 회원가입을 한 유저인 경우
-     */
-    public Pair<Boolean, String> isSignedUserWhenGeneral(String phone) {
-        User user;
-        try {
-            user = userService.readUserByPhone(phone);
-        } catch (GlobalErrorException e) {
-            log.info("User not found. phone: {}", phone);
-            return Pair.of(Boolean.TRUE, null);
-        }
+  private final UserService userService;
 
-        if (user.getPassword() != null) {
-            log.warn("User already exists. phone: {}", phone);
-            throw new UserErrorException(UserErrorCode.ALREADY_SIGNUP);
-        }
+  /**
+   * 일반 회원가입 시 이미 가입된 회원인지 확인
+   *
+   * @param phone String : 전화번호
+   * @return Pair<Boolean, String> : 이미 가입된 회원인지 여부 (TRUE: 가입되지 않은 회원, FALSE: 가입된 회원), 가입된 회원인 경우 회원
+   * ID 반환
+   * @throws UserErrorException : 이미 일반 회원가입을 한 유저인 경우
+   */
+  public Pair<Boolean, String> isSignedUserWhenGeneral(String phone) {
+    User user;
+    try {
+      user = userService.readUserByPhone(phone);
+    } catch (GlobalErrorException e) {
+      log.info("User not found. phone: {}", phone);
+      return Pair.of(Boolean.FALSE, null);
+    }
 
-        return Pair.of(Boolean.FALSE, user.getUsername());
+    if (user.getPassword() != null) {
+      log.warn("User already exists. phone: {}", phone);
+      throw new UserErrorException(UserErrorCode.ALREADY_SIGNUP);
     }
+
+    return Pair.of(Boolean.TRUE, user.getUsername());
+  }
 }