Release 5/23/2024

.gitignore

@@ -17,10 +17,14 @@ db.sqlite3
 
 # Editor directories and files
 .idea
+.editorconfig
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
 *$py.class
 
 .vscode
+
+# Static files
+staticfiles/

authentication/admin.py

@@ -1,27 +1,26 @@
 from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.models import Group
+from django.contrib.auth.admin import GroupAdmin
+from rest_framework.authtoken.models import TokenProxy
+from rest_framework.authtoken.admin import TokenAdmin
+from unfold.admin import ModelAdmin
 from .models import User
 
 
-class CustomUserAdmin(UserAdmin):
+class CustomUserAdmin(ModelAdmin):
+    search_fields = ("email",)
     ordering = ('email_or_cell', 'email')
 
     list_display = ('email_or_cell', 'is_staff')
-    list_filter = ('is_staff',)
 
-    fieldsets = (
-        (None, {'fields': ('email_or_cell', 'password')}),
-        ('Personal info', {'fields': ('email', 'cell')}),
-        ('Permissions', {'fields': ('is_staff', 'tcpa_consent', 'groups')}),
-    )
-    # add_fieldsets is not a standard ModelAdmin attribute. UserAdmin
-    # overrides get_fieldsets to use this attribute when creating a user.
-    add_fieldsets = (
-        (None, {
-            'classes': ('wide',),
-            'fields': ('email_or_cell', 'password1', 'password2', 'email', 'cell', 'tcpa_consent', 'is_staff'),
-        }),
-    )
+class CustomGroupAdmin(ModelAdmin, GroupAdmin):
+    pass
 
+class CustomTokenAdmin(ModelAdmin, TokenAdmin):
+    pass
 
 admin.site.register(User, CustomUserAdmin)
+admin.site.unregister(Group)
+admin.site.register(Group, CustomGroupAdmin)
+admin.site.unregister(TokenProxy)
+admin.site.register(TokenProxy, CustomTokenAdmin)

authentication/views.py

@@ -5,23 +5,23 @@
 from rest_framework import viewsets, permissions, mixins
 from rest_framework.response import Response
 from authentication.serializers import UserSerializer, UserOffersSerializer
-from sentry_sdk import capture_message
+from sentry_sdk import capture_exception
 from integrations.services.hubspot.integration import update_send_offers_hubspot, upsert_user_hubspot
 import uuid
 
 
-class UserViewSet(mixins.UpdateModelMixin,
-                  viewsets.GenericViewSet):
+class UserViewSet(mixins.UpdateModelMixin, viewsets.GenericViewSet):
     """
     API endpoint that allows users to be viewed or edited.
     """
-    queryset = User.objects.all().order_by('-email_or_cell')
+
+    queryset = User.objects.all().order_by("-email_or_cell")
     serializer_class = UserSerializer
     permission_classes = [permissions.DjangoModelPermissions]
 
     def update(self, request, pk=None):
         if pk is None:
-            return Response('Must have an associated screen', status=400)
+            return Response("Must have an associated screen", status=400)
         screen = Screen.objects.get(uuid=pk)
         user = screen.user
         if user:
@@ -43,11 +43,8 @@ def update(self, request, pk=None):
 
                 try:
                     upsert_user_to_hubspot(screen, screen.user)
-                except Exception:
-                    capture_message(
-                        'HubSpot upsert failed',
-                        level='warning',
-                    )
+                except Exception as e:
+                    capture_exception(e, level="warning")
                     return Response("Invalid Email", status=400)
 
             return Response(status=204)
@@ -65,14 +62,13 @@ def upsert_user_to_hubspot(screen, user):
 
     hubspot_id = upsert_user_hubspot(user, screen=screen)
     if hubspot_id:
-        random_id = str(uuid.uuid4()).replace('-', '')
+        random_id = str(uuid.uuid4()).replace("-", "")
         user.external_id = hubspot_id
-        user.email_or_cell = f'{hubspot_id}+{random_id}@myfriendben.org'
+        user.email_or_cell = f"{hubspot_id}+{random_id}@myfriendben.org"
         user.first_name = None
         user.last_name = None
         user.cell = None
         user.email = None
         user.save()
     else:
-        raise Exception('Failed to upsert user')
-
+        raise Exception("Failed to upsert user")

benefits/settings.py

@@ -15,6 +15,7 @@
 from decouple import config
 
 from pathlib import Path
+from django.urls import reverse_lazy
 from django.utils.translation import gettext_lazy as _
 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
@@ -62,6 +63,13 @@
 # Application definition
 
 INSTALLED_APPS = [
+    "unfold",
+    "unfold.contrib.filters",  # optional, if special filters are needed
+    "unfold.contrib.forms",  # optional, if special form elements are needed
+    "unfold.contrib.import_export",  # optional, if django-import-export package is used
+    "unfold.contrib.guardian",  # optional, if django-guardian package is used
+    # optional, if django-simple-history package is used
+    "unfold.contrib.simple_history",
     'authentication.apps.AuthConfig',
     'corsheaders',
     'screener.apps.ScreenerConfig',
@@ -193,7 +201,8 @@
     ),
     'default': {
         'fallbacks': ['en-us'],  # defaults to PARLER_DEFAULT_LANGUAGE_CODE
-        'hide_untranslated': True,  # the default; let .active_translations() return fallbacks too.
+        # the default; let .active_translations() return fallbacks too.
+        'hide_untranslated': True,
     },
 }
 
@@ -221,3 +230,79 @@
     )
 
 django_heroku.settings(locals())
+
+
+# UNFOLD SETTINGS
+UNFOLD = {
+    "SITE_HEADER": _("MFB Admin"),
+    "SITE_TITLE": _("MFB Admin"),
+    'APP_NAME': 'Benefits',
+    'APP_VERSION': '1.0.0',
+    'APP_DESCRIPTION': 'Benefits is a Django application that helps people find and apply for benefits.',
+    "SIDEBAR": {
+        "show_search": True,
+        "show_all_applications": True,
+        "navigation": [
+            {
+                "title": _("Navigation"),
+                "items": [
+                    {
+                        "title": _("Programs"),
+                        "icon": "other_admission",
+                        "link": reverse_lazy("admin:programs_program_changelist"),
+                    },
+                    {
+                        "title": _("Urgent Needs"),
+                        "icon": "breaking_news",
+                        "link": reverse_lazy("admin:programs_urgentneed_changelist"),
+                    },
+                    {
+                        "title": _("Navigators"),
+                        "icon": "near_me",
+                        "link": reverse_lazy("admin:programs_navigator_changelist"),
+                    },
+                    {
+                        "title": _("Configurations"),
+                        "icon": "tune",
+                        "link": reverse_lazy("admin:configuration_configuration_changelist"),
+                    },
+                    {
+                        "title": _("Translations"),
+                        "icon": "translate",
+                        "link": reverse_lazy("admin:translations_translation_changelist"),
+                    },
+                ]
+            },
+            {
+                "separator": True,
+                "items": [
+                    {
+                        "title": _("Dashboard"),
+                        "icon": "dashboard",
+                        "link": reverse_lazy("admin:index"),
+                    },
+                    {
+                        "title": _("Translations API"),
+                        "icon": "settings",
+                        "link": reverse_lazy("translations_api_url"),
+                    },
+                    {
+                        "title": _("Users"),
+                        "icon": "person",
+                        "link": reverse_lazy("admin:authentication_user_changelist"),
+                    },
+                    {
+                        "title": _("Groups"),
+                        "icon": "group",
+                        "link": reverse_lazy("admin:auth_group_changelist"),
+                    },
+                    {
+                        "title": _("Tokens"),
+                        "icon": "key",
+                        "link": reverse_lazy("admin:authtoken_tokenproxy_changelist"),
+                    },
+                ],
+            },
+        ],
+    }
+}

configuration/admin.py

@@ -1,7 +1,10 @@
 from django.contrib import admin
+from unfold.admin import ModelAdmin
 from .models import Configuration
 
-class ConfigurationAdmin(admin.ModelAdmin):
+
+class ConfigurationAdmin(ModelAdmin):
     search_fields = ('name',)
 
-admin.site.register(Configuration, ConfigurationAdmin)
+
+admin.site.register(Configuration, ConfigurationAdmin)

integrations/services/hubspot/integration.py

@@ -4,6 +4,9 @@
 from decouple import config
 import json
 import re
+from authentication.models import User
+from screener.models import Screen
+from sentry_sdk import capture_exception, capture_message
 
 
 def upsert_user_hubspot(user, screen=None):
@@ -16,18 +19,20 @@ def upsert_user_hubspot(user, screen=None):
 def update_send_offers_hubspot(external_id, send_offers, send_updates):
     hubspot = Hubspot()
     contact = {
-        'ab01___send_offers': send_offers,
-        'ab01___send_updates': send_updates,
+        "ab01___send_offers": send_offers,
+        "ab01___send_updates": send_updates,
     }
     try:
         hubspot.update_contact(external_id, contact)
     except ApiException as e:
         print(e)
 
 
-class Hubspot():
+class Hubspot:
+    MAX_HOUSEHOLD_SIZE = 8
+
     def __init__(self):
-        self.api_client = HubSpot(access_token=config('HUBSPOT'))
+        self.api_client = HubSpot(access_token=config("HUBSPOT"))
 
     # Hubspot has no insert or update option in their latest API, so the code
     # below first attempts to create a contact. If there is already a contact
@@ -40,33 +45,30 @@ def upsert_contact(self, contact):
             contact_id = api_response.id
         except ApiException as e:
             http_body = json.loads(e.body)
-            if http_body['category'] == 'CONFLICT':
+            print(http_body)
+            if http_body["category"] == "CONFLICT":
                 try:
                     contact_id = self.get_conflict_contact_id(e)
                     self.update_contact(contact_id, contact)
                 except ApiException as f:
-                    print(f)
+                    capture_exception(f)
                     return False
             else:
+                capture_exception(e)
                 return False
         return contact_id
 
     def create_contact(self, user):
-        simple_public_object_input = SimplePublicObjectInput(
-            properties=user
-        )
+        simple_public_object_input = SimplePublicObjectInput(properties=user)
         api_response = self.api_client.crm.contacts.basic_api.create(
             simple_public_object_input=simple_public_object_input
         )
         return api_response
 
     def update_contact(self, contact_id, user):
-        simple_public_object_input = SimplePublicObjectInput(
-            properties=user
-        )
+        simple_public_object_input = SimplePublicObjectInput(properties=user)
         api_response = self.api_client.crm.contacts.basic_api.update(
-            contact_id,
-            simple_public_object_input=simple_public_object_input
+            contact_id, simple_public_object_input=simple_public_object_input
         )
         return api_response
 
@@ -83,38 +85,48 @@ def get_conflict_contact_id(self, e):
         http_body = json.loads(e.body)
         # strip everything out of the error message except the contact id
         # https://community.hubspot.com/t5/APIs-Integrations/Contacts-v3-contact-exists-error/m-p/364629
-        contact_id = re.sub('[^0-9]', '', http_body['message'])
+        contact_id = re.sub("[^0-9]", "", http_body["message"])
         return contact_id
 
-    def mfb_user_to_hubspot_contact(self, user, screen=None):
+    def mfb_user_to_hubspot_contact(self, user: User, screen: Screen = None):
         contact = {
-            'email': user.email,
-            'firstname': user.first_name,
-            'lastname': user.last_name,
-            'phone': str(user.cell),
-            'benefits_screener_id': user.id,
-            'ab01___send_offers': user.send_offers,
-            'ab01___send_updates': user.send_updates,
-            'ab01___tcpa_consent_to_contact': user.tcpa_consent,
-            'hs_language': user.language_code,
-            'ab01___screener_id': None,
-            'ab01___screener_uuid': None,
-            'ab01___1st_mfb_completion_date': user.date_joined.date().isoformat(),
-            'full_name': f'{user.first_name} {user.last_name}'
+            "email": user.email,
+            "firstname": user.first_name,
+            "lastname": user.last_name,
+            "phone": str(user.cell),
+            "benefits_screener_id": user.id,
+            "ab01___send_offers": user.send_offers,
+            "ab01___send_updates": user.send_updates,
+            "ab01___tcpa_consent_to_contact": user.tcpa_consent,
+            "hs_language": user.language_code,
+            "ab01___1st_mfb_completion_date": user.date_joined.date().isoformat(),
+            "full_name": f"{user.first_name} {user.last_name}",
         }
         if screen:
-            contact['ab01___screener_id'] = screen.id
-            contact['ab01___uuid'] = str(screen.uuid)
+            contact["ab01___screener_id"] = screen.id
+            contact["ab01___uuid"] = str(screen.uuid)
+            contact["ab01___county"] = screen.county
+            contact["ab01___number_of_household_members"] = screen.household_size
+
+            members = screen.household_members.all()
+            if len(members) > self.MAX_HOUSEHOLD_SIZE:
+                capture_message(f"screen has more than {self.MAX_HOUSEHOLD_SIZE} household members", level="error")
+
+            for i, member in enumerate(members):
+                if i >= self.MAX_HOUSEHOLD_SIZE:
+                    break
+
+                contact[f"ab01___hhm{i + 1}_age"] = member.age
 
         return contact
 
     def format_email_new_benefit(self, user, num_benefits, value_benefits):
         contact = {
-            'id': user.external_id,
-            'properties': {
-                'ab01___number_of_new_benefits': int(num_benefits),
-                'ab01___new_benefit_total_value': int(value_benefits),
-            }
+            "id": user.external_id,
+            "properties": {
+                "ab01___number_of_new_benefits": int(num_benefits),
+                "ab01___new_benefit_total_value": int(value_benefits),
+            },
         }
 
         return contact