🐛 [Fix]: 출석 response dto 응답 데이터 수정

.github/workflows/api-deploy.yml

@@ -3,8 +3,9 @@ on:
   push:
     branches:
       - develop
-    paths:
-      - 'apps/api/**'
+      - Fix/296
+    # paths:
+    #   - 'apps/api/**'
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
@@ -66,14 +67,39 @@ jobs:
       - name: Checkout for docker-compose
         uses: actions/checkout@v2
 
-      - name: Copy docker-compose file
-        uses: appleboy/scp-action@master
+      # - name: Copy docker-compose file
+      #   uses: appleboy/scp-action@master
+      #   with:
+      #     host: ${{ secrets.SERVER_IP }}
+      #     username: ${{ secrets.SERVER_USER }}
+      #     key: ${{ secrets.SSH_SERVER_KEY }}
+      #     source: "docker-compose.yml"
+      #     target: "/home/${{ secrets.SERVER_USER }}/camon"
+
+      - name: Create .env.api file
+        uses: appleboy/[email protected]
         with:
           host: ${{ secrets.SERVER_IP }}
           username: ${{ secrets.SERVER_USER }}
           key: ${{ secrets.SSH_SERVER_KEY }}
-          source: "docker-compose.yml"
-          target: "/home/${{ secrets.SERVER_USER }}/camon"
+          script: |
+            cd /home/${{ secrets.SERVER_USER }}/camon
+            cat << EOF > .env.api
+            NCLOUD_REGISTRY_URL=${{ secrets.NCLOUD_REGISTRY_URL }}
+            DB_HOST=${{ secrets.DB_HOST }}
+            DB_PORT=${{ secrets.DB_PORT }}
+            DB_USERNAME=${{ secrets.DB_USERNAME }}
+            DB_PASSWORD=${{ secrets.DB_PASSWORD }}
+            DB_NAME=${{ secrets.DB_NAME }}
+            GH_CLIENT_ID=${{ secrets.GH_CLIENT_ID }}
+            GH_SECRET=${{ secrets.GH_SECRET }}
+            GH_CALLBACK_URL=${{ secrets.GH_CALLBACK_URL }}
+            JWT_SECRET=${{ secrets.JWT_SECRET }}
+            GG_CLIENT_ID=${{ secrets.GG_CLIENT_ID }}
+            GG_SECRET=${{ secrets.GG_SECRET }}
+            GG_CALLBACK_URL=${{ secrets.GG_CALLBACK_URL }}
+            CALLBACK_URI=${{ secrets.CALLBACK_URI }}
+            EOF
           
       - name: SSH and deploy
         uses: appleboy/[email protected]
@@ -82,17 +108,16 @@ jobs:
           username: ${{ secrets.SERVER_USER }}
           key: ${{ secrets.SSH_SERVER_KEY }}
           port: 22
-          envs: DB_HOST,DB_PORT,DB_USERNAME,DB_PASSWORD,DB_NAME,GH_CLIENT_ID,GH_SECRET,GH_CALLBACK_URL,JWT_SECRET,GG_CLIENT_ID,GG_SECRET,GG_CALLBACK_URL,CALLBACK_URI
           script: |
             cd /home/${{ secrets.SERVER_USER }}/camon
             sudo docker login -u ${{secrets.NCLOUD_ACCESS_KEY}} -p ${{ secrets.NCLOUD_SECRET_KEY }} ${{ secrets.NCLOUD_REGISTRY_URL }}
 
             sudo docker stop api-camon || true
             sudo docker rm api-camon || true
-            sudo docker rmi ${{ secrets.NCLOUD_REGISTRY_URL }}/api-camon:latest || true
+            sudo docker rmi ${NCLOUD_REGISTRY_URL}/api-camon:latest || true
 
-            sudo docker pull ${{ secrets.NCLOUD_REGISTRY_URL }}/$IMAGE_NAME:latest
-            sudo docker-compose up -d api
+            sudo docker pull ${NCLOUD_REGISTRY_URL}/api-camon:latest
+            sudo docker-compose --env-file .env.api up -d api
             sudo docker image prune -f
 
       - name: Check container status

apps/api/src/member/dto/attendance-response.dto.ts

@@ -14,14 +14,15 @@ class AttendanceInfo {
 
 export class AttendanceResponseDto {
   @ApiProperty()
-  id: number;
+  memberId: number;
   @ApiProperty({ type: AttendanceInfo, isArray: true })
   attendances: AttendanceInfo[];
 
   static of(memberId: number, attendances: Attendance[]): AttendanceResponseDto {
     return {
-      id: memberId,
+      memberId: memberId,
       attendances: attendances.map(attendance => ({
+        attendanceId: attendance.id,
         date: this.formatDate(attendance.startTime),
         startTime: this.formatTime(attendance.startTime),
         endTime: this.formatTime(attendance.endTime),

docker-compose.yml

@@ -14,6 +14,8 @@ services:
       - DB_USERNAME=${DB_USERNAME}
       - DB_PASSWORD=${DB_PASSWORD}
       - DB_NAME=${DB_NAME}
+    env_file:
+      - .env
 
   media:
     container_name: media-camon