Merge pull request '콘텐츠 정렬 기준' (#118) from test into main
Reviewed-on: #118
This commit is contained in:
		| @@ -145,7 +145,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) | ||||
|         limit: Long | ||||
|     ): List<AudioContent> { | ||||
|         val orderBy = when (sortType) { | ||||
|             SortType.NEWEST -> audioContent.createdAt.desc() | ||||
|             SortType.NEWEST -> audioContent.releaseDate.desc() | ||||
|             SortType.PRICE_HIGH -> audioContent.price.desc() | ||||
|             SortType.PRICE_LOW -> audioContent.price.asc() | ||||
|         } | ||||
| @@ -290,13 +290,13 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) | ||||
|             .where(where) | ||||
|             .offset(offset) | ||||
|             .limit(limit) | ||||
|             .orderBy(audioContent.createdAt.desc()) | ||||
|             .orderBy(audioContent.releaseDate.desc()) | ||||
|             .fetch() | ||||
|     } | ||||
|  | ||||
|     override fun totalCountNewContentFor2Weeks(theme: String, memberId: Long, isAdult: Boolean): Int { | ||||
|         var where = audioContent.isActive.isTrue | ||||
|             .and(audioContent.createdAt.goe(LocalDateTime.now().minusWeeks(2))) | ||||
|             .and(audioContent.releaseDate.goe(LocalDateTime.now().minusWeeks(2))) | ||||
|             .and( | ||||
|                 audioContent.releaseDate.isNull | ||||
|                     .or(audioContent.releaseDate.loe(LocalDateTime.now())) | ||||
| @@ -330,7 +330,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) | ||||
|         limit: Long | ||||
|     ): List<GetAudioContentMainItem> { | ||||
|         var where = audioContent.isActive.isTrue | ||||
|             .and(audioContent.createdAt.goe(LocalDateTime.now().minusWeeks(2))) | ||||
|             .and(audioContent.releaseDate.goe(LocalDateTime.now().minusWeeks(2))) | ||||
|             .and( | ||||
|                 audioContent.releaseDate.isNull | ||||
|                     .or(audioContent.releaseDate.loe(LocalDateTime.now())) | ||||
| @@ -362,7 +362,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) | ||||
|             .where(where) | ||||
|             .offset(offset) | ||||
|             .limit(limit) | ||||
|             .orderBy(audioContent.createdAt.desc()) | ||||
|             .orderBy(audioContent.releaseDate.desc()) | ||||
|             .fetch() | ||||
|     } | ||||
|  | ||||
| @@ -370,7 +370,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) | ||||
|         cloudfrontHost: String, | ||||
|         isAdult: Boolean | ||||
|     ): List<GetNewContentUploadCreator> { | ||||
|         var where = audioContent.createdAt.after(LocalDateTime.now().minusWeeks(2)) | ||||
|         var where = audioContent.releaseDate.after(LocalDateTime.now().minusWeeks(2)) | ||||
|             .and(audioContent.isActive.isTrue) | ||||
|  | ||||
|         if (!isAdult) { | ||||
|   | ||||
| @@ -151,7 +151,7 @@ class AudioContentService( | ||||
|                 .withZoneSameInstant(ZoneId.of("UTC")) | ||||
|                 .toLocalDateTime() | ||||
|         } else { | ||||
|             null | ||||
|             LocalDateTime.now() | ||||
|         } | ||||
|  | ||||
|         // contentFile 체크 | ||||
|   | ||||
| @@ -94,7 +94,7 @@ class CreatorAdminAudioContentQueryRepositoryImpl( | ||||
|             .where(where) | ||||
|             .offset(offset) | ||||
|             .limit(limit) | ||||
|             .orderBy(audioContent.id.desc()) | ||||
|             .orderBy(audioContent.releaseDate.desc()) | ||||
|             .fetch() | ||||
|     } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user