Towns relationship: include related towns to searches

4 files changed, 101 insertions, 1 deletions

diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py
index 4a64ccd12..b0f4b8f9e 100644
--- a/archaeological_context_records/tests.py
+++ b/archaeological_context_records/tests.py
@@ -413,6 +413,44 @@ class ContextRecordSearchTest(ContextRecordInit, TestCase):
         models.RecordRelations.objects.create(
             left_record=cr_1, right_record=cr_2, relation_type=sym_rel_type)
 
+    def test_town_search(self):
+        c = Client()
+        c.login(username=self.username, password=self.password)
+
+        data = {'numero_insee': '98989', 'name': 'base_town'}
+        base_town = self.create_towns(datas=data)[-1]
+
+        parcel = self.create_parcel(data={'town': base_town,
+                                    'section': 'A', 'parcel_number': '1'})[-1]
+        self.context_records[0].parcel = parcel
+        self.context_records[0].save()
+
+        data = {'numero_insee': '56789', 'name': 'parent_town'}
+        parent_town = self.create_towns(datas=data)[-1]
+        parent_town.children.add(base_town)
+
+        data = {'numero_insee': '01234', 'name': 'child_town'}
+        child_town = self.create_towns(datas=data)[-1]
+        base_town.children.add(child_town)
+
+        # simple search
+        search = {'parcel__town': base_town.pk}
+        response = c.get(reverse('get-contextrecord'), search)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(json.loads(response.content)['total'], 1)
+
+        # parent search
+        search = {'parcel__town': parent_town.pk}
+        response = c.get(reverse('get-contextrecord'), search)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(json.loads(response.content)['total'], 1)
+
+        # child search
+        search = {'parcel__town': child_town.pk}
+        response = c.get(reverse('get-contextrecord'), search)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(json.loads(response.content)['total'], 1)
+
     def testSearchExport(self):
         c = Client()
         response = c.get(reverse('get-contextrecord'))
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 91050dc1f..9d99ed67d 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -1119,6 +1119,42 @@ class OperationSearchTest(TestCase, OperationInitTest):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(json.loads(response.content)['total'], 1)
 
+    def test_town_search(self):
+        c = Client()
+        c.login(username=self.username, password=self.password)
+
+        data = {'numero_insee': '98989', 'name': 'base_town'}
+        base_town = self.create_towns(datas=data)[-1]
+
+        data = {'numero_insee': '56789', 'name': 'parent_town'}
+        parent_town = self.create_towns(datas=data)[-1]
+        parent_town.children.add(base_town)
+
+        data = {'numero_insee': '01234', 'name': 'child_town'}
+        child_town = self.create_towns(datas=data)[-1]
+        base_town.children.add(child_town)
+
+        ope = self.operations[1]
+        ope.towns.add(base_town)
+
+        # simple search
+        search = {'towns': base_town.pk}
+        response = c.get(reverse('get-operation'), search)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(json.loads(response.content)['total'], 1)
+
+        # parent search
+        search = {'towns': parent_town.pk}
+        response = c.get(reverse('get-operation'), search)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(json.loads(response.content)['total'], 1)
+
+        # child search
+        search = {'towns': child_town.pk}
+        response = c.get(reverse('get-operation'), search)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(json.loads(response.content)['total'], 1)
+
     def testOwnSearch(self):
         c = Client()
         response = c.get(reverse('get-operation'), {'year': '2010'})
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index 349408465..8a951b29a 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -1046,6 +1046,15 @@ class IshtarBasicTest(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertIn('class="sheet"', response.content)
 
+    def test_town_cache(self):
+        models.Town.objects.create(name="Sin City", numero_insee="99999")
+        town = models.Town.objects.get(numero_insee="99999")
+        self.assertEqual(town.cached_label, "Sin City - 99")
+        town.year = 2050
+        town.save()
+        town = models.Town.objects.get(numero_insee="99999")
+        self.assertEqual(town.cached_label, "Sin City - 99 (2050)")
+
 
 class GeomaticTest(TestCase):
     def test_post_save_point(self):
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 6652ba6a9..b8350c62a 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -815,6 +815,23 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
                     dct.pop(k)
         # manage hierarchic conditions
         for req in dct.copy():
+            if req.endswith('town__pk') or req.endswith('towns__pk'):
+                val = dct.pop(req)
+                reqs = Q(**{req: val})
+                base_req = req[:-2] + '__'
+                req = base_req[:]
+                for idx in range(HIERARCHIC_LEVELS):
+                    req = req[:-2] + 'parents__pk'
+                    q = Q(**{req: val})
+                    reqs |= q
+                req = base_req[:]
+                for idx in range(HIERARCHIC_LEVELS):
+                    req = req[:-2] + 'children__pk'
+                    q = Q(**{req: val})
+                    reqs |= q
+                and_reqs.append(reqs)
+                continue
+
             for k_hr in HIERARCHIC_FIELDS:
                 if type(req) in (list, tuple):
                     val = dct.pop(req)
@@ -830,7 +847,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
                     val = dct.pop(req)
                     reqs = Q(**{req: val})
                     req = req[:-2] + '__'
-                    for idx in xrange(HIERARCHIC_LEVELS):
+                    for idx in range(HIERARCHIC_LEVELS):
                         req = req[:-2] + 'parent__pk'
                         q = Q(**{req: val})
                         reqs |= q