Add ProjectEraseService to ProjectRestService

dasch-swiss · Jun 12, 2024 · af5e9b0 · af5e9b0
1 parent 4bea6ea
commit af5e9b0
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 12 deletions.
diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/AdminModule.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/AdminModule.scala
@@ -10,10 +10,13 @@ import zio.URLayer
 import org.knora.webapi.config.AppConfig
 import org.knora.webapi.responders.IriService
 import org.knora.webapi.slice.admin.domain.AdminDomainModule
+import org.knora.webapi.slice.admin.domain.service.DspIngestClient
 import org.knora.webapi.slice.admin.repo.AdminRepoModule
 import org.knora.webapi.slice.common.repo.service.PredicateObjectMapper
 import org.knora.webapi.slice.infrastructure.CacheManager
 import org.knora.webapi.slice.ontology.domain.service.OntologyRepo
+import org.knora.webapi.slice.ontology.repo.service.OntologyCache
+import org.knora.webapi.slice.resourceinfo.domain.IriConverter
 import org.knora.webapi.store.triplestore.api.TriplestoreService
 
 object AdminModule {
@@ -22,8 +25,11 @@ object AdminModule {
     // format: off
     AppConfig &
     CacheManager &
+    DspIngestClient &
     IriService &
+    IriConverter &
     OntologyRepo &
+    OntologyCache &
     PredicateObjectMapper &
     TriplestoreService
     // format: on

diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminApiModule.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/AdminApiModule.scala
@@ -25,6 +25,7 @@ import org.knora.webapi.slice.admin.domain.service.KnoraProjectService
 import org.knora.webapi.slice.admin.domain.service.KnoraUserService
 import org.knora.webapi.slice.admin.domain.service.KnoraUserToUserConverter
 import org.knora.webapi.slice.admin.domain.service.PasswordService
+import org.knora.webapi.slice.admin.domain.service.ProjectEraseService
 import org.knora.webapi.slice.admin.domain.service.ProjectExportService
 import org.knora.webapi.slice.admin.domain.service.ProjectImportService
 import org.knora.webapi.slice.admin.domain.service.ProjectService
@@ -58,6 +59,7 @@ object AdminApiModule {
     OntologyCache &
     PasswordService &
     PermissionsResponder &
+    ProjectEraseService &
     ProjectExportService &
     ProjectImportService &
     ProjectService &

diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectRestService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/service/ProjectRestService.scala
@@ -6,7 +6,6 @@
 package org.knora.webapi.slice.admin.api.service
 
 import zio.*
-
 import dsp.errors.BadRequestException
 import dsp.errors.ForbiddenException
 import dsp.errors.NotFoundException
@@ -28,6 +27,7 @@ import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortname
 import org.knora.webapi.slice.admin.domain.model.KnoraProject.Status
 import org.knora.webapi.slice.admin.domain.model.User
 import org.knora.webapi.slice.admin.domain.service.KnoraProjectService
+import org.knora.webapi.slice.admin.domain.service.ProjectEraseService
 import org.knora.webapi.slice.admin.domain.service.ProjectExportService
 import org.knora.webapi.slice.admin.domain.service.ProjectImportService
 import org.knora.webapi.slice.admin.domain.service.ProjectService
@@ -41,6 +41,7 @@ final case class ProjectRestService(
   projectService: ProjectService,
   knoraProjectService: KnoraProjectService,
   permissionResponder: PermissionsResponder,
+  projectEraseService: ProjectEraseService,
   projectExportService: ProjectExportService,
   projectImportService: ProjectImportService,
   userService: UserService,
@@ -136,6 +137,10 @@ final case class ProjectRestService(
       internal <- projectService
                     .findByShortcode(shortcode)
                     .someOrFail(NotFoundException(s"$shortcode not found"))
+      project <- knoraProjectService
+                   .findByShortcode(shortcode)
+                   .someOrFail(NotFoundException(s"$shortcode not found"))
+      _        <- projectEraseService.eraseProject(project)
       external <- format.toExternal(ProjectOperationResponseADM(internal))
     } yield external
 

diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/AdminDomainModule.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/AdminDomainModule.scala
@@ -19,6 +19,8 @@ import org.knora.webapi.slice.admin.domain.service.maintenance.MaintenanceServic
 import org.knora.webapi.slice.admin.repo.AdminRepoModule
 import org.knora.webapi.slice.infrastructure.CacheManager
 import org.knora.webapi.slice.ontology.domain.service.OntologyRepo
+import org.knora.webapi.slice.ontology.repo.service.OntologyCache
+import org.knora.webapi.slice.resourceinfo.domain.IriConverter
 import org.knora.webapi.store.triplestore.api.TriplestoreService
 
 object AdminDomainModule {
@@ -28,8 +30,11 @@ object AdminDomainModule {
     AdminRepoModule.Provided &
     AppConfig & 
     CacheManager &
+    DspIngestClient &
     IriService &
+    IriConverter &
     OntologyRepo &
+    OntologyCache &
     TriplestoreService
     // format: on
 
@@ -44,6 +49,7 @@ object AdminDomainModule {
     MaintenanceService &
     PasswordService &
     ProjectService &
+    ProjectEraseService &
     UserService
     // format: on
 
@@ -56,6 +62,7 @@ object AdminDomainModule {
     KnoraUserToUserConverter.layer,
     MaintenanceService.layer,
     PasswordService.layer,
+    ProjectEraseService.layer,
     ProjectService.layer,
     UserService.layer,
   )

diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/KnoraGroupRepo.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/KnoraGroupRepo.scala
@@ -7,7 +7,6 @@ package org.knora.webapi.slice.admin.domain.service
 
 import zio.Chunk
 import zio.Task
-
 import org.knora.webapi.messages.store.triplestoremessages.StringLiteralV2
 import org.knora.webapi.slice.admin.domain.model.GroupDescriptions
 import org.knora.webapi.slice.admin.domain.model.GroupIri

diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectEraseService.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/ProjectEraseService.scala
@@ -3,6 +3,7 @@ package org.knora.webapi.slice.admin.domain.service
 import zio.Chunk
 import zio.Task
 import zio.ZIO
+import zio.ZLayer
 
 import org.knora.webapi.slice.admin.domain.model.AdministrativePermissionRepo
 import org.knora.webapi.slice.admin.domain.model.DefaultObjectAccessPermissionRepo
@@ -59,3 +60,7 @@ final case class ProjectEraseService(
       userService.findByGroupMembership(group).flatMap(userService.removeUsersFromGroup(_, group)),
     )
 }
+
+object ProjectEraseService {
+  val layer = ZLayer.derive[ProjectEraseService]
+}
diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/Vocabulary.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/repo/rdf/Vocabulary.scala
@@ -14,7 +14,6 @@ import org.knora.webapi.messages.OntologyConstants.KnoraAdmin.KnoraAdminPrefixEx
 import org.knora.webapi.messages.OntologyConstants.KnoraBase.KnoraBasePrefixExpansion
 import org.knora.webapi.slice.admin.AdminConstants.adminDataNamedGraph
 import org.knora.webapi.slice.admin.AdminConstants.permissionsDataNamedGraph
-import org.knora.webapi.slice.admin.domain.model.DefaultObjectAccessPermission
 
 object Vocabulary {
   object KnoraAdmin {

diff --git a/...ala/org/knora/webapi/slice/admin/repo/service/DefaultObjectAccessPermissionRepoLive.scala b/...ala/org/knora/webapi/slice/admin/repo/service/DefaultObjectAccessPermissionRepoLive.scala
@@ -15,27 +15,19 @@ import zio.NonEmptyChunk
 import zio.Task
 import zio.ZIO
 import zio.ZLayer
+
 import org.knora.webapi.messages.OntologyConstants.KnoraAdmin
-import org.knora.webapi.messages.OntologyConstants.KnoraBase
 import org.knora.webapi.slice.admin.AdminConstants.permissionsDataNamedGraph
-import org.knora.webapi.slice.admin.domain.model.AdministrativePermission
-import org.knora.webapi.slice.admin.domain.model.AdministrativePermissionPart
-import org.knora.webapi.slice.admin.domain.model.AdministrativePermissionRepo
 import org.knora.webapi.slice.admin.domain.model.DefaultObjectAccessPermission
 import org.knora.webapi.slice.admin.domain.model.DefaultObjectAccessPermissionRepo
-import org.knora.webapi.slice.admin.domain.model.GroupIri
 import org.knora.webapi.slice.admin.domain.model.KnoraProject.ProjectIri
-import org.knora.webapi.slice.admin.domain.model.Permission
-import org.knora.webapi.slice.admin.domain.model.Permission.Administrative
 import org.knora.webapi.slice.admin.domain.model.PermissionIri
 import org.knora.webapi.slice.admin.repo.rdf.RdfConversions.*
 import org.knora.webapi.slice.admin.repo.rdf.Vocabulary
 import org.knora.webapi.slice.common.repo.rdf.Errors.ConversionError
 import org.knora.webapi.slice.common.repo.rdf.Errors.RdfError
 import org.knora.webapi.slice.common.repo.rdf.RdfResource
-import org.knora.webapi.slice.resourceinfo.domain.InternalIri
 import org.knora.webapi.store.triplestore.api.TriplestoreService
-import org.knora.webapi.store.triplestore.errors.TriplestoreResponseException
 
 final case class DefaultObjectAccessPermissionRepoLive(
   triplestore: TriplestoreService,