[refacter] 주석 제거 및 UserRole 칼럼명 수정

W-llama · Sep 29, 2024 · 74210cd · 74210cd
1 parent 7549645
commit 74210cd
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 96 deletions.
diff --git a/.github/workflows/docker-image-qa.yml b/.github/workflows/docker-image-qa.yml
@@ -14,38 +14,32 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # java version 지정
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'
 
-      # 권한 부여
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      # Build
       - name: Build with Gradle
         run: ./gradlew clean build
 
-      # Docker Image 빌드
       - name: Build the Docker image
         run: docker build . --file Dockerfile --tag ${{ secrets.QA_DOCKERHUB_USERNAME }}/${{ env.DOCKER_IMAGE_TAG_NAME }}:latest
 
-      # Docker 로큰
       - name: Login to Docker Hub using Access Token
         run: echo "${{ secrets.QA_DOCKERHUB_TOKEN }}" | docker login -u ${{ secrets.QA_DOCKERHUB_USERNAME }} --password-stdin
 
-      # 이미지 푸시
       - name: Push the Docker image
         run: docker push ${{ secrets.QA_DOCKERHUB_USERNAME }}/${{ env.DOCKER_IMAGE_TAG_NAME }}:latest
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
   deploy-to-ec2:
-    needs: build-and-docker-push # 위의 build-and-docker-push 이 끝나고 실행
+    needs: build-and-docker-push
     runs-on: ubuntu-latest
 
     steps:
@@ -62,7 +56,7 @@ jobs:
               sudo docker stop $CONTAINER_ID
               sudo docker rm $CONTAINER_ID
             fi
-            # 여기서의 환경 변수도 여러분 상황에 맞게 작성하시면 됩니다!!!
+            
             sudo docker pull ${{ secrets.QA_DOCKERHUB_USERNAME }}/${{ env.DOCKER_IMAGE_TAG_NAME }}:latest
             sudo docker run -d -p 8080:8080 \
                 -e DB_USERNAME=${{secrets.DB_USERNAME}} \

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -14,30 +14,24 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # java version 지정
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'
 
-      # 권한 부여
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      # Build
       - name: Build with Gradle
         run: ./gradlew clean build
 
-      # Docker Image 빌드
       - name: Build the Docker image
         run: docker build . --file Dockerfile --tag ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.DOCKER_IMAGE_TAG_NAME }}:latest
 
-      # Docker 로큰
       - name: Login to Docker Hub using Access Token
         run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
 
-      # 이미지 푸시
       - name: Push the Docker image
         run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.DOCKER_IMAGE_TAG_NAME }}:latest
 
@@ -46,7 +40,7 @@ jobs:
 
 
   deploy-to-ec2:
-    needs: build-and-docker-push # 위의 build-and-docker-push 이 끝나고 실행
+    needs: build-and-docker-push
     runs-on: ubuntu-latest
 
     steps:
@@ -63,7 +57,7 @@ jobs:
               sudo docker stop $CONTAINER_ID
               sudo docker rm $CONTAINER_ID
             fi
-            # 여기서의 환경 변수도 여러분 상황에 맞게 작성하시면 됩니다!!!
+            
             sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.DOCKER_IMAGE_TAG_NAME }}:latest
             sudo docker run -d -p 8080:8080 \
                 -e DB_USERNAME=${{secrets.DB_USERNAME}} \

diff --git a/http/auth.http b/http/auth.http
diff --git a/http/challenge.http b/http/challenge.http
diff --git a/http/user.http b/http/user.http
diff --git a/http/verification.http b/http/verification.http
diff --git a/src/main/java/com/bod/bod/user/entity/User.java b/src/main/java/com/bod/bod/user/entity/User.java
@@ -51,7 +51,7 @@ public class User extends TimeStamp {
     @Enumerated(EnumType.STRING)
     private UserStatus userStatus;
 
-    @Column(name = "userRole", nullable = false)
+    @Column(name = "user_role", nullable = false)
     @Enumerated(EnumType.STRING)
     private UserRole userRole;