Merge pull request #206 from CDC-IITDH/nitin

fixed submit application error
This commit is contained in:
Jaya Surya P 2024-10-08 19:03:48 +05:30 committed by GitHub
commit 642ad8e326
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 21 deletions

View File

@ -128,13 +128,7 @@ def getDashboard(request, id, email, user_type):
email_verified=True email_verified=True
).order_by('deadline_datetime') ).order_by('deadline_datetime')
else: else:
internships = Internship.objects.filter( internships = Internship.objects.filter(filters).order_by('deadline_datetime')
allowed_batch__contains=[studentDetails.batch],
allowed_branch__contains=[studentDetails.branch],
deadline_datetime__gte=datetime.datetime.now(),
offer_accepted=True,
email_verified=True
).order_by('deadline_datetime')
filtered_internships = internship_eligibility_filters(studentDetails, internships) filtered_internships = internship_eligibility_filters(studentDetails, internships)
@ -206,14 +200,14 @@ def submitApplication(request, id, email, user_type):
if not len(PlacementApplication.objects.filter( if not len(PlacementApplication.objects.filter(
student_id=id, placement_id=data[OPENING_ID])): student_id=id, placement_id=data[OPENING_ID])):
application = PlacementApplication() application = PlacementApplication()
opening = get_object_or_404( application_filters = Q(
Placement, id=data[OPENING_ID],
id=data[OPENING_ID], allowed_branch__contains=[student.branch],
allowed_branch__contains=[student.branch], deadline_datetime__gte=timezone.now()
deadline_datetime__gte=timezone.now(), )
# Only check allowed_batch if the degree is Btech if student.degree == "Btech":
**({"allowed_batch__contains": [student.batch]} if student.degree == "Btech" else {}) application_filters &= Q(allowed_batch__contains=[student.batch])
) opening = get_object_or_404(Placement.objects.filter(application_filters))
if not opening.offer_accepted or not opening.email_verified: if not opening.offer_accepted or not opening.email_verified:
raise PermissionError("Placement Not Approved") raise PermissionError("Placement Not Approved")
@ -230,12 +224,14 @@ def submitApplication(request, id, email, user_type):
if not len(InternshipApplication.objects.filter( if not len(InternshipApplication.objects.filter(
student_id=id, internship_id=data[OPENING_ID])): student_id=id, internship_id=data[OPENING_ID])):
application = InternshipApplication() application = InternshipApplication()
opening = get_object_or_404(Internship, id=data[OPENING_ID], application_filters = Q(
allowed_branch__contains=[student.branch], id=data[OPENING_ID],
deadline_datetime__gte=timezone.now() allowed_branch__contains=[student.branch],
# Only check allowed_batch if the degree is Btech deadline_datetime__gte=timezone.now()
**({"allowed_batch__contains": [student.batch]} if student.degree == "Btech" else {}) )
) if student.degree == "Btech":
application_filters &= Q(allowed_batch__contains=[student.batch])
opening = get_object_or_404(Internship.objects.filter(application_filters))
if not opening.offer_accepted or not opening.email_verified: if not opening.offer_accepted or not opening.email_verified:
raise PermissionError("Internship Not Approved") raise PermissionError("Internship Not Approved")