CLAP-126 Fix : merge conflict

starboxxxx · starboxxxx · commit 7c5d628f0aeb · 2025-01-26T00:29:04.000+09:00
diff --git a/src/main/java/clap/server/application/Task/CreateTaskService.java b/src/main/java/clap/server/application/Task/CreateTaskService.java
@@ -37,7 +37,7 @@ public class CreateTaskService implements CreateTaskUsecase {
 
     @Override
     @Transactional
-    public CreateAndUpdateTaskResponse createTask(Long requesterId, CreateTaskRequest createTaskRequest) {
+    public CreateTaskResponse createTask(Long requesterId, CreateTaskRequest createTaskRequest) {
         Member member = memberService.findActiveMember(requesterId);
         Category category = categoryService.findById(createTaskRequest.categoryId());
         Task task = Task.createTask(member, category, createTaskRequest.title(), createTaskRequest.description());
@@ -64,6 +64,6 @@ public CreateAndUpdateTaskResponse createTask(Long requesterId, CreateTaskReques
             applicationEventPublisher.publishEvent(notification);
         }
 
-        return TaskMapper.toCreateAndUpdateTaskResponse(savedTask);
+        return TaskMapper.toCreateTaskResponse(savedTask);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public class CreateTaskService implements CreateTaskUsecase {`
`37`	`37`
`38`	`38`	`@Override`
`39`	`39`	`@Transactional`
`40`		`- public CreateAndUpdateTaskResponse createTask(Long requesterId, CreateTaskRequest createTaskRequest) {`
	`40`	`+ public CreateTaskResponse createTask(Long requesterId, CreateTaskRequest createTaskRequest) {`
`41`	`41`	`Member member = memberService.findActiveMember(requesterId);`
`42`	`42`	`Category category = categoryService.findById(createTaskRequest.categoryId());`
`43`	`43`	`Task task = Task.createTask(member, category, createTaskRequest.title(), createTaskRequest.description());`
`@@ -64,6 +64,6 @@ public CreateAndUpdateTaskResponse createTask(Long requesterId, CreateTaskReques`
`64`	`64`	`applicationEventPublisher.publishEvent(notification);`
`65`	`65`	`}`
`66`	`66`
`67`		`- return TaskMapper.toCreateAndUpdateTaskResponse(savedTask);`
	`67`	`+ return TaskMapper.toCreateTaskResponse(savedTask);`
`68`	`68`	`}`
`69`	`69`	`}`