diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/auth/spi/QueryAuthCodeLimitPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/auth/spi/QueryAuthCodeLimitPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/auth/spi/QueryAuthCodeLimitPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/auth/spi/QueryAuthCodeLimitPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/auth/spi/QueryAuthCodePort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/auth/spi/QueryAuthCodePort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/auth/spi/QueryAuthCodePort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/auth/spi/QueryAuthCodePort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/file/spi/QueryEmployeeCertificatePort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/file/spi/QueryEmployeeCertificatePort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/file/spi/QueryEmployeeCertificatePort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/file/spi/QueryEmployeeCertificatePort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/holiday/spi/HolidayQueryUserPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/holiday/spi/HolidayQueryUserPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/holiday/spi/HolidayQueryUserPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/holiday/spi/HolidayQueryUserPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/holiday/spi/HolidaySecurityPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/holiday/spi/HolidaySecurityPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/holiday/spi/HolidaySecurityPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/holiday/spi/HolidaySecurityPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/holiday/spi/QueryHolidayPeriodPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/holiday/spi/QueryHolidayPeriodPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/holiday/spi/QueryHolidayPeriodPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/holiday/spi/QueryHolidayPeriodPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/holiday/spi/QueryHolidayPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/holiday/spi/QueryHolidayPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/holiday/spi/QueryHolidayPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/holiday/spi/QueryHolidayPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/menu/spi/MenuQueryUserPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/menu/spi/MenuQueryUserPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/menu/spi/MenuQueryUserPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/menu/spi/MenuQueryUserPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/menu/spi/MenuSecurityPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/menu/spi/MenuSecurityPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/menu/spi/MenuSecurityPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/menu/spi/MenuSecurityPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/menu/spi/QueryMenuPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/menu/spi/QueryMenuPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/menu/spi/QueryMenuPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/menu/spi/QueryMenuPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/spi/QuerySchedulePort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/schedule/spi/QuerySchedulePort.kt similarity index 92% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/spi/QuerySchedulePort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/schedule/spi/QuerySchedulePort.kt index d405b8f9..00fef26f 100644 --- a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/spi/QuerySchedulePort.kt +++ b/simtong-application/src/main/kotlin/team/comit/simtong/domain/schedule/spi/QuerySchedulePort.kt @@ -2,7 +2,7 @@ package team.comit.simtong.domain.schedule.spi import team.comit.simtong.domain.schedule.model.Schedule import team.comit.simtong.domain.schedule.model.Scope -import team.comit.simtong.domain.schedule.vo.SpotSchedule +import team.comit.simtong.domain.schedule.spi.vo.SpotSchedule import java.time.LocalDate import java.util.UUID diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/spi/ScheduleQuerySpotPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/schedule/spi/ScheduleQuerySpotPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/spi/ScheduleQuerySpotPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/schedule/spi/ScheduleQuerySpotPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/spi/ScheduleQueryUserPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/schedule/spi/ScheduleQueryUserPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/spi/ScheduleQueryUserPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/schedule/spi/ScheduleQueryUserPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/spi/ScheduleSecurityPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/schedule/spi/ScheduleSecurityPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/spi/ScheduleSecurityPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/schedule/spi/ScheduleSecurityPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/spot/spi/QuerySpotPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/spot/spi/QuerySpotPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/spot/spi/QuerySpotPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/spot/spi/QuerySpotPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/team/spi/QueryTeamPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/team/spi/QueryTeamPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/team/spi/QueryTeamPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/team/spi/QueryTeamPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/spi/QueryUserPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/QueryUserPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/spi/QueryUserPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/QueryUserPort.kt diff --git a/simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserPort.kt index 9bcbd2d2..612816d5 100644 --- a/simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserPort.kt +++ b/simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserPort.kt @@ -13,4 +13,5 @@ import team.comit.simtong.domain.schedule.spi.ScheduleQueryUserPort * @date 2022/09/18 * @version 1.0.0 **/ -interface UserPort : QueryUserPort, CommandUserPort, CommandDeviceTokenPort, MenuQueryUserPort, ScheduleQueryUserPort, HolidayQueryUserPort, NotificationQueryUserPort \ No newline at end of file +interface UserPort : QueryUserPort, CommandUserPort, CommandDeviceTokenPort, MenuQueryUserPort, ScheduleQueryUserPort, + HolidayQueryUserPort, NotificationQueryUserPort \ No newline at end of file diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQueryAuthCodeLimitPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQueryAuthCodeLimitPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQueryAuthCodeLimitPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQueryAuthCodeLimitPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQueryEmployeeCertificatePort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQueryEmployeeCertificatePort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQueryEmployeeCertificatePort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQueryEmployeeCertificatePort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQuerySpotPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQuerySpotPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQuerySpotPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQuerySpotPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQueryTeamPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQueryTeamPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQueryTeamPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserQueryTeamPort.kt diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/spi/UserSecurityPort.kt b/simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserSecurityPort.kt similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/spi/UserSecurityPort.kt rename to simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserSecurityPort.kt diff --git a/simtong-application/src/test/kotlin/team/comit/simtong/domain/schedule/usecase/QueryEntireSpotScheduleUseCaseTests.kt b/simtong-application/src/test/kotlin/team/comit/simtong/domain/schedule/usecase/QueryEntireSpotScheduleUseCaseTests.kt index 42344f11..49802c28 100644 --- a/simtong-application/src/test/kotlin/team/comit/simtong/domain/schedule/usecase/QueryEntireSpotScheduleUseCaseTests.kt +++ b/simtong-application/src/test/kotlin/team/comit/simtong/domain/schedule/usecase/QueryEntireSpotScheduleUseCaseTests.kt @@ -9,7 +9,7 @@ import team.comit.simtong.domain.schedule.dto.QueryEntireSpotScheduleResponse import team.comit.simtong.domain.schedule.dto.SpotScheduleResponse import team.comit.simtong.domain.schedule.model.Scope import team.comit.simtong.domain.schedule.spi.QuerySchedulePort -import team.comit.simtong.domain.schedule.vo.SpotSchedule +import team.comit.simtong.domain.schedule.spi.vo.SpotSchedule import team.comit.simtong.global.annotation.SimtongTest import java.time.LocalDate import java.util.UUID diff --git a/simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/ChangeSpotUseCaseTests.kt b/simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/ChangeSpotUseCaseTests.kt index c150343d..38bd9af9 100644 --- a/simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/ChangeSpotUseCaseTests.kt +++ b/simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/ChangeSpotUseCaseTests.kt @@ -9,7 +9,6 @@ import org.mockito.BDDMockito.given import org.springframework.boot.test.mock.mockito.MockBean import org.springframework.context.annotation.Import import org.springframework.test.context.junit.jupiter.SpringExtension -import team.comit.simtong.domain.schedule.exception.ScheduleExceptions import team.comit.simtong.domain.spot.exception.SpotExceptions import team.comit.simtong.domain.user.exception.UserExceptions import team.comit.simtong.domain.user.model.Authority diff --git a/simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/QueryUserInfoUseCaseTests.kt b/simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/QueryUserInfoUseCaseTests.kt index 706bd791..a19e8dda 100644 --- a/simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/QueryUserInfoUseCaseTests.kt +++ b/simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/QueryUserInfoUseCaseTests.kt @@ -6,7 +6,6 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import org.mockito.BDDMockito.given import org.springframework.boot.test.mock.mockito.MockBean -import team.comit.simtong.domain.schedule.exception.ScheduleExceptions import team.comit.simtong.domain.spot.exception.SpotExceptions import team.comit.simtong.domain.spot.model.Spot import team.comit.simtong.domain.user.dto.QueryUserInfoResponse diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/vo/SpotSchedule.kt b/simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/spi/vo/SpotSchedule.kt similarity index 88% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/vo/SpotSchedule.kt rename to simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/spi/vo/SpotSchedule.kt index 0c660ad0..c99386b8 100644 --- a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/vo/SpotSchedule.kt +++ b/simtong-domain/src/main/kotlin/team/comit/simtong/domain/schedule/spi/vo/SpotSchedule.kt @@ -1,4 +1,4 @@ -package team.comit.simtong.domain.schedule.vo +package team.comit.simtong.domain.schedule.spi.vo import java.time.LocalDate import java.util.UUID diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/spot/spi/.gitkeep b/simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/spi/.gitkeep similarity index 100% rename from simtong-domain/src/main/kotlin/team/comit/simtong/domain/spot/spi/.gitkeep rename to simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/spi/.gitkeep diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/holiday/vo/EmployeeHolidayVO.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/holiday/vo/EmployeeHolidayVO.kt index 1f0d0b76..980a8958 100644 --- a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/holiday/vo/EmployeeHolidayVO.kt +++ b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/holiday/vo/EmployeeHolidayVO.kt @@ -1,8 +1,8 @@ package team.comit.simtong.persistence.holiday.vo import com.querydsl.core.annotations.QueryProjection -import team.comit.simtong.domain.holiday.model.HolidayType import team.comit.simtong.domain.holiday.spi.vo.EmployeeHoliday +import team.comit.simtong.domain.holiday.model.HolidayType import java.time.LocalDate import java.util.UUID diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/schedule/SchedulePersistenceAdapter.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/schedule/SchedulePersistenceAdapter.kt index b83e027e..cc785e53 100644 --- a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/schedule/SchedulePersistenceAdapter.kt +++ b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/schedule/SchedulePersistenceAdapter.kt @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component import team.comit.simtong.domain.schedule.model.Schedule import team.comit.simtong.domain.schedule.model.Scope import team.comit.simtong.domain.schedule.spi.SchedulePort -import team.comit.simtong.domain.schedule.vo.SpotSchedule +import team.comit.simtong.domain.schedule.spi.vo.SpotSchedule import team.comit.simtong.global.extension.QuerydslExtensionUtils.or import team.comit.simtong.persistence.schedule.mapper.ScheduleMapper import team.comit.simtong.persistence.schedule.vo.QSpotScheduleVo diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/schedule/vo/SpotScheduleVo.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/schedule/vo/SpotScheduleVo.kt index 1eb0f121..2d6ef42b 100644 --- a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/schedule/vo/SpotScheduleVo.kt +++ b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/schedule/vo/SpotScheduleVo.kt @@ -1,7 +1,7 @@ package team.comit.simtong.persistence.schedule.vo import com.querydsl.core.annotations.QueryProjection -import team.comit.simtong.domain.schedule.vo.SpotSchedule +import team.comit.simtong.domain.schedule.spi.vo.SpotSchedule import java.time.LocalDate import java.util.UUID