Merge pull request #1317 from hinashi/change/edit_entity/update_es

Changed to not update ElasticSearch when editing entity

Author: userlocalhost

entity/tasks.py

@@ -80,11 +80,6 @@ def edit_entity(self, job: Job) -> JobStatus:
         entity.note = recv_data["note"]
         entity.save(update_fields=["note"])
 
-    # This describes job pamraeters of Job.update_es_docuemnt()
-    jp_update_es_document = {
-        "is_updated": True,
-    }
-
     # update processing for each attrs
     deleted_attr_ids = []
     for attr in recv_data["attrs"]:
@@ -156,27 +151,6 @@ def edit_entity(self, job: Job) -> JobStatus:
             # register History to register adding EntityAttr
             history.add_attr(attr_obj)
 
-    Job.new_update_documents(entity, "", jp_update_es_document).run()
-
-    # This job updates elasticsearch not only Entries that are belonged to
-    # the edited Entity, but also Entrie that are refered by Entry, which is
-    # belonged to this Entity.
-    associated_entity_ids = set()
-    for attr in entity.attrs.filter(is_active=True):
-        associated_entity_ids |= set([x.id for x in attr.referral.filter(is_active=True)])
-
-    # This also update es-documents of Entries that are referred by AttributeValues
-    # that are associated with deleted EntityAttrs.
-    for attr_id in deleted_attr_ids:
-        attr = EntityAttr.objects.filter(id=attr_id).last()
-        if attr:
-            associated_entity_ids |= set([x.id for x in attr.referral.filter(is_active=True)])
-
-    # create job to update es-document that is related with edited Entity
-    for related_entity_id in associated_entity_ids:
-        related_entity = Entity.objects.get(id=related_entity_id)
-        Job.new_update_documents(related_entity, "", jp_update_es_document).run()
-
     # clear flag to specify this entity has been completed to edit
     entity.del_status(Entity.STATUS_EDITING)
 
@@ -239,11 +213,6 @@ def edit_entity_v2(self, job: Job) -> JobStatus:
 
     serializer.update_remaining(entity, serializer.validated_data)
 
-    jp_update_es_document = {
-        "is_updated": True,
-    }
-    Job.new_update_documents(entity, "", jp_update_es_document).run()
-
     return JobStatus.DONE
 
 

entity/tests/test_api_v2.py

@@ -12,15 +12,12 @@
 from rest_framework.exceptions import ValidationError
 
 from acl.models import ACLBase
-from airone.lib.elasticsearch import AttrHint
 from airone.lib.log import Logger
 from airone.lib.test import AironeViewTest
 from airone.lib.types import AttrType
 from entity import tasks
 from entity.models import Entity, EntityAttr
-from entry import tasks as entry_tasks
 from entry.models import Entry
-from entry.services import AdvancedSearchService
 from entry.tasks import create_entry_v2
 from group.models import Group
 from role.models import Role
@@ -3628,50 +3625,3 @@ def test_create_entry_when_trigger_is_set(self):
         self.assertEqual(
             [x.value for x in entry.get_attrv("vals").data_array.all()], ["fuga", "piyo"]
         )
-
-    @mock.patch("entity.tasks.edit_entity_v2.delay", mock.Mock(side_effect=tasks.edit_entity_v2))
-    @mock.patch(
-        "entry.tasks.update_es_documents.delay",
-        mock.Mock(side_effect=entry_tasks.update_es_documents),
-    )
-    def test_attr_add_remove_bug(self):
-        user = self.admin_login()
-        self.add_entry(
-            self.user,
-            "test_Entry",
-            self.entity,
-            values={
-                "val": "hoge",
-                "vals": ["hoge"],
-            },
-        )
-        # Get the entity attribute to be deleted
-        entity_attr: EntityAttr = self.entity.attrs.get(name="val", is_active=True)
-        # Prepare parameters to add the attribute back
-        params = {
-            "attrs": [{"id": entity_attr.id, "is_deleted": True}],
-        }
-        # Send a request to delete the specified attribute
-        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)
-
-        params = {
-            "attrs": [
-                {
-                    "name": "val",
-                    "type": AttrType.STRING,
-                },
-            ],
-        }
-        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)
-
-        # Perform a search for entries to verify the state of attributes
-        resp1 = AdvancedSearchService.search_entries(user, [self.entity.id], [AttrHint(name="val")])
-
-        # Validate that the actual value matches the expected value
-        self.assertEqual(resp1.ret_values[0].attrs["val"]["value"], "")

entity/tests/test_view.py

@@ -13,7 +13,6 @@
 from entity.models import Entity, EntityAttr
 from entity.settings import CONFIG
 from entry.models import Attribute, Entry
-from entry.services import AdvancedSearchService
 from entry.tasks import update_es_documents
 from user.models import History, User
 
@@ -620,19 +619,6 @@ def test_post_edit_after_creating_entry(self):
         self.assertEqual(entity.attrs.count(), 3)
         self.assertEqual(entry.attrs.count(), 2)
 
-        res = AdvancedSearchService.search_entries(user, [entity.id], is_output_all=True)
-        self.assertEqual(
-            sorted([x for x in res.ret_values[0].attrs.keys()]), sorted(["foo", "bar", "ref"])
-        )
-
-        # Check the elasticsearch data is also changed when
-        # referred Entity name is changed.
-        res = AdvancedSearchService.search_entries(
-            user, [ref_entity.id], hint_referral="", is_output_all=True
-        )
-        self.assertEqual(res.ret_count, 1)
-        self.assertEqual(res.ret_values[0].referrals[0]["schema"]["name"], "Changed-Entity")
-
     def test_post_edit_attribute_type(self):
         user = self.admin_login()
 
@@ -962,15 +948,6 @@ def test_post_delete_attribute(self):
         self.assertEqual(History.objects.filter(operation=History.MOD_ENTITY).count(), 2)
         self.assertEqual(History.objects.filter(operation=History.DEL_ATTR).count(), 1)
 
-        # Check the elasticsearch data (the referrals parameter) is also removed when
-        # referring EntityAttr is deleted.
-        res = AdvancedSearchService.search_entries(
-            user, [ref_entity.id], hint_referral="", is_output_all=True
-        )
-        self.assertEqual(res.ret_count, 1)
-        self.assertEqual(res.ret_values[0].entry["id"], ref_entry.id)
-        self.assertEqual(res.ret_values[0].referrals, [])
-
         # checks for HistoricalRecord for EntityAttr,
         # it's value must be increased by 1, that are for delete attribute
         self.assertEqual(attr.history.count(), self._test_data["attr_history_count"]["before"] + 1)