Feat: team리스트 api 및 수락 api완성

lsy1307 · lsy1307 · commit 0222a3169673 · 2024-11-20T16:24:15.000+09:00
diff --git a/src/main/java/com/mtvs/devlinkbackend/project/controller/ProjectCommandController.java b/src/main/java/com/mtvs/devlinkbackend/project/controller/ProjectCommandController.java
@@ -14,6 +14,9 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @RestController
 @RequestMapping("/api/project")
 public class ProjectCommandController {
@@ -73,6 +76,26 @@ public ResponseEntity<ProjectTeamResponseDTO> applyProjectByNewTeam(
         return new ResponseEntity<>(newProject, HttpStatus.CREATED);
     }
 
+    @Operation(summary = "프로젝트 지원 수락", description = "특정 팀의 프로젝트 지원을 수락합니다.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "201", description = "지원을 성공적으로 수락함"),
+            @ApiResponse(responseCode = "400", description = "잘못된 파라미터")
+    })
+    @PostMapping("/accept/epic/{projectId}/{teamId}")
+    public ResponseEntity<Map<String, String>> acceptProject(
+            @PathVariable(name = "projectId") Long projectId,
+            @PathVariable(name = "teamId") Long teamId,
+            @RequestHeader(name = "Authorization") String authorizationHeader) throws Exception {
+        Long userId = jwtUtil.getUserIdByToken(authorizationHeader);
+        Map<String, String> response = new HashMap<>();
+        if(projectService.acceptTeam(userId, projectId, teamId)) {
+            response.put("isSuccess", "true");
+        } else {
+            response.put("isSuccess", "false");
+        }
+        return ResponseEntity.ok(response);
+    }
+
     @Operation(summary = "프로젝트 의뢰 삭제", description = "ID로 특정 프로젝트 의뢰를 삭제합니다.")
     @ApiResponses({
             @ApiResponse(responseCode = "204", description = "프로젝트 의뢰가 성공적으로 삭제됨"),
diff --git a/src/main/java/com/mtvs/devlinkbackend/project/controller/ProjectSummaryController.java b/src/main/java/com/mtvs/devlinkbackend/project/controller/ProjectSummaryController.java
@@ -27,7 +27,7 @@ public ProjectSummaryController(ProjectSummaryViewService projectSummaryViewServ
     @GetMapping("/{page}")
     public ResponseEntity<ProjectSummaryPagingResponseDTO> getProjectSummaries(
             @PathVariable(name = "page") int page) {
-        ProjectSummaryPagingResponseDTO responseDTO = projectSummaryViewService.findAllProjectSummaryWithPagination(page);
+        ProjectSummaryPagingResponseDTO responseDTO = projectSummaryViewService.findAllProjectSummaryWithPagination(page-1);
         return ResponseEntity.ok(responseDTO);
     }
 
diff --git a/src/main/java/com/mtvs/devlinkbackend/project/repository/ProjectRepository.java b/src/main/java/com/mtvs/devlinkbackend/project/repository/ProjectRepository.java
@@ -1,9 +1,23 @@
 package com.mtvs.devlinkbackend.project.repository;
 
+import com.mtvs.devlinkbackend.common.model.AcceptStatus;
 import com.mtvs.devlinkbackend.project.entity.Project;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 @Repository
 public interface ProjectRepository extends JpaRepository<Project, Long> {
+    @Modifying
+    @Transactional
+    @Query("UPDATE Support s SET s.supportConfirmation = :confirmationStatus " +
+            "WHERE s.projectId = :projectId AND s.teamId = :teamId " +
+            "AND EXISTS (SELECT 1 FROM Team t WHERE t.teamId = s.teamId AND t.leaderUserId = :userId)")
+    void updateSupportConfirmation(@Param("projectId") Long projectId,
+                                   @Param("teamId") Long teamId,
+                                   @Param("userId") Long userId,
+                                   @Param("confirmationStatus") AcceptStatus confirmationStatus);
 }
diff --git a/src/main/java/com/mtvs/devlinkbackend/project/repository/ProjectViewRepository.java b/src/main/java/com/mtvs/devlinkbackend/project/repository/ProjectViewRepository.java
@@ -5,6 +5,8 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.time.LocalDate;
 
@@ -29,4 +31,7 @@ Page<Project> findProjectsByStartDateLessThanEqualOrEndDateGreaterThanEqual(
     ProjectIdAndContent findProjectIdAndContentByProjectId(Long projectId);
 
     Page<Project> findAllBy(Pageable pageable);
+
+    @Query("SELECT p.userId FROM Project p WHERE p.projectId = :projectId")
+    Long findUserIdByProjectId(@Param("projectId") Long projectId);
 }
diff --git a/src/main/java/com/mtvs/devlinkbackend/project/service/ProjectService.java b/src/main/java/com/mtvs/devlinkbackend/project/service/ProjectService.java
@@ -1,5 +1,6 @@
 package com.mtvs.devlinkbackend.project.service;
 
+import com.mtvs.devlinkbackend.common.model.AcceptStatus;
 import com.mtvs.devlinkbackend.project.dto.response.ProjectTeamResponseDTO;
 import com.mtvs.devlinkbackend.project.dto.response.sub.ProjectAndTeamIdListDTO;
 import com.mtvs.devlinkbackend.project.dto.request.ProjectRegistRequestDTO;
@@ -101,9 +102,21 @@ public ProjectTeamResponseDTO applyProjectByNewTeam(TeamRegistRequestDTO teamReg
                         supportService.findTeamIdsByProjectId(projectId)));
     }
 
+    @Transactional
+    public boolean acceptTeam(Long userId, Long projectId, Long teamId) {
+        try{
+            projectRepository.updateSupportConfirmation(projectId, teamId, userId, AcceptStatus.ACCEPTED);
+            return true;
+        } catch (Exception e){
+            throw new IllegalArgumentException(e.getMessage());
+        }
+    }
+
     @Transactional
     public void deleteProject(Long projectId) {
         projectRepository.deleteById(projectId);
     }
+
+
 }
 
diff --git a/src/main/java/com/mtvs/devlinkbackend/project/service/ProjectSummaryViewService.java b/src/main/java/com/mtvs/devlinkbackend/project/service/ProjectSummaryViewService.java
@@ -41,12 +41,20 @@ public ProjectSummaryPagingResponseDTO findAllProjectSummaryWithPagination(int p
             // workType 설정
             previewDTO.setWorkType(projectSummary.getWorkType());
             previewDTO.setProgressClassification(projectSummary.getProgressClassification());
+            previewDTO.setProjectId(projectSummary.getProjectId());
 
             // previewTitle 생성: workType + (StartDateTime과 EndDateTime의 월 차이) + title
             long monthsDifference = ChronoUnit.MONTHS.between(
                     projectSummary.getStartDate(), projectSummary.getEndDate());
 
-            StringBuilder previewTitle = new StringBuilder("[" + projectSummary.getWorkType() + "] [" + monthsDifference + "개월");
+            StringBuilder previewTitle = new StringBuilder("[");
+            if(projectSummary.getWorkType().equals("both"))
+                previewTitle.append("상주, 원격");
+            else if (projectSummary.getWorkType().equals("local"))
+                previewTitle.append("상주");
+            else if (projectSummary.getWorkType().equals("remote"))
+                previewTitle.append("원격");
+            previewTitle.append("] [").append(monthsDifference).append("개월");
 
             List<String> requiredOccupationNameList = new ArrayList<>();
             for (Occupation occupation : projectSummary.getRequiredOccupationList()) {
diff --git a/src/main/java/com/mtvs/devlinkbackend/support/repository/SupportRepository.java b/src/main/java/com/mtvs/devlinkbackend/support/repository/SupportRepository.java
@@ -14,4 +14,6 @@ public interface SupportRepository extends JpaRepository<Support, Long> {
     List<Support> findSupportsByTeamId(Long teamId);
     @Query("SELECT s.teamId FROM Support s WHERE s.projectId = :projectId")
     List<Long> findTeamIdByProjectId(@Param("projectId") Long projectId);
+    @Query("SELECT s.teamId FROM Support s WHERE s.projectId = :projectId AND s.supportConfirmation = 1")
+    List<Long> findTeamIdByProjectIdUnConfirmed(@Param("projectId") Long projectId);
 }
diff --git a/src/main/java/com/mtvs/devlinkbackend/team/controller/TeamQueryController.java b/src/main/java/com/mtvs/devlinkbackend/team/controller/TeamQueryController.java
@@ -2,6 +2,7 @@
 
 import com.mtvs.devlinkbackend.team.dto.response.TeamListResponseDTO;
 import com.mtvs.devlinkbackend.team.dto.response.TeamSingleReponseDTO;
+import com.mtvs.devlinkbackend.team.dto.response.support.TeamSupportListResponseDTO;
 import com.mtvs.devlinkbackend.team.service.TeamViewService;
 import com.mtvs.devlinkbackend.common.util.JwtUtil;
 import io.swagger.v3.oas.annotations.Operation;
@@ -11,6 +12,8 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/team")
 public class TeamQueryController {
@@ -63,4 +66,14 @@ public ResponseEntity<TeamListResponseDTO> getTeamsByMemberIdContaining(
         TeamListResponseDTO teams = teamViewService.findByAccountIdInTeam(accountId);
         return ResponseEntity.ok(teams);
     }
+
+    @GetMapping("/{projectId}/support/list")
+    public ResponseEntity<TeamSupportListResponseDTO> getSupportTeamsByProjectId(
+            @RequestHeader(name = "Authorization") String authorizationHeader,
+            @PathVariable Long projectId
+            ) throws Exception {
+        Long userId = jwtUtil.getUserIdByToken(authorizationHeader);
+        TeamSupportListResponseDTO teamlists = teamViewService.getTeamList(userId, projectId);
+        return ResponseEntity.ok(teamlists);
+    }
 }
diff --git a/src/main/java/com/mtvs/devlinkbackend/team/dto/response/support/RadarPointDTO.java b/src/main/java/com/mtvs/devlinkbackend/team/dto/response/support/RadarPointDTO.java
@@ -0,0 +1,13 @@
+package com.mtvs.devlinkbackend.team.dto.response.support;
+
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class RadarPointDTO {
+    private String categoryName;
+    private Double pointAvg;
+}
diff --git a/src/main/java/com/mtvs/devlinkbackend/team/dto/response/support/TeamMemberDTO.java b/src/main/java/com/mtvs/devlinkbackend/team/dto/response/support/TeamMemberDTO.java
@@ -0,0 +1,13 @@
+package com.mtvs.devlinkbackend.team.dto.response.support;
+
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class TeamMemberDTO {
+    private String nickname;
+    private Integer experienceValue;
+}
diff --git a/src/main/java/com/mtvs/devlinkbackend/team/dto/response/support/TeamSupportListResponseDTO.java b/src/main/java/com/mtvs/devlinkbackend/team/dto/response/support/TeamSupportListResponseDTO.java
@@ -0,0 +1,14 @@
+package com.mtvs.devlinkbackend.team.dto.response.support;
+
+import lombok.*;
+
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class TeamSupportListResponseDTO {
+    private List<TeamSupportResponseDTO> result;
+}
diff --git a/src/main/java/com/mtvs/devlinkbackend/team/dto/response/support/TeamSupportResponseDTO.java b/src/main/java/com/mtvs/devlinkbackend/team/dto/response/support/TeamSupportResponseDTO.java
@@ -0,0 +1,20 @@
+package com.mtvs.devlinkbackend.team.dto.response.support;
+
+import lombok.*;
+
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class TeamSupportResponseDTO {
+    private Long teamId;
+    private Integer experienceValue;
+    private String nickname;
+    private List<RadarPointDTO> radarPoints;
+    private List<String> portfolioList;
+    private List<TeamMemberDTO> members;
+    private String teamIntroduction;
+}
diff --git a/src/main/java/com/mtvs/devlinkbackend/team/repository/TeamViewRepository.java b/src/main/java/com/mtvs/devlinkbackend/team/repository/TeamViewRepository.java
@@ -12,6 +12,9 @@
 public interface TeamViewRepository extends JpaRepository<Team, Long> {
     List<Team> findTeamsByLeaderUserId(Long leaderUserId);
 
+    @Query("SELECT t.leaderUserId FROM Team t WHERE t.teamId = :teamId")
+    Long findLeaderUserIdByTeamId(@Param("teamId") Long teamId);
+
     // teamMemberList에 memberId를 포함하는 팀 조회
     @Query("SELECT t FROM Team t WHERE :memberId IN (t.teamMemberList)")
     List<Team> findByMemberIdInTeam(@Param("memberId") Long memberId);
diff --git a/src/main/java/com/mtvs/devlinkbackend/team/service/TeamViewService.java b/src/main/java/com/mtvs/devlinkbackend/team/service/TeamViewService.java
@@ -1,23 +1,47 @@
 package com.mtvs.devlinkbackend.team.service;
 
+import com.mtvs.devlinkbackend.member.command.model.entity.Member;
+import com.mtvs.devlinkbackend.member.command.repository.MemberRepository;
+import com.mtvs.devlinkbackend.project.repository.ProjectViewRepository;
+import com.mtvs.devlinkbackend.support.repository.SupportRepository;
 import com.mtvs.devlinkbackend.team.dto.response.TeamListResponseDTO;
 import com.mtvs.devlinkbackend.team.dto.response.TeamSingleReponseDTO;
+import com.mtvs.devlinkbackend.team.dto.response.support.*;
+import com.mtvs.devlinkbackend.team.entity.Team;
 import com.mtvs.devlinkbackend.team.repository.TeamViewRepository;
+import com.mtvs.devlinkbackend.user.command.model.entity.Dev;
+import com.mtvs.devlinkbackend.user.command.model.entity.SkillCategoryInfo;
 import com.mtvs.devlinkbackend.user.command.model.entity.User;
+import com.mtvs.devlinkbackend.user.query.repository.DevViewRepository;
+import com.mtvs.devlinkbackend.user.query.repository.SkillCategoryInfoViewRepository;
 import com.mtvs.devlinkbackend.user.query.repository.UserViewRepository;
 import com.mtvs.devlinkbackend.user.query.service.UserViewService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
 @Service
 public class TeamViewService {
     private final TeamViewRepository teamViewRepository;
     private final UserViewRepository userViewRepository;
+    private final ProjectViewRepository projectViewRepository;
+    private final DevViewRepository devViewRepository;
     private final UserViewService userViewService;
+    private final MemberRepository memberRepository;
+    private final SupportRepository supportRepository;
+    private final SkillCategoryInfoViewRepository skillCategoryInfoViewRepository;
 
-    public TeamViewService(TeamViewRepository teamViewRepository, UserViewRepository userViewRepository, UserViewService userViewService) {
+    public TeamViewService(TeamViewRepository teamViewRepository, UserViewRepository userViewRepository, ProjectViewRepository projectViewRepository, DevViewRepository devViewRepository, UserViewService userViewService, MemberRepository memberRepository, SupportRepository supportRepository, SkillCategoryInfoViewRepository skillCategoryInfoViewRepository) {
         this.teamViewRepository = teamViewRepository;
         this.userViewRepository = userViewRepository;
+        this.projectViewRepository = projectViewRepository;
+        this.devViewRepository = devViewRepository;
         this.userViewService = userViewService;
+        this.memberRepository = memberRepository;
+        this.supportRepository = supportRepository;
+        this.skillCategoryInfoViewRepository = skillCategoryInfoViewRepository;
     }
 
     public TeamSingleReponseDTO findTeamByTeamId(Long teamId) {
@@ -41,4 +65,78 @@ public TeamListResponseDTO findByAccountIdInTeam(String accountId) {
         User foundUser = userViewRepository.findUserByEpicAccountId(accountId);
         return new TeamListResponseDTO(teamViewRepository.findByMemberIdInTeam(foundUser.getUserId()));
     }
+
+    public TeamSupportListResponseDTO getTeamList(Long userId, Long projectId) {
+        if(projectViewRepository.findUserIdByProjectId(projectId).equals(userId)){
+            List<Long> teamIds = supportRepository.findTeamIdByProjectIdUnConfirmed(projectId);
+
+            TeamSupportListResponseDTO teamSupportListResponseDTO = new TeamSupportListResponseDTO();
+
+            List<TeamSupportResponseDTO> teamSupportResponseDTOS = new ArrayList<>();
+            for(Long teamId : teamIds){
+                TeamSupportResponseDTO teamSupportResponseDTO = new TeamSupportResponseDTO();
+                List<RadarPointDTO> radarPointDTOS = new ArrayList<>();
+                Long leaderId = teamViewRepository.findLeaderUserIdByTeamId(teamId);
+                User user = userViewRepository.findById(leaderId).orElse(null);
+                if(user != null){
+                    teamSupportResponseDTO.setExperienceValue(user.getExperienceValue());
+                    teamSupportResponseDTO.setTeamId(teamId);
+                    teamSupportResponseDTO.setNickname(user.getNickname());
+                    Dev dev = devViewRepository.findDevByUserId(leaderId);
+                    if(dev != null){
+                        teamSupportResponseDTO.setPortfolioList(dev.getPortfolioUrlList());
+                        List<SkillCategoryInfo> skillCategoryInfos = skillCategoryInfoViewRepository.findByDevId(dev.getDevId());
+                        for(SkillCategoryInfo skillCategoryInfo : skillCategoryInfos){
+                            RadarPointDTO radarPointDTO = new RadarPointDTO();
+                            radarPointDTO.setCategoryName(skillCategoryInfo.getCategoryName());
+                            radarPointDTO.setPointAvg(skillCategoryInfo.getPointAvg());
+                            radarPointDTOS.add(radarPointDTO);
+                        }
+                    }
+                    else {
+                        throw new IllegalArgumentException("dev 정보 없음");
+                    }
+                }
+                else {
+                    throw new IllegalArgumentException("user 정보 없음");
+                }
+                Team team = teamViewRepository.findById(teamId).orElse(null);
+                if(team != null){
+                    teamSupportResponseDTO.setTeamIntroduction(team.getTeamIntroduction());
+                    List<Long> memberIds = team.getTeamMemberList();
+                    List<TeamMemberDTO> teamMemberDTOS = new ArrayList<>();
+                    for(Long memberId : memberIds){
+                        Member member = memberRepository.findById(memberId).orElse(null);
+                        if(member != null){
+                            TeamMemberDTO teamMemberDTO = new TeamMemberDTO();
+                            Optional<User> teamMember = userViewRepository.findById(member.getUserId());
+                            if(teamMember.isPresent()){
+                                teamMemberDTO.setNickname(teamMember.get().getNickname());
+                                teamMemberDTO.setExperienceValue(teamMember.get().getExperienceValue());
+                                teamMemberDTOS.add(teamMemberDTO);
+                            }
+                            else {
+                                throw new IllegalArgumentException("team member 정보 없음");
+                            }
+                        }
+                        else {
+                            throw new IllegalArgumentException("member 정보 없음");
+                        }
+                    }
+                    teamSupportResponseDTO.setMembers(teamMemberDTOS);
+                    teamSupportResponseDTO.setRadarPoints(radarPointDTOS);
+                    teamSupportResponseDTOS.add(teamSupportResponseDTO);
+                }
+                else {
+                    throw new IllegalArgumentException("team 정보 없음");
+                }
+
+            }
+            teamSupportListResponseDTO.setResult(teamSupportResponseDTOS);
+            return teamSupportListResponseDTO;
+        }
+        else {
+            throw new IllegalArgumentException("잘못된 유저의 접근");
+        }
+    }
 }
diff --git a/src/main/java/com/mtvs/devlinkbackend/user/command/service/EpicBusinessService.java b/src/main/java/com/mtvs/devlinkbackend/user/command/service/EpicBusinessService.java
@@ -51,8 +51,6 @@ public BusinessSingleResponseDTO registUserClientGroup(BusinessRequestDTO busine
         );
         Business savedBusiness = businessRepository.save(business);
 
-        savedUser.setBusinessId(savedBusiness.getBusinessId());
-
 
         // Response 나오면 바로 refactoring
         return new BusinessSingleResponseDTO(businessRepository.save(business));
diff --git a/src/main/java/com/mtvs/devlinkbackend/user/query/repository/BusinessViewRepository.java b/src/main/java/com/mtvs/devlinkbackend/user/query/repository/BusinessViewRepository.java
diff --git a/src/main/java/com/mtvs/devlinkbackend/user/query/repository/SkillCategoryInfoViewRepository.java b/src/main/java/com/mtvs/devlinkbackend/user/query/repository/SkillCategoryInfoViewRepository.java

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public ProjectSummaryController(ProjectSummaryViewService projectSummaryViewServ`
`27`	`27`	`@GetMapping("/{page}")`
`28`	`28`	`public ResponseEntity<ProjectSummaryPagingResponseDTO> getProjectSummaries(`
`29`	`29`	`@PathVariable(name = "page") int page) {`
`30`		`- ProjectSummaryPagingResponseDTO responseDTO = projectSummaryViewService.findAllProjectSummaryWithPagination(page);`
	`30`	`+ ProjectSummaryPagingResponseDTO responseDTO = projectSummaryViewService.findAllProjectSummaryWithPagination(page-1);`
`31`	`31`	`return ResponseEntity.ok(responseDTO);`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,6 @@ public interface SupportRepository extends JpaRepository<Support, Long> {`
`14`	`14`	`List<Support> findSupportsByTeamId(Long teamId);`
`15`	`15`	`@Query("SELECT s.teamId FROM Support s WHERE s.projectId = :projectId")`
`16`	`16`	`List<Long> findTeamIdByProjectId(@Param("projectId") Long projectId);`
	`17`	`+ @Query("SELECT s.teamId FROM Support s WHERE s.projectId = :projectId AND s.supportConfirmation = 1")`
	`18`	`+ List<Long> findTeamIdByProjectIdUnConfirmed(@Param("projectId") Long projectId);`
`17`	`19`	`}`