resolved merge conflicts

.gitignore

@@ -130,6 +130,7 @@ dmypy.json
 
 /venv/
 ./CDC_Backend/static
+CDC_Backend/static_url*
 ./CDC_Backend/Storage
 /CDC_Backend/CDC_Backend/__pycache__/
 /CDC_Backend/APIs/__pycache__/

CDC_Backend/APIs/adminViews.py

@@ -784,7 +784,6 @@ def getStats(request, id, email, user_type):
                         status=status.HTTP_200_OK)
     except:
         logger.warning("Get Stats: " + str(sys.exc_info()))
-        print(sys.exc_info())
         return Response({'action': "Get Stats", 'message': "Something Went Wrong"},
                         status=status.HTTP_400_BAD_REQUEST)
 

CDC_Backend/APIs/companyViews.py

@@ -47,7 +47,6 @@ def addPlacement(request):
             opening.eligiblestudents = json.loads(data[ELIGIBLESTUDENTS])
         else:
             raise ValueError('Allowed Branch must be a subset of ' + str(ELIGIBLE))
-        print(opening.eligiblestudents)
         if data[PWD_ELIGIBLE] == 'Yes':
             opening.pwd_eligible = True
         else:

CDC_Backend/APIs/studentViews.py

@@ -50,6 +50,7 @@ def refresh(request):
 @isAuthorized(allowed_users=[STUDENT])
 def studentProfile(request, id, email, user_type):
     try:
+
         studentDetails = get_object_or_404(Student, id=id)
 
         data = StudentSerializer(studentDetails).data

CDC_Backend/APIs/utils.py

@@ -450,7 +450,6 @@ def internship_eligibility_filters(student, internships):
 @background_task.background(schedule=2)
 def send_opening_notifications(opening_id, opening_type=PLACEMENT):
     try:
-       # print(opening_id, opening_type)
         if opening_type == PLACEMENT:
             opening = get_object_or_404(Placement, id=opening_id)
         else:

CDC_Backend/CDC_Backend/settings.py

@@ -30,7 +30,7 @@ DEBUG = os.environ.get('DEBUG') == "True"
 
 ALLOWED_HOSTS = ['cdc.iitdh.ac.in', 'localhost']
 
-ADMINS = [ ('Jaya Surya', '210020040@iitdh.ac.in')]
+ADMINS = [ ('Jaya Surya', '210020051@iitdh.ac.in')]
 # Application definition
 
 INSTALLED_APPS = [
@@ -143,10 +143,10 @@ DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.2/howto/static-files/
 
-STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+STATIC_URL = '/static_url/'
+STATIC_ROOT = os.path.join(BASE_DIR, 'static_url')
 STATICFILES_DIR = (
-    os.path.join(BASE_DIR, 'static'),
+    os.path.join(BASE_DIR, 'static_url'),
 )
 
 CORS_ORIGIN_ALLOW_ALL = False

start_email_service.sh

@@ -4,4 +4,4 @@ source /home/cdc/Desktop/CDC_Web_Portal_Backend/cdc-placement-website-backend/ve
 
 cd /home/cdc/Desktop/CDC_Web_Portal_Backend/cdc-placement-website-backend/CDC_Backend
 
-python manage.py process_tasks
+python3 manage.py process_tasks