From c729be60685ad48f3a73e083a40011a60a123077 Mon Sep 17 00:00:00 2001 From: Tim Van Campenhout Date: Wed, 17 May 2023 09:44:44 +0200 Subject: [PATCH] #833 providers json text to numeric --- atramhasis/scripts/migrate_sqlalchemy_providers.py | 5 +++-- tests/scripts/test_migratie_sqlalchemy_providers.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/atramhasis/scripts/migrate_sqlalchemy_providers.py b/atramhasis/scripts/migrate_sqlalchemy_providers.py index b4a3217c..29d6a76b 100644 --- a/atramhasis/scripts/migrate_sqlalchemy_providers.py +++ b/atramhasis/scripts/migrate_sqlalchemy_providers.py @@ -187,8 +187,9 @@ def migrate(skos_registry: Registry, session: Session): ) else: provider.metadata['atramhasis.id_generation_strategy'] = 'NUMERIC' - db_provider.meta = json.loads(json.dumps(provider.metadata, default=json_serial)) - + meta = json.loads(json.dumps(provider.metadata, default=json_serial)) + meta["id"] = provider.conceptscheme_id + db_provider.meta = meta db_provider.expand_strategy = ExpandStrategy[provider.expand_strategy.upper()] db_provider.conceptscheme = session.get(ConceptScheme, provider.conceptscheme_id) db_provider.id = provider.conceptscheme_id diff --git a/tests/scripts/test_migratie_sqlalchemy_providers.py b/tests/scripts/test_migratie_sqlalchemy_providers.py index ebff9bab..a223d371 100644 --- a/tests/scripts/test_migratie_sqlalchemy_providers.py +++ b/tests/scripts/test_migratie_sqlalchemy_providers.py @@ -62,7 +62,7 @@ def test_migrate(self): self.assertEqual('urn:x-skosprovider:%s:%s', provider.uri_pattern) self.assertEqual( { - 'id': 'EXTRA', + 'id': int(provider.id), 'subject': [], 'atramhasis.id_generation_strategy': 'NUMERIC' },