Skip to content

fix: is duplicate check logic #99

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
mittal-ishaan merged 1 commit into from
Nov 17, 2024
Merged

fix: is duplicate check logic #99

Show file tree
Hide file tree
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
44 changes: 8 additions & 36 deletions home/utils/rebate_checker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,35 @@ def is_not_duplicate(student, new_rebate_start, new_rebate_end):
try:
for short_rebate in Rebate.objects.filter(email=student).all():
if (
short_rebate.start_date - timedelta(days=2)
short_rebate.start_date
< new_rebate_start
< short_rebate.end_date + timedelta(days=1)
< short_rebate.end_date + timedelta(days=2)
) or (
short_rebate.start_date - timedelta(days=2)
< new_rebate_end
< short_rebate.end_date + timedelta(days=1)
< short_rebate.end_date
):
return False
for short_rebate in LeftShortRebate.objects.filter(email=student).all():
if (
short_rebate.start_date - timedelta(days=2)
short_rebate.start_date
< new_rebate_start
< short_rebate.end_date + timedelta(days=1)
< short_rebate.end_date + timedelta(days=2)
) or (
short_rebate.start_date - timedelta(days=2)
< new_rebate_end
< short_rebate.end_date + timedelta(days=1)
< short_rebate.end_date
):
return False
for long_rebate in LongRebate.objects.filter(email=student).all():
if (
long_rebate.end_date + timedelta(days=2)
long_rebate.end_date
> new_rebate_start
> long_rebate.start_date - timedelta(days=2)
) or (
long_rebate.start_date - timedelta(days=2)
< new_rebate_end
< long_rebate.end_date + timedelta(days=1)
< long_rebate.end_date
):
return False
return True
Expand All @@ -51,20 +51,6 @@ def is_not_duplicate(student, new_rebate_start, new_rebate_end):
return False


# def is_present_rebate_bills(student, semester):
# """
# Checks if student is registered in the rebate bills,
# if not the function registers it with that email ID
# """
# try:
# student_bill = StudentBills.objects.get(email=student,semester=semester)
# except:
# print(Exception)
# student_bill = StudentBills(email=student,semester=semester)
# student_bill.save()
# return student_bill


def max_days_rebate(student, start, end, period):
"""
Checks what period rebate is being applied,
Expand All @@ -78,45 +64,31 @@ def max_days_rebate(student, start, end, period):
match period.Sno:
case 1:
if student_bill.period1_short + sum <= 8:
# student_bill.period1_short+=sum
# student_bill.save(update_fields=["period1_short"])
return -1
else:
return 8 - student_bill.period1_short
case 2:
if student_bill.period2_short + sum <= 8:
# student_bill.period2_short+=sum
# student_bill.save(update_fields=["period2_short"])
return -1
else:
return 8 - student_bill.period2_short
case 3:
if student_bill.period3_short + sum <= 8:
# student_bill.period3_short+=sum
# student_bill.save(update_fields=["period3_short"])
return -1
else:
return 8 - student_bill.period3_short
case 4:
if student_bill.period4_short + sum <= 8:
# student_bill.period4_short+=sum
# student_bill.save(update_fields=["period4_short"])
return -1
else:
return 8 - student_bill.period4_short
case 5:
if student_bill.period5_short + sum <= 8:
# student_bill.period5_short+=sum
# student_bill.save(update_fields=["period5_short"])
return -1
else:
return 8 - student_bill.period5_short
case 6:
if student_bill.period6_short + sum <= 8:
# student_bill.period6_short+=sum
# student_bill.save(update_fields=["period6_short"])
return -1
else:
return 8 - student_bill.period6_short
# case default:
# return -1
47 changes: 34 additions & 13 deletions home/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
from django.contrib.auth.decorators import login_required
from django.http import JsonResponse
from django.shortcuts import redirect, render
from django.utils.http import url_has_allowed_host_and_scheme
from django.utils.dateparse import parse_date
from django.utils.http import url_has_allowed_host_and_scheme
from django.utils.timezone import now

from home.models import (
Expand Down Expand Up @@ -193,15 +193,14 @@ def rebate(request):
period_end = period_obj.end_date
if rebate_days > 7:
text = "Max no of days for rebate is 7"
elif not period_start <= start_date:
text = "Please fill the rebate of this period only"
elif before_rebate_days < 2:
text = "Form needs to be filled atleast 2 days prior the comencement of leave."
elif not is_not_duplicate(student, start_date, end_date):
text = "You have already applied for rebate during this duration"
elif 0 < rebate_days < 2:
text = "Min no of days for rebate is 2"
elif before_rebate_days < 2:
text = "Form needs to be filled atleast 2 days prior the comencement of leave."
else:
additional_text = ""
if not period_start <= start_date <= period_end:
short_left_rebate = LeftShortRebate(
email=student.email,
Expand All @@ -224,6 +223,7 @@ def rebate(request):
upper_cap_check = max_days_rebate(
student, start_date, period_end, period_obj
)
additional_text = " Note: The days after the current period end date will be added to your bills in the next period."
else:
upper_cap_check = max_days_rebate(
student, start_date, end_date, period_obj
Expand All @@ -243,6 +243,8 @@ def rebate(request):
)
r.save()
text = "You have successfully submitted the rebate. Thank You! You shall recieve a confirmation mail, If not please contact the Dining Warden."
if additional_text:
text += additional_text
elif not text:
text = "Your rebate application has been rejected due to non-compliance of the short term rebate rules"
except Allocation.DoesNotExist:
Expand Down Expand Up @@ -372,19 +374,34 @@ def allocationForm(request):
alloc_form.end_time and alloc_form.end_time < now()
):
message = "The Form is closed for now"
elif Allocation.objects.filter(email=student, period=alloc_form.period).exists():
elif Allocation.objects.filter(
email=student, period=alloc_form.period
).exists():
message = "You have filled the form for this period. Please visit the profile page after the allocation process is completed to check your allocated caterer"
elif request.method == "POST" and request.user.is_authenticated:
period_obj = alloc_form.period
jain = request.POST["jain"] == "True"
caterer_prefs = [
request.POST.get(pref) for pref in ["first_pref", "second_pref", "third_pref"]
request.POST.get(pref)
for pref in ["first_pref", "second_pref", "third_pref"]
]
caterer_prefs = [
Caterer.objects.get(name=pref) for pref in caterer_prefs if pref
]
caterer_prefs = [Caterer.objects.get(name=pref) for pref in caterer_prefs if pref]

caterer = next((c for c in caterer_prefs if c.student_limit > Allocation.objects.filter(caterer=c, period=period_obj).count()), None)
caterer = next(
(
c
for c in caterer_prefs
if c.student_limit
> Allocation.objects.filter(caterer=c, period=period_obj).count()
),
None,
)
if caterer:
student_id = f"{caterer.name[0]}{'J' if jain else ''}{caterer.student_limit}"
student_id = (
f"{caterer.name[0]}{'J' if jain else ''}{caterer.student_limit}"
)
allocation = Allocation(
email=student,
student_id=student_id,
Expand All @@ -393,8 +410,12 @@ def allocationForm(request):
high_tea=False,
jain=jain,
first_pref=caterer_prefs[0].name if caterer_prefs else None,
second_pref=caterer_prefs[1].name if len(caterer_prefs) > 1 else None,
third_pref=caterer_prefs[2].name if len(caterer_prefs) > 2 else None,
second_pref=(
caterer_prefs[1].name if len(caterer_prefs) > 1 else None
),
third_pref=(
caterer_prefs[2].name if len(caterer_prefs) > 2 else None
),
)
allocation.save()
UnregisteredStudent.objects.filter(email__iexact=student.email).delete()
Expand All @@ -403,7 +424,7 @@ def allocationForm(request):
if url_has_allowed_host_and_scheme(request.path, allowed_hosts=None):
return redirect(request.path)
else:
return redirect('/')
return redirect("/")
else:
message = "No caterer available with sufficient student limit"

Expand Down
Loading