Refac/issue #112

.github/workflows/deploy-dev.yml

@@ -10,12 +10,9 @@ name: Deploy dev branch
 on:
   push:
     branches: [ "dev" ]
-
-
 jobs:
   build:
     runs-on: ubuntu-latest
-
     permissions:
       contents: read
 
@@ -28,14 +25,6 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      # set up application file
-      - name: Create application.yml
-        run: |
-          mkdir -p ./src/main/resources
-          cd ./src/main/resources
-          echo "${{ secrets.APPLICATION }}" > application.yml
-          echo "${{ secrets.APPLICATION_PROD }}" > application-prod.yml
-
       # apply caching
       - name: Gradle Caching
         uses: actions/cache@v3
@@ -51,7 +40,7 @@ jobs:
       - name: Setup Gradle
         run: |
           chmod +x ./gradlew
-          ./gradlew clean build -x test -Pprofile=prod
+          ./gradlew clean build -x test -Pprofile=dev
 
       # login dockerhub
       - name: docker login
@@ -83,9 +72,8 @@ jobs:
           key: ${{ secrets.PRIVATE_KEY }}
           port: ${{ secrets.PORT }}
           script: |
+            sudo docker stop ${{ secrets.DOCKER_IMAGENAME }}
+            sudo docker rm ${{ secrets.DOCKER_IMAGENAME }}
             sudo docker rmi ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKER_IMAGENAME }}
             sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKER_IMAGENAME }}
-            sudo docker stop ${{ secrets.DOCKER_IMAGENAME }} 2>/dev/null || true
-            sudo docker rm ${{ secrets.DOCKER_IMAGENAME }}
-            sudo docker-compose -f docker-compose.yml up -d
-            sudo docker system prune -f
+            sudo docker-compose -f docker-compose.yml up -d

.github/workflows/deploy-main.yml

@@ -10,12 +10,9 @@ name: Deploy main branch
 on:
   push:
     branches: [ "main" ]
-
-
 jobs:
   build:
     runs-on: ubuntu-latest
-
     permissions:
       contents: read
 
@@ -28,14 +25,6 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      # set up application file
-      - name: Create application.yml
-        run: |
-          mkdir -p ./src/main/resources
-          cd ./src/main/resources
-          echo "${{ secrets.APPLICATION }}" > application.yml
-          echo "${{ secrets.APPLICATION_MAIN }}" > application-main.yml
-
       # apply caching
       - name: Gradle Caching
         uses: actions/cache@v3
@@ -51,7 +40,7 @@ jobs:
       - name: Setup Gradle
         run: |
           chmod +x ./gradlew
-          ./gradlew clean build -x test -Pprofile=main
+          ./gradlew clean build -x test -Pprofile=prod
 
       # login dockerhub
       - name: docker login
@@ -83,9 +72,8 @@ jobs:
           key: ${{ secrets.MAIN_PRIVATE_KEY }}
           port: ${{ secrets.PORT }}
           script: |
+            sudo docker stop ${{ secrets.DOCKER_IMAGENAME }}
+            sudo docker rm ${{ secrets.DOCKER_IMAGENAME }}
             sudo docker rmi ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKER_IMAGENAME }}
             sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKER_IMAGENAME }}
-            sudo docker stop ${{ secrets.DOCKER_IMAGENAME }} 2>/dev/null || true
-            sudo docker rm ${{ secrets.DOCKER_IMAGENAME }}
             sudo docker-compose -f docker-compose.yml up -d
-            sudo docker system prune -f

.github/workflows/test-dev.yml

@@ -10,12 +10,9 @@ name: Test dev branch
 on:
   pull_request:
     branches: [ "dev" ]
-
-
 jobs:
   test:
     runs-on: ubuntu-latest
-
     permissions: write-all
 
     # set up java
@@ -27,14 +24,6 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      # set up application file
-      - name: Create application.yml
-        run: |
-          mkdir -p ./src/main/resources
-          cd ./src/main/resources
-          echo "${{ secrets.APPLICATION }}" > application.yml
-          echo "${{ secrets.APPLICATION_TEST }}" > application-test.yml
-
       # apply caching
       - name: Gradle Caching
         uses: actions/cache@v3
@@ -50,7 +39,7 @@ jobs:
       - name: Setup Gradle
         run: |
           chmod +x ./gradlew
-          ./gradlew clean build -Pprofile=test
+          ./gradlew clean build
 
       - name: Publish Test Result
         uses: EnricoMi/publish-unit-test-result-action@v1

.gitignore

@@ -36,6 +36,5 @@ out/
 ### VS Code ###
 .vscode/
 
-/src/main/resources/**/*.yml
 src/main/resources/static/index.html
 .env

src/main/java/com/gdsc_knu/official_homepage/controller/HealthCheckController.java

@@ -0,0 +1,12 @@
+package com.gdsc_knu.official_homepage.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HealthCheckController {
+    @GetMapping("/check")
+    public String healthCheck(){
+        return "status up";
+    }
+}

src/main/java/com/gdsc_knu/official_homepage/controller/MemberController.java

@@ -4,7 +4,6 @@
 import com.gdsc_knu.official_homepage.authentication.jwt.JwtMemberDetail;
 import com.gdsc_knu.official_homepage.dto.member.MemberRequest;
 import com.gdsc_knu.official_homepage.dto.member.MemberResponse;
-import com.gdsc_knu.official_homepage.dto.member.TeamInfoResponse;
 import com.gdsc_knu.official_homepage.entity.Member;
 import com.gdsc_knu.official_homepage.entity.enumeration.Role;
 import com.gdsc_knu.official_homepage.entity.enumeration.Track;
@@ -32,7 +31,7 @@ public void additionalInfo(@TokenMember JwtMemberDetail jwtMemberDetail,
 
     @GetMapping()
     @Operation(summary="사용자 정보 조회 API")
-    public ResponseEntity<MemberResponse> getMemberInfo(@TokenMember JwtMemberDetail jwtMemberDetail){
+    public ResponseEntity<MemberResponse.Main> getMemberInfo(@TokenMember JwtMemberDetail jwtMemberDetail){
         return ResponseEntity.ok().body(memberInfoService.getMemberInfo(jwtMemberDetail.getId()));
     }
 

src/main/java/com/gdsc_knu/official_homepage/controller/TeamController.java

@@ -2,10 +2,10 @@
 
 import com.gdsc_knu.official_homepage.annotation.TokenMember;
 import com.gdsc_knu.official_homepage.authentication.jwt.JwtMemberDetail;
-import com.gdsc_knu.official_homepage.dto.member.TeamInfoResponse;
+import com.gdsc_knu.official_homepage.dto.member.MemberResponse;
 import com.gdsc_knu.official_homepage.dto.team.TeamResponse;
 import com.gdsc_knu.official_homepage.service.MemberInfoService;
-import com.gdsc_knu.official_homepage.service.TeamService;
+import com.gdsc_knu.official_homepage.service.team.TeamService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -25,14 +25,14 @@ public class TeamController {
     @GetMapping("/{teamId}/member")
     @Operation(summary = "팀원 정보 조회 API",
             description = "해당 팀의 팀원목록(유저 ID, 이름, 직렬)을 반환합니다. (미배치된 팀은 조회되지 않습니다.)")
-    public ResponseEntity<List<TeamResponse.MemberInfo>> getTeamMembers(@PathVariable("teamId") Long teamId) {
+    public ResponseEntity<List<MemberResponse.WithTrack>> getTeamMembers(@PathVariable("teamId") Long teamId) {
         return ResponseEntity.ok().body(teamService.getTeamMember(teamId));
     }
 
     @GetMapping()
     @Operation(summary="현재 로그인한 사용자가 속한 팀 정보 조회 API",
             description = "현재 로그인한 사용자가 속한 팀 정보(팀 ID, 팀 이름) 리스트를 반환합니다.")
-    public ResponseEntity<List<TeamInfoResponse>> getMemberTeamInfo(@TokenMember JwtMemberDetail jwtMemberDetail){
+    public ResponseEntity<List<TeamResponse.Main>> getMemberTeamInfo(@TokenMember JwtMemberDetail jwtMemberDetail){
         return ResponseEntity.ok().body(memberInfoService.getMemberTeamInfo(jwtMemberDetail.getId()));
     }
 }

src/main/java/com/gdsc_knu/official_homepage/dto/admin/memberStatus/AdminMemberResponse.java

@@ -1,6 +1,6 @@
 package com.gdsc_knu.official_homepage.dto.admin.memberStatus;
 
-import com.gdsc_knu.official_homepage.dto.member.TeamInfoResponse;
+import com.gdsc_knu.official_homepage.dto.team.TeamResponse;
 import com.gdsc_knu.official_homepage.entity.Member;
 import com.gdsc_knu.official_homepage.entity.enumeration.Role;
 import com.gdsc_knu.official_homepage.entity.enumeration.Track;
@@ -22,7 +22,7 @@ public class AdminMemberResponse {
     private String studentNumber;
     private String email;
     private String phoneNumber;
-    private List<TeamInfoResponse> teams;
+    private List<TeamResponse.Main> teams;
     private Role role;
 
     public static AdminMemberResponse from(Member member) {
@@ -34,7 +34,7 @@ public static AdminMemberResponse from(Member member) {
                 .email(member.getEmail())
                 .phoneNumber(member.getPhoneNumber())
                 .teams(member.getTeams().stream()
-                        .map(TeamInfoResponse::from)
+                        .map(TeamResponse.Main::from)
                         .toList())
                 .role(member.getRole())
                 .build();

src/main/java/com/gdsc_knu/official_homepage/dto/admin/team/AdminTeamResponse.java

@@ -1,6 +1,6 @@
 package com.gdsc_knu.official_homepage.dto.admin.team;
 
-import com.gdsc_knu.official_homepage.dto.member.TeamInfoResponse;
+import com.gdsc_knu.official_homepage.dto.team.TeamResponse;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -19,7 +19,7 @@ public static class Team {
         private Long id;
         private String teamName;
         @Builder.Default
-        private List<TeamInfoResponse> subTeams = new ArrayList<>();
+        private List<TeamResponse.Main> subTeams = new ArrayList<>();
     }
 
     @Getter

src/main/java/com/gdsc_knu/official_homepage/dto/member/MemberResponse.java

@@ -1,31 +1,57 @@
 package com.gdsc_knu.official_homepage.dto.member;
 
+import com.gdsc_knu.official_homepage.dto.team.TeamResponse;
 import com.gdsc_knu.official_homepage.entity.Member;
 import com.gdsc_knu.official_homepage.entity.enumeration.Role;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 import java.util.List;
 
-@Getter
-@NoArgsConstructor
 public class MemberResponse {
-    private String name;
-    private String profileUrl;
-    private int age;
-    private String major;
-    private String studentNumber;
-    private String email;
-    private Role role;
-    private List<TeamInfoResponse> teamInfos;
-    public MemberResponse(Member member, List<TeamInfoResponse> teamInfos){
-        this.name = member.getName();
-        this.profileUrl = member.getProfileUrl();
-        this.age = member.getAge();
-        this.major = member.getMajor();
-        this.studentNumber = member.getStudentNumber();
-        this.email = member.getEmail();
-        this.role = member.getRole();
-        this.teamInfos = teamInfos;
+    @Getter
+    @Builder
+    @AllArgsConstructor
+    public static class Main {
+        private String name;
+        private String profileUrl;
+        private int age;
+        private String major;
+        private String studentNumber;
+        private String email;
+        private Role role;
+        private List<TeamResponse.Main> teamInfos;
+        public static MemberResponse.Main from (Member member) {
+            return Main.builder()
+                    .name(member.getName())
+                    .profileUrl(member.getProfileUrl())
+                    .age(member.getAge())
+                    .major(member.getMajor())
+                    .studentNumber(member.getStudentNumber())
+                    .email(member.getEmail())
+                    .role(member.getRole())
+                    .teamInfos(member.getTeams().stream()
+                            .map(TeamResponse.Main::from)
+                            .toList())
+                    .build();
+        }
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor
+    public static class WithTrack {
+        private Long id;
+        private String name;
+        private String track;
+
+        public static WithTrack from(Member member) {
+            return WithTrack.builder()
+                    .id(member.getId())
+                    .name(member.getName())
+                    .track(member.getTrack().name())
+                    .build();
+        }
     }
 }