Merge pull request #1681 from IFRCGo/fix/frontend-2641-ongoing-deployments-by-event

Adding start_date check. Using all email addresses in all envs

Author: szabozoltan69

api/serializers.py

@@ -652,7 +652,7 @@ def get_organizations_from(obj):
         deployments = [d for d in obj.personneldeployment_set.all()]
         personnels = []
         for d in deployments:
-            for p in d.personnel_set.filter(end_date__gte=timezone.now(), is_active=True):
+            for p in d.personnel_set.filter(end_date__gte=timezone.now(), start_date__lte=timezone.now(), is_active=True):
                 personnels.append(p)
         return list(set([p.country_from.society_name for p in personnels if p.country_from and p.country_from.society_name != '']))
 

notifications/notification.py

@@ -85,26 +85,25 @@ def send_notification(subject, recipients, html, mailtype='', files=None):
         print(f'\n{html}\n')
         print('-' * 22, 'EMAIL END -', '-' * 22)
 
-    # If it's not PROD only able to use test e-mail addresses which are set in the env var
     to_addresses = recipients if isinstance(recipients, list) else [recipients]
 
-    if not IS_PROD:
-        logger.info('Using test email addresses...')
-        to_addresses = []
-        logger.info(to_addresses)
-        for eml in settings.TEST_EMAILS:
-
-            # It is possible to filter test addressees to domain name only – not used.
-            is_dom = True if '@' not in eml else False
-            if is_dom:
-                for rec in recipients:
-                    try:
-                        if eml == rec.split('@')[1]:
-                            to_addresses.append(rec)
-                    except Exception:
-                        logger.info('Could not extract domain from: {}'.format(rec))
-            elif eml and (eml in recipients):
-                to_addresses.append(eml)
+#    if not IS_PROD:
+#        logger.info('Using test email addresses...')
+#        to_addresses = []
+#        logger.info(to_addresses)
+#        for eml in settings.TEST_EMAILS:
+#
+#            # It is possible to filter test addressees to domain name only – not used.
+#            is_dom = True if '@' not in eml else False
+#            if is_dom:
+#                for rec in recipients:
+#                    try:
+#                        if eml == rec.split('@')[1]:
+#                            to_addresses.append(rec)
+#                    except Exception:
+#                        logger.info('Could not extract domain from: {}'.format(rec))
+#            elif eml and (eml in recipients):
+#                to_addresses.append(eml)
 
     recipients_as_string = ','.join(to_addresses)
     if not recipients_as_string: