Merge pull request #31 from cid-harvard/feature/msa-year

[COL-664] Add MSAYear API for MSA-level ECI comparison graphs

colombia/api_schemas.py

@@ -117,6 +117,12 @@ class Meta:
                   "department_id")
 
 
+class MSAYearSchema(ma.Schema):
+
+    class Meta:
+        fields = ("year", "eci", "location_id")
+
+
 class OccupationYearSchema(ma.Schema):
 
     class Meta:
@@ -150,5 +156,6 @@ class ColombiaMetadataSchema(MetadataSchema):
 industry_year = IndustryYearSchema(many=True)
 occupation_year = OccupationYearSchema(many=True)
 department_year = DepartmentYearSchema(many=True)
+msa_year = MSAYearSchema(many=True)
 
 metadata = ColombiaMetadataSchema(many=True)

colombia/data/models.py

@@ -159,6 +159,18 @@ class DepartmentYear(BaseModel, IDMixin):
     num_establishments = db.Column(db.Integer)
 
 
+class MSAYear(BaseModel, IDMixin):
+
+    __tablename__ = "msa_year"
+
+    location_id = db.Column(db.Integer, db.ForeignKey(Location.id))
+    year = db.Column(db.Integer)
+
+    location = db.relationship(Location)
+
+    eci = db.Column(db.Float)
+
+
 class XIndustryYear(BaseModel, IDMixin):
 
     __abstract__ = True

colombia/data/views.py

@@ -5,7 +5,7 @@
                      MunicipalityIndustryYear, ProductYear, IndustryYear,
                      DepartmentYear, Location, CountryMunicipalityProductYear,
                      CountryDepartmentProductYear, OccupationYear,
-                     OccupationIndustryYear, CountryDepartmentYear)
+                     OccupationIndustryYear, CountryDepartmentYear, MSAYear)
 from ..api_schemas import marshal
 from .routing import lookup_classification_level
 from .. import api_schemas as schemas
@@ -55,8 +55,11 @@ def get_or_fail(name, dictionary):
     "department": {
         "model": DepartmentYear,
         "schema": schemas.department_year
+    },
+    "msa": {
+        "model": MSAYear,
+        "schema": schemas.msa_year
     }
-    #"municipality" ...
 }
 
 product_year_region_mapping = {

colombia/import.py

@@ -125,6 +125,11 @@
                       chunksize=10000, if_exists="append")
 
 
+            # MSA year
+            df = ret[('location_id', 'year')].reset_index()
+            df.to_sql("msa_year", db.engine, index=False,
+                      chunksize=10000, if_exists="append")
+
             # Municipality - trade rcpy
             ret = process_dataset(trade4digit_rcpy_municipality)
 

colombia/models.py

@@ -5,4 +5,4 @@
                           DepartmentIndustryYear, IndustryYear,
                           MunicipalityIndustryYear, MSAProductYear,
                           MSAIndustryYear, OccupationYear,
-                          OccupationIndustryYear, CountryDepartmentYear)
+                          OccupationIndustryYear, CountryDepartmentYear, MSAYear)