refactor

Author: muddymudskipper

cmem_plugin_shapes/plugin_shapes.py

@@ -520,7 +520,7 @@ def add_to_graph(self) -> str:
         }}"""
 
         query_remove_label = f"""
-        PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+        PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
         DELETE {{
             GRAPH <{self.shapes_graph_iri}> {{
                  <{self.shapes_graph_iri}> rdfs:label ?label
@@ -533,22 +533,22 @@ def add_to_graph(self) -> str:
             }}
         }}"""
 
-        has_label = json.loads(post_sparql(query=query_ask_label)).get("boolean", False)
-        if self.label and has_label:
-            post_update(query=query_remove_label)
-        if self.label or not has_label:
-            self.create_label()
-
         query_data = f"""
         INSERT DATA {{
             GRAPH <{self.shapes_graph_iri}> {{
                 {self.shapes_graph.serialize(format="nt", encoding="utf-8").decode()}
             }}
         }}"""
 
+        has_label = json.loads(post_sparql(query=query_ask_label)).get("boolean", False)
+        if self.label and has_label:
+            post_update(query=query_remove_label)
+        if self.label or not has_label:
+            self.create_label()
         post_update(query_data)
-
+        setup_cmempy_user_access(self.context.user)
         now = datetime.now(UTC).isoformat(timespec="milliseconds")[:-6] + "Z"
+
         query_remove_modified = f"""
         PREFIX dcterms: <http://purl.org/dc/terms/>
         PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
@@ -566,9 +566,6 @@ def add_to_graph(self) -> str:
             }}
         }}"""
 
-        setup_cmempy_user_access(self.context.user)
-        post_update(query_remove_modified)
-
         query_add_modified = f"""
         PREFIX dcterms: <http://purl.org/dc/terms/>
         PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
@@ -585,6 +582,7 @@ def add_to_graph(self) -> str:
             BIND(IF(!BOUND(?datetime), xsd:dateTime("{now}"), ?undef) AS ?current)
         }}"""  # noqa: S608
 
+        post_update(query_remove_modified)
         post_update(query_add_modified)
         return now