TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 10:28:27 +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

32
modules/joex/src/main/scala/docspell/joex/process/FindProposal.scala
View File

@ -57,7 +57,11 @@ object FindProposal {
ctx.store
.transact(
RPerson
.findLike(coll, mp.values.head.ref.name.toLowerCase, false)
.findLike(
coll,
mp.values.head.ref.name.toLowerCase,
PersonUse.correspondentAndBoth
)
.map(_.headOption)
)
.flatTap(oref =>
@ -67,7 +71,11 @@ object FindProposal {
ctx.store
.transact(
RPerson
.findLike(coll, mp.values.head.ref.name.toLowerCase, true)
.findLike(
coll,
mp.values.head.ref.name.toLowerCase,
PersonUse.concerningAndBoth
)
.map(_.headOption)
)
.flatTap(oref =>
@ -231,10 +239,16 @@ object FindProposal {
case NerTag.Person =>
val s1 = ctx.store
.transact(RPerson.findLike(ctx.args.meta.collective, value, true))
.transact(
RPerson
.findLike(ctx.args.meta.collective, value, PersonUse.concerningAndBoth)
)
.map(MetaProposalList.from(MetaProposalType.ConcPerson, nt))
val s2 = ctx.store
.transact(RPerson.findLike(ctx.args.meta.collective, value, false))
.transact(
RPerson
.findLike(ctx.args.meta.collective, value, PersonUse.correspondentAndBoth)
)
.map(MetaProposalList.from(MetaProposalType.CorrPerson, nt))
val s3 =
ctx.store
@ -288,10 +302,16 @@ object FindProposal {
.transact(ROrganization.findLike(ctx.args.meta.collective, kind, value))
.map(MetaProposalList.from(MetaProposalType.CorrOrg, nt))
val corrP = ctx.store
.transact(RPerson.findLike(ctx.args.meta.collective, kind, value, false))
.transact(
RPerson
.findLike(ctx.args.meta.collective, kind, value, PersonUse.correspondentAndBoth)
)
.map(MetaProposalList.from(MetaProposalType.CorrPerson, nt))
val concP = ctx.store
.transact(RPerson.findLike(ctx.args.meta.collective, kind, value, true))
.transact(
RPerson
.findLike(ctx.args.meta.collective, kind, value, PersonUse.concerningAndBoth)
)
.map(MetaProposalList.from(MetaProposalType.CorrPerson, nt))
ctx.logger.debug(s"Looking with $kind: $value") *>

2
modules/joex/src/main/scala/docspell/joex/scanmailbox/ScanMailboxTask.scala
View File

@ -236,7 +236,7 @@ object ScanMailboxTask {
ctx.args.account.collective,
from.address,
Some(ContactKind.Email),
Some(true)
Some(NonEmptyList.of(PersonUse.concerning))
)
.take(1)
.compile