TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow to connect a person to an organization

Browse Source
This commit is contained in:
Eike Kettner
2020-11-30 21:04:29 +01:00
parent b05bd43d4e
commit fc2668feee
8 changed files with 81 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/store/src/main/resources/db/migration/h2/V1.14.0__person_org.sql Normal file
View File

@ -0,0 +1,7 @@
ALTER TABLE "person"
ADD COLUMN "oid" varchar(254);
ALTER TABLE "person"
ADD CONSTRAINT fk_person_organization
FOREIGN KEY ("oid")
REFERENCES "organization"("oid");

7
modules/store/src/main/resources/db/migration/mariadb/V1.14.0__person_org.sql Normal file
View File

@ -0,0 +1,7 @@
ALTER TABLE `person`
ADD COLUMN `oid` varchar(254);
ALTER TABLE `person`
ADD CONSTRAINT fk_person_organization
FOREIGN KEY (`oid`)
REFERENCES `organization`(`oid`);

7
modules/store/src/main/resources/db/migration/postgresql/V1.14.0__person_org.sql Normal file
View File

@ -0,0 +1,7 @@
ALTER TABLE "person"
ADD COLUMN "oid" varchar(254);
ALTER TABLE "person"
ADD CONSTRAINT fk_person_organization
FOREIGN KEY ("oid")
REFERENCES "organization"("oid");

42
modules/store/src/main/scala/docspell/store/queries/QOrganization.scala
View File

@ -41,7 +41,7 @@ object QOrganization {
Seq.empty
})
(selectSimple(cols, from, and(q)) ++ orderBy(order(OC).f))
(selectSimple(cols, from, and(q)) ++ orderBy(order(OC).prefix("o").f))
.query[(ROrganization, Option[RContact])]
.stream
.groupAdjacentBy(_._1)
@ -82,17 +82,21 @@ object QOrganization {
coll: Ident,
query: Option[String],
order: PC.type => Column
): Stream[ConnectionIO, (RPerson, Vector[RContact])] = {
): Stream[ConnectionIO, (RPerson, Option[ROrganization], Vector[RContact])] = {
val pColl = PC.cid.prefix("p")
val pName = RPerson.Columns.name.prefix("p")
val pNotes = RPerson.Columns.notes.prefix("p")
val pId = RPerson.Columns.pid.prefix("p")
val cPers = RContact.Columns.personId.prefix("c")
val cVal = RContact.Columns.value.prefix("c")
val oId = ROrganization.Columns.oid.prefix("o")
val pOid = RPerson.Columns.oid.prefix("p")
val cols = RPerson.Columns.all.map(_.prefix("p")) ++ RContact.Columns.all
.map(_.prefix("c"))
val cols = RPerson.Columns.all.map(_.prefix("p")) ++
ROrganization.Columns.all.map(_.prefix("o")) ++
RContact.Columns.all.map(_.prefix("c"))
val from = RPerson.table ++ fr"p LEFT JOIN" ++
ROrganization.table ++ fr"o ON" ++ pOid.is(oId) ++ fr"LEFT JOIN" ++
RContact.table ++ fr"c ON" ++ cPers.is(pId)
val q = Seq(pColl.is(coll)) ++ (query match {
@ -103,38 +107,44 @@ object QOrganization {
Seq.empty
})
(selectSimple(cols, from, and(q)) ++ orderBy(order(PC).f))
.query[(RPerson, Option[RContact])]
(selectSimple(cols, from, and(q)) ++ orderBy(order(PC).prefix("p").f))
.query[(RPerson, Option[ROrganization], Option[RContact])]
.stream
.groupAdjacentBy(_._1)
.map({ case (ro, chunk) =>
val cs = chunk.toVector.flatMap(_._2)
(ro, cs)
.map({ case (rp, chunk) =>
val cs = chunk.toVector.flatMap(_._3)
val ro = chunk.map(_._2).head.flatten
(rp, ro, cs)
})
}
def getPersonAndContact(
coll: Ident,
persId: Ident
): ConnectionIO[Option[(RPerson, Vector[RContact])]] = {
): ConnectionIO[Option[(RPerson, Option[ROrganization], Vector[RContact])]] = {
val pColl = PC.cid.prefix("p")
val pId = RPerson.Columns.pid.prefix("p")
val cPers = RContact.Columns.personId.prefix("c")
val oId = ROrganization.Columns.oid.prefix("o")
val pOid = RPerson.Columns.oid.prefix("p")
val cols = RPerson.Columns.all.map(_.prefix("p")) ++ RContact.Columns.all
.map(_.prefix("c"))
val cols = RPerson.Columns.all.map(_.prefix("p")) ++
ROrganization.Columns.all.map(_.prefix("o")) ++
RContact.Columns.all.map(_.prefix("c"))
val from = RPerson.table ++ fr"p LEFT JOIN" ++
ROrganization.table ++ fr"o ON" ++ pOid.is(oId) ++ fr"LEFT JOIN" ++
RContact.table ++ fr"c ON" ++ cPers.is(pId)
val q = and(pColl.is(coll), pId.is(persId))
selectSimple(cols, from, q)
.query[(RPerson, Option[RContact])]
.query[(RPerson, Option[ROrganization], Option[RContact])]
.stream
.groupAdjacentBy(_._1)
.map({ case (ro, chunk) =>
val cs = chunk.toVector.flatMap(_._2)
(ro, cs)
.map({ case (rp, chunk) =>
val cs = chunk.toVector.flatMap(_._3)
val ro = chunk.map(_._2).head.flatten
(rp, ro, cs)
})
.compile
.last

10
modules/store/src/main/scala/docspell/store/records/RPerson.scala
View File

@ -21,7 +21,8 @@ case class RPerson(
notes: Option[String],
concerning: Boolean,
created: Timestamp,
updated: Timestamp
updated: Timestamp,
oid: Option[Ident]
) {}
object RPerson {
@ -42,6 +43,7 @@ object RPerson {
val concerning = Column("concerning")
val created = Column("created")
val updated = Column("updated")
val oid = Column("oid")
val all = List(
pid,
cid,
@ -53,7 +55,8 @@ object RPerson {
notes,
concerning,
created,
updated
updated,
oid
)
}
@ -63,7 +66,7 @@ object RPerson {
val sql = insertRow(
table,
all,
fr"${v.pid},${v.cid},${v.name},${v.street},${v.zip},${v.city},${v.country},${v.notes},${v.concerning},${v.created},${v.updated}"
fr"${v.pid},${v.cid},${v.name},${v.street},${v.zip},${v.city},${v.country},${v.notes},${v.concerning},${v.created},${v.updated},${v.oid}"
)
sql.update.run
}
@ -82,6 +85,7 @@ object RPerson {
country.setTo(v.country),
concerning.setTo(v.concerning),
notes.setTo(v.notes),
oid.setTo(v.oid),
updated.setTo(now)
)
)