Skip to content

Derek furst/consolidate get docs #1005

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

Merged
yuanzhou merged 2 commits into from
Apr 21, 2026
Merged

Derek furst/consolidate get docs #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf72d5e
wip: added donors
DerekFurstPitt Apr 21, 2026
3d02671
added support for donors in the reindex-info
DerekFurstPitt Apr 21, 2026
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
2 changes: 2 additions & 0 deletions src/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,8 @@ def run_triggers_cached(entity_dict):
}
if raw.get("donor"):
result["donor"] = run_triggers_cached(raw["donor"])
if raw.get("donors"):
result["donors"] = [run_triggers_cached(e) for e in raw["donors"]]
if raw.get("origin_samples"):
result["origin_samples"] = [run_triggers_cached(e) for e in raw["origin_samples"]]
if raw.get("source_samples"):
Expand Down
13 changes: 7 additions & 6 deletions src/app_neo4j_queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,14 @@ def get_reindex_info_raw(neo4j_driver, uuid):
}

if entity_type.lower() in ['sample', 'dataset', 'publication']:
donor_record = session.run("""
MATCH (e:Entity {uuid: $uuid})
MATCH (e)<-[:ACTIVITY_INPUT|ACTIVITY_OUTPUT*]-(d:Entity {entity_type: 'Donor'})
RETURN properties(d) AS donor
LIMIT 1
donors_record = session.run("""
MATCH (e:Entity {uuid: $uuid})<-[:ACTIVITY_INPUT|ACTIVITY_OUTPUT*]-(d:Donor)
RETURN apoc.coll.toSet(COLLECT(properties(d))) AS donors
""", uuid=uuid).single()
donor = dict(donor_record["donor"]) if donor_record and donor_record["donor"] else None
donors = [dict(d) for d in (donors_record["donors"] or [])]
donor = donors[0] if donors else None
if donors is not None:
result['donors'] = donors
if donor is not None:
result['donor'] = donor

Expand Down
Loading