Adopt store module to new collective table

modules/store/src/test/scala/docspell/store/fts/TempFtsOpsTest.scala

@@ -6,22 +6,19 @@
 
 package docspell.store.fts
 
-import java.time.LocalDate
-
+import java.time.{Instant, LocalDate}
 import cats.effect.IO
 import cats.syntax.option._
 import cats.syntax.traverse._
 import fs2.Stream
-
 import docspell.common._
 import docspell.ftsclient.FtsResult
 import docspell.ftsclient.FtsResult.{AttachmentData, ItemMatch}
 import docspell.store._
 import docspell.store.qb.DSL._
 import docspell.store.qb._
-import docspell.store.queries.{QItem, Query}
-import docspell.store.records.{RCollective, RItem}
-
+import docspell.store.queries.{QItem, QLogin, Query}
+import docspell.store.records.{RCollective, RItem, RUser}
 import doobie._
 
 class TempFtsOpsTest extends DatabaseTest {
@@ -60,9 +57,10 @@ class TempFtsOpsTest extends DatabaseTest {
 
   def prepareItems(store: Store[IO]) =
     for {
-      _ <- store.transact(RCollective.insert(makeCollective(DocspellSystem.user)))
+      _ <- store.transact(RCollective.insert(makeCollective(CollectiveId(2))))
+      _ <- store.transact(RUser.insert(makeUser(CollectiveId(2))))
       items = (0 until 200)
-        .map(makeItem(_, DocspellSystem.user))
+        .map(makeItem(_, CollectiveId(2)))
         .toList
       _ <- items.traverse(i => store.transact(RItem.insert(i)))
     } yield ()
@@ -100,7 +98,9 @@ class TempFtsOpsTest extends DatabaseTest {
   def assertQueryItem(store: Store[IO], ftsResults: Stream[ConnectionIO, FtsResult]) =
     for {
       today <- IO(LocalDate.now())
-      account = DocspellSystem.account
+      account <- store
+        .transact(QLogin.findUser(DocspellSystem.account))
+        .map(_.get.account)
       tempTable = ftsResults
         .through(TempFtsOps.prepareTable(store.dbms, "fts_result"))
         .compile
@@ -170,10 +170,31 @@ class TempFtsOpsTest extends DatabaseTest {
     }
   }
 
-  def makeCollective(cid: Ident): RCollective =
-    RCollective(cid, CollectiveState.Active, Language.English, true, ts)
+  def makeUser(cid: CollectiveId): RUser =
+    RUser(
+      Ident.unsafe("uid1"),
+      DocspellSystem.account.user,
+      cid,
+      Password("test"),
+      UserState.Active,
+      AccountSource.Local,
+      None,
+      0,
+      None,
+      Timestamp(Instant.now)
+    )
 
-  def makeItem(n: Int, cid: Ident): RItem =
+  def makeCollective(cid: CollectiveId): RCollective =
+    RCollective(
+      cid,
+      DocspellSystem.account.collective,
+      CollectiveState.Active,
+      Language.English,
+      true,
+      ts
+    )
+
+  def makeItem(n: Int, cid: CollectiveId): RItem =
     RItem(
       id(s"item-$n"),
       cid,

modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala

@@ -40,7 +40,7 @@ class ItemQueryGeneratorTest extends FunSuite {
   test("basic test") {
     val q = ItemQueryParser
       .parseUnsafe("(& name:hello date>=2020-02-01 (| source:expense* folder=test ))")
-    val cond = ItemQueryGenerator(now, tables, Ident.unsafe("coll"))(q)
+    val cond = ItemQueryGenerator(now, tables, CollectiveId(1))(q)
     val expect =
       tables.item.name.like("hello") &&
         coalesce(tables.item.itemDate.s, tables.item.created.s) >=
@@ -52,14 +52,14 @@ class ItemQueryGeneratorTest extends FunSuite {
 
   test("!conc:*") {
     val q = ItemQueryParser.parseUnsafe("!conc:*")
-    val cond = ItemQueryGenerator(now, tables, Ident.unsafe("coll"))(q)
+    val cond = ItemQueryGenerator(now, tables, CollectiveId(1))(q)
     val expect = not(tables.concPers.name.like("%") || tables.concEquip.name.like("%"))
     assertEquals(cond, expect)
   }
 
   test("attach.id with wildcard") {
     val q = ItemQueryParser.parseUnsafe("attach.id=abcde*")
-    val cond = ItemQueryGenerator(now, tables, Ident.unsafe("coll"))(q)
+    val cond = ItemQueryGenerator(now, tables, CollectiveId(1))(q)
     val expect = tables.item.id.in(
       Select(
         select(RAttachment.T.itemId),
@@ -73,7 +73,7 @@ class ItemQueryGeneratorTest extends FunSuite {
 
   test("attach.id with equals") {
     val q = ItemQueryParser.parseUnsafe("attach.id=abcde")
-    val cond = ItemQueryGenerator(now, tables, Ident.unsafe("coll"))(q)
+    val cond = ItemQueryGenerator(now, tables, CollectiveId(1))(q)
     val expect = tables.item.id.in(
       Select(
         select(RAttachment.T.itemId),

modules/store/src/test/scala/docspell/store/migrate/MigrateTest.scala

@@ -7,9 +7,7 @@
 package docspell.store.migrate
 
 import cats.effect._
-
 import docspell.store.{DatabaseTest, SchemaMigrateConfig, StoreFixture}
-
 import org.flywaydb.core.api.output.MigrateResult
 
 class MigrateTest extends DatabaseTest {