Merge pull request #678 from 18F/jw-nibrs-count-fix_labels

Adds Column for missing NIBRS Location

crime_data/common/cdemodels.py

@@ -939,7 +939,7 @@ def get(ori=None):
     construction_site = db.Column(db.Integer)
     cyberspace = db.Column(db.Integer)
     daycare_facility = db.Column(db.Integer)
-    department__discount_store = db.Column(db.Integer)
+    department__discout_store = db.Column(db.Integer)
     dock__wharf__shipping_terminal = db.Column(db.Integer)
     drug_store__doctors_office__hospital = db.Column(db.Integer)
     farm_facility = db.Column(db.Integer)
@@ -967,6 +967,7 @@ def get(ori=None):
     shopping_mall = db.Column(db.Integer)
     specialty_store = db.Column(db.Integer)
     tribal_lands = db.Column(db.Integer)
+    convenience_store = db.Column(db.Integer)
     data_year = db.Column(db.Integer)
 
 NIBRSAgencyVictimDenormLocation_index = Index('ori_index_nibrs_agency_denorm_victim_location', NIBRSAgencyVictimDenormLocation.ori)
@@ -1127,7 +1128,7 @@ def get(state_abbr=None):
     construction_site = db.Column(db.Integer)
     cyberspace = db.Column(db.Integer)
     daycare_facility = db.Column(db.Integer)
-    department__discount_store = db.Column(db.Integer)
+    department__discout_store = db.Column(db.Integer)
     dock__wharf__shipping_terminal = db.Column(db.Integer)
     drug_store__doctors_office__hospital = db.Column(db.Integer)
     farm_facility = db.Column(db.Integer)
@@ -1155,6 +1156,7 @@ def get(state_abbr=None):
     shopping_mall = db.Column(db.Integer)
     specialty_store = db.Column(db.Integer)
     tribal_lands = db.Column(db.Integer)
+    convenience_store = db.Column(db.Integer)
     data_year = db.Column(db.Integer)
 
 class NIBRSNationalVictimDenormCount(db.Model):
@@ -1252,7 +1254,7 @@ class NIBRSNationalVictimDenormLocation(db.Model):
     construction_site = db.Column(db.Integer)
     cyberspace = db.Column(db.Integer)
     daycare_facility = db.Column(db.Integer)
-    department__discount_store = db.Column(db.Integer)
+    department__discout_store = db.Column(db.Integer)
     dock__wharf__shipping_terminal = db.Column(db.Integer)
     drug_store__doctors_office__hospital = db.Column(db.Integer)
     farm_facility = db.Column(db.Integer)
@@ -1280,6 +1282,7 @@ class NIBRSNationalVictimDenormLocation(db.Model):
     shopping_mall = db.Column(db.Integer)
     specialty_store = db.Column(db.Integer)
     tribal_lands = db.Column(db.Integer)
+    convenience_store = db.Column(db.Integer)
     data_year = db.Column(db.Integer)
 
 

dba/create_new/offender_nibrs_rollup_mv.sql

@@ -55,7 +55,7 @@ coalesce(sum(case when age_range = '60-69' then count end), 0) as range_60_69,
 coalesce(sum(case when age_range = '70-79' then count end), 0) as range_70_79,
 coalesce(sum(case when age_range = '80-89' then count end), 0) as range_80_89,
 coalesce(sum(case when age_range = '90-99' then count end), 0) as range_90_99,
-coalesce(sum(case when age_range = 'Unknown' then count end), 0) as unknown
+coalesce(sum(case when age_range = 'UNKNOWN' then count end), 0) as unknown
 from public.nibrs_offender_count group by state_id, state_abbr, offense_name, data_year;
 
 
@@ -111,7 +111,7 @@ coalesce(sum(case when age_range = '60-69' then count end), 0) as range_60_69,
 coalesce(sum(case when age_range = '70-79' then count end), 0) as range_70_79,
 coalesce(sum(case when age_range = '80-89' then count end), 0) as range_80_89,
 coalesce(sum(case when age_range = '90-99' then count end), 0) as range_90_99,
-coalesce(sum(case when age_range = 'Unknown' then count end), 0) as unknown
+coalesce(sum(case when age_range = 'UNKNOWN' then count end), 0) as unknown
 from public.nibrs_offender_count group by offense_name, data_year;
 
 CREATE MATERIALIZED VIEW nibrs_agency_denorm_offender_sex AS
@@ -171,7 +171,7 @@ coalesce(sum(case when age_range = '60-69' then count end), 0) as range_60_69,
 coalesce(sum(case when age_range = '70-79' then count end), 0) as range_70_79,
 coalesce(sum(case when age_range = '80-89' then count end), 0) as range_80_89,
 coalesce(sum(case when age_range = '90-99' then count end), 0) as range_90_99,
-coalesce(sum(case when age_range = 'Unknown' then count end), 0) as unknown
+coalesce(sum(case when age_range = 'UNKNOWN' then count end), 0) as unknown
 from public.nibrs_offender_count group by agency_id, ori, offense_name, data_year;
 
 REFRESH MATERIALIZED VIEW public.nibrs_agency_denorm_offender_age;