Merge pull request #1486 from IFRCGo/feature/index-also-related-ns

Indexing also NS for sharpening visibility

Author: szabozoltan69

api/indexes.py

@@ -8,6 +8,8 @@
             'type': 'keyword',
             'normalizer': 'lowercase'
         },
+        'visibility': {'type': 'text'},
+        'ns': {'type': 'text'},
         'body': {
             'type': 'text',
             'analyzer': 'autocomplete'

api/models.py

@@ -79,6 +79,7 @@ def indexing(self):
             'name': str(self.name.label),
             'keyword': None,
             'visibility': None,
+            'ns': None,
             'body': str(self.name.label),
             'date': None
         }
@@ -225,6 +226,7 @@ def indexing(self):
             'name': self.name,
             'keyword': None,
             'visibility': None,
+            'ns': None,
             'body': '%s %s' % (
                 self.name,
                 self.society_name,
@@ -659,14 +661,16 @@ def end_date(self):
         return max(end_dates) if len(end_dates) else None
 
     def indexing(self):
-        countries = [getattr(c, 'name') for c in self.countries.all()]
+        countries = [c.name for c in self.countries.all()]
+        ns =        [c.id   for c in self.countries.all()]
         return {
             'id': self.id,
             'event_id': self.id,
             'type': 'event',
             'name': self.name,
             'keyword': None,
             'visibility': self.visibility,
+            'ns': ' '.join(map(str, ns)) if len(ns) else None,
             'body': '%s %s' % (
                 self.name,
                 ' '.join(map(str, countries)) if len(countries) else None,
@@ -984,6 +988,7 @@ def indexing(self):
             'name': self.name,
             'keyword': self.code,
             'visibility': self.event.visibility if self.event else None,
+            'ns': self.country_id if self.country else None,
             'body': '%s %s' % (
                 self.name,
                 getattr(self.country, 'name', None)
@@ -1420,13 +1425,15 @@ def save(self, *args, **kwargs):
 
     def indexing(self):
         countries = [c.name for c in self.countries.all()]
+        ns =        [c.id   for c in self.countries.all()]
         return {
             'id': self.id,
             'event_id': self.event_id,
             'type': 'report',
             'name': self.summary,
             'keyword': None,
             'visibility': self.visibility,
+            'ns': ' '.join(map(str, ns)) if len(ns) else None,
             'body': '%s %s' % (
                 self.summary,
                 ' '.join(map(str, countries)) if len(countries) else None