From ac4db91df46f51c8a53c3c8de201a75251b36196 Mon Sep 17 00:00:00 2001
From: Clansty <i@gao4.pw>
Date: Thu, 31 Oct 2024 01:30:18 +0800
Subject: [PATCH] [F] userActivityList not unique error

---
 .../maimai2/handler/UpsertUserAllHandler.kt   | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt
index 04951b6c..aed1b37e 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt
@@ -122,13 +122,19 @@ class UpsertUserAllHandler(
             repos.userFavorite.saveAll(news.mapApply {
                 id = repos.userFavorite.findByUserAndItemKind(u, itemKind)()?.id ?: 0 }) }
 
-        req.userActivityList?.let { news ->
-            repos.userAct.saveAll(news.flatMap { listOf(it.musicList, it.playList) }.flatten()
-                .filter { it.kind != 0 && it.activityId != 0 }
-                .mapApply {
-                    id = repos.userAct.findByUserAndKindAndActivityId(u, kind, activityId)()?.id ?: 0
-                    user = u
-                }.sortedBy { it.sortNumber })
+        // 2024/10/31 Found some user data findByUserAndKindAndActivityId is not unique
+        // I think userActivityList is not important, so I will ignore it
+        try {
+            req.userActivityList?.let { news ->
+                repos.userAct.saveAll(news.flatMap { listOf(it.musicList, it.playList) }.flatten()
+                    .filter { it.kind != 0 && it.activityId != 0 }
+                    .mapApply {
+                        id = repos.userAct.findByUserAndKindAndActivityId(u, kind, activityId)()?.id ?: 0
+                        user = u
+                    }.sortedBy { it.sortNumber })
+            }
+        } catch (e: Exception) {
+            logger.error("Error saving user activity", e)
         }
 
         if(req.isNewFavoritemusicList == "0")