diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendaannouncement/controller/AgendaAnnouncementAdminController.java b/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendaannouncement/controller/AgendaAnnouncementAdminController.java index f9b7765fa..ce3a00382 100644 --- a/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendaannouncement/controller/AgendaAnnouncementAdminController.java +++ b/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendaannouncement/controller/AgendaAnnouncementAdminController.java @@ -1,7 +1,5 @@ package gg.agenda.api.admin.agendaannouncement.controller; -import gg.agenda.api.admin.agendaannouncement.controller.request.AgendaAnnouncementAdminUpdateReqDto; -import gg.agenda.api.user.agendaannouncement.controller.request.AgendaAnnouncementCreateReqDto; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; @@ -19,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import gg.agenda.api.admin.agendaannouncement.controller.request.AgendaAnnouncementAdminUpdateReqDto; import gg.agenda.api.admin.agendaannouncement.controller.response.AgendaAnnouncementAdminResDto; import gg.agenda.api.admin.agendaannouncement.service.AgendaAnnouncementAdminService; import gg.data.agenda.AgendaAnnouncement; diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendaannouncement/controller/request/AgendaAnnouncementAdminUpdateReqDto.java b/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendaannouncement/controller/request/AgendaAnnouncementAdminUpdateReqDto.java index dfe23e9fe..59709a144 100644 --- a/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendaannouncement/controller/request/AgendaAnnouncementAdminUpdateReqDto.java +++ b/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendaannouncement/controller/request/AgendaAnnouncementAdminUpdateReqDto.java @@ -2,11 +2,13 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; + +import org.hibernate.validator.constraints.Length; + import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.hibernate.validator.constraints.Length; @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendaannouncement/service/AgendaAnnouncementAdminService.java b/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendaannouncement/service/AgendaAnnouncementAdminService.java index 91181e7fb..bb9901eee 100644 --- a/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendaannouncement/service/AgendaAnnouncementAdminService.java +++ b/gg-agenda-api/src/main/java/gg/agenda/api/admin/agendaannouncement/service/AgendaAnnouncementAdminService.java @@ -2,8 +2,6 @@ import static gg.utils.exception.ErrorCode.*; -import gg.agenda.api.admin.agendaannouncement.controller.request.AgendaAnnouncementAdminUpdateReqDto; -import gg.agenda.api.user.agendaannouncement.controller.request.AgendaAnnouncementCreateReqDto; import java.util.List; import java.util.UUID; @@ -13,6 +11,7 @@ import gg.admin.repo.agenda.AgendaAdminRepository; import gg.admin.repo.agenda.AgendaAnnouncementAdminRepository; +import gg.agenda.api.admin.agendaannouncement.controller.request.AgendaAnnouncementAdminUpdateReqDto; import gg.data.agenda.Agenda; import gg.data.agenda.AgendaAnnouncement; import gg.utils.exception.custom.NotExistException; diff --git a/gg-agenda-api/src/test/java/gg/agenda/api/admin/agendaannouncement/controller/AgendaAnnouncementAdminControllerTest.java b/gg-agenda-api/src/test/java/gg/agenda/api/admin/agendaannouncement/controller/AgendaAnnouncementAdminControllerTest.java index c78902c45..02495a2fb 100644 --- a/gg-agenda-api/src/test/java/gg/agenda/api/admin/agendaannouncement/controller/AgendaAnnouncementAdminControllerTest.java +++ b/gg-agenda-api/src/test/java/gg/agenda/api/admin/agendaannouncement/controller/AgendaAnnouncementAdminControllerTest.java @@ -4,7 +4,6 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; -import gg.agenda.api.admin.agendaannouncement.controller.request.AgendaAnnouncementAdminUpdateReqDto; import java.util.List; import java.util.UUID; @@ -26,6 +25,7 @@ import gg.admin.repo.agenda.AgendaAdminRepository; import gg.admin.repo.agenda.AgendaAnnouncementAdminRepository; +import gg.agenda.api.admin.agendaannouncement.controller.request.AgendaAnnouncementAdminUpdateReqDto; import gg.agenda.api.user.agendaannouncement.controller.response.AgendaAnnouncementResDto; import gg.data.agenda.Agenda; import gg.data.agenda.AgendaAnnouncement; diff --git a/gg-agenda-api/src/test/java/gg/agenda/api/admin/agendaannouncement/service/AgendaAnnouncementAdminServiceTest.java b/gg-agenda-api/src/test/java/gg/agenda/api/admin/agendaannouncement/service/AgendaAnnouncementAdminServiceTest.java index 6d2a3467b..e934f3a59 100644 --- a/gg-agenda-api/src/test/java/gg/agenda/api/admin/agendaannouncement/service/AgendaAnnouncementAdminServiceTest.java +++ b/gg-agenda-api/src/test/java/gg/agenda/api/admin/agendaannouncement/service/AgendaAnnouncementAdminServiceTest.java @@ -2,18 +2,12 @@ import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; -import gg.admin.repo.agenda.AgendaAdminRepository; -import gg.admin.repo.agenda.AgendaAnnouncementAdminRepository; -import gg.agenda.api.admin.agendaannouncement.controller.request.AgendaAnnouncementAdminUpdateReqDto; -import gg.data.agenda.Agenda; -import gg.data.agenda.AgendaAnnouncement; -import gg.utils.annotation.UnitTest; -import gg.utils.exception.custom.NotExistException; + import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.UUID; -import lombok.extern.slf4j.Slf4j; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -24,6 +18,15 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; +import gg.admin.repo.agenda.AgendaAdminRepository; +import gg.admin.repo.agenda.AgendaAnnouncementAdminRepository; +import gg.agenda.api.admin.agendaannouncement.controller.request.AgendaAnnouncementAdminUpdateReqDto; +import gg.data.agenda.Agenda; +import gg.data.agenda.AgendaAnnouncement; +import gg.utils.annotation.UnitTest; +import gg.utils.exception.custom.NotExistException; +import lombok.extern.slf4j.Slf4j; + @Slf4j @UnitTest public class AgendaAnnouncementAdminServiceTest { diff --git a/gg-data/src/main/java/gg/data/agenda/AgendaAnnouncement.java b/gg-data/src/main/java/gg/data/agenda/AgendaAnnouncement.java index ed515ff34..18e68dcac 100644 --- a/gg-data/src/main/java/gg/data/agenda/AgendaAnnouncement.java +++ b/gg-data/src/main/java/gg/data/agenda/AgendaAnnouncement.java @@ -1,6 +1,7 @@ package gg.data.agenda; import java.util.Objects; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType;