From eb9d505e179311a410291757487dd9a81582853e Mon Sep 17 00:00:00 2001 From: Gauthier Roebroeck Date: Fri, 10 Sep 2021 15:58:02 +0800 Subject: [PATCH] fix: don't update read progress data upon upgrade or restore --- .../org/gotson/komga/infrastructure/jooq/ReadProgressDao.kt | 4 +--- .../gotson/komga/infrastructure/jooq/ReadProgressDaoTest.kt | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReadProgressDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReadProgressDao.kt index 7ee5e6ea..c0d65356 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReadProgressDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReadProgressDao.kt @@ -9,8 +9,6 @@ import org.jooq.Query import org.jooq.impl.DSL import org.springframework.stereotype.Component import org.springframework.transaction.annotation.Transactional -import java.time.LocalDateTime -import java.time.ZoneId @Component class ReadProgressDao( @@ -73,7 +71,7 @@ class ReadProgressDao( .onDuplicateKeyUpdate() .set(r.PAGE, readProgress.page) .set(r.COMPLETED, readProgress.completed) - .set(r.LAST_MODIFIED_DATE, LocalDateTime.now(ZoneId.of("Z"))) + .set(r.LAST_MODIFIED_DATE, readProgress.lastModifiedDate.toUTC()) @Transactional override fun delete(bookId: String, userId: String) { diff --git a/komga/src/test/kotlin/org/gotson/komga/infrastructure/jooq/ReadProgressDaoTest.kt b/komga/src/test/kotlin/org/gotson/komga/infrastructure/jooq/ReadProgressDaoTest.kt index 8a80f22d..26729be0 100644 --- a/komga/src/test/kotlin/org/gotson/komga/infrastructure/jooq/ReadProgressDaoTest.kt +++ b/komga/src/test/kotlin/org/gotson/komga/infrastructure/jooq/ReadProgressDaoTest.kt @@ -105,7 +105,8 @@ class ReadProgressDaoTest( book1.id, user1.id, 10, - true + true, + lastModifiedDate = modificationDate, ) )