From d441dd1889c6764ee4ff71ec51bd63408adba52b Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Tue, 15 Aug 2023 10:01:22 +0200
Subject: [PATCH] TMSS-2541: logging, and compare the full id-part of the
instead of starts_with
---
LCS/PyCommon/json_utils.py | 11 ++++++++---
SAS/TMSS/backend/src/tmss/tmssapp/models/common.py | 10 +++++-----
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/LCS/PyCommon/json_utils.py b/LCS/PyCommon/json_utils.py
index adf02f175f2..cfbf0cb9ba2 100644
--- a/LCS/PyCommon/json_utils.py
+++ b/LCS/PyCommon/json_utils.py
@@ -408,8 +408,9 @@ def resolved_refs(schema):
return resolved_local_refs(resolved_remote_refs(schema))
-def get_refs(schema) -> set:
- '''return a set of all $refs in the schema'''
+def get_refs(schema, only_ids: bool=False) -> set:
+ '''return a set of all $refs in the schema.
+ If only_ids is True, then references are stripped from their jsonpointer, and only the id-part is returned'''
refs = set()
if isinstance(schema, dict):
for key, value in schema.items():
@@ -420,7 +421,11 @@ def get_refs(schema) -> set:
if isinstance(schema, list):
for item in schema:
- refs.update(get_refs(item))
+ refs.update(get_refs(item, only_ids=only_ids))
+
+ if only_ids:
+ # strip right-hand-side jsonpointers, and keep unique left-hand-side id's
+ refs = set(ref.lstrip().partition('#')[0].rstrip('/') for ref in refs)
return refs
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/models/common.py b/SAS/TMSS/backend/src/tmss/tmssapp/models/common.py
index 69a57bf61b9..325c6953c47 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/models/common.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/models/common.py
@@ -448,7 +448,7 @@ class AbstractSchemaTemplate(AbstractTemplate):
# yep, version was auto incremented, so update the using templates
# do this in a transaction, such that if any one fails, all are reverted, keeping the references consistent.
with transaction.atomic():
- logger.info("%s name='%s' was updated to version=%s", self.__class__.__name__, self.name, new_version)
+ logger.info("%s name='%s' was updated from version=%s to version=%s", self.__class__.__name__, self.name, old_version, new_version)
old_template = self.__class__.objects.get(name=self.name, version=old_version)
new_template = self.__class__.objects.get(name=self.name, version=new_version)
@@ -459,10 +459,10 @@ class AbstractSchemaTemplate(AbstractTemplate):
for template_subclass in AbstractSchemaTemplate.__subclasses__():
for template_instance in template_subclass.objects.exclude(state__value__in=(TemplateState.Choices.OBSOLETE.value, TemplateState.Choices.LEGACY.value)).all():
- refs = get_refs(template_instance.schema)
- if any(ref.lstrip().startswith(old_schema_id) for ref in refs):
- logger.info("updating reference(s) in %s name='%s' version=%s to %s",
- template_subclass.__name__, template_instance.name, template_instance.version, new_schema_id)
+ ref_ids = get_refs(template_instance.schema, only_ids=True)
+ if any(ref_id == old_schema_id for ref_id in ref_ids):
+ logger.info("updating reference(s) in %s name='%s' version=%s from %s to %s",
+ template_subclass.__name__, template_instance.name, template_instance.version, old_schema_id, new_schema_id)
template_instance.schema = json.loads(json.dumps(template_instance.schema).replace(old_schema_id, new_schema_id))
template_instance.save()
--
GitLab