klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: klaus:3ef1a732e5641598c240cbb1221c2642cf67ea01
Branches Tags
klaus:test
klaus:main
..
compare: klaus:dd138bff8675574cfde7a95a0c689069663c5453
Branches Tags
klaus:main
klaus:test

No commits in common. "3ef1a732e5641598c240cbb1221c2642cf67ea01" and "dd138bff8675574cfde7a95a0c689069663c5453" have entirely different histories.
3ef1a732e5 ... dd138bff86

5 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

4
src/main/kotlin/kr/co/vividnext/sodalive/admin/event/banner/AdminEventBannerRepository.kt
View File

@ -26,7 +26,7 @@ class AdminEventBannerQueryRepositoryImpl(
override fun getEventList(): List<GetAdminEventResponse> { override fun getEventList(): List<GetAdminEventResponse> {
val now = LocalDateTime.now() val now = LocalDateTime.now()
val where = event.isActive.isTrue val where = event.isActive.isTrue
.and(event.endDate.goe(now)) .and(event.startDate.loe(now))
return queryFactory return queryFactory
.select( .select(
@ -65,7 +65,7 @@ class AdminEventBannerQueryRepositoryImpl(
private fun getProcessedUrlExpression(path: StringPath): StringExpression { private fun getProcessedUrlExpression(path: StringPath): StringExpression {
return Expressions.stringTemplate( return Expressions.stringTemplate(
"CASE WHEN {0} LIKE '$cloudFrontHost%' THEN {0} ELSE CONCAT('$cloudFrontHost/', {0}) END", "CASE WHEN {0} LIKE '$cloudFrontHost%' THEN {0} ELSE CONCAT('$cloudFrontHost', {0}) END",
path path
) )
} }

2
src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/ad/AdminAdStatisticsController.kt → src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsController.kt
View File

@ -1,4 +1,4 @@
package kr.co.vividnext.sodalive.admin.statistics.ad package kr.co.vividnext.sodalive.admin.marketing.statistics
import kr.co.vividnext.sodalive.common.ApiResponse import kr.co.vividnext.sodalive.common.ApiResponse
import org.springframework.data.domain.Pageable import org.springframework.data.domain.Pageable

2
src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/ad/AdminAdStatisticsRepository.kt → src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsRepository.kt
View File

@ -1,4 +1,4 @@
package kr.co.vividnext.sodalive.admin.statistics.ad package kr.co.vividnext.sodalive.admin.marketing.statistics
import com.querydsl.core.types.dsl.CaseBuilder import com.querydsl.core.types.dsl.CaseBuilder
import com.querydsl.core.types.dsl.DateTimePath import com.querydsl.core.types.dsl.DateTimePath

2
src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/ad/AdminAdStatisticsService.kt → src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsService.kt
View File

@ -1,4 +1,4 @@
package kr.co.vividnext.sodalive.admin.statistics.ad package kr.co.vividnext.sodalive.admin.marketing.statistics
import kr.co.vividnext.sodalive.extensions.convertLocalDateTime import kr.co.vividnext.sodalive.extensions.convertLocalDateTime
import org.springframework.stereotype.Service import org.springframework.stereotype.Service

2
src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/ad/GetAdminAdStatisticsResponse.kt → src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/GetAdminAdStatisticsResponse.kt
View File

@ -1,4 +1,4 @@
package kr.co.vividnext.sodalive.admin.statistics.ad package kr.co.vividnext.sodalive.admin.marketing.statistics
import com.querydsl.core.annotations.QueryProjection import com.querydsl.core.annotations.QueryProjection