Merge pull request #206 from cmu-delphi/development

Development

Author: dmytrotsko

src/indicatorsets/resources.py

@@ -111,6 +111,11 @@ def strip_all_string_values(row) -> None:
             row[key] = value.strip()
 
 
+def process_data_use_terms(row) -> None:
+    if not row["Data Use Terms"]:
+        row["Data Use Terms"] = "None found"
+
+
 class IndicatorSetResource(resources.ModelResource):
     name = Field(attribute="name", column_name="Indicator Set name* ")
     short_name = Field(attribute="short_name", column_name="Indicator Set Short Name")
@@ -260,6 +265,7 @@ def before_import_row(self, row, **kwargs):
         process_severity_pyramid_rungs(row)
         process_pathogens(row)
         process_available_geographies(row)
+        process_data_use_terms(row)
 
     def after_save_instance(self, instance, row, **kwargs):
         instance.source_type = (
@@ -405,6 +411,7 @@ def before_import_row(self, row, **kwargs):
         process_severity_pyramid_rungs(row)
         process_pathogens(row)
         process_available_geographies(row)
+        process_data_use_terms(row)
 
     def after_save_instance(self, instance, row, **kwargs):
         instance.source_type = "non_delphi"
@@ -467,6 +474,8 @@ class USStateIndicatorSetResource(resources.ModelResource):
     documentation_link = Field(
         attribute="documentation_link", column_name="Link to documentation"
     )
+    license = Field(attribute="license", column_name="Data Use Terms")
+
 
     class Meta:
         model = USStateIndicatorSet
@@ -493,6 +502,7 @@ class Meta:
             "original_data_provider",
             "preprocessing_description",
             "documentation_link",
+            "license",
         )
 
     def skip_row(self, instance, original, row, import_validation_errors=None):
@@ -518,6 +528,7 @@ def before_import_row(self, row, **kwargs):
         process_pathogens(row)
         process_available_geographies(row)
         process_severity_pyramid_rungs(row)
+        process_data_use_terms(row)
 
     def after_save_instance(self, instance, row, **kwargs):
         instance.source_type = "us_state"