diff --git a/src/main/java/com/codiary/backend/global/domain/entity/Team.java b/src/main/java/com/codiary/backend/global/domain/entity/Team.java index 5ea07c2..04cb9a1 100644 --- a/src/main/java/com/codiary/backend/global/domain/entity/Team.java +++ b/src/main/java/com/codiary/backend/global/domain/entity/Team.java @@ -10,6 +10,7 @@ @Entity @Getter +@Setter @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor @Builder diff --git a/src/main/java/com/codiary/backend/global/service/TeamService/TeamCommandServiceImpl.java b/src/main/java/com/codiary/backend/global/service/TeamService/TeamCommandServiceImpl.java index 9d407fa..0976271 100644 --- a/src/main/java/com/codiary/backend/global/service/TeamService/TeamCommandServiceImpl.java +++ b/src/main/java/com/codiary/backend/global/service/TeamService/TeamCommandServiceImpl.java @@ -42,5 +42,4 @@ public Team updateTeam(Long teamId, TeamRequestDTO.UpdateTeamDTO request) { return teamRepository.save(team); } - } diff --git a/src/main/java/com/codiary/backend/global/web/controller/TeamController.java b/src/main/java/com/codiary/backend/global/web/controller/TeamController.java index 77b3b76..8d3de59 100644 --- a/src/main/java/com/codiary/backend/global/web/controller/TeamController.java +++ b/src/main/java/com/codiary/backend/global/web/controller/TeamController.java @@ -23,34 +23,26 @@ public class TeamController { private final TeamCommandService teamCommandService; //팀 생성 @PostMapping() - @Operation( - summary = "팀 생성" - ) + @Operation(summary = "팀 생성") public ApiResponse createTeam( @RequestBody TeamRequestDTO.CreateTeamRequestDTO request ){ Team newTeam = teamCommandService.createTeam(request); return ApiResponse.onSuccess( SuccessStatus.TEAM_OK, - TeamConverter.toCreateMemberDTO(newTeam) - ); + TeamConverter.toCreateMemberDTO(newTeam)); } - //팀 프로필 수정 + // 팀 프로필 수정 @PatchMapping("/profile/{teamId}") - @Operation( - summary = "팀 프로필 수정" - ) + @Operation(summary = "팀 프로필 수정") public ApiResponse updateTeam( @RequestBody TeamRequestDTO.UpdateTeamDTO request, - @PathVariable Long teamId - ){ + @PathVariable Long teamId) { + Team updatedTeam = teamCommandService.updateTeam(teamId, request); return ApiResponse.onSuccess( SuccessStatus.TEAM_OK, - TeamConverter.toUpdateTeamDTO( - teamCommandService.updateTeam(teamId) - ) - ); + TeamConverter.toUpdateTeamDTO(updatedTeam)); } //팀 팔로우 diff --git a/src/main/java/com/codiary/backend/global/web/dto/Team/TeamRequestDTO.java b/src/main/java/com/codiary/backend/global/web/dto/Team/TeamRequestDTO.java index 524d89e..1b27664 100644 --- a/src/main/java/com/codiary/backend/global/web/dto/Team/TeamRequestDTO.java +++ b/src/main/java/com/codiary/backend/global/web/dto/Team/TeamRequestDTO.java @@ -25,14 +25,6 @@ public static class CreateTeamRequestDTO { //팀 생성 private String instagram; } - @Getter - @Builder - @AllArgsConstructor - @NoArgsConstructor - public static class CheckTeam { //팀 조회 - private Long teamId; - } - @Getter @Builder @AllArgsConstructor @@ -45,4 +37,12 @@ public static class UpdateTeamDTO { //팀 프로필 수정 private String discord; private String instagram; } + + @Getter + @Builder + @AllArgsConstructor + @NoArgsConstructor + public static class CheckTeam { //팀 조회 + private Long teamId; + } } diff --git a/src/main/java/com/codiary/backend/global/web/dto/Team/TeamResponseDTO.java b/src/main/java/com/codiary/backend/global/web/dto/Team/TeamResponseDTO.java index 9113b67..fb89316 100644 --- a/src/main/java/com/codiary/backend/global/web/dto/Team/TeamResponseDTO.java +++ b/src/main/java/com/codiary/backend/global/web/dto/Team/TeamResponseDTO.java @@ -19,11 +19,11 @@ public static class CreateTeamResponseDTO { // 팀 생성 String profilePhoto; } - @Builder @Getter + @Builder @NoArgsConstructor @AllArgsConstructor - public static class TeamCheckResponseDTO { // 팀 조회 + public static class UpdateTeamDTO { // 팀 프로필 수정 Long teamId; String name; String intro; @@ -31,13 +31,15 @@ public static class TeamCheckResponseDTO { // 팀 조회 String github; String email; String linkedIn; + String discord; + String instagram; } - @Getter @Builder + @Getter @NoArgsConstructor @AllArgsConstructor - public static class UpdateTeamDTO { // 팀 프로필 수정 + public static class TeamCheckResponseDTO { // 팀 조회 Long teamId; String name; String intro; @@ -45,11 +47,8 @@ public static class UpdateTeamDTO { // 팀 프로필 수정 String github; String email; String linkedIn; - String discord; - String instagram; } - @Builder public record TeamFollowResponseDto( //팀 팔로우 기능 Long followId,