From 7ec450a1f16ae5770dd89d765bbd8ab559dc0f6a Mon Sep 17 00:00:00 2001
From: Johannes Nussbaum <39048939+jnussbaum@users.noreply.github.com>
Date: Mon, 23 Oct 2023 10:38:36 +0200
Subject: [PATCH 1/2] refactor: make oap_set.py easier (#69)

---
 dsp_permissions_scripts/oap/oap_set.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/dsp_permissions_scripts/oap/oap_set.py b/dsp_permissions_scripts/oap/oap_set.py
index 80631dfb..7c46cde7 100644
--- a/dsp_permissions_scripts/oap/oap_set.py
+++ b/dsp_permissions_scripts/oap/oap_set.py
@@ -18,7 +18,7 @@
 logger = get_logger(__name__)
 
 
-def _get_value_iris(resource: dict[str, Any]) -> list[ValueUpdate]:
+def _get_values_to_update(resource: dict[str, Any]) -> list[ValueUpdate]:
     """Returns a list of values that have permissions and hence should be updated."""
     res: list[ValueUpdate] = []
     for k, v in resource.items():
@@ -142,15 +142,12 @@ def _update_permissions_for_resource_and_values(
 ) -> None:
     """Updates the permissions for the given resource and its values on a DSP server"""
     resource = _get_resource(resource_iri, host, token)
-    lmd: str | None = resource.get("knora-api:lastModificationDate")
-    resource_type: str = resource["@type"]
-    context: dict[str, str] = resource["@context"]
-    values = _get_value_iris(resource)
+    values = _get_values_to_update(resource)
     _update_permissions_for_resource(
         resource_iri=resource_iri,
-        lmd=lmd,
-        resource_type=resource_type,
-        context=context,
+        lmd=resource.get("knora-api:lastModificationDate"),
+        resource_type=resource["@type"],
+        context=resource["@context"],
         scope=scope,
         host=host,
         token=token,
@@ -159,8 +156,8 @@ def _update_permissions_for_resource_and_values(
         _update_permissions_for_value(
             resource_iri=resource_iri,
             value=v,
-            resource_type=resource_type,
-            context=context,
+            resource_type=resource["@type"],
+            context=resource["@context"],
             scope=scope,
             host=host,
             token=token,

From ecd7e526be0dff20ce747baa953fc7140e5be0a2 Mon Sep 17 00:00:00 2001
From: Johannes Nussbaum <39048939+jnussbaum@users.noreply.github.com>
Date: Mon, 23 Oct 2023 10:50:53 +0200
Subject: [PATCH 2/2] feat: update other values if one value fails (#68)

---
 dsp_permissions_scripts/oap/oap_set.py | 64 ++++++++++++++++----------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/dsp_permissions_scripts/oap/oap_set.py b/dsp_permissions_scripts/oap/oap_set.py
index 7c46cde7..5000cc79 100644
--- a/dsp_permissions_scripts/oap/oap_set.py
+++ b/dsp_permissions_scripts/oap/oap_set.py
@@ -139,29 +139,49 @@ def _update_permissions_for_resource_and_values(
     scope: PermissionScope,
     host: str,
     token: str,
-) -> None:
+) -> bool:
     """Updates the permissions for the given resource and its values on a DSP server"""
-    resource = _get_resource(resource_iri, host, token)
+    try:
+        resource = _get_resource(resource_iri, host, token)
+    except Exception as exc:  # pylint: disable=broad-exception-caught
+        logger.error(f"Cannot update resource {resource_iri}: {exc}")
+        warnings.warn(f"Cannot update resource {resource_iri}: {exc}")
+        return False
     values = _get_values_to_update(resource)
-    _update_permissions_for_resource(
-        resource_iri=resource_iri,
-        lmd=resource.get("knora-api:lastModificationDate"),
-        resource_type=resource["@type"],
-        context=resource["@context"],
-        scope=scope,
-        host=host,
-        token=token,
-    )
-    for v in values:
-        _update_permissions_for_value(
+    
+    success = True
+    try:
+        _update_permissions_for_resource(
             resource_iri=resource_iri,
-            value=v,
+            lmd=resource.get("knora-api:lastModificationDate"),
             resource_type=resource["@type"],
             context=resource["@context"],
             scope=scope,
             host=host,
             token=token,
         )
+    except ApiError as err:
+        logger.error(err)
+        warnings.warn(err.message)
+        success = False
+    
+    for v in values:
+        try:
+            _update_permissions_for_value(
+                resource_iri=resource_iri,
+                value=v,
+                resource_type=resource["@type"],
+                context=resource["@context"],
+                scope=scope,
+                host=host,
+                token=token,
+            )
+        except ApiError as err:
+            logger.error(err)
+            warnings.warn(err.message)
+            success = False
+    
+    return success
 
 
 def _write_failed_res_iris_to_file(
@@ -193,16 +213,12 @@ def apply_updated_oaps_on_server(
         msg = f"Updating permissions of resource {index + 1}/{len(resource_oaps)}: {resource_oap.object_iri}..."
         logger.info(f"====={msg}")
         print(msg)
-        try:
-            _update_permissions_for_resource_and_values(
-                resource_iri=resource_oap.object_iri,
-                scope=resource_oap.scope,
-                host=host,
-                token=token,
-            )
-        except ApiError as err:
-            logger.error(err)
-            warnings.warn(err.message)
+        if not _update_permissions_for_resource_and_values(
+            resource_iri=resource_oap.object_iri,
+            scope=resource_oap.scope,
+            host=host,
+            token=token,
+        ):
             failed_res_iris.append(resource_oap.object_iri)
         logger.info(f"Updated permissions of resource {resource_oap.object_iri} and its values.")