Fix database cleanup query pulling duplicate mediaProgresses

Merge pull request #4413 from HadrienPatte/nusqlite3-path
Make `NUSQLITE3_PATH` build arg configurable
2026-07-05 17:01:34 +00:00 · 2025-06-16 17:50:53 -05:00 · 2025-06-16 17:22:21 -05:00 · 2025-06-16 23:03:02 +02:00
2 changed files with 20 additions and 9 deletions
--- a/2
+++ b/2
@ -57,7 +57,7 @@ WORKDIR /app
 # Copy compiled frontend and server from build stages
 COPY --from=build-client /client/dist /app/client/dist
 COPY --from=build-server /server /app
-COPY --from=build-server /usr/local/lib/nusqlite3 /usr/local/lib/nusqlite3
+COPY --from=build-server ${NUSQLITE3_PATH} ${NUSQLITE3_PATH}

 EXPOSE 80

--- a/server/Database.js
+++ b/server/Database.js
@ -766,14 +766,25 @@ class Database {
      Logger.warn(`Removed ${badSessionsRemoved} sessions that were 3 seconds or less`)
    }

-    // Remove mediaProgresses with duplicate mediaItemId (remove the oldest updatedAt)
-    // const [duplicateMediaProgresses] = await this.sequelize.query(`SELECT id, mediaItemId FROM mediaProgresses WHERE (mediaItemId, userId, updatedAt) IN (SELECT mediaItemId, userId, MIN(updatedAt) FROM mediaProgresses GROUP BY mediaItemId, userId HAVING COUNT(*) > 1)`)
-    // for (const duplicateMediaProgress of duplicateMediaProgresses) {
-    //   Logger.warn(`Found duplicate mediaProgress for mediaItem "${duplicateMediaProgress.mediaItemId}" - removing it`)
-    //   await this.mediaProgressModel.destroy({
-    //     where: { id: duplicateMediaProgress.id }
-    //   })
-    // }
+    // Remove mediaProgresses with duplicate mediaItemId (remove the oldest updatedAt or if updatedAt is the same, remove arbitrary one)
+    const [duplicateMediaProgresses] = await this.sequelize.query(`SELECT mp1.id, mp1.mediaItemId
+FROM mediaProgresses mp1
+WHERE EXISTS (
+    SELECT 1
+    FROM mediaProgresses mp2
+    WHERE mp2.mediaItemId = mp1.mediaItemId
+    AND mp2.userId = mp1.userId
+    AND (
+        mp2.updatedAt > mp1.updatedAt
+        OR (mp2.updatedAt = mp1.updatedAt AND mp2.id < mp1.id)
+    )
+)`)
+    for (const duplicateMediaProgress of duplicateMediaProgresses) {
+      Logger.warn(`Found duplicate mediaProgress for mediaItem "${duplicateMediaProgress.mediaItemId}" - removing it`)
+      await this.mediaProgressModel.destroy({
+        where: { id: duplicateMediaProgress.id }
+      })
+    }
  }

  async createTextSearchQuery(query) {
Author	SHA1	Message	Date
advplyr	1f7be58124	Fix database cleanup query pulling duplicate mediaProgresses Some checks are pending CodeQL / Analyze (push) Waiting to run Details Build and Push Docker Image / build (push) Waiting to run Details Integration Test / build and test (push) Waiting to run Details Run Unit Tests / Run Unit Tests (push) Waiting to run Details	2025-06-16 17:50:53 -05:00
advplyr	6b8b27b04f	Merge pull request #4413 from HadrienPatte/nusqlite3-path Make `NUSQLITE3_PATH` build arg configurable	2025-06-16 17:22:21 -05:00
Hadrien Patte	ba4061e5a4	Make `NUSQLITE3_PATH` build arg configurable	2025-06-16 23:03:02 +02:00