fix tests

Author: antkryt

admin/nodes/views.py

@@ -226,15 +226,13 @@ def post(self, request, *args, **kwargs):
                 message=f'User {user.pk} removed from {node.__class__.__name__.lower()} {node.pk}.',
                 action_flag=CONTRIBUTOR_REMOVED
             )
+            params = dict(node.log_params)
+            params['contributors'] = user.pk
             node.add_log(
                 action=NodeLog.CONTRIB_REMOVED,
                 auth=None,
                 foreign_user=NodeLog.SUPPORT_USER_LABEL,
-                params={
-                    'project': node.parent_id,
-                    'node': node.pk,
-                    'contributors': user.pk
-                },
+                params=params,
                 log_date=timezone.now(),
                 should_hide=False,
             )
@@ -366,9 +364,7 @@ def post(self, request, *args, **kwargs):
                 action=NodeLog.NODE_CREATED,
                 auth=None,
                 foreign_user=NodeLog.SUPPORT_USER_LABEL,
-                params={
-                    'project': node.parent_id,
-                },
+                params=dict(node.log_params),
                 log_date=timezone.now(),
                 should_hide=False,
             )
@@ -387,10 +383,7 @@ def post(self, request, *args, **kwargs):
                 action=NodeLog.NODE_REMOVED,
                 auth=None,
                 foreign_user=NodeLog.SUPPORT_USER_LABEL,
-                params={
-                    'project': node.parent_id,
-                    'node': node.pk,
-                },
+                params=dict(node.log_params),
                 log_date=timezone.now(),
                 should_hide=False,
             )

admin_tests/nodes/test_views.py

@@ -269,10 +269,11 @@ def test_do_not_remove_last_admin(self):
         assert len(list(self.node.get_admin_contributors(self.node.contributors))) == 1
         assert AdminLogEntry.objects.count() == count
 
-    def test_no_log(self):
+    def test_log(self):
+        assert not self.node.logs.filter(action=NodeLog.CONTRIB_REMOVED).exists()
         view = setup_log_view(self.view(), self.request, guid=self.node._id, user_id=self.user_2.id)
         view.post(self.request)
-        assert self.node.logs.latest().action != NodeLog.CONTRIB_REMOVED
+        assert self.node.logs.filter(action=NodeLog.CONTRIB_REMOVED).exists()
 
     def test_no_user_permissions_raises_error(self):
         guid = self.node._id

admin_tests/preprints/test_views.py

@@ -542,15 +542,16 @@ def test_do_not_remove_last_admin(self):
         assert len(list(self.preprint.get_admin_contributors(self.preprint.contributors))) == 1
         assert AdminLogEntry.objects.count() == count
 
-    def test_no_log(self):
+    def test_log(self):
+        assert not self.preprint.logs.filter(action=PreprintLog.CONTRIB_REMOVED).exists()
         view = setup_log_view(
             self.view(),
             self.request,
             guid=self.preprint._id,
             user_id=self.user_2.id
         )
         view.post(self.request)
-        assert self.preprint.logs.latest().action != PreprintLog.CONTRIB_REMOVED
+        assert self.preprint.logs.filter(action=PreprintLog.CONTRIB_REMOVED).exists()
 
 
 @pytest.mark.urls('admin.base.urls')

api/logs/serializers.py

@@ -209,7 +209,7 @@ class NodeLogSerializer(JSONAPISerializer):
     id = ser.CharField(read_only=True, source='_id')
     date = VersionedDateTimeField(read_only=True)
     action = ser.CharField(read_only=True)
-    foreign_user = ser.SerializerMethodField(read_only=True)
+    foreign_user = ser.CharField(read_only=True)
     params = ser.SerializerMethodField(read_only=True)
     links = LinksField({'self': 'get_absolute_url'})