Skip to content

Commit 5c8b120

Browse files
committed
CLAP-126 Fix : Merge Conflict 해결을 위한 수정
1 parent f965d1c commit 5c8b120

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

src/main/java/clap/server/application/Task/CreateTaskService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ public CreateAndUpdateTaskResponse createTask(Long requesterId, CreateTaskReques
6464
applicationEventPublisher.publishEvent(createNotificationRequest);
6565
}
6666

67-
return TaskMapper.toCreateAndUpdateTaskResponse(savedTask);
67+
return TaskMapper.toCreateTaskResponse(savedTask);
6868
}
6969
}

src/main/java/clap/server/config/evenlistener/CustomEventListener.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import clap.server.adapter.inbound.web.dto.notification.CreateNotificationRequest;
44
import clap.server.application.service.notification.CreateNotificationService;
55
import lombok.RequiredArgsConstructor;
6-
import org.springframework.context.event.EventListener;
76
import org.springframework.stereotype.Component;
87
import org.springframework.transaction.annotation.Propagation;
98
import org.springframework.transaction.annotation.Transactional;

src/test/java/clap/server/notification/NotificationServiceTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.time.LocalDateTime;
1919
import java.util.List;
2020

21-
import static org.junit.Assert.assertEquals;
2221
import static org.mockito.Mockito.when;
2322

2423
@Testcontainers

0 commit comments

Comments
 (0)