Merge pull request #175 from kimheonningg/upcy-14th-backend-dev

access 토큰 없이 특정 리폼러의 data를 email 대신 nickname으로 가져오도록 수정
sdp-tech · Jan 8, 2025 · d91ef3f · d91ef3f
2 parents 043c5d0 + adc0589
commit d91ef3f
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 57 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -43,69 +43,68 @@ jobs:
 
       - name: Django 테스트 실행
         env:
-          DJANGO_SETTINGS_MODULE: 'config.settings'
+          DJANGO_SETTINGS_MODULE: "config.settings"
           DJANGO_DEBUG_MODE: true
-          UPCY_SECRET_KEY: 'test123123123123123123123' # 진짜 SECRET 키 아닙니다.
+          UPCY_SECRET_KEY: "test123123123123123123123" # 진짜 SECRET 키 아닙니다.
         run: |
           poetry run python manage.py migrate  # 데이터베이스 마이그레이션
           poetry run python manage.py test     # Django 전체 테스트 실행
 
-
   deploy:
     name: Deploy Docker image to ECR and Run docker image in EC2 instance
     # PR이 머지되었을 때만 실행
     if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
     runs-on: ubuntu-latest
 
     steps:
-    - name: 코드 Checkout
-      uses: actions/checkout@v4
-
-    - name: AWS Credentials 가져오기
-      uses: aws-actions/configure-aws-credentials@v4
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: ${{secrets.AWS_REGION}}
-
-    - name: AWS ECR 로그인
-      id: login-ecr
-      uses: aws-actions/amazon-ecr-login@v2
-
-    - name: 백엔드 도커 이미지 생성 및 배포
-      env:
-        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-        ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY_NAME }}
-        IMAGE_TAG: ${{ github.sha }}
-      run: |
-        # 도커 이미지 생성
-        docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:latest .
-
-        # ECR로 도커 이미지 PUSH
-        docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-        docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest
-
-    - name: EC2에 배포 및 백엔드 어플리케이션 실행
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.EC2_HOST }}
-        username: ${{ secrets.EC2_USERNAME }}
-        key: ${{ secrets.EC2_SSH_KEY }}
-        script: ./deploy.sh
-
-    - name: 배포 결과 확인
-      if: always()
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.EC2_HOST }}
-        username: ${{ secrets.EC2_USERNAME }}
-        key: ${{ secrets.EC2_SSH_KEY }}
-        script: |
-          # 컨테이너 상태 확인
-          if docker ps | grep -q "${{ secrets.ECR_REPOSITORY_NAME }}"; then
-            echo "Container is running successfully"
-            exit 0
-          else
-            echo "Container is not running"
-            exit 1
-          fi
+      - name: 코드 Checkout
+        uses: actions/checkout@v4
+
+      - name: AWS Credentials 가져오기
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ap-northeast-2
+
+      - name: AWS ECR 로그인
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: 백엔드 도커 이미지 생성 및 배포
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY_NAME }}
+          IMAGE_TAG: ${{ github.sha }}
+        run: |
+          # 도커 이미지 생성
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:latest .
+
+          # ECR로 도커 이미지 PUSH
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest
+
+      - name: EC2에 배포 및 백엔드 어플리케이션 실행
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: ./deploy.sh
+
+      - name: 배포 결과 확인
+        if: always()
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            # 컨테이너 상태 확인
+            if docker ps | grep -q "${{ secrets.ECR_REPOSITORY_NAME }}"; then
+              echo "Container is running successfully"
+              exit 0
+            else
+              echo "Container is not running"
+              exit 1
+            fi
diff --git a/users/urls.py b/users/urls.py
@@ -65,7 +65,7 @@
     path("/token/refresh", UserTokenRefreshView.as_view(), name="token_refresh"),
     path("/reformer", ReformerProfileView.as_view(), name="reformer"),
     path(
-        "/reformer/<str:email>",
+        "/reformer/<str:nickname>",
         ReformerSpecificProfileView.as_view(),
         name="specific_reformer",
     ),

diff --git a/users/views/reformer_view/reformer_specific_profile_view.py b/users/views/reformer_view/reformer_specific_profile_view.py
@@ -16,9 +16,9 @@ class ReformerSpecificProfileView(APIView):
         AllowAny,
     ]
 
-    def get(self, request, email: str) -> Response:
+    def get(self, request, nickname: str) -> Response:
         try:
-            user = User.objects.get(email=email)
+            user = User.objects.get(nickname=nickname)
             reformer_profile = Reformer.objects.get(user=user)
             if not reformer_profile:
                 raise Reformer.DoesNotExist(