Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

entity: better replace identifiedBy #3454

Merged
merged 1 commit into from
Oct 3, 2023
Merged

entity: better replace identifiedBy #3454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
89 changes: 52 additions & 37 deletions rero_ils/modules/entities/remote_entities/replace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

"""Replace identifiedBy with $ref from MEF."""


import contextlib
from copy import deepcopy
from datetime import datetime, timezone

Expand Down Expand Up @@ -171,32 +171,46 @@ def _do_entity(self, entity, doc_pid):
new_source, new_source_pid = self._find_other_source(
source, source_pid, mef_data)
if new_source:
self._create_entity(mef_type, mef_data)
authorized_access_point = entity[
"entity"]["authorized_access_point"]
mef_authorized_access_point = mef_data[
new_source]["authorized_access_point"]
self.logger.info(
f'Replace document:{doc_pid} '
f'{self.field} "{authorized_access_point}" - '
f'({mef_type}|{doc_entity_type}) '
f'{new_source}:{new_source_pid} '
f'"{mef_authorized_access_point}"'
)
entity['entity'] = {
'$ref': (
f'{self._get_base_url(mef_type)}'
f'/{new_source}/{new_source_pid}'
),
'pid': mef_data['pid']
}
changed = True
mef_entity_type = mef_data.get('type')
# verify local and MEF type are the same
if mef_entity_type == doc_entity_type:
self._create_entity(mef_type, mef_data)
authorized_access_point = entity[
"entity"]["authorized_access_point"]
mef_authorized_access_point = mef_data[
new_source]["authorized_access_point"]
self.logger.info(
f'Replace document:{doc_pid} '
f'{self.field} "{authorized_access_point}" - '
f'({mef_type}) {new_source}:{new_source_pid} '
f'"{mef_authorized_access_point}"'
)
entity['entity'] = {
'$ref': (
f'{self._get_base_url(mef_type)}'
f'/{new_source}/{new_source_pid}'
),
'pid': mef_data['pid']
}
changed = True
else:
authorized_access_point = mef_data.get(
source, {}).get('authorized_access_point')
info = (
f'{doc_entity_type} != {mef_entity_type} '
f': "{authorized_access_point}"'
)
self.rero_only[identifier] = info
self.logger.warning(
f'Type differ:{doc_pid} '
f'{self.field} - ({mef_type}) {identifier} {info}'
)
else:
authorized_access_point = mef_data.get(
source, {}).get('authorized_access_point')
info = f'{doc_entity_type}: {authorized_access_point}'
self.rero_only[identifier] = info
self.logger.warning(
self.logger.info(
f'No other source found for document:{doc_pid} '
f'{self.field} - ({mef_type}|{doc_entity_type}) '
f'{identifier} "{info}"'
Expand All @@ -206,7 +220,7 @@ def _do_entity(self, entity, doc_pid):
'entity']['authorized_access_point']
info = f'{doc_entity_type}: {authorized_access_point}'
self.not_found[identifier] = info
self.logger.warning(
self.logger.info(
f'No MEF found for document:{doc_pid} '
f' - ({mef_type}) {identifier} "{info}"'
)
Expand All @@ -218,20 +232,21 @@ def _replace_entities_in_document(self, doc_id):
:param doc_id: (string) document id
"""
changed = False
doc = Document.get_record(doc_id)
entities_to_update = filter(
lambda c: c.get('entity', {}).get('identifiedBy'),
doc.get(self.field, {})
)
for entity in entities_to_update:
try:
changed = self._do_entity(entity, doc.pid)
except Exception as err:
self.logger.error(
f'Error document:{doc.pid} {entity} {err}"'
)
if changed:
return doc
with contextlib.suppress(Exception):
doc = Document.get_record(doc_id)
entities_to_update = filter(
lambda c: c.get('entity', {}).get('identifiedBy'),
doc.get(self.field, {})
)
for entity in entities_to_update:
try:
changed = self._do_entity(entity, doc.pid) or changed
except Exception as err:
self.logger.error(
f'Error document:{doc.pid} {entity} {err}"'
)
if changed:
return doc

def run(self):
"""Replace identifiedBy with $ref."""
Expand Down