Finished patch-work to be able to invoke Trigger when named_object typed Attribute was changed via creating, editing and reverting processing of APIv1

Author: userlocalhost

entry/models.py

@@ -2385,9 +2385,12 @@ def _get_value(attrname, attrtype, value):
                 return [_get_value(attrname, attrtype, x) for x in value]
 
             elif attrtype & AttrTypeValue["named"]:
-                [co_value] = list(value.values())
+                [name, ref] = list(value.keys()) + list(value.values())
 
-                return co_value["id"] if co_value else None
+                return {
+                    "id": ref["id"] if ref else None,
+                    "name": name,
+                }
 
             elif attrtype & AttrTypeValue["object"]:
                 return value["id"] if value else None

entry/tests/test_view.py

@@ -7,6 +7,7 @@
 
 import yaml
 from django.conf import settings
+from django.db.models import Q
 from django.http import HttpResponse
 from django.http.response import JsonResponse
 from django.urls import reverse
@@ -4926,45 +4927,61 @@ def test_invoke_trigger_by_revert_attrv(self):
             user,
             "Entity",
             [
-                {"name": "cond", "type": AttrTypeValue["string"]},
+                {"name": "cond_str", "type": AttrTypeValue["string"]},
+                {"name": "cond_name", "type": AttrTypeValue["named_object"]},
                 {"name": "action", "type": AttrTypeValue["string"]},
             ],
         )
-        entry = self.add_entry(
-            user,
-            "TestEntry",
-            entity,
-            values={
-                "cond": "hoge",
-            },
-        )
-
-        # changed value to retrieve
-        changing_attr = entry.attrs.get(name="cond")
-        changing_attr.add_value(user, "changed")
 
         # register TriggerAction configuration before creating an Entry
         TriggerCondition.register(
             entity,
-            [{"attr_id": entity.attrs.get(name="cond").id, "cond": "hoge"}],
+            [{"attr_id": entity.attrs.get(name="cond_str").id, "cond": "hoge"}],
             [{"attr_id": entity.attrs.get(name="action").id, "value": "fuga"}],
         )
-
-        # send request to revert attribute value of "cond"
-        revert_attrv = changing_attr.values.filter(value="hoge").last()
-        params = {"attr_id": str(changing_attr.id), "attrv_id": str(revert_attrv.id)}
-        resp = self.client.post(
-            reverse("entry:revert_attrv"), json.dumps(params), "application/json"
+        TriggerCondition.register(
+            entity,
+            [{"attr_id": entity.attrs.get(name="cond_name").id, "cond": "foo"}],
+            [{"attr_id": entity.attrs.get(name="action").id, "value": "fuga"}],
         )
-        self.assertEqual(resp.status_code, 200)
 
-        # This check that Attribute value of "action" would be updated by TriggerAction
-        self.assertEqual(entry.get_attrv("action").value, "fuga")
+        # changed value to retrieve
+        testing_params = [
+            ("cond_str", "hoge", "changed", Q(value="hoge")),
+            (
+                "cond_name",
+                {"name": "foo", "id": None},
+                {"name": "changed", "id": None},
+                Q(value="foo"),
+            ),
+        ]
+        for index, (attrname, initial_value, changed_value, query) in enumerate(testing_params):
+            entry = self.add_entry(
+                user,
+                "TestEntry",
+                entity,
+                values={
+                    attrname: initial_value,
+                },
+            )
+            changing_attr = entry.attrs.get(name=attrname)
+            changing_attr.add_value(user, changed_value)
 
-        # check trigger action was worked properly
-        job_query = Job.objects.filter(operation=JobOperation.MAY_INVOKE_TRIGGER)
-        self.assertEqual(job_query.count(), 1)
-        self.assertEqual(job_query.first().status, JobStatus.DONE)
+            # send request to revert attribute value of "cond"
+            revert_attrv = changing_attr.values.filter(query).last()
+            params = {"attr_id": str(changing_attr.id), "attrv_id": str(revert_attrv.id)}
+            resp = self.client.post(
+                reverse("entry:revert_attrv"), json.dumps(params), "application/json"
+            )
+            self.assertEqual(resp.status_code, 200)
+
+            # This check that Attribute value of "action" would be updated by TriggerAction
+            self.assertEqual(entry.get_attrv("action").value, "fuga")
+
+            # check trigger action was worked properly
+            job_query = Job.objects.filter(operation=JobOperation.MAY_INVOKE_TRIGGER)
+            self.assertEqual(job_query.count(), 1 + index)
+            self.assertEqual(job_query.last().status, JobStatus.DONE)
 
     def test_revert_attrv_with_invalid_value(self):
         user = self.guest_login()

trigger/models.py

@@ -451,10 +451,10 @@ def get_invoked_actions(cls, entity: Entity, recv_data: list):
                     # for naemd_object typed Attribute
                     v = [
                         {
-                            "index": v["index"],
+                            "index": v["index"] if v else "0",
                             "data": {
-                                "name": r["data"],
-                                "id": v["data"],
+                                "name": r["data"] if r else "",
+                                "id": v["data"] if v else None,
                             },
                         }
                         for (v, r) in itertools.zip_longest(