diff --git a/src/nsls2api/services/pass_service.py b/src/nsls2api/services/pass_service.py index 4bc55a9..af07555 100644 --- a/src/nsls2api/services/pass_service.py +++ b/src/nsls2api/services/pass_service.py @@ -199,7 +199,7 @@ async def get_proposals_allocated_by_cycle( logger.error(error_message) raise PassException(error_message) - cycle = await Cycle.find_one(Cycle.name == cycle_name) + cycle = await Cycle.find_one(Cycle.name == cycle_name, Cycle.facility == facility) if not cycle: error_message: str = f"Could not find a cycle with the name {cycle_name}." logger.error(error_message) diff --git a/src/nsls2api/services/sync_service.py b/src/nsls2api/services/sync_service.py index 0818012..46f0ce2 100644 --- a/src/nsls2api/services/sync_service.py +++ b/src/nsls2api/services/sync_service.py @@ -114,7 +114,7 @@ async def worker_synchronize_cycles_from_pass( pass_id=str(pass_cycle.ID), ) - updated_cycle = await Cycle.find_one(Cycle.name == pass_cycle.Name).upsert( + updated_cycle = await Cycle.find_one(Cycle.name == pass_cycle.Name, Cycle.facility == facility.facility_name).upsert( Set( { Cycle.accepting_proposals: cycle.accepting_proposals, @@ -132,7 +132,7 @@ async def worker_synchronize_cycles_from_pass( ) # Now let's update the list of proposals for this cycle - proposals_list = await pass_service.get_proposals_allocated_by_cycle(cycle.name) + proposals_list = await pass_service.get_proposals_allocated_by_cycle(cycle.name, facility=facility_name) for proposal in proposals_list: await updated_cycle.update( AddToSet({Cycle.proposals: str(proposal.Proposal_ID)})