Merge pull request #189 from Team-Tiki/chore-/#188-workspace-naming-p…

…olicy [CHORE] 워크스페이스 이름 변경 정책 추가
Team-Tiki · Dec 8, 2024 · ace7dd1 · ace7dd1
2 parents 33d88c9 + 035c806
commit ace7dd1
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 53 deletions.
diff --git a/src/main/java/com/tiki/server/memberteammanager/controller/MemberTeamController.java b/src/main/java/com/tiki/server/memberteammanager/controller/MemberTeamController.java
@@ -13,6 +13,8 @@
 
 import static com.tiki.server.common.dto.SuccessResponse.success;
 import static com.tiki.server.memberteammanager.message.SuccessMessage.GET_POSITION;
+import static com.tiki.server.memberteammanager.message.SuccessMessage.KICK_TEAM;
+import static com.tiki.server.memberteammanager.message.SuccessMessage.LEAVE_TEAM;
 import static com.tiki.server.memberteammanager.message.SuccessMessage.UPDATE_NAME;
 
 @RestController
@@ -42,4 +44,25 @@ public ResponseEntity<BaseResponse> updateTeamMemberName(
         memberTeamManagerService.updateTeamMemberName(memberId, teamId, request.newName());
         return ResponseEntity.ok(success(UPDATE_NAME.getMessage()));
     }
+
+    @DeleteMapping("/teams/{teamId}/members/{kickOutMemberId}")
+    public ResponseEntity<BaseResponse> kickOutMemberFromTeam(
+            final Principal principal,
+            @PathVariable final long teamId,
+            @PathVariable final long kickOutMemberId
+    ) {
+        long memberId = Long.parseLong(principal.getName());
+        memberTeamManagerService.kickOutMemberFromTeam(memberId, teamId, kickOutMemberId);
+        return ResponseEntity.ok(success(KICK_TEAM.getMessage()));
+    }
+
+    @DeleteMapping("/teams/{teamId}/leave")
+    public ResponseEntity<BaseResponse> leaveTeam(
+            final Principal principal,
+            @PathVariable final long teamId
+    ) {
+        long memberId = Long.parseLong(principal.getName());
+        memberTeamManagerService.leaveTeam(memberId, teamId);
+        return ResponseEntity.ok(success(LEAVE_TEAM.getMessage()));
+    }
 }
diff --git a/src/main/java/com/tiki/server/memberteammanager/controller/MemberTeamManagerController.java b/src/main/java/com/tiki/server/memberteammanager/controller/MemberTeamManagerController.java
diff --git a/src/main/java/com/tiki/server/memberteammanager/message/SuccessMessage.java b/src/main/java/com/tiki/server/memberteammanager/message/SuccessMessage.java
@@ -7,8 +7,10 @@
 @RequiredArgsConstructor
 public enum SuccessMessage {
 
-	UPDATE_NAME("팀 내 이름 변경 성공"),
-	GET_POSITION("직책 불러오기 성공");
+    UPDATE_NAME("팀 내 이름 변경 성공"),
+    LEAVE_TEAM("팀 탈퇴 성공"),
+    KICK_TEAM("팀 퇴출 성공"),
+    GET_POSITION("직책 불러오기 성공");
 
-	private final String message;
+    private final String message;
 }
diff --git a/src/main/java/com/tiki/server/team/entity/Team.java b/src/main/java/com/tiki/server/team/entity/Team.java
@@ -1,5 +1,6 @@
 package com.tiki.server.team.entity;
 
+import static com.tiki.server.team.message.ErrorCode.TOO_SHORT_PERIOD;
 import static jakarta.persistence.EnumType.STRING;
 import static jakarta.persistence.GenerationType.IDENTITY;
 import static lombok.AccessLevel.PRIVATE;
@@ -9,11 +10,14 @@
 import com.tiki.server.common.entity.University;
 import com.tiki.server.team.dto.request.TeamCreateRequest;
 
+import com.tiki.server.team.exception.TeamException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 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;
@@ -44,18 +48,24 @@ public class Team extends BaseTime {
     private String imageUrl;
 
     private String iconImageUrl;
+    private LocalDate namingUpdatedAt;
 
     public static Team of(TeamCreateRequest request, University univ) {
         return Team.builder()
                 .name(request.name())
                 .category(request.category())
                 .univ(univ)
+                .namingUpdatedAt(null)
                 .iconImageUrl(request.iconImageUrl())
                 .build();
     }
 
     public void updateName(final String name) {
+        if (!canChangeName()) {
+            throw new TeamException(TOO_SHORT_PERIOD);
+        }
         this.name = name;
+        this.namingUpdatedAt = LocalDate.now();
     }
 
     public void setIconImageUrl(final String url) {
@@ -65,4 +75,12 @@ public void setIconImageUrl(final String url) {
     public boolean isDefaultImage() {
         return this.getIconImageUrl().isBlank();
     }
+
+    private boolean canChangeName() {
+        if (namingUpdatedAt == null) {
+            return true;
+        }
+        long daysBetween = ChronoUnit.DAYS.between(namingUpdatedAt, LocalDate.now());
+        return daysBetween >= 30;
+    }
 }
diff --git a/src/main/java/com/tiki/server/team/message/ErrorCode.java b/src/main/java/com/tiki/server/team/message/ErrorCode.java
@@ -11,15 +11,16 @@
 @AllArgsConstructor
 public enum ErrorCode {
 
-	/* 400 BAD_REQUEST : 잘못된 요청 */
-	TOO_HIGH_AUTHORIZATION(BAD_REQUEST, "어드민은 진행할 수 없습니다."),
+    /* 400 BAD_REQUEST : 잘못된 요청 */
+    TOO_HIGH_AUTHORIZATION(BAD_REQUEST, "어드민은 진행할 수 없습니다."),
+    TOO_SHORT_PERIOD(BAD_REQUEST, "30일이 지나야 이름을 변경할 수 있습니다."),
 
-	/* 403 FORBIDDEN : 권한 없음 */
-	INVALID_AUTHORIZATION_DELETE(FORBIDDEN, "권한이 없습니다."),
+    /* 403 FORBIDDEN : 권한 없음 */
+    INVALID_AUTHORIZATION_DELETE(FORBIDDEN, "권한이 없습니다."),
 
-	/* 404 NOT_FOUND : 자원을 찾을 수 없음 */
-	INVALID_TEAM(NOT_FOUND, "유효하지 않은 단체입니다.");
+    /* 404 NOT_FOUND : 자원을 찾을 수 없음 */
+    INVALID_TEAM(NOT_FOUND, "유효하지 않은 단체입니다.");
 
-	private final HttpStatus httpStatus;
-	private final String message;
+    private final HttpStatus httpStatus;
+    private final String message;
 }