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 person to be correspondent, concerning or both

Browse Source
This commit is contained in:
Eike Kettner
2021-02-16 22:37:56 +01:00
parent 567bfb3e69
commit 48eee00c0b
19 changed files with 321 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/store/src/main/resources/db/migration/h2/V1.20.0__personuse.sql Normal file
View File

@ -0,0 +1,9 @@
ALTER TABLE "person"
ADD COLUMN "person_use" varchar(254);
UPDATE "person" SET "person_use" = 'concerning' where "concerning" = true;
UPDATE "person" SET "person_use" = 'correspondent' where "concerning" = false;
UPDATE "person" SET "person_use" = 'both' where "concerning" is null;
ALTER TABLE "person"
DROP COLUMN "concerning";

9
modules/store/src/main/resources/db/migration/mariadb/V1.20.0__personuse.sql Normal file
View File

@ -0,0 +1,9 @@
ALTER TABLE `person`
ADD COLUMN `person_use` varchar(254);
UPDATE `person` SET `person_use` = 'concerning' where `concerning` = true;
UPDATE `person` SET `person_use` = 'correspondent' where `concerning` = false;
UPDATE `person` SET `person_use` = 'both' where `concerning` is null;
ALTER TABLE `person`
DROP COLUMN `concerning`;

9
modules/store/src/main/resources/db/migration/postgresql/V1.20.0__personuse.sql Normal file
View File

@ -0,0 +1,9 @@
ALTER TABLE "person"
ADD COLUMN "person_use" varchar(254);
UPDATE "person" SET "person_use" = 'concerning' where "concerning" = true;
UPDATE "person" SET "person_use" = 'correspondent' where "concerning" = false;
UPDATE "person" SET "person_use" = 'both' where "concerning" is null;
ALTER TABLE "person"
DROP COLUMN "concerning";

3
modules/store/src/main/scala/docspell/store/impl/DoobieMeta.scala
View File

@ -103,6 +103,9 @@ trait DoobieMeta extends EmilDoobieMeta {
implicit val metaListType: Meta[ListType] =
Meta[String].timap(ListType.unsafeFromString)(_.name)
implicit val metaPersonUse: Meta[PersonUse] =
Meta[String].timap(PersonUse.unsafeFromString)(_.name)
}
object DoobieMeta extends DoobieMeta {

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

@ -1,5 +1,6 @@
package docspell.store.queries
import cats.data.NonEmptyList
import cats.implicits._
import fs2._
@ -121,13 +122,13 @@ object QOrganization {
coll: Ident,
value: String,
ck: Option[ContactKind],
concerning: Option[Boolean]
use: Option[NonEmptyList[PersonUse]]
): Stream[ConnectionIO, RPerson] =
runDistinct(
select(p.all),
from(p).innerJoin(c, c.personId === p.pid),
c.value.like(s"%${value.toLowerCase}%") && p.cid === coll &&?
concerning.map(c => p.concerning === c) &&?
use.map(u => p.use.in(u)) &&?
ck.map(k => c.kind === k)
).query[RPerson].stream

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

@ -21,10 +21,10 @@ case class RPerson(
city: String,
country: String,
notes: Option[String],
concerning: Boolean,
created: Timestamp,
updated: Timestamp,
oid: Option[Ident]
oid: Option[Ident],
use: PersonUse
) {}
object RPerson {
@ -34,18 +34,18 @@ object RPerson {
final case class Table(alias: Option[String]) extends TableDef {
val tableName = "person"
val pid = Column[Ident]("pid", this)
val cid = Column[Ident]("cid", this)
val name = Column[String]("name", this)
val street = Column[String]("street", this)
val zip = Column[String]("zip", this)
val city = Column[String]("city", this)
val country = Column[String]("country", this)
val notes = Column[String]("notes", this)
val concerning = Column[Boolean]("concerning", this)
val created = Column[Timestamp]("created", this)
val updated = Column[Timestamp]("updated", this)
val oid = Column[Ident]("oid", this)
val pid = Column[Ident]("pid", this)
val cid = Column[Ident]("cid", this)
val name = Column[String]("name", this)
val street = Column[String]("street", this)
val zip = Column[String]("zip", this)
val city = Column[String]("city", this)
val country = Column[String]("country", this)
val notes = Column[String]("notes", this)
val created = Column[Timestamp]("created", this)
val updated = Column[Timestamp]("updated", this)
val oid = Column[Ident]("oid", this)
val use = Column[PersonUse]("person_use", this)
val all = NonEmptyList.of[Column[_]](
pid,
cid,
@ -55,10 +55,10 @@ object RPerson {
city,
country,
notes,
concerning,
created,
updated,
oid
oid,
use
)
}
@ -70,7 +70,7 @@ object RPerson {
DML.insert(
T,
T.all,
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}"
fr"${v.pid},${v.cid},${v.name},${v.street},${v.zip},${v.city},${v.country},${v.notes},${v.created},${v.updated},${v.oid},${v.use}"
)
def update(v: RPerson): ConnectionIO[Int] = {
@ -85,7 +85,7 @@ object RPerson {
T.zip.setTo(v.zip),
T.city.setTo(v.city),
T.country.setTo(v.country),
T.concerning.setTo(v.concerning),
T.use.setTo(v.use),
T.notes.setTo(v.notes),
T.oid.setTo(v.oid),
T.updated.setTo(now)
@ -116,19 +116,19 @@ object RPerson {
def findLike(
coll: Ident,
personName: String,
concerningOnly: Boolean
use: NonEmptyList[PersonUse]
): ConnectionIO[Vector[IdRef]] =
run(
select(T.pid, T.name),
from(T),
where(T.cid === coll, T.concerning === concerningOnly, T.name.like(personName))
where(T.cid === coll, T.use.in(use), T.name.like(personName))
).query[IdRef].to[Vector]
def findLike(
coll: Ident,
contactKind: ContactKind,
value: String,
concerningOnly: Boolean
use: NonEmptyList[PersonUse]
): ConnectionIO[Vector[IdRef]] = {
val p = RPerson.as("p")
val c = RContact.as("c")
@ -139,7 +139,7 @@ object RPerson {
where(
p.cid === coll,
c.kind === contactKind,
p.concerning === concerningOnly,
p.use.in(use),
c.value.like(value)
)
).query[IdRef].to[Vector]