From b775781fd78dabdebd07795584b6fafaa504038d Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Tue, 30 Apr 2024 22:53:01 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=9C=EB=A6=AC=EC=A6=88,=20=EC=8B=9C?=
=?UTF-8?q?=EB=A6=AC=EC=A6=88=20=EC=BD=98=ED=85=90=EC=B8=A0=20-=20?=
=?UTF-8?q?=EC=A0=95=EB=A0=AC=EC=88=9C=EC=84=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sodalive/content/series/ContentSeriesRepository.kt | 1 +
.../content/series/content/ContentSeriesContentRepository.kt | 1 +
.../vividnext/sodalive/creator/admin/content/series/Series.kt | 3 ++-
.../sodalive/creator/admin/content/series/SeriesContent.kt | 2 ++
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt
index 345e4fb..cc763bc 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt
@@ -64,6 +64,7 @@ class ContentSeriesQueryRepositoryImpl(
return queryFactory
.selectFrom(series)
.where(where)
+ .orderBy(series.orders.asc(), series.createdAt.asc())
.offset(offset)
.limit(limit)
.fetch()
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/content/ContentSeriesContentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/content/ContentSeriesContentRepository.kt
index 469dbc2..aa83137 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/content/ContentSeriesContentRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/content/ContentSeriesContentRepository.kt
@@ -89,6 +89,7 @@ class ContentSeriesContentQueryRepositoryImpl(
.innerJoin(seriesContent.series, series)
.innerJoin(seriesContent.content, audioContent)
.where(where)
+ .orderBy(series.orders.asc(), series.createdAt.asc())
.offset(offset)
.limit(limit)
.fetch()
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/Series.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/Series.kt
index 82a63f4..79f4f1b 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/Series.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/Series.kt
@@ -43,7 +43,8 @@ data class Series(
@CollectionTable(name = "series_published_days_of_week", joinColumns = [JoinColumn(name = "series_id")])
val publishedDaysOfWeek: MutableSet<SeriesPublishedDaysOfWeek> = mutableSetOf(),
var isAdult: Boolean = false,
- var isActive: Boolean = true
+ var isActive: Boolean = true,
+ var orders: Int = 1
) : BaseEntity() {
@OneToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "genre_id", nullable = false)
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/SeriesContent.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/SeriesContent.kt
index eabc927..1ba0b99 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/SeriesContent.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/SeriesContent.kt
@@ -17,6 +17,8 @@ class SeriesContent {
@GeneratedValue(strategy = GenerationType.IDENTITY)
var id: Long? = null
+ var orders: Int = 1
+
var createdAt: LocalDateTime? = null
@ManyToOne(fetch = FetchType.LAZY)