RECORDS: can_delete fix for item and patron tyspes

* FIX Fixes es query for finding item and patron types links closes #227 Signed-off-by: Aly Badr <[email protected]>
rero · Mar 25, 2019 · 0d66a54 · 0d66a54
1 parent a954f7a
commit 0d66a54
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 30 deletions.
diff --git a/rero_ils/modules/item_types/api.py b/rero_ils/modules/item_types/api.py
@@ -28,6 +28,7 @@
 
 from functools import partial
 
+from elasticsearch_dsl import Q
 from invenio_search.api import RecordsSearch
 
 from .models import ItemTypeIdentifier
@@ -65,19 +66,6 @@ class ItemType(IlsRecord):
     fetcher = item_type_id_fetcher
     provider = ItemTypeProvider
 
-    # @property
-    # def can_delete(self):
-    #     """Record can be deleted."""
-    #     from ..documents_items.api import DocumentsSearch
-
-    #     search = (
-    #         DocumentsSearch()
-    #         .filter('term', **{'itemslist.item_type_pid': self.pid})
-    #         .source()
-    #         .scan()
-    #     )
-    #     return search.count() == 0
-
     @classmethod
     def get_pid_by_name(cls, name):
         """Get pid by name."""
@@ -123,7 +111,18 @@ def get_number_of_items(self):
     def get_number_of_circ_policies(self):
         """Get number of circulation policies."""
         results = CircPoliciesSearch().filter(
-            'term', settings__patron_type__pid=self.pid).source().count()
+            'nested',
+            path='settings',
+            query=Q(
+                'bool',
+                must=[
+                    Q(
+                        'match',
+                        settings__item_type__pid=self.pid
+                    )
+                ]
+            )
+        ).source().count()
         return results
 
     def get_links_to_me(self):

diff --git a/rero_ils/modules/patron_types/api.py b/rero_ils/modules/patron_types/api.py
@@ -28,6 +28,7 @@
 
 from functools import partial
 
+from elasticsearch_dsl import Q
 from invenio_search.api import RecordsSearch
 
 from .models import PatronTypeIdentifier
@@ -66,21 +67,6 @@ class PatronType(IlsRecord):
     fetcher = patron_type_id_fetcher
     provider = PatronTypeProvider
 
-    # @property
-    # def can_delete(self):
-    #     """Record can be deleted."""
-    #     from ..patrons.api import PatronsSearch
-
-    #     count = len(
-    #         list(
-    #             PatronsSearch()
-    #             .filter('term', **{'patron_type_pid': self.pid})
-    #             .source()
-    #             .scan()
-    #         )
-    #     )
-    #     return count == 0
-
     @classmethod
     def exist_name_and_organisation_pid(cls, name, organisation_pid):
         """Check if the name is unique on organisation."""
@@ -106,7 +92,18 @@ def get_number_of_patrons(self):
     def get_number_of_circ_policies(self):
         """Get number of circulation policies."""
         results = CircPoliciesSearch().filter(
-            'term', settings__item_type__pid=self.pid).source().count()
+            'nested',
+            path='settings',
+            query=Q(
+                'bool',
+                must=[
+                    Q(
+                        'match',
+                        settings__patron_type__pid=self.pid
+                    )
+                ]
+            )
+        ).source().count()
         return results
 
     def get_links_to_me(self):