TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-07 15:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #582 from eikek/delete-org-fix

Browse Source 
Fix deleting organization
This commit is contained in:
mergify[bot] 2021-01-21 22:56:56 +00:00 committed by GitHub
commit 38e0a50942
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,8 +197,9 @@ object QOrganization {
for { for {
n0 <- RItem.removeCorrOrg(collective, orgId) n0 <- RItem.removeCorrOrg(collective, orgId)
n1 <- RContact.deleteOrg(orgId) n1 <- RContact.deleteOrg(orgId)
n2 <- ROrganization.delete(orgId, collective) n2 <- RPerson.removeOrg(orgId)
} yield n0 + n1 + n2 n3 <- ROrganization.delete(orgId, collective)
} yield n0 + n1 + n2 + n3
def deletePerson(personId: Ident, collective: Ident): ConnectionIO[Int] = def deletePerson(personId: Ident, collective: Ident): ConnectionIO[Int] =
for { for {

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

@ -178,4 +178,7 @@ object RPerson {
case None => case None =>
Sync[ConnectionIO].pure(Vector.empty) Sync[ConnectionIO].pure(Vector.empty)
} }
def removeOrg(orgId: Ident): ConnectionIO[Int] =
DML.update(T, T.oid === orgId, DML.set(T.oid.setTo(None)))
} }