[FEAT] 워크스페이스 설정 로직

src/main/java/com/tiki/server/memberteammanager/controller/MemberTeamController.java

@@ -4,7 +4,7 @@
 import com.tiki.server.common.dto.SuccessResponse;
 import com.tiki.server.memberteammanager.controller.dto.request.UpdateTeamMemberNameRequest;
 import com.tiki.server.memberteammanager.service.MemberTeamManagerService;
-import com.tiki.server.memberteammanager.service.dto.response.MemberTeamPositionGetResponse;
+import com.tiki.server.memberteammanager.service.dto.response.MemberTeamInformGetResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -25,12 +25,12 @@ public class MemberTeamController {
     private final MemberTeamManagerService memberTeamManagerService;
 
     @GetMapping("/teams/{teamId}/members/position")
-    public ResponseEntity<SuccessResponse<MemberTeamPositionGetResponse>> getMemberTeamPosition(
+    public ResponseEntity<SuccessResponse<MemberTeamInformGetResponse>> getMemberTeamInform(
             final Principal principal,
             @PathVariable final long teamId
     ) {
         long memberId = Long.parseLong(principal.getName());
-        MemberTeamPositionGetResponse response = memberTeamManagerService.getPosition(memberId, teamId);
+        MemberTeamInformGetResponse response = memberTeamManagerService.getMemberTeamInform(memberId, teamId);
         return ResponseEntity.ok().body(success(GET_POSITION.getMessage(), response));
     }
 

src/main/java/com/tiki/server/memberteammanager/service/MemberTeamManagerService.java

@@ -7,7 +7,7 @@
 import com.tiki.server.note.adapter.NoteFinder;
 import com.tiki.server.note.entity.Note;
 import com.tiki.server.team.exception.TeamException;
-import com.tiki.server.memberteammanager.service.dto.response.MemberTeamPositionGetResponse;
+import com.tiki.server.memberteammanager.service.dto.response.MemberTeamInformGetResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -44,9 +44,9 @@ public void leaveTeam(final long memberId, final long teamId) {
         memberTeamManagerDeleter.delete(memberTeamManager);
     }
 
-    public MemberTeamPositionGetResponse getPosition(final long memberId, final long teamId) {
+    public MemberTeamInformGetResponse getMemberTeamInform(final long memberId, final long teamId) {
         MemberTeamManager memberTeamManager = memberTeamManagerFinder.findByMemberIdAndTeamId(memberId, teamId);
-        return MemberTeamPositionGetResponse.from(memberTeamManager.getPosition());
+        return MemberTeamInformGetResponse.from(memberTeamManager.getPosition(), memberTeamManager.getName());
     }
 
     @Transactional

src/main/java/com/tiki/server/memberteammanager/service/dto/response/MemberTeamInformGetResponse.java

@@ -0,0 +1,12 @@
+package com.tiki.server.memberteammanager.service.dto.response;
+
+import com.tiki.server.common.entity.Position;
+
+public record MemberTeamInformGetResponse(
+        Position position,
+        String name
+) {
+    public static MemberTeamInformGetResponse from(final Position position, final String name) {
+        return new MemberTeamInformGetResponse(position, name);
+    }
+}

src/main/java/com/tiki/server/team/controller/TeamController.java

@@ -6,11 +6,12 @@
 import java.security.Principal;
 
 import com.tiki.server.common.dto.BaseResponse;
-import com.tiki.server.team.controller.dto.request.UpdateTeamIconRequest;
-import com.tiki.server.team.controller.dto.request.UpdateTeamNameRequest;
+import com.tiki.server.team.controller.dto.request.UpdateTeamMemberAndTeamInformRequest;
+import com.tiki.server.team.dto.request.UpdateTeamMemberAndTeamInformServiceRequest;
 import com.tiki.server.team.dto.response.CategoriesGetResponse;
 import com.tiki.server.team.dto.response.TeamsGetResponse;
 
+import com.tiki.server.team.service.dto.response.TeamInformGetResponse;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -68,26 +69,23 @@ public ResponseEntity<BaseResponse> deleteTeam(
         return ResponseEntity.noContent().build();
     }
 
-    @PatchMapping("/{teamId}/name")
-    public ResponseEntity<BaseResponse> updateTeamName(
-            final Principal principal,
-            @PathVariable final long teamId,
-            @RequestBody final UpdateTeamNameRequest request
+    @GetMapping("/{teamId}/inform")
+    public ResponseEntity<SuccessResponse<TeamInformGetResponse>> getTeamName(
+            @PathVariable final long teamId
     ) {
-        long memberId = Long.parseLong(principal.getName());
-        teamService.updateTeamName(memberId, teamId, request.newTeamName());
-        return ResponseEntity.ok(success(SUCCESS_UPDATE_TEAM_NAME.getMessage()));
+        TeamInformGetResponse response = teamService.getTeamInform(teamId);
+        return ResponseEntity.ok().body(success(SUCCESS_GET_CATEGORIES.getMessage(), response));
     }
 
-    @PatchMapping("/{teamId}/icon")
-    public ResponseEntity<BaseResponse> updateIconImage(
+    @PatchMapping("/{teamId}/inform")
+    public ResponseEntity<BaseResponse> updateTeamAndTeamMemberInform(
             final Principal principal,
             @PathVariable final long teamId,
-            @RequestBody final UpdateTeamIconRequest request
+            @RequestBody final UpdateTeamMemberAndTeamInformRequest request
     ) {
         long memberId = Long.parseLong(principal.getName());
-        teamService.updateIconImage(memberId, teamId, request.iconImageUrl());
-        return ResponseEntity.ok(success(SUCCESS_UPDATE_TEAM_ICON.getMessage()));
+        teamService.updateTeamAndTeamMemberInform(memberId, teamId, UpdateTeamMemberAndTeamInformServiceRequest.from(request));
+        return ResponseEntity.ok(success(SUCCESS_UPDATE_TEAM_NAME.getMessage()));
     }
 
     @PatchMapping("/{teamId}/member/{targetId}/admin")

src/main/java/com/tiki/server/team/controller/dto/request/UpdateTeamMemberAndTeamInformRequest.java

@@ -0,0 +1,10 @@
+package com.tiki.server.team.controller.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+
+public record UpdateTeamMemberAndTeamInformRequest(
+        @NotNull String teamMemberName,
+        @NotNull String teamName,
+        @NotNull String teamUrl
+) {
+}

src/main/java/com/tiki/server/team/dto/request/UpdateTeamMemberAndTeamInformServiceRequest.java

@@ -0,0 +1,18 @@
+package com.tiki.server.team.dto.request;
+
+import com.tiki.server.team.controller.dto.request.UpdateTeamMemberAndTeamInformRequest;
+import jakarta.validation.constraints.NotNull;
+
+public record UpdateTeamMemberAndTeamInformServiceRequest(
+        @NotNull String teamMemberName,
+        @NotNull String teamName,
+        @NotNull String teamIconUrl
+) {
+    public static UpdateTeamMemberAndTeamInformServiceRequest from(UpdateTeamMemberAndTeamInformRequest request) {
+        return new UpdateTeamMemberAndTeamInformServiceRequest(
+                request.teamMemberName(),
+                request.teamName(),
+                request.teamUrl()
+        );
+    }
+}

src/main/java/com/tiki/server/team/entity/Team.java

@@ -16,8 +16,10 @@
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
+
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -60,15 +62,20 @@ public static Team of(TeamCreateRequest request, University univ) {
                 .build();
     }
 
-    public void updateName(final String name) {
+    public void updateInform(final String name, final String iconImageUrl) {
+        updateTeamName(name);
+        updateIconImageUrl(iconImageUrl);
+    }
+
+    private void updateTeamName(final String name) {
         if (!canChangeName()) {
             throw new TeamException(TOO_SHORT_PERIOD);
         }
         this.name = name;
         this.namingUpdatedAt = LocalDate.now();
     }
 
-    public void setIconImageUrl(final String url) {
+    private void updateIconImageUrl(final String url) {
         this.iconImageUrl = url;
     }
 

src/main/java/com/tiki/server/team/service/TeamService.java

@@ -12,9 +12,11 @@
 import com.tiki.server.memberteammanager.adapter.MemberTeamManagerFinder;
 import com.tiki.server.team.adapter.TeamDeleter;
 import com.tiki.server.team.adapter.TeamFinder;
+import com.tiki.server.team.dto.request.UpdateTeamMemberAndTeamInformServiceRequest;
 import com.tiki.server.team.dto.response.CategoriesGetResponse;
 import com.tiki.server.team.dto.response.TeamsGetResponse;
 
+import com.tiki.server.team.service.dto.response.TeamInformGetResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -29,7 +31,6 @@
 import com.tiki.server.team.dto.response.TeamCreateResponse;
 import com.tiki.server.team.entity.Category;
 import com.tiki.server.team.entity.Team;
-import com.tiki.server.team.exception.TeamException;
 import com.tiki.server.team.vo.TeamVO;
 import com.tiki.server.timeblock.adapter.TimeBlockDeleter;
 
@@ -83,23 +84,26 @@ public void deleteTeam(final long memberId, final long teamId) {
         teamDeleter.deleteById(teamId);
     }
 
-    private Team createTeam(final TeamCreateRequest request, final University univ) {
-        return Team.of(request, univ);
+    public TeamInformGetResponse getTeamInform(final long teamId) {
+        Team team = teamFinder.findById(teamId);
+        return TeamInformGetResponse.from(team.getName(), team.getUniv(), team.getIconImageUrl());
     }
 
-    @Transactional
-    public void updateTeamName(final long memberId, final long teamId, final String newTeamName) {
-        checkIsAdmin(memberId, teamId);
-        Team team = teamFinder.findById(teamId);
-        team.updateName(newTeamName);
+    private Team createTeam(final TeamCreateRequest request, final University univ) {
+        return Team.of(request, univ);
     }
 
     @Transactional
-    public void updateIconImage(final long memberId, final long teamId, final String iconImageUrl) {
-        checkIsAdmin(memberId, teamId);
+    public void updateTeamAndTeamMemberInform(
+            final long memberId,
+            final long teamId,
+            final UpdateTeamMemberAndTeamInformServiceRequest request
+    ) {
+        MemberTeamManager memberTeamManager = checkIsAdmin(memberId, teamId);
+        memberTeamManager.updateName(request.teamMemberName());
         Team team = teamFinder.findById(teamId);
-        deleteIconUrl(team);
-        team.setIconImageUrl(iconImageUrl);
+        team.updateInform(request.teamName(), request.teamIconUrl());
+        updateIconUrlS3(team, request.teamIconUrl());
     }
 
     @Transactional
@@ -114,8 +118,8 @@ private MemberTeamManager createMemberTeamManager(final Member member, final Tea
         return MemberTeamManager.of(member, team, position);
     }
 
-    private void deleteIconUrl(final Team team) {
-        if (!team.isDefaultImage()) {
+    private void updateIconUrlS3(final Team team, final String iconUrl) {
+        if (!team.isDefaultImage() && !team.getImageUrl().equals(iconUrl)) {
             s3Handler.deleteFile(team.getIconImageUrl());
         }
     }

src/main/java/com/tiki/server/team/service/dto/response/TeamInformGetResponse.java

@@ -0,0 +1,14 @@
+package com.tiki.server.team.service.dto.response;
+
+import com.tiki.server.common.entity.University;
+
+public record TeamInformGetResponse(
+        String teamName,
+        University university,
+        String teamIconUrl
+) {
+
+    public static TeamInformGetResponse from(final String teamName, final University university, final String teamIconUrl) {
+        return new TeamInformGetResponse(teamName, university, teamIconUrl);
+    }
+}