Refactoring index migration task

modules/joex/src/main/scala/docspell/joex/fts/IndexTask.scala

@@ -22,7 +22,7 @@ object IndexTask {
       .flatMap(_ =>
         Task(ctx =>
           Migration[F](cfg, ctx.store, fts, ctx.logger)
-            .run(Migration.migrationTasks[F])
+            .run(migrationTasks[F])
         )
       )
 
@@ -45,4 +45,11 @@ object IndexTask {
       Some(taskName)
     )
 
+  private val solrEngine = Ident.unsafe("solr")
+  def migrationTasks[F[_]: Effect]: List[Migration[F]] =
+    List(
+      Migration[F](1, solrEngine, "initialize", MigrationTask[F](ctx => ctx.fts.initialize)),
+      Migration[F](2, solrEngine, "Index all from database", MigrationTask.insertAll[F])
+    )
+
 }

modules/joex/src/main/scala/docspell/joex/fts/MigrateCtx.scala

@@ -0,0 +1,13 @@
+package docspell.joex.fts
+
+import docspell.common.Logger
+import docspell.joex.Config
+import docspell.store.Store
+import docspell.ftsclient.FtsClient
+
+case class MigrateCtx[F[_]](
+    cfg: Config.FullTextSearch,
+    store: Store[F],
+    fts: FtsClient[F],
+    logger: Logger[F]
+)

modules/joex/src/main/scala/docspell/joex/fts/Migration.scala

@@ -8,25 +8,16 @@ import docspell.common._
 import docspell.joex.Config
 import docspell.store.{AddResult, Store}
 import docspell.store.records.RFtsMigration
-import docspell.store.queries.{QAttachment, QItem}
 import docspell.ftsclient._
 
+case class Migration[F[_]](
+    version: Int,
+    engine: Ident,
+    description: String,
+    task: MigrationTask[F]
+)
+
 object Migration {
-  private val solrEngine = Ident.unsafe("solr")
-
-  case class MigrateCtx[F[_]](
-      cfg: Config.FullTextSearch,
-      store: Store[F],
-      fts: FtsClient[F],
-      logger: Logger[F]
-  )
-
-  case class Migration[F[_]](
-      version: Int,
-      engine: Ident,
-      description: String,
-      task: Kleisli[F, MigrateCtx[F], Unit]
-  )
 
   def apply[F[_]: Effect](
       cfg: Config.FullTextSearch,
@@ -72,47 +63,4 @@ object Migration {
       ctx.logger.info(s"Migration ${m.version}/${m.description} already applied.")
     )
   }
-
-  def migrationTasks[F[_]: Effect]: List[Migration[F]] =
-    List(
-      Migration[F](1, solrEngine, "initialize", Kleisli(ctx => ctx.fts.initialize)),
-      Migration[F](
-        2,
-        solrEngine,
-        "Index all attachments from database",
-        Kleisli(ctx =>
-          ctx.fts.indexData(
-            ctx.logger,
-            ctx.store
-              .transact(
-                QAttachment.allAttachmentMetaAndName(ctx.cfg.migration.indexAllChunk)
-              )
-              .map(caa =>
-                TextData
-                  .attachment(
-                    caa.item,
-                    caa.id,
-                    caa.collective,
-                    caa.lang,
-                    caa.name,
-                    caa.content
-                  )
-              )
-          )
-        )
-      ),
-      Migration[F](
-        3,
-        solrEngine,
-        "Index all items from database",
-        Kleisli(ctx =>
-          ctx.fts.indexData(
-            ctx.logger,
-            ctx.store
-              .transact(QItem.allNameAndNotes(ctx.cfg.migration.indexAllChunk * 5))
-              .map(nn => TextData.item(nn.id, nn.collective, Option(nn.name), nn.notes))
-          )
-        )
-      )
-    )
 }

modules/joex/src/main/scala/docspell/joex/fts/MigrationTask.scala

@@ -0,0 +1,56 @@
+package docspell.joex.fts
+
+import cats.effect._
+import cats.data.{Kleisli, NonEmptyList}
+import cats.{FlatMap, Semigroup}
+import docspell.store.queries.{QAttachment, QItem}
+import docspell.ftsclient.TextData
+
+object MigrationTask {
+  def apply[F[_]](f: MigrateCtx[F] => F[Unit]): MigrationTask[F] =
+    Kleisli(f)
+
+  def all[F[_]: FlatMap](
+      m0: MigrationTask[F],
+      mn: MigrationTask[F]*
+  ): MigrationTask[F] =
+    NonEmptyList.of(m0, mn: _*).reduce(semigroup[F])
+
+  implicit def semigroup[F[_]: FlatMap]: Semigroup[MigrationTask[F]] =
+    Semigroup.instance((mt1, mt2) => mt1.flatMap(_ => mt2))
+
+  // some tasks
+
+  def insertAll[F[_]: Effect]: MigrationTask[F] =
+    MigrationTask
+      .all(
+        MigrationTask(ctx =>
+          ctx.fts.indexData(
+            ctx.logger,
+            ctx.store
+              .transact(
+                QAttachment.allAttachmentMetaAndName(ctx.cfg.migration.indexAllChunk)
+              )
+              .map(caa =>
+                TextData
+                  .attachment(
+                    caa.item,
+                    caa.id,
+                    caa.collective,
+                    caa.lang,
+                    caa.name,
+                    caa.content
+                  )
+              )
+          )
+        ),
+        MigrationTask(ctx =>
+          ctx.fts.indexData(
+            ctx.logger,
+            ctx.store
+              .transact(QItem.allNameAndNotes(ctx.cfg.migration.indexAllChunk * 5))
+              .map(nn => TextData.item(nn.id, nn.collective, Option(nn.name), nn.notes))
+          )
+        )
+      )
+}

modules/joex/src/main/scala/docspell/joex/fts/package.scala

@@ -0,0 +1,9 @@
+package docspell.joex
+
+import cats.data.Kleisli
+
+package object fts {
+
+  type MigrationTask[F[_]] = Kleisli[F, MigrateCtx[F], Unit]
+
+}