Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions site/cds_rdm/inspire_harvester/writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,26 +194,41 @@ def _resource_type_versioning(self, record, update_metadata, ctx, logger):
)
if should_update_files:
self._publish_new_version(version_record, version, logger)
logger.info(
f"Created new version for resource type {incoming_resource_type}"
logger.warning(
"New record version created. "
f"| details: resource_type={incoming_resource_type}"
)
else:
self._publish_edit(version_record.id, version, logger)
logger.info(
f"Edited {version_record.id} for resource type {incoming_resource_type}"
)
else:
from_type = record.data["metadata"]["resource_type"]["id"]
self._publish_new_version(record, version, logger)
logger.warning(
"New record version created for additional resource type. "
f"| details: from={from_type}, to={incoming_resource_type}"
)

latest_record_version = current_rdm_records_service.record_cls.get_latest_published_by_parent(
record._record.parent
)
record = current_rdm_records_service.read(system_identity, latest_record_version["id"])
# publish the latest version at the end
from_type = record.data["metadata"]["resource_type"]["id"]
to_type = update_metadata["metadata"]["resource_type"]["id"]
self._publish_new_version(record, update_metadata, logger)
logger.info(
f"Created new version {update_metadata['metadata']['resource_type']}"
)
if from_type != to_type:
logger.warning(
"New record version created because resource type changed. "
f"| details: from={from_type}, to={to_type}"
)
else:
logger.warning(
"New record version created. "
f"| details: resource_type={to_type}"
)

def _publish_new_version(self, record, update_metadata, logger):
"""Create and publish a new version with updated metadata and synced files."""
Expand All @@ -233,7 +248,6 @@ def _publish_new_version(self, record, update_metadata, logger):
draft = self.drafts.update(draft, new_version_entry)
self.file_sync.sync(draft, record, update_metadata, logger)
self.drafts.publish(draft.id, logger)
current_app.logger.info(f"New record version #{draft.id} published.")

def _publish_edit(
self,
Expand Down
Loading