From 2b734012ce7c8fd7020e9c643b095388084fe5a2 Mon Sep 17 00:00:00 2001 From: karthikmurakonda Date: Wed, 2 Aug 2023 23:29:04 +0530 Subject: [PATCH] change email template and email backend --- CDC_Backend/APIs/admin.py | 8 ++++---- CDC_Backend/APIs/companyViews.py | 6 ++++-- CDC_Backend/APIs/constants.py | 2 +- CDC_Backend/APIs/utils.py | 2 +- CDC_Backend/CDC_Backend/settings.py | 12 ++++++++---- .../templates/company_email_verification.html | 2 +- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/CDC_Backend/APIs/admin.py b/CDC_Backend/APIs/admin.py index 4bfef8f..66c874d 100644 --- a/CDC_Backend/APIs/admin.py +++ b/CDC_Backend/APIs/admin.py @@ -123,9 +123,9 @@ class AdminAdmin(ExportMixin, SimpleHistoryAdmin): @admin.register(Placement) class Placement(AdminAdmin): - list_display = (COMPANY_NAME, CONTACT_PERSON_NAME, PHONE_NUMBER, 'tier', 'compensation_CTC', 'email_verified') + list_display = (COMPANY_NAME, CONTACT_PERSON_NAME, PHONE_NUMBER, 'tier', 'compensation_CTC', 'email_verified', 'updated_at') search_fields = (COMPANY_NAME, CONTACT_PERSON_NAME) - ordering = (COMPANY_NAME, CONTACT_PERSON_NAME, 'tier', 'compensation_CTC') + ordering = ('updated_at', COMPANY_NAME, CONTACT_PERSON_NAME, 'tier', 'compensation_CTC') list_filter = ('tier',) @@ -195,7 +195,7 @@ class InternAdmin(ExportMixin, SimpleHistoryAdmin): @admin.register(Internship) class Placement(InternAdmin): - list_display = (COMPANY_NAME, CONTACT_PERSON_NAME, PHONE_NUMBER, 'stipend', 'email_verified') + list_display = (COMPANY_NAME, CONTACT_PERSON_NAME, PHONE_NUMBER, 'stipend', 'email_verified', 'updated_at') search_fields = (COMPANY_NAME, CONTACT_PERSON_NAME) - ordering = (COMPANY_NAME, CONTACT_PERSON_NAME, 'stipend', ) + ordering = ('updated_at', COMPANY_NAME, CONTACT_PERSON_NAME, 'stipend') diff --git a/CDC_Backend/APIs/companyViews.py b/CDC_Backend/APIs/companyViews.py index 7b04def..bfc9ecc 100644 --- a/CDC_Backend/APIs/companyViews.py +++ b/CDC_Backend/APIs/companyViews.py @@ -221,7 +221,8 @@ def addPlacement(request): raise RuntimeError("Error in generating one time verification link for placement") data = { "designation": opening.designation, - "one_time_link": link + "one_time_link": link, + "opening_type": "Job" } sendEmail(opening.email, COMPANY_EMAIl_VERIFICATION_TEMPLATE_SUBJECT, data, @@ -480,7 +481,8 @@ def addInternship(request): raise RuntimeError("Error in generating one time verification link for internship") data = { "designation": internship.designation, - "one_time_link": link + "one_time_link": link, + "opening_type": "Internship" } sendEmail(internship.email, COMPANY_EMAIl_VERIFICATION_TEMPLATE_SUBJECT, data, diff --git a/CDC_Backend/APIs/constants.py b/CDC_Backend/APIs/constants.py index 5aeaf6b..b83efe1 100644 --- a/CDC_Backend/APIs/constants.py +++ b/CDC_Backend/APIs/constants.py @@ -162,7 +162,7 @@ SPECIAL_FORMAT_IN_PDF = ['website', 'company_details_pdf_names', 'description_pd 'stipend_description_pdf_names'] COMPANY_OPENING_ERROR_TEMPLATE = "Alert! Error submitting opening for {company_name}." -COMPANY_OPENING_SUBMITTED_TEMPLATE_SUBJECT = "Notification Submitted - {id} - Career Development Cell, IIT Dharwad" +COMPANY_OPENING_SUBMITTED_TEMPLATE_SUBJECT = "Notification Submitted - {id}, {company} - Career Development Cell, IIT Dharwad" STUDENT_APPLICATION_STATUS_TEMPLATE_SUBJECT = 'Application Status - {company_name} - {id}' STUDENT_APPLICATION_SUBMITTED_TEMPLATE_SUBJECT = 'CDC - Application Submitted - {company_name}' STUDENT_APPLICATION_UPDATED_TEMPLATE_SUBJECT = 'CDC - Application Updated - {company_name}' diff --git a/CDC_Backend/APIs/utils.py b/CDC_Backend/APIs/utils.py index ba79f38..851c99e 100644 --- a/CDC_Backend/APIs/utils.py +++ b/CDC_Backend/APIs/utils.py @@ -465,7 +465,7 @@ def send_email_for_opening(opening): emails = [opening.email, CDC_MAIl_ADDRESS] # Send the email sendEmail(emails, - COMPANY_OPENING_SUBMITTED_TEMPLATE_SUBJECT.format(id=opening.id), data, + COMPANY_OPENING_SUBMITTED_TEMPLATE_SUBJECT.format(id=opening.designation, company=opening.company_name), data, COMPANY_OPENING_SUBMITTED_TEMPLATE, attachment_jnf_respone) except Exception as e: diff --git a/CDC_Backend/CDC_Backend/settings.py b/CDC_Backend/CDC_Backend/settings.py index 7df7fc3..355ba6d 100644 --- a/CDC_Backend/CDC_Backend/settings.py +++ b/CDC_Backend/CDC_Backend/settings.py @@ -157,10 +157,14 @@ CORS_ORIGIN_WHITELIST = [ CORS_REPLACE_HTTPS_REFERER = True CSRF_TRUSTED_ORIGINS = [ "https://cdc.iitdh.ac.in", "http://cdc.iitdh.ac.in"] -# EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend' -EMAIL_FILE_PATH = './emails' - -EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' +EMAIL_BACKEND = '' +if DEBUG: + # file based email backend for development + EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend' + EMAIL_FILE_PATH = './test-emails' +else: + # SMTP backend for production + EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_HOST = 'smtp.gmail.com' EMAIL_USE_TLS = True EMAIL_PORT = 587 diff --git a/CDC_Backend/templates/company_email_verification.html b/CDC_Backend/templates/company_email_verification.html index 16f39d4..035f21e 100644 --- a/CDC_Backend/templates/company_email_verification.html +++ b/CDC_Backend/templates/company_email_verification.html @@ -44,7 +44,7 @@

- We have received your Job Notification for {{ designation }}. Kindly verify your email by clicking here.