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

src/main/java/com/tiki/server/auth/controller/docs/AuthControllerDocs.java

@@ -11,7 +11,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;

src/main/java/com/tiki/server/document/entity/Document.java

@@ -1,20 +1,16 @@
 package com.tiki.server.document.entity;
 
-import static jakarta.persistence.FetchType.LAZY;
 import static jakarta.persistence.GenerationType.IDENTITY;
 import static lombok.AccessLevel.PRIVATE;
 import static lombok.AccessLevel.PROTECTED;
 
 import com.tiki.server.common.entity.BaseTime;
 import com.tiki.server.document.dto.request.DocumentCreateRequest;
-import com.tiki.server.timeblock.entity.TimeBlock;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;

src/main/java/com/tiki/server/document/repository/DocumentRepository.java

@@ -4,9 +4,7 @@
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
 
-import com.tiki.server.common.entity.Position;
 import com.tiki.server.document.entity.Document;
 
 public interface DocumentRepository extends JpaRepository<Document, Long> {

src/main/java/com/tiki/server/document/service/DocumentService.java

@@ -20,7 +20,7 @@
 import com.tiki.server.document.entity.Document;
 import com.tiki.server.document.exception.DocumentException;
 import com.tiki.server.documenttimeblockmanager.adapter.DTBAdapter;
-import com.tiki.server.external.util.S3Handler;
+import com.tiki.server.external.util.AwsHandler;
 import com.tiki.server.folder.adapter.FolderFinder;
 import com.tiki.server.folder.entity.Folder;
 import com.tiki.server.memberteammanager.adapter.MemberTeamManagerFinder;
@@ -43,7 +43,7 @@ public class DocumentService {
 	private final DeletedDocumentAdapter deletedDocumentAdapter;
 	private final TeamFinder teamFinder;
 	private final DTBAdapter dtbAdapter;
-	private final S3Handler s3Handler;
+	private final AwsHandler awsHandler;
 
 	public DocumentsGetResponse getAllDocuments(final long memberId, final long teamId, final String type) {
 		MemberTeamManager memberTeamManager = memberTeamManagerFinder.findByMemberIdAndTeamId(memberId, teamId);
@@ -82,7 +82,7 @@ public void deleteTrash(final long memberId, final long teamId, final List<Long>
 		memberTeamManagerFinder.findByMemberIdAndTeamId(memberId, teamId);
 		List<DeletedDocument> deletedDocuments = deletedDocumentAdapter.get(documentIds, teamId);
 		restoreTeamUsage(teamId, deletedDocuments);
-		deletedDocuments.forEach(deletedDocument -> s3Handler.deleteFile(deletedDocument.getFileKey()));
+		deletedDocuments.forEach(deletedDocument -> awsHandler.deleteFile(deletedDocument.getFileKey()));
 		deletedDocumentAdapter.deleteAll(deletedDocuments);
 	}
 

src/main/java/com/tiki/server/external/controller/S3Controller.java → src/main/java/com/tiki/server/external/controller/FileHandlerController.java

@@ -4,7 +4,7 @@
 import static com.tiki.server.external.message.SuccessMessage.PRESIGNED_URL_GET_SUCCESS;
 import static com.tiki.server.external.message.SuccessMessage.S3_FILE_DELETE_SUCCESS;
 
-import com.tiki.server.external.service.S3Service;
+import com.tiki.server.external.service.FileHandlerService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,7 +15,7 @@
 
 import com.tiki.server.common.dto.BaseResponse;
 import com.tiki.server.common.dto.SuccessResponse;
-import com.tiki.server.external.controller.docs.S3ControllerDocs;
+import com.tiki.server.external.controller.docs.FileeHandlerControllerDocs;
 import com.tiki.server.external.dto.request.S3DeleteRequest;
 import com.tiki.server.external.dto.response.PreSignedUrlResponse;
 
@@ -24,21 +24,21 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("api/v1/file")
-public class S3Controller implements S3ControllerDocs {
+public class FileHandlerController implements FileeHandlerControllerDocs {
 
-	private final S3Service s3Service;
+	private final FileHandlerService fileHandlerService;
 
 	@Override
 	@GetMapping("/upload")
 	public ResponseEntity<SuccessResponse<PreSignedUrlResponse>> getPreSignedUrl(@RequestParam String fileFormat) {
-		PreSignedUrlResponse response = s3Service.getUploadPreSignedUrl(fileFormat);
+		PreSignedUrlResponse response = fileHandlerService.getUploadPreSignedUrl(fileFormat);
 		return ResponseEntity.ok(success(PRESIGNED_URL_GET_SUCCESS.getMessage(), response));
 	}
 
 	@Override
 	@PostMapping
 	public ResponseEntity<BaseResponse> deleteFile(@RequestBody S3DeleteRequest request) {
-		s3Service.deleteFile(request);
+		fileHandlerService.deleteFile(request);
 		return ResponseEntity.ok(success(S3_FILE_DELETE_SUCCESS.getMessage()));
 	}
 }

src/main/java/com/tiki/server/external/controller/docs/S3ControllerDocs.java → src/main/java/com/tiki/server/external/controller/docs/FileeHandlerControllerDocs.java

@@ -19,7 +19,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 @Tag(name = "S3", description = "AWS S3 API")
-public interface S3ControllerDocs {
+public interface FileeHandlerControllerDocs {
 
 	@Operation(
 		summary = "Presigned Url 생성",

src/main/java/com/tiki/server/external/service/S3Service.java → src/main/java/com/tiki/server/external/service/FileHandlerService.java

@@ -2,21 +2,21 @@
 
 import com.tiki.server.external.dto.request.S3DeleteRequest;
 import com.tiki.server.external.dto.response.PreSignedUrlResponse;
-import com.tiki.server.external.util.S3Handler;
+import com.tiki.server.external.util.AwsHandler;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
-public class S3Service {
+public class FileHandlerService {
 
-    private final S3Handler s3Handler;
+    private final AwsHandler awsHandler;
 
     public PreSignedUrlResponse getUploadPreSignedUrl(final String fileFormat) {
-        return s3Handler.getUploadPreSignedUrl(fileFormat);
+        return awsHandler.getUploadPreSignedUrl(fileFormat);
     }
 
     public void deleteFile(final S3DeleteRequest request) {
-        s3Handler.deleteFile(request.fileKey());
+        awsHandler.deleteFile(request.fileKey());
     }
 }

src/main/java/com/tiki/server/external/util/S3Handler.java → src/main/java/com/tiki/server/external/util/AwsHandler.java

@@ -24,7 +24,7 @@
 
 @Component
 @RequiredArgsConstructor
-public class S3Handler {
+public class AwsHandler {
 
 	private final AWSConfig awsConfig;
 

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

@@ -4,15 +4,15 @@
 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.*;
 
 import java.security.Principal;
 
 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.GET_TEAM_INFORM;
 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;
@@ -25,13 +25,13 @@ 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);
-        return ResponseEntity.ok().body(success(GET_POSITION.getMessage(), response));
+        MemberTeamInformGetResponse response = memberTeamManagerService.getMemberTeamInform(memberId, teamId);
+        return ResponseEntity.ok().body(success(GET_TEAM_INFORM.getMessage(), response));
     }
 
     @PatchMapping("/teams/{teamId}/members/name")

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

@@ -7,10 +7,10 @@
 @RequiredArgsConstructor
 public enum SuccessMessage {
 
-    UPDATE_NAME("팀 내 이름 변경 성공"),
-    LEAVE_TEAM("팀 탈퇴 성공"),
+    GET_TEAM_INFORM("팀 개인 정보 불러오기 성공"),
     KICK_TEAM("팀 퇴출 성공"),
-    GET_POSITION("직책 불러오기 성공");
+    LEAVE_TEAM("팀 탈퇴 성공"),
+    UPDATE_NAME("팀 내 이름 변경 성공");
 
     private final String message;
 }

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;
 
@@ -31,22 +31,24 @@ public class MemberTeamManagerService {
 
     @Transactional
     public void kickOutMemberFromTeam(final long memberId, final long teamId, final long kickOutMemberId) {
-        checkIsAdmin(memberId, teamId);
-        MemberTeamManager memberTeamManager = memberTeamManagerFinder.findByMemberIdAndTeamId(kickOutMemberId, teamId);
+        MemberTeamManager accessMember = memberTeamManagerFinder.findByMemberIdAndTeamId(memberId, teamId);
+        checkIsAdmin(accessMember);
+        MemberTeamManager kickOutMember = memberTeamManagerFinder.findByMemberIdAndTeamId(kickOutMemberId, teamId);
         deleteNoteDependency(kickOutMemberId, teamId);
-        memberTeamManagerDeleter.delete(memberTeamManager);
+        memberTeamManagerDeleter.delete(kickOutMember);
     }
 
     @Transactional
     public void leaveTeam(final long memberId, final long teamId) {
-        MemberTeamManager memberTeamManager = checkIsNotAdmin(memberId, teamId);
+        MemberTeamManager accessMember = memberTeamManagerFinder.findByMemberIdAndTeamId(memberId, teamId);
+        checkIsNotAdmin(accessMember);
         deleteNoteDependency(memberId, teamId);
-        memberTeamManagerDeleter.delete(memberTeamManager);
+        memberTeamManagerDeleter.delete(accessMember);
     }
 
-    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.of(memberTeamManager.getPosition(), memberTeamManager.getName());
     }
 
     @Transactional
@@ -55,19 +57,16 @@ public void updateTeamMemberName(final long memberId, final long teamId, final S
         memberTeamManager.updateName(name);
     }
 
-    private void checkIsAdmin(final long memberId, final long teamId) {
-        MemberTeamManager memberTeamManager = memberTeamManagerFinder.findByMemberIdAndTeamId(memberId, teamId);
+    private void checkIsAdmin(MemberTeamManager memberTeamManager) {
         if (!memberTeamManager.getPosition().equals(ADMIN)) {
             throw new TeamException(INVALID_AUTHORIZATION_DELETE);
         }
     }
 
-    private MemberTeamManager checkIsNotAdmin(final long memberId, final long teamId) {
-        MemberTeamManager memberTeamManager = memberTeamManagerFinder.findByMemberIdAndTeamId(memberId, teamId);
+    private void checkIsNotAdmin(MemberTeamManager memberTeamManager) {
         if (memberTeamManager.getPosition().equals(ADMIN)) {
             throw new TeamException(TOO_HIGH_AUTHORIZATION);
         }
-        return memberTeamManager;
     }
 
     private void deleteNoteDependency(final long memberId, final long teamId) {

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

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

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

@@ -6,13 +6,14 @@
 import java.security.Principal;
 
 import com.tiki.server.common.dto.BaseResponse;
-import com.tiki.server.team.dto.request.UpdateTeamIconRequest;
-import com.tiki.server.team.dto.request.UpdateTeamNameRequest;
+import com.tiki.server.team.dto.request.TeamMemberAndTeamInformUpdateRequest;
+import com.tiki.server.team.dto.request.TeamMemberAndTeamInformUpdateServiceRequest;
 import com.tiki.server.team.dto.response.UsageGetResponse;
 import com.tiki.server.team.dto.response.CategoriesGetResponse;
 import com.tiki.server.team.dto.response.TeamsGetResponse;
 
 import org.springframework.http.HttpStatus;
+import com.tiki.server.team.service.dto.response.TeamInformGetResponse;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -70,26 +71,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_TEAM_INFORM.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 TeamMemberAndTeamInformUpdateRequest 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, TeamMemberAndTeamInformUpdateServiceRequest.from(request));
+        return ResponseEntity.ok(success(SUCCESS_UPDATE_TEAM_NAME.getMessage()));
     }
 
     @PatchMapping("/{teamId}/member/{targetId}/admin")

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

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

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

@@ -0,0 +1,17 @@
+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(TeamMemberAndTeamInformUpdateRequest request) {
+        return new TeamMemberAndTeamInformUpdateServiceRequest(
+                request.teamMemberName(),
+                request.teamName(),
+                request.teamUrl()
+        );
+    }
+}