Merge pull request #475 from the-deep/feature/add-lead-assignee-info

Add lead assignee information in entries api

Author: bewakes

apps/entry/serializers.py

@@ -17,7 +17,7 @@
 from geo.models import GeoArea, Region
 from geo.serializers import SimpleRegionSerializer
 from tabular.serializers import FieldProcessedOnlySerializer
-from user.serializers import EntryCommentUserSerializer, ComprehensiveUserSerializer
+from user.serializers import EntryCommentUserSerializer, ComprehensiveUserSerializer, SimpleUserSerializer
 from .widgets.store import widget_store
 
 from .models import (
@@ -156,9 +156,12 @@ class EntryLeadSerializer(RemoveNullFieldsMixin, serializers.ModelSerializer):
     attachment = FileSerializer(read_only=True)
     tabular_book = serializers.SerializerMethodField()
 
+    assignee_details = SimpleUserSerializer(source='get_assignee', read_only=True)
+
     class Meta:
         model = Lead
-        fields = ('id', 'title', 'created_at', 'url', 'attachment', 'tabular_book', 'client_id')
+        fields = ('id', 'title', 'created_at', 'url', 'attachment',
+                  'tabular_book', 'client_id', 'assignee', 'assignee_details')
 
     def get_tabular_book(self, obj):
         file = obj.attachment

apps/entry/views.py

@@ -94,7 +94,9 @@ def post(self, request, version=None):
         filters = request.data.get('filters', [])
         filters = {f[0]: f[1] for f in filters}
 
-        queryset = get_filtered_entries(request.user, filters).prefetch_related('lead', 'lead__attachment')
+        queryset = get_filtered_entries(request.user, filters).prefetch_related(
+            'lead', 'lead__attachment', 'lead__assignee',
+        )
         queryset = Entry.annotate_comment_count(queryset)
 
         project = filters.get('project')

deep/settings.py

@@ -512,8 +512,8 @@ def add_username_attribute(record):
                                  '[email protected]')
 EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD', 'deep1234')
 EMAIL_USE_TLS = os.environ.get('EMAIL_USE_TLS', 'True').lower() == 'true'
-EMAIL_FROM = 'DEEP Admin [{}]<{}>'.format(
-    f'{DEEP_ENVIRONMENT.upper()} ' if DEEP_ENVIRONMENT.lower() != 'beta' else '',
+EMAIL_FROM = 'DEEP Admin {}<{}>'.format(
+    f'[{DEEP_ENVIRONMENT.upper()}]' if DEEP_ENVIRONMENT.lower() != 'beta' else '',
     EMAIL_HOST_USER,
 )
 EMAIL_PORT = int(os.environ.get('EMAIL_PORT')) if os.environ.get('EMAIL_PORT')\