feat: ebook record dedup #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BadrAly
force-pushed
the
baa-#623-records-dedup
branch
2 times, most recently
from
4993e33 to
34a2e9f
Compare
jma
requested changes
Aug 21, 2018
rero_ebooks/api.py
Outdated
| ): | ||
| """Create a new ebook record.""" | ||
| assert cls.minter | ||
| if delete_pid and data.get('pid'): |
There was a problem hiding this comment.
Why not assert not data.get('pid')?
There was a problem hiding this comment.
accepted your proposition, done
rero_ebooks/api.py
Outdated
| assert cls.minter | ||
| if delete_pid and data.get('pid'): | ||
| del (data['pid']) | ||
| if not id_: |
There was a problem hiding this comment.
problem copy and paste from reroils_data, fixed
rero_ebooks/api.py
Outdated
| except PIDDoesNotExistError: | ||
| return None | ||
|
|
||
| @staticmethod |
There was a problem hiding this comment.
Alternative implementation (to be checked):
import copy
@staticmethod
def _merge(new_record, record):
"""Merge new and old electronic_location_and_access fields."""
field = 'electronic_location_and_access'
new_e_r = new_record.get(field)
old_e_r = record.get(field)
for e_r in old_e_r:
# check if already exists!
if e_r not in new_e_r:
new_e_r.append(copy.deepcopy(e_r))
new_record['__order__'].insert(
new_record['__order__'].index(field), field
)
return new_recordThere was a problem hiding this comment.
accepted your proposition, done
rero_ebooks/api.py
Outdated
|
|
||
| @staticmethod | ||
| def _merge(new_record, record): | ||
| """Merge new and old records.""" |
There was a problem hiding this comment.
No realy merge record but only electronic_location_and_access
|
|
||
|
|
||
| @pytest.yield_fixture() | ||
| def cdf_record(): |
There was a problem hiding this comment.
cdf = la-chaux-de-fonds, comments added to the tests
tests/api/conftest.py
Outdated
|
|
||
| @pytest.yield_fixture() | ||
| def mv_record(): | ||
| """CDF record.""" |
There was a problem hiding this comment.
MV record instead? What is MV?
There was a problem hiding this comment.
MV: mediatheque-valais, comments added to the tests
tests/api/test_api.py
Outdated
| assert merged_record_status == 'updated' | ||
| ela = merged_record['electronic_location_and_access'] | ||
| assert len(ela) == 2 | ||
| first_856 = ela[0]['uniform_resource_identifier'][0] |
Signed-off-by: Aly Badr <aly.badr@rero.ch>
BadrAly
force-pushed
the
baa-#623-records-dedup
branch
from
34a2e9f to
d711ece
Compare
jma
approved these changes
Aug 21, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
How to test:
dojson -l marcxml -i data/ebooks.xml do cantookmarc21 | invenio records create_else_update --vendor cantook
Signed-off-by: Aly Badr aly.badr@rero.ch
Co-authored-by: Gianni Pante gianni.pante@rero.ch