additional details from sheet

Signed-off-by: John Seekins <[email protected]>

Author: johnseekins

schemas.py

@@ -56,13 +56,26 @@
             "criminal": 0,
             "non_criminal": 0,
         },
+        "ice_threat_level": {
+            "level_1": 0,
+            "level_2": 0,
+            "level_3": 0,
+            "none": 0,
+        },
     },
     "facility_type": {
         "id": "",
         "description": "",
         "expanded_name": "",
+        "housing": {
+            "mandatory": 0,
+            "guaranteed_min": 0,
+        },
+    },
+    "inspection": {
+        "last_date": None,
+        "last_rating": "",
     },
-    "inspection_date": None,
     "avg_stay_length": 0,
 }
 

scraper.py

@@ -271,13 +271,28 @@ def _load_sheet(self) -> dict:
                     details["population"]["female"]["allowed"] = True
                 else:
                     details["population"]["male"]["allowed"] = True
-            details["facility_type"] = {"id": row["Type Detailed"]}
+            details["population"]["ice_threat_level"] = {
+                "level_1": row["ICE Threat Level 1"],
+                "level_2": row["ICE Threat Level 2"],
+                "level_3": row["ICE Threat Level 3"],
+                "none": row["No ICE Threat Level"],
+            }
+            details["facility_type"] = {
+                "id": row["Type Detailed"],
+                "housing": {
+                    "mandatory": row["Mandatory"],
+                    "guaranteed_min": row["Guaranteed Minimum"],
+                },
+            }
             ft_details = ice_facility_types.get(row["Type Detailed"], {})
             if ft_details:
                 details["facility_type"]["description"] = ft_details["description"]
                 details["facility_type"]["expanded_name"] = ft_details["expanded_name"]
             details["avg_stay_length"] = row["FY25 ALOS"]
-            details["inspection_date"] = row["Last Inspection End Date"]
+            details["inspection"] = {
+                "last_date": row["Last Inspection End Date"],
+                "last_rating": row["Last Final Rating"],
+            }
             details["source_urls"].append(self.sheet_url)
             details["address_str"] = full_address
             details["field_office"] = default_field_office