Merge branch 'develop' into CLAP-172

joowojr · web-flow · commit 0e1319bd7ed4 · 2025-01-30T18:28:22.000+07:00
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/DeleteMemberController.java b/src/main/java/clap/server/adapter/inbound/web/admin/DeleteMemberController.java
@@ -0,0 +1,26 @@
+package clap.server.adapter.inbound.web.admin;
+
+import clap.server.application.port.inbound.admin.DeleteMemberUsecase;
+import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Tag(name = "05. Admin")
+@WebAdapter
+@RequiredArgsConstructor
+@RequestMapping("/api/managements")
+public class DeleteMemberController {
+    private final DeleteMemberUsecase deleteMemberUsecase;
+
+    @Operation(summary = "회원 삭제 API")
+    @Secured("ROLE_ADMIN")
+    @PatchMapping("/members/{memberId}")
+    public void deleteMember(@PathVariable Long memberId) {
+        deleteMemberUsecase.deleteMember(memberId);
+    }
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/ManagementLabelController.java b/src/main/java/clap/server/adapter/inbound/web/admin/ManagementLabelController.java
@@ -0,0 +1,55 @@
+package clap.server.adapter.inbound.web.admin;
+
+import clap.server.adapter.inbound.security.SecurityUserDetails;
+import clap.server.adapter.inbound.web.dto.label.AddAndEditLabelRequest;
+import clap.server.application.port.inbound.admin.AddLabelUsecase;
+import clap.server.application.port.inbound.admin.DeleteLabelUsecase;
+import clap.server.application.port.inbound.admin.UpdateLabelUsecase;
+import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+@Tag(name = "05. Admin")
+@WebAdapter
+@RequiredArgsConstructor
+@RequestMapping("/api/management/label")
+public class ManagementLabelController {
+
+    private final AddLabelUsecase addLabelUsecase;
+    private final UpdateLabelUsecase updateLabelUsecase;
+    private final DeleteLabelUsecase deleteLabelUsecase;
+
+    @Operation(summary = "구분(label) 추가 API")
+    @PostMapping
+    @Secured({"ROLE_ADMIN"})
+    public void addLabel(@AuthenticationPrincipal SecurityUserDetails userInfo,
+                         @RequestBody AddAndEditLabelRequest request) {
+        addLabelUsecase.addLabel(userInfo.getUserId(), request);
+    }
+
+    @Operation(summary = "구분(label) 수정 API")
+    @Parameter(name = "labelId", description = "구분(label) 고유 ID", required = true, in = ParameterIn.PATH)
+    @PatchMapping("/{labelId}")
+    @Secured({"ROLE_ADMIN"})
+    public void updateLabel(@AuthenticationPrincipal SecurityUserDetails userInfo,
+                            @PathVariable Long labelId,
+                            @RequestBody AddAndEditLabelRequest request) {
+        updateLabelUsecase.editLabel(userInfo.getUserId(), labelId, request);
+
+    }
+
+    @Operation(summary = "구분(label) 삭제 API")
+    @Parameter(name = "labelId", description = "구분(label) 고유 ID", required = true, in = ParameterIn.PATH)
+    @DeleteMapping("/{labelId}")
+    @Secured({"ROLE_ADMIN"})
+    public void deleteLabel(@AuthenticationPrincipal SecurityUserDetails userInfo,
+                            @PathVariable Long labelId) {
+        deleteLabelUsecase.deleteLabel(userInfo.getUserId(), labelId);
+    }
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/label/AddAndEditLabelRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/label/AddAndEditLabelRequest.java
@@ -0,0 +1,13 @@
+package clap.server.adapter.inbound.web.dto.label;
+
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
+import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record AddAndEditLabelRequest(
+
+        @Schema(description = "구분(label) 이름")
+        String labelName,
+        @Schema(description = "구분(label) 색상")
+        LabelColor labelColor
+) {}
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/label/FindLabelListResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/label/FindLabelListResponse.java
@@ -1,10 +1,14 @@
 package clap.server.adapter.inbound.web.dto.label;
 
 import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 public record FindLabelListResponse(
+        @Schema(description = "구분(label) 고유 ID")
         Long labelId,
+        @Schema(description = "구분(label) 이름")
         String labelName,
+        @Schema(description = "구분(label) 색상")
         LabelColor labelColor
 ) {
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/LabelPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/LabelPersistenceAdapter.java
@@ -8,6 +8,7 @@
 import clap.server.adapter.outbound.persistense.repository.task.LabelRepository;
 import clap.server.application.mapper.LabelMapper;
 import clap.server.application.mapper.NotificationMapper;
+import clap.server.application.port.outbound.task.CommandLabelPort;
 import clap.server.application.port.outbound.task.LoadLabelPort;
 import clap.server.common.annotation.architecture.PersistenceAdapter;
 import clap.server.domain.model.notification.Notification;
@@ -22,7 +23,7 @@
 
 @PersistenceAdapter
 @RequiredArgsConstructor
-public class LabelPersistenceAdapter implements LoadLabelPort {
+public class LabelPersistenceAdapter implements LoadLabelPort, CommandLabelPort {
 
     private final LabelRepository labelRepository;
     private final LabelPersistenceMapper labelPersistenceMapper;
@@ -51,4 +52,10 @@ public SliceResponse<FindLabelListResponse> findLabelListBySlice(Pageable pageab
                 labelList.map(LabelMapper::toFindLabelListResponse)
         );
     }
+
+    @Override
+    public void save(Label label) {
+        LabelEntity labelEntity = labelPersistenceMapper.toEntity(label);
+        labelRepository.save(labelEntity);
+    }
 }
diff --git a/src/main/java/clap/server/application/port/inbound/admin/AddLabelUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/AddLabelUsecase.java
@@ -0,0 +1,10 @@
+package clap.server.application.port.inbound.admin;
+
+import clap.server.adapter.inbound.web.dto.label.AddAndEditLabelRequest;
+
+public interface AddLabelUsecase {
+
+    void addLabel(Long adminId, AddAndEditLabelRequest request);
+
+
+}
diff --git a/src/main/java/clap/server/application/port/inbound/admin/DeleteLabelUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/DeleteLabelUsecase.java
@@ -0,0 +1,5 @@
+package clap.server.application.port.inbound.admin;
+
+public interface DeleteLabelUsecase {
+    void deleteLabel(Long adminId, Long labelId);
+}
diff --git a/src/main/java/clap/server/application/port/inbound/admin/DeleteMemberUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/DeleteMemberUsecase.java
@@ -0,0 +1,5 @@
+package clap.server.application.port.inbound.admin;
+
+public interface DeleteMemberUsecase {
+    void deleteMember(Long memberId);
+}
diff --git a/src/main/java/clap/server/application/port/inbound/admin/UpdateLabelUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/UpdateLabelUsecase.java
@@ -0,0 +1,7 @@
+package clap.server.application.port.inbound.admin;
+
+import clap.server.adapter.inbound.web.dto.label.AddAndEditLabelRequest;
+
+public interface UpdateLabelUsecase {
+    void editLabel(Long adminId, Long labelId, AddAndEditLabelRequest request);
+}
diff --git a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java
@@ -1,5 +1,6 @@
 package clap.server.application.port.inbound.domain;
 
+import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.domain.model.member.Member;
 import clap.server.exception.ApplicationException;
@@ -13,6 +14,8 @@
 @RequiredArgsConstructor
 public class MemberService {
     private final LoadMemberPort loadMemberPort;
+    private final CommandMemberPort commandMemberPort;
+
 
     public Member findById(Long memberId) {
         return loadMemberPort.findById(memberId).orElseThrow(
@@ -33,4 +36,5 @@ public Member findReviewer(Long memberId) {
     public List<Member> findReviewers() {
         return loadMemberPort.findReviewers();
     }
+
 }
diff --git a/src/main/java/clap/server/application/port/outbound/task/CommandLabelPort.java b/src/main/java/clap/server/application/port/outbound/task/CommandLabelPort.java
@@ -0,0 +1,7 @@
+package clap.server.application.port.outbound.task;
+
+import clap.server.domain.model.task.Label;
+
+public interface CommandLabelPort {
+    void save(Label label);
+}
diff --git a/src/main/java/clap/server/application/service/admin/DeleteMemberService.java b/src/main/java/clap/server/application/service/admin/DeleteMemberService.java
@@ -0,0 +1,28 @@
+package clap.server.application.service.admin;
+
+import clap.server.application.port.inbound.admin.DeleteMemberUsecase;
+import clap.server.application.port.inbound.domain.MemberService;
+import clap.server.application.port.outbound.member.CommandMemberPort;
+import clap.server.application.port.outbound.member.LoadMemberPort;
+import clap.server.domain.model.member.Member;
+import clap.server.exception.ApplicationException;
+import clap.server.exception.code.MemberErrorCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class DeleteMemberService implements DeleteMemberUsecase {
+    private final LoadMemberPort loadMemberPort; // 조회 작업용 Port
+    private final CommandMemberPort commandMemberPort; // 데이터 변경 작업용 Port
+
+    @Override
+    public void deleteMember(Long memberId) {
+        Member member = loadMemberPort.findById(memberId)
+                .orElseThrow(() -> new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND));
+
+        member.setStatusDeleted();
+
+        commandMemberPort.save(member);
+    }
+}
diff --git a/src/main/java/clap/server/application/service/label/AddLabelService.java b/src/main/java/clap/server/application/service/label/AddLabelService.java
@@ -0,0 +1,27 @@
+package clap.server.application.service.label;
+
+import clap.server.adapter.inbound.web.dto.label.AddAndEditLabelRequest;
+import clap.server.application.port.inbound.admin.AddLabelUsecase;
+import clap.server.application.port.inbound.domain.MemberService;
+import clap.server.application.port.outbound.task.CommandLabelPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.member.Member;
+import clap.server.domain.model.task.Label;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
+@ApplicationService
+@RequiredArgsConstructor
+public class AddLabelService implements AddLabelUsecase {
+
+    private final MemberService memberService;
+    private final CommandLabelPort commandLabelPort;
+
+    @Transactional
+    @Override
+    public void addLabel(Long adminId, AddAndEditLabelRequest request) {
+        Member admin = memberService.findActiveMember(adminId);
+        Label label = Label.addLabel(admin, request);
+        commandLabelPort.save(label);
+    }
+}
diff --git a/src/main/java/clap/server/application/service/label/ManageLabelService.java b/src/main/java/clap/server/application/service/label/ManageLabelService.java
@@ -0,0 +1,48 @@
+package clap.server.application.service.label;
+
+import clap.server.adapter.inbound.web.dto.label.AddAndEditLabelRequest;
+import clap.server.application.port.inbound.admin.DeleteLabelUsecase;
+import clap.server.application.port.inbound.admin.UpdateLabelUsecase;
+import clap.server.application.port.inbound.domain.MemberService;
+import clap.server.application.port.outbound.task.CommandLabelPort;
+import clap.server.application.port.outbound.task.LoadLabelPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.task.Label;
+import clap.server.exception.ApplicationException;
+import clap.server.exception.code.LabelErrorCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
+@ApplicationService
+@RequiredArgsConstructor
+public class ManageLabelService implements UpdateLabelUsecase, DeleteLabelUsecase {
+
+    private final MemberService memberService;
+    private final LoadLabelPort loadLabelPort;
+    private final CommandLabelPort commandLabelPort;
+
+    @Transactional
+    @Override
+    public void editLabel(Long adminId, Long labelId, AddAndEditLabelRequest request) {
+        memberService.findActiveMember(adminId);
+
+        Label label = loadLabelPort.findById(labelId)
+                .orElseThrow(() -> new ApplicationException(LabelErrorCode.LABEL_NOT_FOUND));
+
+        label.updateLabel(request);
+        commandLabelPort.save(label);
+    }
+
+
+    @Transactional
+    @Override
+    public void deleteLabel(Long adminId, Long labelId) {
+        memberService.findActiveMember(adminId);
+
+        Label label = loadLabelPort.findById(labelId)
+                .orElseThrow(() -> new ApplicationException(LabelErrorCode.LABEL_NOT_FOUND));
+
+        label.deleteLabel();
+        commandLabelPort.save(label);
+    }
+}
diff --git a/src/main/java/clap/server/domain/model/member/Member.java b/src/main/java/clap/server/domain/model/member/Member.java
@@ -74,5 +74,7 @@ public void updateMemberInfo(String name, Boolean agitNotificationEnabled, Boole
         if (imageUrl != null) {
             this.imageUrl = imageUrl;
         }
+    public void setStatusDeleted() {
+        this.status = MemberStatus.DELETED;
     }
 }
diff --git a/src/main/java/clap/server/domain/model/task/Label.java b/src/main/java/clap/server/domain/model/task/Label.java
@@ -1,5 +1,6 @@
 package clap.server.domain.model.task;
 
+import clap.server.adapter.inbound.web.dto.label.AddAndEditLabelRequest;
 import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
 import clap.server.domain.model.common.BaseTime;
 import clap.server.domain.model.member.Member;
@@ -17,4 +18,22 @@ public class Label extends BaseTime {
     private String labelName;
     private LabelColor labelColor;
     private boolean isDeleted;
+
+    public static Label addLabel(Member admin, AddAndEditLabelRequest request) {
+        return Label.builder()
+                .admin(admin)
+                .labelName(request.labelName())
+                .labelColor(request.labelColor())
+                .isDeleted(false)
+                .build();
+    }
+
+    public void updateLabel(AddAndEditLabelRequest request) {
+        this.labelName = request.labelName();
+        this.labelColor = request.labelColor();
+    }
+
+    public void deleteLabel() {
+        this.isDeleted = true;
+    }
 }
