reuse updateDoap method

dasch-swiss · Nov 14, 2024 · 3fd1ff6 · 3fd1ff6
1 parent 3a469de
commit 3fd1ff6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 27 deletions.
diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponder.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/PermissionsResponder.scala
@@ -797,15 +797,7 @@ final case class PermissionsResponder(
                 updatedPermission.asInstanceOf[AdministrativePermissionADM],
               )
             case _: DefaultObjectAccessPermissionADM =>
-              for {
-                doap <- doapService
-                          .findById(permissionIri)
-                          .someOrFail(NotFoundException(s"DOAP ${permissionIri.value} not found."))
-                groupIri <- checkGroupExists(groupIri.value)
-                newDoap  <- doapService.save(doap.copy(forWhat = Group(groupIri)))
-              } yield DefaultObjectAccessPermissionGetResponseADM(
-                doapService.asDefaultObjectAccessPermissionADM(newDoap),
-              )
+              updateDoap(permissionIri, ChangeDoapRequest(forGroup = Some(groupIri.value)), apiRequestID)
           }
       } yield response
 
@@ -876,20 +868,9 @@ final case class PermissionsResponder(
                         } yield AdministrativePermissionGetResponseADM(
                           updatedPermission.asInstanceOf[AdministrativePermissionADM],
                         )
-                      case doap: DefaultObjectAccessPermissionADM =>
-                        // No. It is a default object access permission.
-                        for {
-                          verifiedPermissions <- verifyHasPermissionsDOAP(newHasPermissions.toSet)
-                          formattedPermissions <-
-                            ZIO.attempt(
-                              PermissionUtilADM.formatPermissionADMs(verifiedPermissions, PermissionType.OAP),
-                            )
-                          _ <-
-                            updatePermission(permissionIri = doap.iri, maybeHasPermissions = Some(formattedPermissions))
-                          updatedPermission <- verifyUpdateOfHasPermissions(verifiedPermissions)
-                        } yield DefaultObjectAccessPermissionGetResponseADM(
-                          updatedPermission.asInstanceOf[DefaultObjectAccessPermissionADM],
-                        )
+                      case _: DefaultObjectAccessPermissionADM =>
+                        val request = ChangeDoapRequest(hasPermissions = Some(newHasPermissions.toSet))
+                        updateDoap(permissionIri, request, apiRequestID)
                       case _ =>
                         throw UpdateNotPerformedException(
                           s"Permission ${permissionIri.value} was not updated. Please report this as a bug.",

diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/PermissionsEndpoints.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/PermissionsEndpoints.scala
@@ -26,10 +26,10 @@ import org.knora.webapi.slice.common.api.BaseEndpoints
 
 object PermissionEndpointsRequests {
   final case class ChangeDoapRequest(
-    forGroup: Option[String],
-    forResourceClass: Option[String],
-    forProperty: Option[String],
-    hasPermissions: Option[Set[PermissionADM]],
+    forGroup: Option[String] = None,
+    forResourceClass: Option[String] = None,
+    forProperty: Option[String] = None,
+    hasPermissions: Option[Set[PermissionADM]] = None,
   ) {
     def isEmpty: Boolean =
       forGroup.isEmpty &&