From cd126378df1b762735b442e6722380b836033f2a Mon Sep 17 00:00:00 2001 From: unanchoi Date: Thu, 27 Jun 2024 00:53:09 +0900 Subject: [PATCH] =?UTF-8?q?[fix]=20query=20dsl=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=9D=98=EC=A1=B4=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 6 ------ pophory-domain/build.gradle.kts | 5 +++++ .../java/com/pophory/pophorydomain/album/Album.java | 2 +- .../pophorydomain/common}/BaseTimeEntity.java | 13 ++++++------- .../com/pophory/pophorydomain/member/Member.java | 2 +- .../java/com/pophory/pophorydomain/photo/Photo.java | 2 +- .../pophorydomain/config/JpaAuditingConfig.kt | 9 +++++++++ 7 files changed, 23 insertions(+), 16 deletions(-) rename {pophory-common/src/main/java/com/pophory/pophorycommon/entity => pophory-domain/src/main/java/com/pophory/pophorydomain/common}/BaseTimeEntity.java (76%) create mode 100644 pophory-domain/src/main/kotlin/com/pophory/pophorydomain/config/JpaAuditingConfig.kt diff --git a/build.gradle.kts b/build.gradle.kts index a7309e8..bdbd387 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -185,12 +185,6 @@ project("pophory-domain") { api(project(":pophory-common")) implementation("org.springframework.boot:spring-boot-starter-web") - //querydsl 추가 - implementation("com.querydsl:querydsl-jpa:5.0.0:jakarta") - annotationProcessor("com.querydsl:querydsl-apt:5.0.0:jakarta") - annotationProcessor("jakarta.annotation:jakarta.annotation-api") - annotationProcessor("jakarta.persistence:jakarta.persistence-api") - implementation("org.springframework.boot:spring-boot-starter-validation") implementation("org.springframework.boot:spring-boot-starter-data-jpa") diff --git a/pophory-domain/build.gradle.kts b/pophory-domain/build.gradle.kts index 0ce6a16..ff425c0 100644 --- a/pophory-domain/build.gradle.kts +++ b/pophory-domain/build.gradle.kts @@ -1,3 +1,8 @@ dependencies { + //querydsl 추가 + implementation("com.querydsl:querydsl-jpa:5.0.0:jakarta") + annotationProcessor("com.querydsl:querydsl-apt:5.0.0:jakarta") + annotationProcessor("jakarta.annotation:jakarta.annotation-api") + annotationProcessor("jakarta.persistence:jakarta.persistence-api") } \ No newline at end of file diff --git a/pophory-domain/src/main/java/com/pophory/pophorydomain/album/Album.java b/pophory-domain/src/main/java/com/pophory/pophorydomain/album/Album.java index 446aa90..881fc47 100644 --- a/pophory-domain/src/main/java/com/pophory/pophorydomain/album/Album.java +++ b/pophory-domain/src/main/java/com/pophory/pophorydomain/album/Album.java @@ -1,8 +1,8 @@ package com.pophory.pophorydomain.album; -import com.pophory.pophorycommon.entity.BaseTimeEntity; import com.pophory.pophorydomain.albumtheme.AlbumDesign; +import com.pophory.pophorydomain.common.BaseTimeEntity; import com.pophory.pophorydomain.member.Member; import com.pophory.pophorydomain.photo.Photo; import jakarta.persistence.*; diff --git a/pophory-common/src/main/java/com/pophory/pophorycommon/entity/BaseTimeEntity.java b/pophory-domain/src/main/java/com/pophory/pophorydomain/common/BaseTimeEntity.java similarity index 76% rename from pophory-common/src/main/java/com/pophory/pophorycommon/entity/BaseTimeEntity.java rename to pophory-domain/src/main/java/com/pophory/pophorydomain/common/BaseTimeEntity.java index b58e9e9..c1c499d 100644 --- a/pophory-common/src/main/java/com/pophory/pophorycommon/entity/BaseTimeEntity.java +++ b/pophory-domain/src/main/java/com/pophory/pophorydomain/common/BaseTimeEntity.java @@ -1,5 +1,4 @@ -package com.pophory.pophorycommon.entity; - +package com.pophory.pophorydomain.common; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; @@ -16,10 +15,10 @@ @Getter @NoArgsConstructor public abstract class BaseTimeEntity { + @CreatedDate + private LocalDateTime createdAt; - @CreatedDate - private LocalDateTime createdAt; - - @LastModifiedDate - private LocalDateTime updatedAt; + @LastModifiedDate + private LocalDateTime updatedAt; } + diff --git a/pophory-domain/src/main/java/com/pophory/pophorydomain/member/Member.java b/pophory-domain/src/main/java/com/pophory/pophorydomain/member/Member.java index e60ad01..6af0940 100644 --- a/pophory-domain/src/main/java/com/pophory/pophorydomain/member/Member.java +++ b/pophory-domain/src/main/java/com/pophory/pophorydomain/member/Member.java @@ -2,9 +2,9 @@ -import com.pophory.pophorycommon.entity.BaseTimeEntity; import com.pophory.pophorycommon.exception.MemberException; import com.pophory.pophorydomain.album.Album; +import com.pophory.pophorydomain.common.BaseTimeEntity; import com.pophory.pophorydomain.fcm.FcmEntity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; diff --git a/pophory-domain/src/main/java/com/pophory/pophorydomain/photo/Photo.java b/pophory-domain/src/main/java/com/pophory/pophorydomain/photo/Photo.java index 9ef7983..e038a2d 100644 --- a/pophory-domain/src/main/java/com/pophory/pophorydomain/photo/Photo.java +++ b/pophory-domain/src/main/java/com/pophory/pophorydomain/photo/Photo.java @@ -1,8 +1,8 @@ package com.pophory.pophorydomain.photo; -import com.pophory.pophorycommon.entity.BaseTimeEntity; import com.pophory.pophorycommon.util.RandomUtil; import com.pophory.pophorydomain.album.Album; +import com.pophory.pophorydomain.common.BaseTimeEntity; import com.pophory.pophorydomain.studio.Studio; import jakarta.persistence.*; import lombok.Builder; diff --git a/pophory-domain/src/main/kotlin/com/pophory/pophorydomain/config/JpaAuditingConfig.kt b/pophory-domain/src/main/kotlin/com/pophory/pophorydomain/config/JpaAuditingConfig.kt new file mode 100644 index 0000000..7d77ab6 --- /dev/null +++ b/pophory-domain/src/main/kotlin/com/pophory/pophorydomain/config/JpaAuditingConfig.kt @@ -0,0 +1,9 @@ +package com.pophory.pophorydomain.config + +import org.springframework.context.annotation.Configuration +import org.springframework.data.jpa.repository.config.EnableJpaAuditing + +@EnableJpaAuditing +@Configuration +class JpaAuditingConfig { +} \ No newline at end of file