Merge pull request #4 from xjlin0/dynamic_contacts

Dynamic contacts
xjlin0 · May 22, 2021 · 8cab80a · 8cab80a
2 parents d677996 + 6118286
commit 8cab80a
Show file tree

Hide file tree

Showing 6 changed files with 390 additions and 180 deletions.
diff --git a/attendees/persons/serializers/attendee_minimal_serializer.py b/attendees/persons/serializers/attendee_minimal_serializer.py
@@ -37,9 +37,8 @@ def create(self, validated_data):
 
         instance = Attendee.objects.get(pk=attendee_id)
         if instance:
-            old_photo = instance.photo
-
             if deleting_photo or validated_data.get('photo', None):
+                old_photo = instance.photo
                 if old_photo:
                     old_file = Path(old_photo.path)
                     old_file.unlink(missing_ok=True)
@@ -51,7 +50,6 @@ def create(self, validated_data):
                 defaults=validated_data,
             )
 
-
             return obj
         else:
             return None
@@ -61,8 +59,21 @@ def update(self, instance, validated_data):
         Update and return an existing `AttendingMeet` instance, given the validated data.
 
         """
-        print("hi AttendeeMinimalSerializer.update() 47 here is validated_data: ")
-        print(validated_data)
-        instance.save()
-        return instance
+        deleting_photo = self._kwargs['data'].get('photo-clear', None)
+
+        if instance:
+            if deleting_photo or validated_data.get('photo', None):
+                old_photo = instance.photo
+                if old_photo:
+                    old_file = Path(old_photo.path)
+                    old_file.unlink(missing_ok=True)
+                if deleting_photo:
+                    validated_data['photo'] = None
+
+            obj, created = Attendee.objects.update_or_create(
+                id=instance.id,
+                defaults=validated_data,
+            )
+
+        return obj
 
diff --git a/attendees/persons/urls.py b/attendees/persons/urls.py
@@ -63,7 +63,7 @@
     basename='attending',
 )
 router.register(
-    'api/datagrid_data_attendee/(?P<attendee_id>.+)',
+    'api/datagrid_data_attendee',
     api_datagrid_data_attendee_viewset,
     basename='attendee',
 )

diff --git a/attendees/persons/views/api/datagrid_data_attendee.py b/attendees/persons/views/api/datagrid_data_attendee.py
@@ -19,33 +19,29 @@ class ApiDatagridDataAttendeeViewSet(LoginRequiredMixin, ModelViewSet):  # from
     serializer_class = AttendeeMinimalSerializer
     # queryset = Attendee.objects.all()
 
-    def retrieve(self, request, *args, **kwargs):
-        attendee_id = self.request.query_params.get('attendee_id')
-        print("entering retrieve ... ")
-        attendee = Attendee.objects.annotate(
-            joined_meets=JSONBAgg(
-                Func(
-                    Value('slug'), 'attendings__meets__slug',
-                    Value('display_name'), 'attendings__meets__display_name',
-                    function='jsonb_build_object'
-                ),
-            )
-                    # joined_meets=ArrayAgg('attendings__meets__slug', distinct=True),
-                   ).filter(pk=attendee_id).first()
-        # attendee = get_object_or_404(queryset)
-        serializer = AttendeeMinimalSerializer(attendee)
-        return Response(serializer.data)
+    # def retrieve(self, request, *args, **kwargs):
+    #     attendee_id = self.kwargs.get('pk')
+    #     attendee =  Attendee.objects.annotate(
+    #                 joined_meets=JSONBAgg(
+    #                     Func(
+    #                         Value('attendingmeet_id'), 'attendings__attendingmeet__id',
+    #                         Value('attending_finish'), 'attendings__attendingmeet__finish',
+    #                         Value('attending_start'), 'attendings__attendingmeet__start',
+    #                         Value('meet_name'), 'attendings__meets__display_name',
+    #                         function='jsonb_build_object'
+    #                     ),
+    #                 ),
+    #                 # contacts=ArrayAgg('attendings__meets__slug', distinct=True),
+    #            ).filter(pk=attendee_id)
+    #     serializer = AttendeeMinimalSerializer(attendee)
+    #     return Response(serializer.data)
 
     def get_queryset(self):
         """
 
         """
         current_user = self.request.user  # Todo: guard this API so only admin or scheduler can call it.
-        querying_attendee_id = self.kwargs.get('attendee_id')
-        # return AttendeeService.single_record(
-        #     current_user=current_user,
-        #     attendee_id=querying_attendee_id,
-        # )
+        querying_attendee_id = self.kwargs.get('pk')
 
         return Attendee.objects.annotate(
                     joined_meets=JSONBAgg(