Skip to content
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

POLIO-1788, POLIO-1752, POLIO-1716: Polio hotfixes #1862

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

POLIO-1788, POLIO-1752, POLIO-1716: Polio hotfixes #1862

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
62f8bb5
POLIO-1752 fix embed redirection
quang-le Dec 11, 2024
56c59fa
POLIO-1716: fix type error in task
quang-le Dec 11, 2024
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: 1 addition & 1 deletion plugins/polio/js/src/domains/VaccineModule/Repository/VaccineRepository.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const VaccineRepository: FunctionComponent = () => {
...params,
tab: newTab,
};
redirectTo(baseUrl, newParams);
redirectTo(redirectUrl, newParams);
};

return (
Expand Down
62 changes: 33 additions & 29 deletions plugins/polio/tasks/archive_vaccine_stock_for_rounds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,22 @@
def archive_stock_for_round(round, vaccine_stock, reference_date, country=None):
vaccine_stock_for_vaccine = vaccine_stock

if vaccine_stock_for_vaccine.exists():
if vaccine_stock_for_vaccine:
if not country:
vaccine_stock_for_vaccine = vaccine_stock_for_vaccine.filter(country=round.campaign.country.id)
vaccine_stock_for_vaccine = vaccine_stock_for_vaccine.first()
calculator = VaccineStockCalculator(vaccine_stock_for_vaccine)
total_usable_vials_in, total_usable_doses_in = calculator.get_total_of_usable_vials(reference_date)
total_unusable_vials_in, total_unusable_doses_in = calculator.get_total_of_unusable_vials(reference_date)
VaccineStockHistory.objects.create(
vaccine_stock=vaccine_stock_for_vaccine,
round=round,
usable_vials_in=total_usable_vials_in,
usable_doses_in=total_usable_doses_in,
unusable_vials_in=total_unusable_vials_in,
unusable_doses_in=total_unusable_doses_in,
)
vaccine_stock_for_vaccine = vaccine_stock_for_vaccine.filter(country=round.campaign.country)
if vaccine_stock_for_vaccine:
vaccine_stock_for_vaccine = vaccine_stock_for_vaccine.first()
calculator = VaccineStockCalculator(vaccine_stock_for_vaccine)
total_usable_vials_in, total_usable_doses_in = calculator.get_total_of_usable_vials(reference_date)
total_unusable_vials_in, total_unusable_doses_in = calculator.get_total_of_unusable_vials(reference_date)
VaccineStockHistory.objects.create(
vaccine_stock=vaccine_stock_for_vaccine,
round=round,
usable_vials_in=total_usable_vials_in,
usable_doses_in=total_usable_doses_in,
unusable_vials_in=total_unusable_vials_in,
unusable_doses_in=total_unusable_doses_in,
)


@task_decorator(task_name="archive_vaccine_stock")
Expand All @@ -38,7 +39,9 @@ def archive_vaccine_stock_for_rounds(date=None, country=None, campaign=None, vac
reference_date = datetime.strptime(date, "%Y-%m-%d") if date else task_start
round_end_date = reference_date - timedelta(days=14)

rounds_qs = Round.objects.filter(ended_at__lte=round_end_date, campaign__account=account)
rounds_qs = Round.objects.filter(ended_at__lte=round_end_date, campaign__account=account).select_related(
"campaign__country"
)

if country:
rounds_qs = rounds_qs.filter(campaign__country__id=country)
Expand Down Expand Up @@ -69,20 +72,21 @@ def archive_vaccine_stock_for_rounds(date=None, country=None, campaign=None, vac
i = 0
for vax in vaccines:
qs = vax_dict[vax]
vaccine_stock = VaccineStock.objects.filter(vaccine=vax)

for r in qs:
i += 1
try:
archive_stock_for_round(round=r, reference_date=reference_date, vaccine_stock=vaccine_stock)
task.report_progress_and_stop_if_killed(
progress_value=i,
end_value=count,
progress_message=f"Stock history added for {r.pk} and vaccine {vax}",
)
except IntegrityError:
task.report_progress_and_stop_if_killed(
progress_value=i,
end_value=count,
progress_message=f"Could not add stock history for round {r.pk} vaccine {vax}. History already exists",
)
vaccine_stock = VaccineStock.objects.filter(vaccine=vax)
if vaccine_stock:
try:
archive_stock_for_round(round=r, reference_date=reference_date, vaccine_stock=vaccine_stock)
task.report_progress_and_stop_if_killed(
progress_value=i,
end_value=count,
progress_message=f"Stock history added for {r.pk} and vaccine {vax}",
)
except IntegrityError:
task.report_progress_and_stop_if_killed(
progress_value=i,
end_value=count,
progress_message=f"Could not add stock history for round {r.pk} vaccine {vax}. History already exists",
)
Loading