fix: 그룹 유저 스코어를 수정 시간대를 기준으로 변경

DDD-Community · Sep 16, 2024 · 544c9ef · 544c9ef
1 parent 5d90d80
commit 544c9ef
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/src/main/kotlin/com/hero/alignlab/batch/grouprank/job/GroupRankRefreshJob.kt b/src/main/kotlin/com/hero/alignlab/batch/grouprank/job/GroupRankRefreshJob.kt
@@ -25,20 +25,20 @@ class GroupRankRefreshJob(
 
         val uids = groupUsers.map { it.uid }
 
-        val counts = poseSnapshotService.countByUidsAndCreatedAtBetween(
+        val counts = poseSnapshotService.countByUidsAndModifiedAtBetween(
             uids = uids,
-            fromCreatedAt = from,
-            toCreatedAt = to
+            fromModifiedAt = from,
+            toModifiedAt = to
         ).associateBy { it.uid }
 
         groupUserScoreService.findAllByUids(uids)
-            .groupBy { it.groupId }
-            .forEach { (key, value) ->
-                val groupUserScores = value.mapNotNull {
-                    val score = counts[it.uid]?.count?.toInt() ?: return@mapNotNull null
+            .groupBy { groupUserScore -> groupUserScore.groupId }
+            .forEach { (groupId, scores) ->
+                val groupUserScores = scores.map { groupUserScore ->
+                    val score = counts[groupUserScore.uid]?.count?.toInt() ?: 0
 
-                    it.apply {
-                        it.score = score
+                    groupUserScore.apply {
+                        groupUserScore.score = score
                     }
                 }
 

diff --git a/src/main/kotlin/com/hero/alignlab/domain/pose/application/PoseSnapshotService.kt b/src/main/kotlin/com/hero/alignlab/domain/pose/application/PoseSnapshotService.kt
@@ -28,16 +28,16 @@ class PoseSnapshotService(
         }
     }
 
-    suspend fun countByUidsAndCreatedAtBetween(
+    suspend fun countByUidsAndModifiedAtBetween(
         uids: List<Long>,
-        fromCreatedAt: LocalDateTime,
-        toCreatedAt: LocalDateTime,
+        fromModifiedAt: LocalDateTime,
+        toModifiedAt: LocalDateTime,
     ): List<PoseTypeCountModel> {
         return withContext(Dispatchers.IO) {
-            poseSnapshotRepository.countByUidAndCreatedAt(
+            poseSnapshotRepository.countByUidAndModifiedAt(
                 uids = uids,
-                fromCreatedAt = fromCreatedAt,
-                toCreatedAt = toCreatedAt,
+                fromModifiedAt = fromModifiedAt,
+                toModifiedAt = toModifiedAt,
             )
         }
     }

diff --git a/src/main/kotlin/com/hero/alignlab/domain/pose/infrastructure/PoseSnapshotRepository.kt b/src/main/kotlin/com/hero/alignlab/domain/pose/infrastructure/PoseSnapshotRepository.kt
@@ -24,10 +24,10 @@ interface PoseSnapshotRepository : JpaRepository<PoseSnapshot, Long>, PoseSnapsh
 interface PoseSnapshotQRepository {
     fun countByUidsAndDate(uids: List<Long>, date: LocalDate): List<PoseTypeCountModel>
 
-    fun countByUidAndCreatedAt(
+    fun countByUidAndModifiedAt(
         uids: List<Long>,
-        fromCreatedAt: LocalDateTime,
-        toCreatedAt: LocalDateTime,
+        fromModifiedAt: LocalDateTime,
+        toModifiedAt: LocalDateTime,
     ): List<PoseTypeCountModel>
 }
 
@@ -60,10 +60,10 @@ class PoseSnapshotQRepositoryImpl : PoseSnapshotQRepository, QuerydslRepositoryS
             .fetch()
     }
 
-    override fun countByUidAndCreatedAt(
+    override fun countByUidAndModifiedAt(
         uids: List<Long>,
-        fromCreatedAt: LocalDateTime,
-        toCreatedAt: LocalDateTime
+        fromModifiedAt: LocalDateTime,
+        toModifiedAt: LocalDateTime
     ): List<PoseTypeCountModel> {
         return JPAQuery<QPoseSnapshot>(entityManager)
             .select(
@@ -76,7 +76,7 @@ class PoseSnapshotQRepositoryImpl : PoseSnapshotQRepository, QuerydslRepositoryS
             .from(qPoseSnapshot)
             .where(
                 qPoseSnapshot.uid.`in`(uids),
-                qPoseSnapshot.createdAt.between(fromCreatedAt, toCreatedAt)
+                qPoseSnapshot.modifiedAt.between(fromModifiedAt, toModifiedAt)
             )
             .groupBy(qPoseSnapshot.uid, qPoseSnapshot.type)
             .fetch()

diff --git a/src/main/kotlin/com/hero/alignlab/event/listener/PoseSnapshotListener.kt b/src/main/kotlin/com/hero/alignlab/event/listener/PoseSnapshotListener.kt
@@ -65,10 +65,10 @@ class PoseSnapshotListener(
                 val to = event.poseSnapshot.createdAt
                 val from = to.minusHours(1)
 
-                val score = poseSnapshotService.countByUidsAndCreatedAtBetween(
+                val score = poseSnapshotService.countByUidsAndModifiedAtBetween(
                     uids = listOf(event.poseSnapshot.uid),
-                    fromCreatedAt = from,
-                    toCreatedAt = to
+                    fromModifiedAt = from,
+                    toModifiedAt = to
                 ).filter { model -> model.type in BAD_POSE }.sumOf { model -> model.count }.toInt()
 
                 val groupUserScore = groupUserScoreService.createOrUpdateGroupUserScore(this, score)