tests pass

Author: pcrespov

services/web/server/src/simcore_service_webserver/licenses/_licensed_items_service.py

@@ -77,29 +77,32 @@ async def register_resource_as_licensed_item(
     #
     # This approach not only reduces unnecessary error logs but also helps prevent race conditions
     # when multiple concurrent calls attempt to register the same resource.
+    new_licensed_resource_data = licensed_resource_data.model_dump(
+        mode="json", exclude_unset=True
+    )
+
     try:
         licensed_item = await _licensed_items_repository.get_by_resource_identifier(
             app,
             licensed_resource_name=licensed_resource_name,
             licensed_resource_type=licensed_resource_type,
         )
 
-        new_data = licensed_resource_data.model_dump(mode="json", exclude_unset=True)
-
-        if licensed_item.licensed_resource_data != new_data:
-            differences = _compute_difference(
-                licensed_item.licensed_resource_data or {},
-                licensed_resource_data.model_dump(mode="json", exclude_unset=True),
-            )
-            msg = f"DIFFERENT RESOURCE: {licensed_resource_name}, {licensed_resource_type}. Difference:\n{pformat(differences)}"
+        if licensed_item.licensed_resource_data != new_licensed_resource_data:
+            # differences = _compute_difference(
+            #    licensed_item.licensed_resource_data or {},
+            #    new_licensed_resource_data,
+            # )
+            differences = "there are differences TMP"
+            msg = f"DIFFERENT_RESOURCE: {licensed_resource_name}, {licensed_resource_type}. Difference:\n{pformat(differences)}"
             return RegistrationResult(
                 licensed_item, RegistrationState.DIFFERENT_RESOURCE, msg
             )
 
         return RegistrationResult(
             licensed_item,
             RegistrationState.ALREADY_REGISTERED,
-            f"ALREADY REGISTERED: {licensed_resource_name}, {licensed_resource_type}",
+            f"ALREADY_REGISTERED: {licensed_resource_name}, {licensed_resource_type}",
         )
 
     except LicensedItemNotFoundError:
@@ -108,17 +111,15 @@ async def register_resource_as_licensed_item(
             display_name=licensed_item_display_name,
             licensed_resource_name=licensed_resource_name,
             licensed_resource_type=licensed_resource_type,
-            licensed_resource_data=licensed_resource_data.model_dump(
-                mode="json", exclude_unset=True
-            ),
+            licensed_resource_data=new_licensed_resource_data,
             product_name=None,
             pricing_plan_id=None,
         )
 
         return RegistrationResult(
             licensed_item,
             RegistrationState.NEWLY_REGISTERED,
-            f"NEWLY REGISTERED: {licensed_resource_name}, {licensed_resource_type}",
+            f"NEWLY_REGISTERED: {licensed_resource_name}, {licensed_resource_type}",
         )
 
 

services/web/server/tests/unit/with_dbs/04/licenses/conftest.py

@@ -33,7 +33,7 @@ async def pricing_plan_id(
             )
             .returning(resource_tracker_pricing_plans.c.pricing_plan_id)
         )
-        row = result.first()
+        row = result.one()
 
     assert row
 
@@ -42,3 +42,17 @@ async def pricing_plan_id(
     async with transaction_context(get_asyncpg_engine(client.app)) as conn:
         await conn.execute(licensed_items.delete())
         await conn.execute(resource_tracker_pricing_plans.delete())
+
+
+@pytest.fixture
+async def ensure_empty_licensed_items(client: TestClient):
+    async def _cleanup():
+        assert client.app
+        async with transaction_context(get_asyncpg_engine(client.app)) as conn:
+            await conn.execute(licensed_items.delete())
+
+    await _cleanup()
+
+    yield
+
+    await _cleanup()

services/web/server/tests/unit/with_dbs/04/licenses/test_itis_vip_service.py

@@ -135,6 +135,7 @@ async def test_sync_itis_vip_as_licensed_items(
     mock_itis_vip_downloadables_api: respx.MockRouter,
     app_environment: EnvVarsDict,
     client: TestClient,
+    ensure_empty_licensed_items: None,
 ):
     assert client.app
 
@@ -213,6 +214,7 @@ async def test_itis_vip_syncer_service(
     app_environment: EnvVarsDict,
     client: TestClient,
     caplog: pytest.LogCaptureFixture,
+    ensure_empty_licensed_items: None,
 ):
     assert client.app
 
@@ -222,14 +224,20 @@ async def test_itis_vip_syncer_service(
     categories = settings.to_categories()
 
     with caplog.at_level(logging.DEBUG, _itis_vip_syncer_service._logger.name):
-        caplog.clear()
+
+        def _get_captured_levels():
+            return [
+                rc[1]
+                for rc in caplog.record_tuples
+                if rc[0] == _itis_vip_syncer_service._logger.name
+            ]
 
         # one round
+        caplog.clear()
         await _itis_vip_syncer_service.sync_resources_with_licensed_items(
             client.app, categories
         )
-
-        levels_logged = [o[1] for o in caplog.record_tuples]
+        levels_logged = _get_captured_levels()
         assert logging.DEBUG not in levels_logged
         assert logging.INFO in levels_logged
         assert logging.WARNING not in levels_logged
@@ -240,6 +248,7 @@ async def test_itis_vip_syncer_service(
             client.app, categories
         )
 
+        levels_logged = _get_captured_levels()
         assert logging.DEBUG in levels_logged
         assert logging.INFO not in levels_logged
         assert logging.WARNING not in levels_logged