Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package clap.server.adapter.inbound.web.admin;

import clap.server.adapter.inbound.web.dto.admin.request.DeleteMemberRequest;
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 jakarta.validation.Valid;
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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

@Tag(name = "05. Admin")
Expand All @@ -19,8 +21,8 @@ public class DeleteMemberController {

@Operation(summary = "회원 삭제 API")
@Secured("ROLE_ADMIN")
@PatchMapping("/members/{memberId}")
public void deleteMember(@PathVariable Long memberId) {
deleteMemberUsecase.deleteMember(memberId);
@PatchMapping("/members/delete")
public void deleteMember(@RequestBody @Valid DeleteMemberRequest deleteMemberRequest) {
deleteMemberUsecase.deleteMember(deleteMemberRequest.memberId());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
import clap.server.adapter.inbound.web.dto.admin.response.RetrieveAllMemberResponse;
import clap.server.adapter.inbound.web.dto.common.PageResponse;
import clap.server.application.port.inbound.admin.FindMembersWithFilterUsecase;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.ResponseEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package clap.server.adapter.inbound.web.dto.admin.request;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;

public record DeleteMemberRequest(
@NotNull(message = "회원 ID는 필수 값입니다.")
@Schema(description = "삭제할 회원 ID", example = "1", required = true)
Long memberId
) {
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
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;
Expand All @@ -13,8 +12,8 @@
@Service
@RequiredArgsConstructor
public class DeleteMemberService implements DeleteMemberUsecase {
private final LoadMemberPort loadMemberPort; // 조회 작업용 Port
private final CommandMemberPort commandMemberPort; // 데이터 변경 작업용 Port
private final LoadMemberPort loadMemberPort;
private final CommandMemberPort commandMemberPort;

@Override
public void deleteMember(Long memberId) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskLabelRequest;
import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskProcessorRequest;
import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskRequest;
import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse;
import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
import clap.server.adapter.outbound.persistense.entity.task.constant.TaskHistoryType;
import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
import clap.server.application.mapper.AttachmentMapper;
import clap.server.application.mapper.TaskResponseMapper;
import clap.server.application.port.inbound.domain.CategoryService;
import clap.server.application.port.inbound.domain.LabelService;
import clap.server.application.port.inbound.domain.MemberService;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/clap/server/domain/model/member/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class Member extends BaseTime {
private MemberStatus status;
private String password;

// @Builder가 Lombok과 충돓하여 삭제

public Member(MemberInfo memberInfo, Boolean agitNotificationEnabled, Boolean emailNotificationEnabled, Boolean kakaoworkNotificationEnabled,
Member admin, String imageUrl, MemberStatus status, String password) {
this.memberInfo = memberInfo;
Expand Down