Skip to content

Commit

Permalink
fix manual merging
Browse files Browse the repository at this point in the history
  • Loading branch information
MJedr committed Jul 27, 2023
1 parent 1b9376c commit f308e5c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions inspirehep/modules/workflows/tasks/manual_merging.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def _merge_roots_hep(new_uuid, head_roots, update_roots):
dict(
source=update_root["source"],
record_uuid=new_uuid,
json=update_root["json_data"],
json=update_root["json"],
)
)
requests.delete(
Expand Down Expand Up @@ -180,7 +180,7 @@ def _merge_roots(new_uuid, head_roots, update_roots):
data={
"record_uuid": head_root["record_uuid"],
"source": head_root["source"],
"json": head_root["json_data"],
"json": head_root["json"],
},
)
if response.status_code != 200:
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/workflows/test_workflows_manual_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ def test_save_roots_using_hep_root_table_api(workflow_app):
{
"created": "20-02-2012 14:35:34.2345",
"updated": "20-02-2012 14:35:34.2345",
"json_data": {"version": "original"},
"json": {"version": "original"},
"record_uuid": str(head.id),
"source": "arxiv",
}
Expand All @@ -310,14 +310,14 @@ def test_save_roots_using_hep_root_table_api(workflow_app):
{
"created": "20-02-2012 14:35:34.2345",
"updated": "20-02-2012 14:35:34.2345",
"json_data": {"version": "updated"},
"json": {"version": "updated"},
"record_uuid": str(update.id),
"source": "arxiv",
},
{
"created": "20-02-2012 15:35:34.2345",
"updated": "20-02-2012 15:35:34.2345",
"json_data": {"version": "updated"},
"json": {"version": "updated"},
"record_uuid": str(update.id),
"source": "publisher",
},
Expand Down

0 comments on commit f308e5c

Please sign in to comment.