From 4cb1f031e482b1ef9f28adf9539dc13499ff4e74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Kleinb=C3=B6lting?=
 <christian.kleinboelting@dasch.swiss>
Date: Thu, 6 Feb 2025 09:50:50 +0100
Subject: [PATCH] cleanup

---
 .../api/OntologyV2RequestParser.scala         | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/webapi/src/main/scala/org/knora/webapi/slice/ontology/api/OntologyV2RequestParser.scala b/webapi/src/main/scala/org/knora/webapi/slice/ontology/api/OntologyV2RequestParser.scala
index 6d4848e3ff..ff635d78b5 100644
--- a/webapi/src/main/scala/org/knora/webapi/slice/ontology/api/OntologyV2RequestParser.scala
+++ b/webapi/src/main/scala/org/knora/webapi/slice/ontology/api/OntologyV2RequestParser.scala
@@ -275,7 +275,7 @@ final case class OntologyV2RequestParser(iriConverter: IriConverter) {
     apiRequestId: UUID,
     requestingUser: User,
   ): IO[String, AddCardinalitiesToClassRequestV2] =
-    construct(
+    constructClassRelatedRequest(
       jsonLd,
       apiRequestId,
       requestingUser,
@@ -288,36 +288,23 @@ final case class OntologyV2RequestParser(iriConverter: IriConverter) {
     apiRequestId: UUID,
     requestingUser: User,
   ): IO[String, ReplaceClassCardinalitiesRequestV2] =
-    construct(jsonLd, apiRequestId, requestingUser, ReplaceClassCardinalitiesRequestV2.apply)
+    constructClassRelatedRequest(jsonLd, apiRequestId, requestingUser, ReplaceClassCardinalitiesRequestV2.apply)
 
   def canDeleteCardinalitiesFromClassRequestV2(
     jsonLd: String,
     apiRequestId: UUID,
     requestingUser: User,
   ): IO[String, CanDeleteCardinalitiesFromClassRequestV2] =
-    construct(jsonLd, apiRequestId, requestingUser, CanDeleteCardinalitiesFromClassRequestV2.apply)
-
-    ZIO.scoped {
-      for {
-        ds        <- DatasetOps.fromJsonLd(jsonLd)
-        meta      <- extractOntologyMetadata(ds.defaultModel)
-        classInfo <- extractClassInfo(ds, meta)
-      } yield CanDeleteCardinalitiesFromClassRequestV2(
-        classInfo,
-        meta.lastModificationDate,
-        apiRequestId,
-        requestingUser,
-      )
-    }
+    constructClassRelatedRequest(jsonLd, apiRequestId, requestingUser, CanDeleteCardinalitiesFromClassRequestV2.apply)
 
   def deleteCardinalitiesFromClassRequestV2(
     jsonLd: String,
     apiRequestId: UUID,
     requestingUser: User,
   ): IO[String, DeleteCardinalitiesFromClassRequestV2] =
-    construct(jsonLd, apiRequestId, requestingUser, DeleteCardinalitiesFromClassRequestV2.apply)
+    constructClassRelatedRequest(jsonLd, apiRequestId, requestingUser, DeleteCardinalitiesFromClassRequestV2.apply)
 
-  private def construct[A](
+  private def constructClassRelatedRequest[A](
     jsonLd: String,
     apiRequestId: UUID,
     requestingUser: User,