- Updating based on comments.

- Added base class to keep things a little more DRY

tdrs-backend/tdpservice/search_indexes/admin/filter.py

@@ -30,7 +30,7 @@ def choices(self, cl):
 
     def queryset(self, request, queryset):
         """Sort queryset to show latest records."""
-        if self.value() is None and len(queryset):
+        if self.value() is None and queryset.exists():
             max_date = DataFile.objects.all().latest('created_at').created_at
             datafile = DataFile.objects.get(created_at=max_date)
             return queryset.filter(datafile=datafile)

tdrs-backend/tdpservice/search_indexes/documents/document_base.py

@@ -0,0 +1,19 @@
+"""Elasticsearch base document mappings."""
+
+from django_elasticsearch_dsl import fields
+from tdpservice.data_files.models import DataFile
+
+class DocumentBase:
+    """Elastic search model mapping for a parsed SSP M1 data file."""
+
+    datafile = fields.ObjectField(properties={
+                      'pk': fields.IntegerField(),
+                      'created_at': fields.DateField(),
+                      'version': fields.IntegerField(),
+                      'quarter': fields.TextField()
+                  })
+
+    def get_instances_from_related(self, related_instance):
+        """Return correct instance."""
+        if isinstance(related_instance, DataFile):
+            return related_instance

tdrs-backend/tdpservice/search_indexes/documents/ssp.py

@@ -1,26 +1,15 @@
 """Elasticsearch document mappings for SSP submission models."""
 
-from django_elasticsearch_dsl import Document, fields
+from django_elasticsearch_dsl import Document
 from django_elasticsearch_dsl.registries import registry
 from ..models.ssp import SSP_M1, SSP_M2, SSP_M3
 from tdpservice.data_files.models import DataFile
+from .document_base import DocumentBase
 
 @registry.register_document
-class SSP_M1DataSubmissionDocument(Document):
+class SSP_M1DataSubmissionDocument(DocumentBase, Document):
     """Elastic search model mapping for a parsed SSP M1 data file."""
 
-    datafile = fields.ObjectField(properties={
-                      'pk': fields.IntegerField(),
-                      'created_at': fields.DateField(),
-                      'version': fields.IntegerField(),
-                      'quarter': fields.TextField()
-                  })
-
-    def get_instances_from_related(self, related_instance):
-        """Return correct instance."""
-        if isinstance(related_instance, DataFile):
-            return related_instance
-
     class Index:
         """ElasticSearch index generation settings."""
 
@@ -82,22 +71,9 @@ class Django:
 
 
 @registry.register_document
-class SSP_M2DataSubmissionDocument(Document):
+class SSP_M2DataSubmissionDocument(DocumentBase, Document):
     """Elastic search model mapping for a parsed SSP M2 data file."""
 
-    datafile = fields.ObjectField(properties={
-                      'pk': fields.IntegerField(),
-                      'created_at': fields.DateField(),
-                      'version': fields.IntegerField(),
-                      'quarter': fields.TextField()
-                  })
-
-    def get_instances_from_related(self, related_instance):
-        """Return correct instance."""
-        """Return correct instance."""
-        if isinstance(related_instance, DataFile):
-            return related_instance
-
     class Index:
         """ElasticSearch index generation settings."""
 
@@ -183,21 +159,9 @@ class Django:
 
 
 @registry.register_document
-class SSP_M3DataSubmissionDocument(Document):
+class SSP_M3DataSubmissionDocument(DocumentBase, Document):
     """Elastic search model mapping for a parsed SSP M3 data file."""
 
-    datafile = fields.ObjectField(properties={
-                      'pk': fields.IntegerField(),
-                      'created_at': fields.DateField(),
-                      'version': fields.IntegerField(),
-                      'quarter': fields.TextField()
-                  })
-
-    def get_instances_from_related(self, related_instance):
-        """Return correct instance."""
-        if isinstance(related_instance, DataFile):
-            return related_instance
-
     class Index:
         """ElasticSearch index generation settings."""
 

tdrs-backend/tdpservice/search_indexes/documents/tanf.py

@@ -1,26 +1,14 @@
 """Elasticsearch document mappings for TANF submission models."""
 
-from django_elasticsearch_dsl import Document, fields
+from django_elasticsearch_dsl import Document
 from django_elasticsearch_dsl.registries import registry
 from ..models.tanf import TANF_T1, TANF_T2, TANF_T3, TANF_T4, TANF_T5, TANF_T6, TANF_T7
-from tdpservice.data_files.models import DataFile
+from .document_base import DocumentBase
 
 @registry.register_document
-class TANF_T1DataSubmissionDocument(Document):
+class TANF_T1DataSubmissionDocument(DocumentBase, Document):
     """Elastic search model mapping for a parsed TANF T1 data file."""
 
-    datafile = fields.ObjectField(properties={
-                      'pk': fields.IntegerField(),
-                      'created_at': fields.DateField(),
-                      'version': fields.IntegerField(),
-                      'quarter': fields.TextField()
-                  })
-
-    def get_instances_from_related(self, related_instance):
-        """Return correct instance."""
-        if isinstance(related_instance, DataFile):
-            return related_instance
-
     class Index:
         """ElasticSearch index generation settings."""
 
@@ -84,21 +72,9 @@ class Django:
 
 
 @registry.register_document
-class TANF_T2DataSubmissionDocument(Document):
+class TANF_T2DataSubmissionDocument(DocumentBase, Document):
     """Elastic search model mapping for a parsed TANF T2 data file."""
 
-    datafile = fields.ObjectField(properties={
-                      'pk': fields.IntegerField(),
-                      'created_at': fields.DateField(),
-                      'version': fields.IntegerField(),
-                      'quarter': fields.TextField()
-                  })
-
-    def get_instances_from_related(self, related_instance):
-        """Return correct instance."""
-        if isinstance(related_instance, DataFile):
-            return related_instance
-
     class Index:
         """ElasticSearch index generation settings."""
 
@@ -186,21 +162,9 @@ class Django:
 
 
 @registry.register_document
-class TANF_T3DataSubmissionDocument(Document):
+class TANF_T3DataSubmissionDocument(DocumentBase, Document):
     """Elastic search model mapping for a parsed TANF T3 data file."""
 
-    datafile = fields.ObjectField(properties={
-                      'pk': fields.IntegerField(),
-                      'created_at': fields.DateField(),
-                      'version': fields.IntegerField(),
-                      'quarter': fields.TextField()
-                  })
-
-    def get_instances_from_related(self, related_instance):
-        """Return correct instance."""
-        if isinstance(related_instance, DataFile):
-            return related_instance
-
     class Index:
         """ElasticSearch index generation settings."""
 
@@ -240,21 +204,9 @@ class Django:
 
 
 @registry.register_document
-class TANF_T4DataSubmissionDocument(Document):
+class TANF_T4DataSubmissionDocument(DocumentBase, Document):
     """Elastic search model mapping for a parsed TANF T4 data file."""
 
-    datafile = fields.ObjectField(properties={
-                      'pk': fields.IntegerField(),
-                      'created_at': fields.DateField(),
-                      'version': fields.IntegerField(),
-                      'quarter': fields.TextField()
-                  })
-
-    def get_instances_from_related(self, related_instance):
-        """Return correct instance."""
-        if isinstance(related_instance, DataFile):
-            return related_instance
-
     class Index:
         """ElasticSearch index generation settings."""
 
@@ -287,21 +239,9 @@ class Django:
 
 
 @registry.register_document
-class TANF_T5DataSubmissionDocument(Document):
+class TANF_T5DataSubmissionDocument(DocumentBase, Document):
     """Elastic search model mapping for a parsed TANF T5 data file."""
 
-    datafile = fields.ObjectField(properties={
-                      'pk': fields.IntegerField(),
-                      'created_at': fields.DateField(),
-                      'version': fields.IntegerField(),
-                      'quarter': fields.TextField()
-                  })
-
-    def get_instances_from_related(self, related_instance):
-        """Return correct instance."""
-        if isinstance(related_instance, DataFile):
-            return related_instance
-
     class Index:
         """ElasticSearch index generation settings."""
 
@@ -350,21 +290,9 @@ class Django:
 
 
 @registry.register_document
-class TANF_T6DataSubmissionDocument(Document):
+class TANF_T6DataSubmissionDocument(DocumentBase, Document):
     """Elastic search model mapping for a parsed TANF T6 data file."""
 
-    datafile = fields.ObjectField(properties={
-                      'pk': fields.IntegerField(),
-                      'created_at': fields.DateField(),
-                      'version': fields.IntegerField(),
-                      'quarter': fields.TextField()
-                  })
-
-    def get_instances_from_related(self, related_instance):
-        """Return correct instance."""
-        if isinstance(related_instance, DataFile):
-            return related_instance
-
     class Index:
         """ElasticSearch index generation settings."""
 
@@ -402,21 +330,9 @@ class Django:
 
 
 @registry.register_document
-class TANF_T7DataSubmissionDocument(Document):
+class TANF_T7DataSubmissionDocument(DocumentBase, Document):
     """Elastic search model mapping for a parsed TANF T7 data file."""
 
-    datafile = fields.ObjectField(properties={
-                      'pk': fields.IntegerField(),
-                      'created_at': fields.DateField(),
-                      'version': fields.IntegerField(),
-                      'quarter': fields.TextField()
-                  })
-
-    def get_instances_from_related(self, related_instance):
-        """Return correct instance."""
-        if isinstance(related_instance, DataFile):
-            return related_instance
-
     class Index:
         """ElasticSearch index generation settings."""
 

tdrs-backend/tdpservice/search_indexes/test/test_model_mapping.py

@@ -373,6 +373,7 @@ def test_can_create_and_index_tanf_t7_submission(test_datafile):
 
     submission.save()
 
+    # No checks her because t7 records can't be parsed currently.
     # assert submission.id is not None
 
     # search = documents.tanf.TANF_T7DataSubmissionDocument.search().query(