Merge branch 'develop'

# Conflicts: # backend/application/api/src/main/kotlin/io/raemian/api/goal/service/GoalQueryService.kt
depromeet · Apr 26, 2024 · 75c4469 · 75c4469
2 parents f201076 + 9ba3988
commit 75c4469
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/backend/application/api/src/main/kotlin/io/raemian/api/goal/service/GoalQueryService.kt b/backend/application/api/src/main/kotlin/io/raemian/api/goal/service/GoalQueryService.kt
@@ -10,7 +10,6 @@ import io.raemian.api.lifemap.service.LifeMapService
 import io.raemian.api.support.response.OffsetPaginationResult
 import io.raemian.api.task.service.TaskService
 import io.raemian.storage.db.core.goal.GoalJdbcQueryRepository
-import io.raemian.storage.db.core.goal.GoalRepository
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
@@ -19,15 +18,14 @@ class GoalQueryService(
     private val lifeMapService: LifeMapService,
     private val goalJdbcQueryRepository: GoalJdbcQueryRepository,
     private val lifeMapCountQueryService: LifeMapCountQueryService,
-    private val goalRepository: GoalRepository,
     private val emojiService: EmojiService,
     private val taskService: TaskService,
     private val commentService: CommentService,
 ) {
     @Transactional(readOnly = true)
     fun findAllByUsernameWithOffset(username: String, request: TimelinePageRequest): OffsetPaginationResult<GoalTimelinePageResult> {
         val lifeMap = lifeMapService.getFirstByUserName(username)
-        val goals = goalJdbcQueryRepository.findAllByLifeMapWithOffset(lifeMap.lifeMapId, request.page, request.size)
+        val goals = goalJdbcQueryRepository.findAllByLifeMapWithOffset(lifeMap.lifeMapId, request.page * request.size, request.size)
 
         if (goals.isEmpty()) {
             return OffsetPaginationResult.empty(request.page, request.size)
@@ -57,7 +55,7 @@ class GoalQueryService(
     @Transactional(readOnly = true)
     fun findAllByUserIdWithOffset(userId: Long, request: TimelinePageRequest): OffsetPaginationResult<GoalTimelinePageResult> {
         val lifeMap = lifeMapService.getFirstByUserId(userId)
-        val goals = goalJdbcQueryRepository.findAllByLifeMapWithOffset(lifeMap.lifeMapId, request.page, request.size)
+        val goals = goalJdbcQueryRepository.findAllByLifeMapWithOffset(lifeMap.lifeMapId, request.page * request.size, request.size)
         if (goals.isEmpty()) {
             return OffsetPaginationResult.empty(request.page, request.size)
         }