merge: (#286) SPI 구조 변경 (#297)

Team-ComIT · Jan 10, 2023 · 4cab708 · 4cab708
2 parents 56a3336 + 21bdf25
commit 4cab708
Show file tree

Hide file tree

Showing 31 changed files with 8 additions and 9 deletions.
diff --git a/...domain/auth/spi/QueryAuthCodeLimitPort.kt → ...domain/auth/spi/QueryAuthCodeLimitPort.kt b/...domain/auth/spi/QueryAuthCodeLimitPort.kt → ...domain/auth/spi/QueryAuthCodeLimitPort.kt
diff --git a/...tong/domain/auth/spi/QueryAuthCodePort.kt → ...tong/domain/auth/spi/QueryAuthCodePort.kt b/...tong/domain/auth/spi/QueryAuthCodePort.kt → ...tong/domain/auth/spi/QueryAuthCodePort.kt
diff --git a/.../file/spi/QueryEmployeeCertificatePort.kt → .../file/spi/QueryEmployeeCertificatePort.kt b/.../file/spi/QueryEmployeeCertificatePort.kt → .../file/spi/QueryEmployeeCertificatePort.kt
diff --git a/...omain/holiday/spi/HolidayQueryUserPort.kt → ...omain/holiday/spi/HolidayQueryUserPort.kt b/...omain/holiday/spi/HolidayQueryUserPort.kt → ...omain/holiday/spi/HolidayQueryUserPort.kt
diff --git a/...domain/holiday/spi/HolidaySecurityPort.kt → ...domain/holiday/spi/HolidaySecurityPort.kt b/...domain/holiday/spi/HolidaySecurityPort.kt → ...domain/holiday/spi/HolidaySecurityPort.kt
diff --git a/...ain/holiday/spi/QueryHolidayPeriodPort.kt → ...ain/holiday/spi/QueryHolidayPeriodPort.kt b/...ain/holiday/spi/QueryHolidayPeriodPort.kt → ...ain/holiday/spi/QueryHolidayPeriodPort.kt
diff --git a/...ng/domain/holiday/spi/QueryHolidayPort.kt → ...ng/domain/holiday/spi/QueryHolidayPort.kt b/...ng/domain/holiday/spi/QueryHolidayPort.kt → ...ng/domain/holiday/spi/QueryHolidayPort.kt
diff --git a/...tong/domain/menu/spi/MenuQueryUserPort.kt → ...tong/domain/menu/spi/MenuQueryUserPort.kt b/...tong/domain/menu/spi/MenuQueryUserPort.kt → ...tong/domain/menu/spi/MenuQueryUserPort.kt
diff --git a/...mtong/domain/menu/spi/MenuSecurityPort.kt → ...mtong/domain/menu/spi/MenuSecurityPort.kt b/...mtong/domain/menu/spi/MenuSecurityPort.kt → ...mtong/domain/menu/spi/MenuSecurityPort.kt
diff --git a/.../simtong/domain/menu/spi/QueryMenuPort.kt → .../simtong/domain/menu/spi/QueryMenuPort.kt b/.../simtong/domain/menu/spi/QueryMenuPort.kt → .../simtong/domain/menu/spi/QueryMenuPort.kt
diff --git a/.../domain/schedule/spi/QuerySchedulePort.kt → .../domain/schedule/spi/QuerySchedulePort.kt b/.../domain/schedule/spi/QuerySchedulePort.kt → .../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/...ain/schedule/spi/ScheduleQuerySpotPort.kt → ...ain/schedule/spi/ScheduleQuerySpotPort.kt b/...ain/schedule/spi/ScheduleQuerySpotPort.kt → ...ain/schedule/spi/ScheduleQuerySpotPort.kt
diff --git a/...ain/schedule/spi/ScheduleQueryUserPort.kt → ...ain/schedule/spi/ScheduleQueryUserPort.kt b/...ain/schedule/spi/ScheduleQueryUserPort.kt → ...ain/schedule/spi/ScheduleQueryUserPort.kt
diff --git a/...main/schedule/spi/ScheduleSecurityPort.kt → ...main/schedule/spi/ScheduleSecurityPort.kt b/...main/schedule/spi/ScheduleSecurityPort.kt → ...main/schedule/spi/ScheduleSecurityPort.kt
diff --git a/.../simtong/domain/spot/spi/QuerySpotPort.kt → .../simtong/domain/spot/spi/QuerySpotPort.kt b/.../simtong/domain/spot/spi/QuerySpotPort.kt → .../simtong/domain/spot/spi/QuerySpotPort.kt
diff --git a/.../simtong/domain/team/spi/QueryTeamPort.kt → .../simtong/domain/team/spi/QueryTeamPort.kt b/.../simtong/domain/team/spi/QueryTeamPort.kt → .../simtong/domain/team/spi/QueryTeamPort.kt
diff --git a/.../simtong/domain/user/spi/QueryUserPort.kt → .../simtong/domain/user/spi/QueryUserPort.kt b/.../simtong/domain/user/spi/QueryUserPort.kt → .../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
@@ -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
+interface UserPort : QueryUserPort, CommandUserPort, CommandDeviceTokenPort, MenuQueryUserPort, ScheduleQueryUserPort,
+    HolidayQueryUserPort, NotificationQueryUserPort
diff --git a/...in/user/spi/UserQueryAuthCodeLimitPort.kt → ...in/user/spi/UserQueryAuthCodeLimitPort.kt b/...in/user/spi/UserQueryAuthCodeLimitPort.kt → ...in/user/spi/UserQueryAuthCodeLimitPort.kt
diff --git a/...r/spi/UserQueryEmployeeCertificatePort.kt → ...r/spi/UserQueryEmployeeCertificatePort.kt b/...r/spi/UserQueryEmployeeCertificatePort.kt → ...r/spi/UserQueryEmployeeCertificatePort.kt
diff --git a/...tong/domain/user/spi/UserQuerySpotPort.kt → ...tong/domain/user/spi/UserQuerySpotPort.kt b/...tong/domain/user/spi/UserQuerySpotPort.kt → ...tong/domain/user/spi/UserQuerySpotPort.kt
diff --git a/...tong/domain/user/spi/UserQueryTeamPort.kt → ...tong/domain/user/spi/UserQueryTeamPort.kt b/...tong/domain/user/spi/UserQueryTeamPort.kt → ...tong/domain/user/spi/UserQueryTeamPort.kt
diff --git a/...mtong/domain/user/spi/UserSecurityPort.kt → ...mtong/domain/user/spi/UserSecurityPort.kt b/...mtong/domain/user/spi/UserSecurityPort.kt → ...mtong/domain/user/spi/UserSecurityPort.kt
diff --git a/.../kotlin/team/comit/simtong/domain/schedule/usecase/QueryEntireSpotScheduleUseCaseTests.kt b/.../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/...lication/src/test/kotlin/team/comit/simtong/domain/user/usecase/ChangeSpotUseCaseTests.kt b/...lication/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/...ation/src/test/kotlin/team/comit/simtong/domain/user/usecase/QueryUserInfoUseCaseTests.kt b/...ation/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/...imtong/domain/schedule/vo/SpotSchedule.kt → ...ng/domain/schedule/spi/vo/SpotSchedule.kt b/...imtong/domain/schedule/vo/SpotSchedule.kt → ...ng/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/...am/comit/simtong/domain/spot/spi/.gitkeep → ...am/comit/simtong/domain/user/spi/.gitkeep b/...am/comit/simtong/domain/spot/spi/.gitkeep → ...am/comit/simtong/domain/user/spi/.gitkeep
diff --git a/...astructure/src/main/kotlin/team/comit/simtong/persistence/holiday/vo/EmployeeHolidayVO.kt b/...astructure/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/...ure/src/main/kotlin/team/comit/simtong/persistence/schedule/SchedulePersistenceAdapter.kt b/...ure/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/...frastructure/src/main/kotlin/team/comit/simtong/persistence/schedule/vo/SpotScheduleVo.kt b/...frastructure/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