🔀 :: 외출신청자 조회 API 리팩토링 (#123)

🔀 :: 외출신청자 조회 API 리팩토링 (#123)

.editorconfig

@@ -1,4 +1,4 @@
 root = true
 
 [*.{kt,kts}]
-disabled_rules=import-ordering
+disabled_rules = import-ordering

pick-application/src/main/kotlin/com/pickdsm/pickserverspring/domain/application/spi/QueryStatusSpi.kt

@@ -2,6 +2,7 @@ package com.pickdsm.pickserverspring.domain.application.spi
 
 import com.pickdsm.pickserverspring.domain.application.Status
 import com.pickdsm.pickserverspring.domain.application.StatusType
+import com.pickdsm.pickserverspring.domain.application.vo.PicnicApplicationVO
 import java.time.LocalDate
 import java.util.UUID
 
@@ -19,7 +20,11 @@ interface QueryStatusSpi {
 
     fun queryPicnicStudentByStudentIdAndToday(studentId: UUID): Status?
 
-    fun queryStatusByStudentIdAndStartPeriodAndEndPeriodAndToday(studentId: UUID, startPeriod: Int, endPeriod: Int): Status?
+    fun queryStatusByStudentIdAndStartPeriodAndEndPeriodAndToday(
+        studentId: UUID,
+        startPeriod: Int,
+        endPeriod: Int,
+    ): Status?
 
     fun queryMovementStudentByStudentId(studentId: UUID): Status?
 
@@ -38,4 +43,6 @@ interface QueryStatusSpi {
     fun existAwaitOrPicnicStatusByStudentId(studentId: UUID): Boolean
 
     fun queryPicnicOrAwaitOrMovementStatusStudentIdListByToday(): List<UUID>
+
+    fun queryPicnicApplicationListByToday(): List<PicnicApplicationVO>
 }

pick-application/src/main/kotlin/com/pickdsm/pickserverspring/domain/application/vo/PicnicApplicationVO.kt

@@ -0,0 +1,10 @@
+package com.pickdsm.pickserverspring.domain.application.vo
+
+import java.util.UUID
+
+open class PicnicApplicationVO(
+    val studentId: UUID,
+    val startPeriod: Int,
+    val endPeriod: Int,
+    val reason: String,
+)

pick-application/src/main/kotlin/com/pickdsm/pickserverspring/domain/user/User.kt

@@ -13,4 +13,10 @@ data class User(
     val num: Int,
     val birthDay: LocalDate,
     val profileFileName: String?,
-)
+) {
+    companion object {
+        fun User.processGcn() = "${this.grade}${this.classNum}${this.paddedUserNum()}"
+
+        private fun User.paddedUserNum(): String = this.num.toString().padStart(2, '0')
+    }
+}

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/annotation/Adapter.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/annotation/Adapter.kt

@@ -1,4 +1,4 @@
-package com.pickdsm.pickserverspring.global.annotation
+package com.pickdsm.pickserverspring.common.annotation
 
 import org.springframework.stereotype.Component
 import org.springframework.transaction.annotation.Transactional

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/annotation/NoArg.kt

@@ -0,0 +1,3 @@
+package com.pickdsm.pickserverspring.common.annotation
+
+annotation class NoArg

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/annotation/config/AnnotationConfig.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/annotation/config/AnnotationConfig.kt

@@ -1,4 +1,4 @@
-package com.pickdsm.pickserverspring.global.annotation.config
+package com.pickdsm.pickserverspring.common.annotation.config
 
 import com.pickdsm.pickserverspring.common.annotation.ReadOnlyUseCase
 import com.pickdsm.pickserverspring.common.annotation.UseCase

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/querydsl/QuerydslConfig.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/config/QuerydslConfig.kt

@@ -1,4 +1,4 @@
-package com.pickdsm.pickserverspring.global.querydsl
+package com.pickdsm.pickserverspring.common.config
 
 import com.querydsl.jpa.impl.JPAQueryFactory
 import org.springframework.context.annotation.Bean

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/config/SchedulerConfig.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/config/SchedulerConfig.kt

@@ -1,4 +1,4 @@
-package com.pickdsm.pickserverspring.global.config
+package com.pickdsm.pickserverspring.common.config
 
 import org.springframework.context.annotation.Configuration
 import org.springframework.scheduling.annotation.EnableScheduling

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/entity/BaseUUIDEntity.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/entity/BaseUUIDEntity.kt

@@ -1,4 +1,4 @@
-package com.pickdsm.pickserverspring.global.entity
+package com.pickdsm.pickserverspring.common.entity
 
 import org.hibernate.annotations.GenericGenerator
 import java.util.UUID

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/error/ErrorResponse.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/error/ErrorResponse.kt

@@ -1,4 +1,4 @@
-package com.pickdsm.pickserverspring.global.error
+package com.pickdsm.pickserverspring.common.error
 
 import com.pickdsm.pickserverspring.common.error.ErrorProperty
 import org.springframework.dao.DataIntegrityViolationException

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/error/GlobalErrorCode.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/error/GlobalErrorCode.kt

@@ -1,4 +1,4 @@
-package com.pickdsm.pickserverspring.global.error
+package com.pickdsm.pickserverspring.common.error
 
 import com.pickdsm.pickserverspring.common.error.ErrorProperty
 

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/error/GlobalErrorHandler.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/error/GlobalErrorHandler.kt

@@ -1,4 +1,4 @@
-package com.pickdsm.pickserverspring.global.error
+package com.pickdsm.pickserverspring.common.error
 
 import org.springframework.dao.DataIntegrityViolationException
 import org.springframework.http.HttpStatus

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/exception/InternalServerErrorException.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/exception/InternalServerErrorException.kt

@@ -1,7 +1,7 @@
-package com.pickdsm.pickserverspring.global.exception
+package com.pickdsm.pickserverspring.common.exception
 
 import com.pickdsm.pickserverspring.common.error.PickException
-import com.pickdsm.pickserverspring.global.error.GlobalErrorCode
+import com.pickdsm.pickserverspring.common.error.GlobalErrorCode
 
 object InternalServerErrorException : PickException(
     GlobalErrorCode.INTERNAL_SERVER_ERROR

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/feign/client/dto/response/TimeResponse.kt

@@ -1,6 +1,6 @@
 package com.pickdsm.pickserverspring.common.feign.client.dto.response
 
-import com.pickdsm.pickserverspring.global.annotation.NoArg
+import com.pickdsm.pickserverspring.common.annotation.NoArg
 import java.time.LocalDate
 import java.time.LocalTime
 import java.util.UUID

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/filter/ExceptionFilter.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/filter/ExceptionFilter.kt

@@ -1,10 +1,10 @@
-package com.pickdsm.pickserverspring.global.filter
+package com.pickdsm.pickserverspring.common.filter
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.pickdsm.pickserverspring.common.error.ErrorProperty
 import com.pickdsm.pickserverspring.common.error.PickException
-import com.pickdsm.pickserverspring.global.error.of
-import com.pickdsm.pickserverspring.global.exception.InternalServerErrorException
+import com.pickdsm.pickserverspring.common.error.of
+import com.pickdsm.pickserverspring.common.exception.InternalServerErrorException
 import io.sentry.Sentry
 import org.springframework.http.MediaType
 import org.springframework.web.filter.OncePerRequestFilter

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/scheduler/StatusScheduler.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/scheduler/StatusScheduler.kt

@@ -1,4 +1,4 @@
-package com.pickdsm.pickserverspring.global.scheduler
+package com.pickdsm.pickserverspring.common.scheduler
 
 import com.pickdsm.pickserverspring.domain.application.StatusType
 import com.pickdsm.pickserverspring.domain.application.exception.StatusNotFoundException

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/security/AuthenticationFilter.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/security/AuthenticationFilter.kt

@@ -1,4 +1,4 @@
-package com.pickdsm.pickserverspring.global.security
+package com.pickdsm.pickserverspring.common.security
 
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
 import org.springframework.security.core.Authentication

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/security/FilterConfig.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/security/FilterConfig.kt

@@ -1,7 +1,7 @@
-package com.pickdsm.pickserverspring.global.security
+package com.pickdsm.pickserverspring.common.security
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.pickdsm.pickserverspring.global.filter.ExceptionFilter
+import com.pickdsm.pickserverspring.common.filter.ExceptionFilter
 import org.springframework.security.config.annotation.SecurityConfigurerAdapter
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.web.DefaultSecurityFilterChain

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/security/SecurityConfig.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/security/SecurityConfig.kt

@@ -1,4 +1,4 @@
-package com.pickdsm.pickserverspring.global.security
+package com.pickdsm.pickserverspring.common.security
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.springframework.context.annotation.Bean

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/security/UserRole.kt

@@ -0,0 +1,7 @@
+package com.pickdsm.pickserverspring.common.security
+
+enum class UserRole {
+    STU,
+    SCH,
+    DOR,
+}

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/global/security/WebConfig.kt → pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/common/security/WebConfig.kt

@@ -1,4 +1,4 @@
-package com.pickdsm.pickserverspring.global.security
+package com.pickdsm.pickserverspring.common.security
 
 import org.springframework.context.annotation.Configuration
 import org.springframework.web.servlet.config.annotation.CorsRegistry

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/afterschool/persistence/adapter/AfterSchoolPersistenceAdapter.kt

@@ -11,7 +11,7 @@ import com.pickdsm.pickserverspring.domain.afterschool.persistence.vo.QQueryAfte
 import com.pickdsm.pickserverspring.domain.afterschool.persistence.vo.QueryAfterSchoolRoomVO
 import com.pickdsm.pickserverspring.domain.afterschool.spi.AfterSchoolSpi
 import com.pickdsm.pickserverspring.domain.classroom.persistence.entity.QClassroomEntity.classroomEntity
-import com.pickdsm.pickserverspring.global.annotation.Adapter
+import com.pickdsm.pickserverspring.common.annotation.Adapter
 import com.querydsl.jpa.impl.JPAQueryFactory
 import java.util.UUID
 import javax.persistence.LockModeType

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/afterschool/persistence/entity/AfterSchoolEntity.kt

@@ -1,6 +1,6 @@
 package com.pickdsm.pickserverspring.domain.afterschool.persistence.entity
 
-import com.pickdsm.pickserverspring.global.entity.BaseUUIDEntity
+import com.pickdsm.pickserverspring.common.entity.BaseUUIDEntity
 import java.util.UUID
 import javax.persistence.Column
 import javax.persistence.Entity

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/afterschool/persistence/entity/AfterSchoolInfoEntity.kt

@@ -1,7 +1,7 @@
 package com.pickdsm.pickserverspring.domain.afterschool.persistence.entity
 
 import com.pickdsm.pickserverspring.domain.classroom.persistence.entity.ClassroomEntity
-import com.pickdsm.pickserverspring.global.entity.BaseUUIDEntity
+import com.pickdsm.pickserverspring.common.entity.BaseUUIDEntity
 import org.hibernate.annotations.ColumnDefault
 import java.util.UUID
 import javax.persistence.Entity

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/application/persistence/adapter/ApplicationPersistenceAdapter.kt

@@ -6,7 +6,7 @@ import com.pickdsm.pickserverspring.domain.application.persistence.ApplicationRe
 import com.pickdsm.pickserverspring.domain.application.persistence.entity.QApplicationEntity.applicationEntity
 import com.pickdsm.pickserverspring.domain.application.persistence.entity.QStatusEntity.statusEntity
 import com.pickdsm.pickserverspring.domain.application.spi.ApplicationSpi
-import com.pickdsm.pickserverspring.global.annotation.Adapter
+import com.pickdsm.pickserverspring.common.annotation.Adapter
 import com.querydsl.jpa.impl.JPAQueryFactory
 import java.time.LocalDate
 import java.util.UUID

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/application/persistence/adapter/StatusPersistenceAdapter.kt

@@ -1,15 +1,17 @@
 package com.pickdsm.pickserverspring.domain.application.persistence.adapter
 
+import com.pickdsm.pickserverspring.common.annotation.Adapter
 import com.pickdsm.pickserverspring.domain.application.Status
 import com.pickdsm.pickserverspring.domain.application.StatusType
 import com.pickdsm.pickserverspring.domain.application.mapper.StatusMapper
 import com.pickdsm.pickserverspring.domain.application.persistence.StatusRepository
 import com.pickdsm.pickserverspring.domain.application.persistence.entity.QApplicationEntity.applicationEntity
 import com.pickdsm.pickserverspring.domain.application.persistence.entity.QStatusEntity.statusEntity
+import com.pickdsm.pickserverspring.domain.application.persistence.vo.QQueryPicnicApplicationVO
 import com.pickdsm.pickserverspring.domain.application.spi.StatusSpi
+import com.pickdsm.pickserverspring.domain.application.vo.PicnicApplicationVO
 import com.pickdsm.pickserverspring.domain.classroom.persistence.entity.QClassroomEntity.classroomEntity
 import com.pickdsm.pickserverspring.domain.classroom.persistence.entity.QClassroomMovementEntity.classroomMovementEntity
-import com.pickdsm.pickserverspring.global.annotation.Adapter
 import com.querydsl.core.types.dsl.BooleanExpression
 import com.querydsl.jpa.impl.JPAQueryFactory
 import java.time.LocalDate
@@ -231,4 +233,23 @@ class StatusPersistenceAdapter(
                     .and(statusEntity.date.eq(LocalDate.now())),
             )
             .fetch()
+
+    override fun queryPicnicApplicationListByToday(): List<PicnicApplicationVO> =
+        jpaQueryFactory
+            .select(
+                QQueryPicnicApplicationVO(
+                    statusEntity.studentId,
+                    statusEntity.startPeriod,
+                    statusEntity.endPeriod,
+                    applicationEntity.reason,
+                ),
+            )
+            .from(statusEntity)
+            .innerJoin(applicationEntity)
+            .on(statusEntity.id.eq(applicationEntity.statusEntity.id))
+            .where(
+                statusEntity.date.eq(LocalDate.now()),
+                statusEntity.type.eq(StatusType.AWAIT),
+            )
+            .fetch()
 }

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/application/persistence/entity/ApplicationEntity.kt

@@ -1,14 +1,14 @@
 package com.pickdsm.pickserverspring.domain.application.persistence.entity
 
-import com.pickdsm.pickserverspring.global.entity.BaseUUIDEntity
+import com.pickdsm.pickserverspring.common.entity.BaseUUIDEntity
 import org.hibernate.annotations.ColumnDefault
 import java.util.UUID
+import javax.persistence.Column
 import javax.persistence.Entity
 import javax.persistence.FetchType
 import javax.persistence.JoinColumn
 import javax.persistence.OneToOne
 import javax.persistence.Table
-import javax.persistence.Column
 
 @Table(name = "tbl_application")
 @Entity
@@ -28,4 +28,4 @@ class ApplicationEntity(
     @ColumnDefault("false")
     val isReturn: Boolean,
 
-) : BaseUUIDEntity(id)
+    ) : BaseUUIDEntity(id)

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/application/persistence/entity/StatusEntity.kt

@@ -1,7 +1,7 @@
 package com.pickdsm.pickserverspring.domain.application.persistence.entity
 
 import com.pickdsm.pickserverspring.domain.application.StatusType
-import com.pickdsm.pickserverspring.global.entity.BaseUUIDEntity
+import com.pickdsm.pickserverspring.common.entity.BaseUUIDEntity
 import org.hibernate.annotations.ColumnDefault
 import java.time.LocalDate
 import java.util.UUID

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/application/persistence/vo/QueryPicnicApplicationVO.kt

@@ -0,0 +1,17 @@
+package com.pickdsm.pickserverspring.domain.application.persistence.vo
+
+import com.pickdsm.pickserverspring.domain.application.vo.PicnicApplicationVO
+import com.querydsl.core.annotations.QueryProjection
+import java.util.UUID
+
+class QueryPicnicApplicationVO @QueryProjection constructor(
+    studentId: UUID,
+    startPeriod: Int,
+    endPeriod: Int,
+    reason: String,
+) : PicnicApplicationVO(
+    studentId = studentId,
+    startPeriod = startPeriod,
+    endPeriod = endPeriod,
+    reason = reason,
+)

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/classroom/persistence/adapter/ClassPersistenceAdapter.kt

@@ -6,7 +6,7 @@ import com.pickdsm.pickserverspring.domain.classroom.persistence.entity.QClassro
 import com.pickdsm.pickserverspring.domain.classroom.persistence.vo.QQueryClassroomVO
 import com.pickdsm.pickserverspring.domain.classroom.persistence.vo.QueryClassroomVO
 import com.pickdsm.pickserverspring.domain.classroom.spi.ClassroomSpi
-import com.pickdsm.pickserverspring.global.annotation.Adapter
+import com.pickdsm.pickserverspring.common.annotation.Adapter
 import com.querydsl.jpa.impl.JPAQueryFactory
 import java.util.UUID
 

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/classroom/persistence/adapter/ClassroomMovementPersistenceAdapter.kt

@@ -9,7 +9,7 @@ import com.pickdsm.pickserverspring.domain.classroom.persistence.ClassroomMoveme
 import com.pickdsm.pickserverspring.domain.classroom.persistence.entity.QClassroomEntity.classroomEntity
 import com.pickdsm.pickserverspring.domain.classroom.persistence.entity.QClassroomMovementEntity.classroomMovementEntity
 import com.pickdsm.pickserverspring.domain.classroom.spi.ClassroomMovementSpi
-import com.pickdsm.pickserverspring.global.annotation.Adapter
+import com.pickdsm.pickserverspring.common.annotation.Adapter
 import com.querydsl.jpa.impl.JPAQueryFactory
 import java.time.LocalDate
 import java.util.UUID

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/classroom/persistence/entity/ClassroomEntity.kt

@@ -1,6 +1,6 @@
 package com.pickdsm.pickserverspring.domain.classroom.persistence.entity
 
-import com.pickdsm.pickserverspring.global.entity.BaseUUIDEntity
+import com.pickdsm.pickserverspring.common.entity.BaseUUIDEntity
 import org.hibernate.annotations.ColumnDefault
 import java.util.UUID
 import javax.persistence.Column

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/classroom/persistence/entity/ClassroomMovementEntity.kt

@@ -1,7 +1,7 @@
 package com.pickdsm.pickserverspring.domain.classroom.persistence.entity
 
 import com.pickdsm.pickserverspring.domain.application.persistence.entity.StatusEntity
-import com.pickdsm.pickserverspring.global.entity.BaseUUIDEntity
+import com.pickdsm.pickserverspring.common.entity.BaseUUIDEntity
 import java.util.UUID
 import javax.persistence.Entity
 import javax.persistence.FetchType

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/club/persistence/adapter/ClubPersistenceAdapter.kt

@@ -12,7 +12,7 @@ import com.pickdsm.pickserverspring.domain.club.persistence.entity.QClubInfoEnti
 import com.pickdsm.pickserverspring.domain.club.persistence.vo.QQueryClubRoomVO
 import com.pickdsm.pickserverspring.domain.club.persistence.vo.QueryClubRoomVO
 import com.pickdsm.pickserverspring.domain.club.spi.ClubSpi
-import com.pickdsm.pickserverspring.global.annotation.Adapter
+import com.pickdsm.pickserverspring.common.annotation.Adapter
 import com.querydsl.jpa.impl.JPAQueryFactory
 import java.util.UUID
 

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/club/persistence/entity/ClubEntity.kt

@@ -1,6 +1,6 @@
 package com.pickdsm.pickserverspring.domain.club.persistence.entity
 
-import com.pickdsm.pickserverspring.global.entity.BaseUUIDEntity
+import com.pickdsm.pickserverspring.common.entity.BaseUUIDEntity
 import java.util.UUID
 import javax.persistence.Column
 import javax.persistence.Entity

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/club/persistence/entity/ClubInfoEntity.kt

@@ -1,7 +1,7 @@
 package com.pickdsm.pickserverspring.domain.club.persistence.entity
 
 import com.pickdsm.pickserverspring.domain.classroom.persistence.entity.ClassroomEntity
-import com.pickdsm.pickserverspring.global.entity.BaseUUIDEntity
+import com.pickdsm.pickserverspring.common.entity.BaseUUIDEntity
 import org.hibernate.annotations.ColumnDefault
 import java.util.UUID
 import javax.persistence.Column

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/schedule/SchedulePersistenceAdapter.kt

@@ -2,7 +2,7 @@ package com.pickdsm.pickserverspring.domain.schedule
 
 import com.pickdsm.pickserverspring.common.feign.client.ScheduleClient
 import com.pickdsm.pickserverspring.domain.schedule.spi.QueryScheduleSpi
-import com.pickdsm.pickserverspring.global.annotation.Adapter
+import com.pickdsm.pickserverspring.common.annotation.Adapter
 
 @Adapter
 class SchedulePersistenceAdapter(

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/selfstudydirector/persistence/adapter/SelfStudyDirectorPersistenceAdapter.kt

@@ -7,7 +7,7 @@ import com.pickdsm.pickserverspring.domain.selfstudydirector.persistence.SelfStu
 import com.pickdsm.pickserverspring.domain.selfstudydirector.persistence.entity.QSelfStudyDirectorEntity.selfStudyDirectorEntity
 import com.pickdsm.pickserverspring.domain.selfstudydirector.persistence.entity.QTypeEntity.typeEntity
 import com.pickdsm.pickserverspring.domain.selfstudydirector.spi.SelfStudyDirectorSpi
-import com.pickdsm.pickserverspring.global.annotation.Adapter
+import com.pickdsm.pickserverspring.common.annotation.Adapter
 import com.querydsl.jpa.impl.JPAQueryFactory
 import java.time.LocalDate
 import java.util.UUID

pick-infrastructure/src/main/kotlin/com/pickdsm/pickserverspring/domain/selfstudydirector/persistence/adapter/TypePersistenceAdapter.kt

@@ -7,7 +7,7 @@ import com.pickdsm.pickserverspring.domain.selfstudydirector.mapper.TypeMapper
 import com.pickdsm.pickserverspring.domain.selfstudydirector.persistence.TypeRepository
 import com.pickdsm.pickserverspring.domain.selfstudydirector.persistence.entity.QTypeEntity.typeEntity
 import com.pickdsm.pickserverspring.domain.selfstudydirector.spi.TypeSpi
-import com.pickdsm.pickserverspring.global.annotation.Adapter
+import com.pickdsm.pickserverspring.common.annotation.Adapter
 import com.querydsl.jpa.impl.JPAQueryFactory
 import java.time.LocalDate
 import java.util.UUID