Merge pull request #1110 from hinashi/fixed/edit_entity_apiv2

Fixed entity editing failing for non created user

Author: userlocalhost

entity/api_v2/serializers.py

@@ -214,7 +214,7 @@ def _update_or_create(
 
         entity: Entity
         entity, is_created_entity = Entity.objects.get_or_create(
-            id=entity_id, created_user=user, defaults={**validated_data}
+            id=entity_id, defaults={**validated_data}
         )
         if not is_created_entity:
             # record history for specific fields on update

entity/tests/test_api_v2.py

@@ -2631,6 +2631,25 @@ def test_update_entity_without_permission(self):
         )
         self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
 
+    @mock.patch("entity.tasks.edit_entity_v2.delay", mock.Mock(side_effect=tasks.edit_entity_v2))
+    def test_update_entity_with_other_created_user(self):
+        self.admin_login()
+
+        params = {
+            "id": self.entity.id,
+            "name": "change-entity",
+            "note": "change-hoge",
+        }
+
+        resp = self.client.put(
+            "/entity/api/v2/%d/" % self.entity.id, json.dumps(params), "application/json"
+        )
+        self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
+
+        self.entity.refresh_from_db()
+        self.assertEqual(self.entity.name, "change-entity")
+        self.assertEqual(self.entity.note, "change-hoge")
+
     def test_update_entity_with_webhook_is_disabled(self):
         entity: Entity = self.create_entity(
             **{