Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ async def test_batch_processor_integration(in_memory_job_seekers_db, in_memory_o
"opportunities_data_1",
)
await opportunities_data_repository._collection.insert_one(
{"active": True, "skillGroups": [{"UUID": "skill-uuid-1"}]})
{"active": True, "skillGroups": [{"originUUID": "skill-uuid-1"}]})

# AND the opportunity data service is constructed
opportunities_data_service = OpportunitiesDataService(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def __init__(self, db: AsyncIOMotorDatabase, collection_name: str):
async def get_opportunities_skills_uuids(self, limit: int, batch_size: int) -> list[set[str]]:
try:
# fetch the opportunities from the collection
cursor = self._collection.find({"active": {"$eq": True}}, {'skillGroups.UUID': 1, '_id': False}).limit(limit).batch_size(
cursor = self._collection.find({"active": {"$eq": True}}, {'skillGroups.originUUID': 1, '_id': False}).limit(limit).batch_size(
batch_size)

skills_sets = []
Expand All @@ -26,11 +26,11 @@ async def get_opportunities_skills_uuids(self, limit: int, batch_size: int) -> l
# And the cursor will fetch the next batch.
if len(opportunities_docs) >= batch_size:
# process the batch
skills_sets.extend({skill["UUID"] for skill in opportunity_doc.get("skillGroups", [])} for opportunity_doc in opportunities_docs)
skills_sets.extend({skill["originUUID"] for skill in opportunity_doc.get("skillGroups", [])} for opportunity_doc in opportunities_docs)
opportunities_docs = []

# process any remaining documents in the last batch
skills_sets.extend({skill["UUID"] for skill in opportunity_doc.get("skillGroups", [])} for opportunity_doc in opportunities_docs)
skills_sets.extend({skill["originUUID"] for skill in opportunity_doc.get("skillGroups", [])} for opportunity_doc in opportunities_docs)

# if no skills were found, log an error so that it can be caught by Sentry.
if len(skills_sets) == 0:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,31 @@
given_test_opportunities_data = [
{
"active": True,
"skillGroups": [{"UUID": given_skills_uuids[0]}, {"UUID": given_skills_uuids[1]}]
"skillGroups": [{"originUUID": given_skills_uuids[0]}, {"originUUID": given_skills_uuids[1]}]
},
{
"active": False,
"skillGroups": [{"UUID": given_skills_uuids[2]}, {"UUID": given_skills_uuids[3]}]
"skillGroups": [{"originUUID": given_skills_uuids[2]}, {"originUUID": given_skills_uuids[3]}]
},
{
"active": True,
"skillGroups": [{"UUID": given_skills_uuids[4]}, {"UUID": given_skills_uuids[5]}, {"UUID": given_skills_uuids[6]}]
"skillGroups": [{"originUUID": given_skills_uuids[4]}, {"originUUID": given_skills_uuids[5]}, {"originUUID": given_skills_uuids[6]}]
},
{
"active": True,
"skillGroups": [{"UUID": given_skills_uuids[6]}, {"UUID": given_skills_uuids[7]}]
"skillGroups": [{"originUUID": given_skills_uuids[6]}, {"originUUID": given_skills_uuids[7]}]
},
{
"active": True,
"skillGroups": [{"UUID": given_skills_uuids[8]}, {"UUID": given_skills_uuids[9]}]
"skillGroups": [{"originUUID": given_skills_uuids[8]}, {"originUUID": given_skills_uuids[9]}]
},
{
"active": True,
"skillGroups": [{"UUID": given_skills_uuids[7]}, {"UUID": given_skills_uuids[5]}]
"skillGroups": [{"originUUID": given_skills_uuids[7]}, {"originUUID": given_skills_uuids[5]}]
},
{
"active": True,
"skillGroups": [{"UUID": given_skills_uuids[3]}, {"UUID": given_skills_uuids[8]}]
"skillGroups": [{"originUUID": given_skills_uuids[3]}, {"originUUID": given_skills_uuids[8]}]
}
]
expected_opportunities_skills_uuids = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class TestCase(BaseModel):
given_opportunities_skills_uuids=[
{
"active": True,
"skillGroups": [{"UUID": "skill-group-uuid-1"}]
"skillGroups": [{"originUUID": "skill-group-uuid-1"}]
}
],
given_skills_data=[
Expand Down