From aa4b074fbeb607a50d3a75cfb580f6e41d800061 Mon Sep 17 00:00:00 2001 From: kdomo Date: Mon, 22 May 2023 19:00:44 +0900 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20picture=EC=9D=98=20key=EC=BB=AC?= =?UTF-8?q?=EB=9F=BC=EC=9D=84=20uuid=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../depromeet/whatnow/domains/picture/domain/Picture.kt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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..9d6a8c2c 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 @@ -1,12 +1,7 @@ package com.depromeet.whatnow.domains.picture.domain import com.depromeet.whatnow.common.BaseTimeEntity -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.GeneratedValue -import javax.persistence.GenerationType -import javax.persistence.Id -import javax.persistence.Table +import javax.persistence.* @Entity @Table(name = "tbl_picture") @@ -17,7 +12,7 @@ class Picture( var uri: String, - var key: String, + var uuid: String, @Id @GeneratedValue(strategy = GenerationType.IDENTITY) From 7858e88fc4343a7af562d14328a29c26708405ac Mon Sep 17 00:00:00 2001 From: kdomo Date: Mon, 22 May 2023 19:51:15 +0900 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20PromiseProgeress=20type=EC=BB=AC?= =?UTF-8?q?=EB=9F=BC=20=EC=98=88=EC=95=BD=EC=96=B4=EB=9D=BC=20promise=5Fpr?= =?UTF-8?q?ogress=5Fgroup=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domains/promiseprogress/domain/PromiseProgress.kt | 11 ++--------- Whatnow-Domain/src/main/resources/data.sql | 4 ++-- 2 files changed, 4 insertions(+), 11 deletions(-) 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..6cbdadda 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 @@ -1,21 +1,14 @@ package com.depromeet.whatnow.domains.promiseprogress.domain import com.depromeet.whatnow.common.BaseTimeEntity -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.EnumType -import javax.persistence.Enumerated -import javax.persistence.GeneratedValue -import javax.persistence.GenerationType -import javax.persistence.Id -import javax.persistence.Table +import javax.persistence.* @Entity @Table(name = "tbl_promise_progress") 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); From 58a34f9f46f8f3890cd734dc64cde4491ff7adea Mon Sep 17 00:00:00 2001 From: kdomo Date: Mon, 22 May 2023 20:45:58 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20PromiseDomainService=20conflict=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../whatnow/domains/promise/service/PromiseDomainService.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From dcfee671f569858759cb9014fe55e77b9ba5393d Mon Sep 17 00:00:00 2001 From: kdomo Date: Mon, 22 May 2023 20:48:33 +0900 Subject: [PATCH 4/4] style: spotless --- .../depromeet/whatnow/domains/picture/domain/Picture.kt | 7 ++++++- .../domains/promise/domain/PromiseRegisterEvent.kt | 2 +- .../domains/promiseprogress/domain/PromiseProgress.kt | 9 ++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) 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 9d6a8c2c..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 @@ -1,7 +1,12 @@ package com.depromeet.whatnow.domains.picture.domain import com.depromeet.whatnow.common.BaseTimeEntity -import javax.persistence.* +import javax.persistence.Column +import javax.persistence.Entity +import javax.persistence.GeneratedValue +import javax.persistence.GenerationType +import javax.persistence.Id +import javax.persistence.Table @Entity @Table(name = "tbl_picture") 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/promiseprogress/domain/PromiseProgress.kt b/Whatnow-Domain/src/main/kotlin/com/depromeet/whatnow/domains/promiseprogress/domain/PromiseProgress.kt index 6cbdadda..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 @@ -1,7 +1,14 @@ package com.depromeet.whatnow.domains.promiseprogress.domain import com.depromeet.whatnow.common.BaseTimeEntity -import javax.persistence.* +import javax.persistence.Column +import javax.persistence.Entity +import javax.persistence.EnumType +import javax.persistence.Enumerated +import javax.persistence.GeneratedValue +import javax.persistence.GenerationType +import javax.persistence.Id +import javax.persistence.Table @Entity @Table(name = "tbl_promise_progress")