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

updated meal group assignment logic #505

Merged
merged 1 commit into from
Jan 17, 2025
Merged

updated meal group assignment logic #505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 7 additions & 13 deletions hiss/application/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,23 +405,17 @@ class Application(models.Model):

def get_next_meal_group(self):
"""
Determines the next meal group considering frontloading for restricted groups
using the RESTRICTED_FRONTLOAD_FACTOR.
Determines the next meal group by counting all non-null meal group values
modulo 4, using a dictionary to assign meal groups.
"""
meal_groups = ['A', 'B', 'C', 'D']

last_assigned_group = (
meal_group_map = {0: 'A', 1: 'B', 2: 'C', 3: 'D'}
non_null_count = (
Application.objects.filter(status=STATUS_CONFIRMED)
.exclude(meal_group__isnull=True)
.order_by('-datetime_submitted')
.values_list('meal_group', flat=True)
.first()
.count()
)
if last_assigned_group:
next_index = (meal_groups.index(last_assigned_group) + 1) % len(meal_groups)
return meal_groups[next_index]
else:
return 'A'
next_group_num = non_null_count % 4
return meal_group_map[next_group_num]

def assign_meal_group(self):
"""
Expand Down
Loading