From a634c39063d98a2f016670f61ec5d48d3a7ea68b Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Sun, 26 Jan 2025 20:16:38 +0900 Subject: [PATCH 1/3] =?UTF-8?q?CLAP-149=20HotFix:=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EC=88=98=EC=A0=95=20=EC=8B=9C?= =?UTF-8?q?=20secured=20=EC=98=A4=ED=83=88=EC=9E=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inbound/web/task/ManagementTaskController.java | 8 ++++---- .../server/domain/model/notification/Notification.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java index 3b20d9ee..f3df7958 100644 --- a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java +++ b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java @@ -33,8 +33,8 @@ public class ManagementTaskController { private final ApprovalTaskUsecase approvalTaskUsecase; @Operation(summary = "작업 요청 생성") - @PostMapping(consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE}) - @Secured({"ROLE_MANAGER, ROLE_USER"}) + @PostMapping(consumes = {MediaType.MULTIPART_FORM_DATA_VALUE}) + @Secured({"ROLE_MANAGER", "ROLE_USER"}) public ResponseEntity createTask( @RequestPart(name = "taskInfo") @Valid CreateTaskRequest createTaskRequest, @RequestPart(name = "attachment") @NotNull List attachments, @@ -44,8 +44,8 @@ public ResponseEntity createTask( } @Operation(summary = "작업 수정") - @PatchMapping(value = "/{taskId}", consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE}) - @Secured({"ROLE_MANAGER, ROLE_USER"}) + @PatchMapping(value = "/{taskId}", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE}) + @Secured({"ROLE_MANAGER", "ROLE_USER"}) public ResponseEntity updateTask( @PathVariable @NotNull Long taskId, @RequestPart(name = "taskInfo") @Valid UpdateTaskRequest updateTaskRequest, diff --git a/src/main/java/clap/server/domain/model/notification/Notification.java b/src/main/java/clap/server/domain/model/notification/Notification.java index 46bd4f26..e96f9718 100644 --- a/src/main/java/clap/server/domain/model/notification/Notification.java +++ b/src/main/java/clap/server/domain/model/notification/Notification.java @@ -44,7 +44,7 @@ public static Notification createTaskNotification(Task task, Member reviewer, No .task(task) .type(type) .receiver(reviewer) - .message(null) + .message("테스트메세지") .build(); } } From c7694223a2063845cf75ec91e0e90278eb2f9bd0 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Sun, 26 Jan 2025 20:27:58 +0900 Subject: [PATCH 2/3] =?UTF-8?q?CLAP-149=20HotFix:=20=EC=9E=91=EC=97=85?= =?UTF-8?q?=EC=83=9D=EC=84=B1=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20=EC=83=9D=EC=84=B1=20=EC=8B=9C=20null=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clap/server/domain/model/notification/Notification.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/clap/server/domain/model/notification/Notification.java b/src/main/java/clap/server/domain/model/notification/Notification.java index e96f9718..46bd4f26 100644 --- a/src/main/java/clap/server/domain/model/notification/Notification.java +++ b/src/main/java/clap/server/domain/model/notification/Notification.java @@ -44,7 +44,7 @@ public static Notification createTaskNotification(Task task, Member reviewer, No .task(task) .type(type) .receiver(reviewer) - .message("테스트메세지") + .message(null) .build(); } } From 202ad84f2d7af60e8f5913282e830e17ce9693c5 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Sun, 26 Jan 2025 20:31:50 +0900 Subject: [PATCH 3/3] =?UTF-8?q?CLAP-149=20HotFix:=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EC=88=98=EC=A0=95=20=EC=8B=9C?= =?UTF-8?q?=20mediatype=20json=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/inbound/web/task/ManagementTaskController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java index f3df7958..7a4c0f19 100644 --- a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java +++ b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java @@ -33,7 +33,7 @@ public class ManagementTaskController { private final ApprovalTaskUsecase approvalTaskUsecase; @Operation(summary = "작업 요청 생성") - @PostMapping(consumes = {MediaType.MULTIPART_FORM_DATA_VALUE}) + @PostMapping(consumes = {MediaType.MULTIPART_FORM_DATA_VALUE, MediaType.APPLICATION_JSON_VALUE}) @Secured({"ROLE_MANAGER", "ROLE_USER"}) public ResponseEntity createTask( @RequestPart(name = "taskInfo") @Valid CreateTaskRequest createTaskRequest, @@ -44,7 +44,7 @@ public ResponseEntity createTask( } @Operation(summary = "작업 수정") - @PatchMapping(value = "/{taskId}", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE}) + @PatchMapping(value = "/{taskId}", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE, MediaType.APPLICATION_JSON_VALUE}) @Secured({"ROLE_MANAGER", "ROLE_USER"}) public ResponseEntity updateTask( @PathVariable @NotNull Long taskId,