SFR-479 Add Claimants to ElasticSearch index

This adds a full `Claimant` object to the ElasticSearch index, including the `claimant_type` field which helps users see the specific relationship a claimant has to a renewal. It would be good to provide translations of these codes in the future, but this is not currently necessary.

esIndexer.py

@@ -20,7 +20,8 @@ from model.registration import Registration as dbRegistration
 from model.elastic import (
     CCE,
     Registration,
-    Renewal
+    Renewal,
+    Claimant
 )
 
 
@@ -143,9 +144,11 @@ class ESRen():
         self.renewal = Renewal(meta={'id': self.dbRen.renewal_num})
 
     def indexRen(self):
+        self.renewal.uuid = self.dbRen.uuid
         self.renewal.rennum = self.dbRen.renewal_num
         self.renewal.rendate = self.dbRen.renewal_date
         self.renewal.title = self.dbRen.title
         self.renewal.claimants = [
-            c.name for c in self.dbRen.claimants
+            Claimant(name=c.name, claim_type=c.claimant_type)
+            for c in self.dbRen.claimants
         ]

model/elastic.py

@@ -31,11 +31,18 @@ class Registration(BaseInner):
     regdate = Date()
 
 
+class Claimant(BaseInner):
+    name = Text(fields={'keyword': Keyword()})
+    claim_type = Keyword()
+
+
 class Renewal(BaseDoc):
+    uuid = Keyword(store=True)
     rennum = Keyword()
     rendate = Date()
     title = Text(fields={'keyword': Keyword()})
-    claimants = Text(multi=True)
+    
+    claimants = Nested(Claimant)
 
     class Index:
         with open('config.yaml', 'r') as yamlFile: