From 56699705d6bbd86aa4d4c833be68ae0a58f56b1b Mon Sep 17 00:00:00 2001 From: paragon0107 Date: Tue, 31 Dec 2024 16:11:24 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[CHORE]=20=ED=8C=80=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EB=B0=8F=20=ED=8C=80=20=EB=A9=A4=EB=B2=84=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EC=9D=84=20=ED=8C=80=20=EC=84=A4=EC=A0=95=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team/controller/TeamController.java | 10 +++++----- ...uest.java => TeamInformUpdateRequest.java} | 3 +-- .../TeamInformUpdateServiceRequest.java | 19 +++++++++++++++++++ ...mberAndTeamInformUpdateServiceRequest.java | 17 ----------------- .../tiki/server/team/service/TeamService.java | 13 ++++--------- 5 files changed, 29 insertions(+), 33 deletions(-) rename src/main/java/com/tiki/server/team/dto/request/{TeamMemberAndTeamInformUpdateRequest.java => TeamInformUpdateRequest.java} (63%) create mode 100644 src/main/java/com/tiki/server/team/dto/request/TeamInformUpdateServiceRequest.java delete mode 100644 src/main/java/com/tiki/server/team/dto/request/TeamMemberAndTeamInformUpdateServiceRequest.java diff --git a/src/main/java/com/tiki/server/team/controller/TeamController.java b/src/main/java/com/tiki/server/team/controller/TeamController.java index f0e6c938..b95932ed 100644 --- a/src/main/java/com/tiki/server/team/controller/TeamController.java +++ b/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 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()); } diff --git a/src/main/java/com/tiki/server/team/dto/request/TeamMemberAndTeamInformUpdateRequest.java b/src/main/java/com/tiki/server/team/dto/request/TeamInformUpdateRequest.java similarity index 63% rename from src/main/java/com/tiki/server/team/dto/request/TeamMemberAndTeamInformUpdateRequest.java rename to src/main/java/com/tiki/server/team/dto/request/TeamInformUpdateRequest.java index 6206ea81..61e5bc31 100644 --- a/src/main/java/com/tiki/server/team/dto/request/TeamMemberAndTeamInformUpdateRequest.java +++ b/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 ) { diff --git a/src/main/java/com/tiki/server/team/dto/request/TeamInformUpdateServiceRequest.java b/src/main/java/com/tiki/server/team/dto/request/TeamInformUpdateServiceRequest.java new file mode 100644 index 00000000..dea104ca --- /dev/null +++ b/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() + ); + } +} diff --git a/src/main/java/com/tiki/server/team/dto/request/TeamMemberAndTeamInformUpdateServiceRequest.java b/src/main/java/com/tiki/server/team/dto/request/TeamMemberAndTeamInformUpdateServiceRequest.java deleted file mode 100644 index 4938b976..00000000 --- a/src/main/java/com/tiki/server/team/dto/request/TeamMemberAndTeamInformUpdateServiceRequest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.tiki.server.team.dto.request; - -import jakarta.validation.constraints.NotNull; - -public record TeamMemberAndTeamInformUpdateServiceRequest( - @NotNull String teamMemberName, - @NotNull String teamName, - @NotNull String teamIconUrl -) { - public static TeamMemberAndTeamInformUpdateServiceRequest from(final TeamMemberAndTeamInformUpdateRequest request) { - return new TeamMemberAndTeamInformUpdateServiceRequest( - request.teamMemberName(), - request.teamName(), - request.teamUrl() - ); - } -} diff --git a/src/main/java/com/tiki/server/team/service/TeamService.java b/src/main/java/com/tiki/server/team/service/TeamService.java index 11055af9..87adc4d7 100644 --- a/src/main/java/com/tiki/server/team/service/TeamService.java +++ b/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()); } From 5a5949be8374eca3e4da7742e93abbc56d73931f Mon Sep 17 00:00:00 2001 From: paragon0107 Date: Tue, 31 Dec 2024 16:12:09 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[CHORE]=20=ED=8C=80=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EB=B0=98=ED=99=98=EC=8B=9C=20=ED=8C=80=20=EB=84=A4=EC=9E=84?= =?UTF-8?q?=EC=9D=B4=20=EC=88=98=EC=A0=95=EB=90=9C=20=EC=8B=9C=EA=B8=B0=20?= =?UTF-8?q?=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team/service/dto/response/TeamInformGetResponse.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/tiki/server/team/service/dto/response/TeamInformGetResponse.java b/src/main/java/com/tiki/server/team/service/dto/response/TeamInformGetResponse.java index 6e320e23..14811941 100644 --- a/src/main/java/com/tiki/server/team/service/dto/response/TeamInformGetResponse.java +++ b/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()); } } From 736fd40cbb3a9232d3d0abf107d433a99b8314b4 Mon Sep 17 00:00:00 2001 From: paragon0107 Date: Tue, 31 Dec 2024 16:12:30 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[CHORE]=20=ED=8C=80=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=8B=9C=20=EA=B8=B0=EC=A1=B4=20=EA=B0=92?= =?UTF-8?q?=EA=B3=BC=20=EB=B9=84=EA=B5=90=ED=9B=84=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/tiki/server/team/entity/Team.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/tiki/server/team/entity/Team.java b/src/main/java/com/tiki/server/team/entity/Team.java index fa3e6a98..98d444ec 100644 --- a/src/main/java/com/tiki/server/team/entity/Team.java +++ b/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; } From 2f2f76f4b064ecc6b9e2b7e2af4923d3f42fc4b7 Mon Sep 17 00:00:00 2001 From: paragon0107 Date: Tue, 31 Dec 2024 16:24:59 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[CHORE]=20=ED=8C=80=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=84=B1=EA=B3=B5=20=EB=A9=94=EC=84=B8?= =?UTF-8?q?=EC=A7=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/tiki/server/team/message/SuccessMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/tiki/server/team/message/SuccessMessage.java b/src/main/java/com/tiki/server/team/message/SuccessMessage.java index 38ee1ea0..e4ba24dc 100644 --- a/src/main/java/com/tiki/server/team/message/SuccessMessage.java +++ b/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("전체 팀 불러오기 성공"),