fix: add-to-fixture subjects

Author: mfenner

invenio_rdm_records/fixtures/__init__.py

@@ -73,6 +73,7 @@ def add_to(self, fixture):
             app_data_folder=app_data_folder,
             pkg_data_folder=data_folder,
             filename="vocabularies.yaml",
+            delay=False,
         ).load(reload=fixture)
 
 

invenio_rdm_records/fixtures/tasks.py

@@ -24,11 +24,10 @@
 from invenio_communities.generators import CommunityRoleNeed
 from invenio_communities.members.errors import AlreadyMemberError
 from invenio_communities.proxies import current_communities
-from invenio_pidstore.errors import PersistentIdentifierError
+from invenio_pidstore.models import PersistentIdentifier
 from invenio_records_resources.proxies import current_service_registry
 from invenio_requests import current_events_service, current_requests_service
 from invenio_requests.customizations import CommentEventType
-from invenio_vocabularies.records.api import Vocabulary
 
 from ..proxies import current_oaipmh_server_service, current_rdm_records_service
 from ..requests import CommunitySubmission
@@ -49,19 +48,32 @@ def get_authenticated_identity(user_id):
 def create_vocabulary_record(service_str, data):
     """Create or update a vocabulary record."""
     service = current_service_registry.get(service_str)
+
+    # Determine the PID based on vocabulary type
     if "type" in data:
-        # We only check non-datastream vocabularies for updates
-        try:
-            pid = (data["type"], data["id"])
-            # If the entry hasn't been added, this will fail
-            record = Vocabulary.pid.resolve(pid)
-            service.update(system_identity, pid, data=data)
-            current_app.logger.info(f"updated existing fixture with {data}")
-        except PersistentIdentifierError:
-            service.create(system_identity, data)
-            current_app.logger.info(f"added new fixture with {data}")
+        # Generic vocabularies with type field
+        pid_type = data["type"]
+        pid_value = data["id"]
+    else:
+        # Special vocabularies like subjects (without type field)
+        # Use the service_str as the type
+        pid_type = service_str
+        pid_value = data["id"]
+
+    # Check if PID exists in the database
+    existing_pid = PersistentIdentifier.query.filter_by(
+        pid_type=pid_type, pid_value=pid_value
+    ).first()
+
+    if existing_pid:
+        # Update existing record
+        pid = (pid_type, pid_value)
+        service.update(system_identity, pid, data=data)
+        current_app.logger.debug(f"updated existing fixture with {data}")
     else:
+        # Create new record
         service.create(system_identity, data)
+        current_app.logger.debug(f"added new fixture with {data}")
 
 
 @shared_task
@@ -235,4 +247,4 @@ def create_demo_invitation_requests(user_id, n_requests):
         #         comment_with_type
         #     )
 
-        print(f"Created request for user {user_id} and " f"community {community_id}")
+        print(f"Created request for user {user_id} and community {community_id}")

invenio_rdm_records/fixtures/vocabularies.py

@@ -190,6 +190,10 @@ def load(self, reload=None):
         # If it's not already loaded it means it's a new one
         if reload and reload in self._loaded_vocabularies:
             self._loaded_vocabularies.remove(reload)
+            # Also remove all child schemes (e.g., subjects.FOS when reloading subjects)
+            self._loaded_vocabularies = {
+                v for v in self._loaded_vocabularies if not v.startswith(f"{reload}.")
+            }
         # 1- Load from app_data_folder
         filepath = self._app_data_folder / self._filename
         # An instance doesn't necessarily have custom vocabularies