Fix test for entity create

Author: syucream

acl/tests/test_api_v2.py

@@ -1,9 +1,12 @@
 import json
 
+from mock import mock
+
 from acl.models import ACLBase
 from airone.lib.acl import ACLType
 from airone.lib.test import AironeViewTest
 from airone.lib.types import AttrTypeValue
+from entity import tasks
 from entity.models import Entity, EntityAttr
 from role.models import Role
 
@@ -474,6 +477,9 @@ def _put_acl():
         self.assertEqual(resp.status_code, 200)
         self.assertTrue(role.is_permitted(acl, ACLType.Full))
 
+    @mock.patch(
+        "entity.tasks.create_entity_v2.delay", mock.Mock(side_effect=tasks.create_entity_v2)
+    )
     def test_list_history(self):
         self.initialization_for_retrieve_test()
         self.client.post("/entity/api/v2/", json.dumps({"name": "test"}), "application/json")
@@ -594,6 +600,9 @@ def test_list_history_with_role(self):
             ],
         )
 
+    @mock.patch(
+        "entity.tasks.create_entity_v2.delay", mock.Mock(side_effect=tasks.create_entity_v2)
+    )
     def test_list_history_with_entity_attr(self):
         self.initialization_for_retrieve_test()
 

airone/lib/drf.py

@@ -2,6 +2,7 @@
 
 import yaml
 from django.conf import settings
+from rest_framework import serializers
 from rest_framework.exceptions import APIException, ParseError, ValidationError
 from rest_framework.parsers import BaseParser
 from rest_framework.renderers import BaseRenderer
@@ -150,3 +151,17 @@ def _convert_error_code(detail):
         response.data = _convert_error_code(response.data)
 
     return response
+
+
+class AironeUserDefault(serializers.CurrentUserDefault):
+    """
+    It enables to get user from the custom field in the context.
+    The original CurrentUserDefault fetches it from request context,
+    so it fails if the context doesn't have request.
+    """
+
+    def __call__(self, serializer_field):
+        if "_user" in serializer_field.context:
+            return serializer_field.context["_user"]
+
+        return super().__call__(serializer_field)

entity/api_v2/serializers.py

@@ -11,6 +11,7 @@
 from rest_framework.exceptions import PermissionDenied, ValidationError
 
 import custom_view
+from airone.lib import drf
 from airone.lib.acl import ACLType
 from airone.lib.drf import DuplicatedObjectExistsError, ObjectNotExistsError, RequiredParameterError
 from airone.lib.log import Logger
@@ -69,7 +70,7 @@ def validate(self, webhook):
 
 
 class EntityAttrCreateSerializer(serializers.ModelSerializer):
-    created_user = serializers.HiddenField(default=serializers.CurrentUserDefault())
+    created_user = serializers.HiddenField(default=drf.AironeUserDefault())
 
     class Meta:
         model = EntityAttr
@@ -361,6 +362,7 @@ def create(self, validated_data: EntityCreateData):
         if user is None:
             raise RequiredParameterError("user is required")
 
+        validated_data["created_user"] = user
         if custom_view.is_custom("before_create_entity_V2"):
             validated_data = custom_view.call_custom(
                 "before_create_entity_v2", None, user, validated_data

entity/api_v2/views.py

@@ -134,10 +134,10 @@ def get_queryset(self):
     def create(self, request, *args, **kwargs):
         user: User = request.user
 
-        serializer = EntityCreateSerializer(data=request.data)
+        serializer = EntityCreateSerializer(data=request.data, context={"_user": user})
         serializer.is_valid(raise_exception=True)
 
-        job = Job.new_create_entity_v2(user, None, params=serializer.validated_data)
+        job = Job.new_create_entity_v2(user, None, params=request.data)
         job.run()
 
         return Response(status=status.HTTP_202_ACCEPTED)

entity/tests/test_api_v2.py

@@ -6,6 +6,7 @@
 import yaml
 from django.conf import settings
 from django.urls import reverse
+from rest_framework import status
 from rest_framework.exceptions import ValidationError
 
 from acl.models import ACLBase
@@ -465,6 +466,9 @@ def test_list_entity_without_permission(self):
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(resp.json()["count"], 2)
 
+    @mock.patch(
+        "entity.tasks.create_entity_v2.delay", mock.Mock(side_effect=tasks.create_entity_v2)
+    )
     def test_create_entity(self):
         params = {
             "name": "entity1",
@@ -493,16 +497,9 @@ def test_create_entity(self):
         }
 
         resp = self.client.post("/entity/api/v2/", json.dumps(params), "application/json")
-        self.assertEqual(resp.status_code, 201)
+        self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
 
-        entity: Entity = Entity.objects.get(id=resp.json()["id"])
-        self.assertEqual(
-            resp.json(),
-            {
-                "id": entity.id,
-                "name": "entity1",
-            },
-        )
+        entity: Entity = Entity.objects.get(name=params["name"])
         self.assertEqual(entity.name, "entity1")
         self.assertEqual(entity.note, "hoge")
         self.assertEqual(entity.status, Entity.STATUS_TOP_LEVEL)
@@ -1246,6 +1243,9 @@ def test_create_entity_with_invalid_param_webhooks(self):
             },
         )
 
+    @mock.patch(
+        "entity.tasks.create_entity_v2.delay", mock.Mock(side_effect=tasks.create_entity_v2)
+    )
     def test_create_entity_with_attrs_referral(self):
         params = {
             "name": "entity1",
@@ -1261,25 +1261,33 @@ def test_create_entity_with_attrs_referral(self):
         }
 
         resp = self.client.post("/entity/api/v2/", json.dumps(params), "application/json")
+        self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
 
-        entity: Entity = Entity.objects.get(id=resp.json()["id"])
+        entity: Entity = Entity.objects.get(name=params["name"])
         for entity_attr in entity.attrs.all():
             if entity_attr.type & AttrTypeValue["object"]:
                 self.assertEqual([x.id for x in entity_attr.referral.all()], [self.ref_entity.id])
             else:
                 self.assertEqual([x.id for x in entity_attr.referral.all()], [])
 
+    @mock.patch(
+        "entity.tasks.create_entity_v2.delay", mock.Mock(side_effect=tasks.create_entity_v2)
+    )
     def test_create_entity_with_webhook_is_verified(self):
         params = {
             "name": "entity1",
             "webhooks": [{"url": "http://example.net/"}, {"url": "http://hoge.hoge/"}],
         }
         resp = self.client.post("/entity/api/v2/", json.dumps(params), "application/json")
-        entity: Entity = Entity.objects.get(id=resp.json()["id"])
+        self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
+        entity: Entity = Entity.objects.get(name=params["name"])
         self.assertEqual([x.is_verified for x in entity.webhooks.all()], [True, False])
 
     @mock.patch("custom_view.is_custom", mock.Mock(return_value=True))
     @mock.patch("custom_view.call_custom")
+    @mock.patch(
+        "entity.tasks.create_entity_v2.delay", mock.Mock(side_effect=tasks.create_entity_v2)
+    )
     def test_create_entity_with_customview(self, mock_call_custom):
         params = {"name": "hoge"}
 
@@ -1297,7 +1305,7 @@ def side_effect(handler_name, entity_name, user, *args):
             self.assertEqual(user, self.user)
 
             if handler_name == "before_create_entity_v2":
-                self.assertEqual(
+                self.assertDictEqual(
                     args[0],
                     {
                         "name": "hoge",
@@ -1315,7 +1323,7 @@ def side_effect(handler_name, entity_name, user, *args):
 
         mock_call_custom.side_effect = side_effect
         resp = self.client.post("/entity/api/v2/", json.dumps(params), "application/json")
-        self.assertEqual(resp.status_code, 201)
+        self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
         self.assertTrue(mock_call_custom.called)
 
     def test_create_entity_with_webhook_is_disabled(self):

job/models.py

@@ -544,7 +544,6 @@ def new_invoke_trigger(kls, user, target_entry, recv_attrs={}, dependent_job=Non
 
     @classmethod
     def new_create_entity_v2(kls, user, target, text="", params={}):
-        print(params)
         return kls._create_new_job(
             user,
             target,