diff --git a/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/picture/domain/Picture.kt b/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/picture/domain/Picture.kt index 74cc4d1e..3105c892 100644 --- a/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/picture/domain/Picture.kt +++ b/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/picture/domain/Picture.kt @@ -17,7 +17,7 @@ class Picture( var uri: String, - var key: String, + var uuid: String, @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/promise/domain/PromiseRegisterEvent.kt b/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/promise/domain/PromiseRegisterEvent.kt index d131f920..6f975bc9 100644 --- a/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/promise/domain/PromiseRegisterEvent.kt +++ b/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/promise/domain/PromiseRegisterEvent.kt @@ -4,7 +4,7 @@ import com.depromeet.whatnow.common.aop.event.DomainEvent class PromiseRegisterEvent( val promiseId: Long, -) : DomainEvent(){ +) : DomainEvent() { // Factory method companion object { fun from(promise: Promise): PromiseRegisterEvent { diff --git a/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/promise/service/PromiseDomainService.kt b/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/promise/service/PromiseDomainService.kt index 1daaabeb..b00a0d08 100644 --- a/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/promise/service/PromiseDomainService.kt +++ b/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/promise/service/PromiseDomainService.kt @@ -4,7 +4,7 @@ import com.depromeet.whatnow.common.vo.PlaceVo import com.depromeet.whatnow.domains.promise.adaptor.PromiseAdaptor import com.depromeet.whatnow.domains.promise.domain.Promise import com.depromeet.whatnow.domains.promise.domain.PromiseType -import com.depromeet.whatnow.domains.promiseprogress.domain.PromiseProgressType +import com.depromeet.whatnow.domains.promiseprogress.domain.PromiseProgressGroup import org.springframework.stereotype.Service import java.time.LocalDateTime import javax.transaction.Transactional @@ -56,14 +56,14 @@ class PromiseDomainService( // 약속 진행상태(출발 전, 이동 중, 도착, ETC) 변경 @Transactional - fun pendingPromiseProgressType(promiseId: Long, promiseProgressType: PromiseProgressType): Promise { + fun pendingPromiseProgressType(promiseId: Long, promiseProgressGroup: PromiseProgressGroup): Promise { val promise = promiseAdaptor.queryPromise(promiseId) promise.pendingPromise() return promise } @Transactional - fun endPromiseProgressType(promiseId: Long, promiseProgressType: PromiseProgressType): Promise { + fun endPromiseProgressType(promiseId: Long, promiseProgressGroup: PromiseProgressGroup): Promise { val promise = promiseAdaptor.queryPromise(promiseId) promise.endPromise() return promise diff --git a/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/promiseprogress/domain/PromiseProgress.kt b/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/promiseprogress/domain/PromiseProgress.kt index 50c67f65..1eabd175 100644 --- a/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/promiseprogress/domain/PromiseProgress.kt +++ b/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/promiseprogress/domain/PromiseProgress.kt @@ -15,7 +15,7 @@ import javax.persistence.Table class PromiseProgress( @Enumerated(EnumType.STRING) - @Column(name = "type") + @Column(name = "promise_progress_group") var group: PromiseProgressGroup, var code: String, // 상태 코드 diff --git a/Whatnow-Domain/src/main/resources/data.sql b/Whatnow-Domain/src/main/resources/data.sql index db7ffddb..7cdfbb86 100644 --- a/Whatnow-Domain/src/main/resources/data.sql +++ b/Whatnow-Domain/src/main/resources/data.sql @@ -1,4 +1,4 @@ -INSERT INTO tbl_promise_progress(promise_progress_id, type, code , kr, img ) +INSERT INTO tbl_promise_progress(promise_progress_id, promise_progress_group, code , kr, img ) VALUES (1,'PREPARING','SHOWER' ,'씻는중',''), (2,'PREPARING','LEAVE_SOON' ,'곧 나감',''), @@ -13,4 +13,4 @@ VALUES (11,'EXPECTED_TIME','AFTER_5' ,'5분뒤 도착',''), (12,'EXPECTED_TIME','AFTER_10' ,'10분뒤 도착',''), (13,'DEFAULT','DEFAULT' ,'기본 속성','') - ON DUPLICATE KEY UPDATE type = VALUES (type), code = VALUES (code), kr = VALUES (kr), img = VALUES (img); + ON DUPLICATE KEY UPDATE promise_progress_group = VALUES (promise_progress_group), code = VALUES (code), kr = VALUES (kr), img = VALUES (img);