[CHORE] 팀 정보 수정 로직 분리 및 팀 정보 반환시 팀 이름 변경 날짜 반환

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

@@ -10,8 +10,8 @@
 
 import java.security.Principal;
 
-import com.tiki.server.team.dto.request.TeamMemberAndTeamInformUpdateRequest;
-import com.tiki.server.team.dto.request.TeamMemberAndTeamInformUpdateServiceRequest;
+import com.tiki.server.team.dto.request.TeamInformUpdateRequest;
+import com.tiki.server.team.dto.request.TeamInformUpdateServiceRequest;
 import com.tiki.server.team.dto.response.UsageGetResponse;
 import com.tiki.server.team.dto.response.CategoriesGetResponse;
 import com.tiki.server.team.dto.response.TeamsGetResponse;
@@ -86,13 +86,13 @@ public SuccessResponse<TeamInformGetResponse> getTeamName(
 
     @ResponseStatus(HttpStatus.OK)
     @PatchMapping("/{teamId}/inform")
-    public SuccessResponse<?> updateTeamAndTeamMemberInform(
+    public SuccessResponse<?> updateTeamInform(
             final Principal principal,
             @PathVariable final long teamId,
-            @RequestBody final TeamMemberAndTeamInformUpdateRequest request
+            @RequestBody final TeamInformUpdateRequest request
     ) {
         long memberId = Long.parseLong(principal.getName());
-        teamService.updateTeamAndTeamMemberInform(memberId, teamId, TeamMemberAndTeamInformUpdateServiceRequest.from(request));
+        teamService.updateTeamInform(TeamInformUpdateServiceRequest.from(request,memberId,teamId));
         return SuccessResponse.success(SUCCESS_UPDATE_TEAM_NAME.getMessage());
     }
 

src/main/java/com/tiki/server/team/dto/request/TeamMemberAndTeamInformUpdateRequest.java → src/main/java/com/tiki/server/team/dto/request/TeamInformUpdateRequest.java

@@ -2,8 +2,7 @@
 
 import jakarta.validation.constraints.NotNull;
 
-public record TeamMemberAndTeamInformUpdateRequest(
-        @NotNull String teamMemberName,
+public record TeamInformUpdateRequest(
         @NotNull String teamName,
         @NotNull String teamUrl
 ) {

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

@@ -0,0 +1,19 @@
+package com.tiki.server.team.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+
+public record TeamInformUpdateServiceRequest(
+        @NotNull long memberId,
+        @NotNull long teamId,
+        @NotNull String teamName,
+        @NotNull String teamIconUrl
+) {
+    public static TeamInformUpdateServiceRequest from(final TeamInformUpdateRequest request, final long memberId, final long teamId) {
+        return new TeamInformUpdateServiceRequest(
+                memberId,
+                teamId,
+                request.teamName(),
+                request.teamUrl()
+        );
+    }
+}

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

@@ -76,13 +76,17 @@ public static Team of(final TeamCreateRequest request, final University univ) {
                 .subscribe(BASIC)
                 .usage(INIT_NUM)
                 .iconImageUrl(request.iconImageUrl())
-                .namingUpdatedAt(null)
+                .namingUpdatedAt(LocalDate.now())
                 .build();
     }
 
     public void updateInform(final String name, final String iconImageUrl) {
-        updateTeamName(name);
-        updateIconImageUrl(iconImageUrl);
+        if (!name.equals(this.name)) {
+            updateTeamName(name);
+        }
+        if(!iconImageUrl.equals(this.iconImageUrl)){
+            updateIconImageUrl(iconImageUrl);
+        }
     }
 
     private void updateTeamName(final String name) {
@@ -121,9 +125,6 @@ public double getCapacity() {
     }
 
     private boolean canChangeName() {
-        if (namingUpdatedAt == null) {
-            return true;
-        }
         long daysBetween = ChronoUnit.DAYS.between(namingUpdatedAt, LocalDate.now());
         return daysBetween >= 30;
     }

src/main/java/com/tiki/server/team/message/SuccessMessage.java

@@ -8,7 +8,7 @@
 public enum SuccessMessage {
 
 	SUCCESS_CREATE_TEAM("팀 생성 성공"),
-	SUCCESS_UPDATE_TEAM_NAME("팀 이름 변경 성공"),
+	SUCCESS_UPDATE_TEAM_NAME("팀 정보 변경 성공"),
 	SUCCESS_UPDATE_TEAM_ICON("팀 아이콘 변경 성공"),
 	SUCCESS_ALTER_AUTHORITY("어드민 권한 위임 성공"),
 	SUCCESS_GET_TEAMS("전체 팀 불러오기 성공"),

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

@@ -12,7 +12,7 @@
 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.TeamMemberAndTeamInformUpdateServiceRequest;
+import com.tiki.server.team.dto.request.TeamInformUpdateServiceRequest;
 import com.tiki.server.team.dto.response.CategoriesGetResponse;
 import com.tiki.server.team.dto.response.TeamsGetResponse;
 
@@ -93,14 +93,9 @@ private Team createTeam(final TeamCreateRequest request, final University univ)
     }
 
     @Transactional
-    public void updateTeamAndTeamMemberInform(
-            final long memberId,
-            final long teamId,
-            final TeamMemberAndTeamInformUpdateServiceRequest request
-    ) {
-        MemberTeamManager memberTeamManager = checkIsAdmin(memberId, teamId);
-        memberTeamManager.updateName(request.teamMemberName());
-        Team team = teamFinder.findById(teamId);
+    public void updateTeamInform(final TeamInformUpdateServiceRequest request) {
+        checkIsAdmin(request.memberId(), request.teamId());
+        Team team = teamFinder.findById(request.teamId());
         team.updateInform(request.teamName(), request.teamIconUrl());
         updateIconUrlS3(team, request.teamIconUrl());
     }

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

@@ -4,13 +4,16 @@
 import com.tiki.server.team.entity.Team;
 import jakarta.validation.constraints.NotNull;
 
+import java.time.LocalDate;
+
 public record TeamInformGetResponse(
         @NotNull String teamName,
         @NotNull University university,
-        @NotNull String teamIconUrl
-) {
+        @NotNull String teamIconUrl,
+        @NotNull LocalDate namingUpdatedAt
+        ) {
 
     public static TeamInformGetResponse from(final Team team) {
-        return new TeamInformGetResponse(team.getName(),team.getUniv(), team.getIconImageUrl());
+        return new TeamInformGetResponse(team.getName(),team.getUniv(), team.getIconImageUrl(),team.getNamingUpdatedAt());
     }
 }