Fix special collections not being updated on startup

LaurenceWarne · Jan 7, 2022 · 0656345 · 0656345
1 parent 7d416f3
commit 0656345
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/finito/api/src/fin/SortConversions.scala b/finito/api/src/fin/SortConversions.scala
@@ -11,6 +11,7 @@ object SortConversions {
       case "title"         => SortType.Title.asRight
       case "author"        => SortType.Author.asRight
       case "rating"        => SortType.Rating.asRight
+      case "lastread"      => SortType.LastRead.asRight
       case unmatchedString => InvalidSortStringError(unmatchedString).asLeft
     }
 }
diff --git a/finito/main/src/fin/SpecialCollectionSetup.scala b/finito/main/src/fin/SpecialCollectionSetup.scala
@@ -25,13 +25,10 @@ object SpecialCollectionSetup {
           .map(_.name)
           .mkString(", ")
       )
-      _ <-
+      _ <- transact(
         specialCollections
-          .filter(_.`lazy`.contains(false))
-          .traverse { c =>
-            transact(processSpecialCollection[G](collectionRepo, c))
-              .flatMap(Logger[F].info(_))
-          }
+          .traverse(c => processSpecialCollection[G](collectionRepo, c))
+      ).flatMap(_.traverse(s => Logger[F].info(s)))
       hookExecutionService = HookExecutionServiceImpl[F]
       wrappedCollectionService = SpecialCollectionService[F](
         defaultCollection,
@@ -53,7 +50,9 @@ object SpecialCollectionSetup {
   ): G[String] =
     for {
       maybeCollection <- collectionRepo.collection(collection.name)
-      _ <- Monad[G].whenA(maybeCollection.isEmpty) {
+      _ <- Monad[G].whenA(
+        maybeCollection.isEmpty && collection.`lazy`.contains(false)
+      ) {
         val sort = collection.preferredSort.getOrElse(
           CollectionServiceImpl.defaultSort
         )

diff --git a/finito/main/src/fin/config/ServiceConfig.scala b/finito/main/src/fin/config/ServiceConfig.scala
@@ -49,15 +49,15 @@ object ServiceConfig {
           |    },
           |    {
           |      name = Currently Reading,
-          |      sort = {
-          |        type = last-read,
-          |        sort-ascending = false
-          |      },
           |      read-started-hook = \"\"\"add = true\"\"\",
           |      read-completed-hook = \"\"\"remove = true\"\"\"
           |    },
           |    {
           |      name = Read,
+          |      preferred-sort = {
+          |        type = last-read,
+          |        sort-ascending = false
+          |      },
           |      read-completed-hook = \"\"\"add = true\"\"\"
           |    },
           |    {