Merge pull request #390 from PolicyEngine/daphnehanse11/issue388

Fix last SSN Issues

Author: MaxGhenis

changelog_entry.yaml

@@ -0,0 +1,4 @@
+- bump: patch
+  changes:
+    fixed:
+    - Clean up immigration status PR.

policyengine_us_data/datasets/cps/cps.py

@@ -66,6 +66,7 @@ def generate(self):
             cps,
             person,
             spm_unit,
+            self.time_period,
             undocumented_target=13e6,
             undocumented_workers_target=8.3e6,
             undocumented_students_target=0.21 * 1.9e6,
@@ -706,6 +707,7 @@ def add_ssn_card_type(
     cps: h5py.File,
     person: pd.DataFrame,
     spm_unit: pd.DataFrame,
+    time_period: int,
     undocumented_target: float = 13e6,
     undocumented_workers_target: float = 8.3e6,
     undocumented_students_target: float = 0.21 * 1.9e6,
@@ -1390,8 +1392,7 @@ def get_arrival_year_midpoint(peinusyr):
 
     # Calculate arrival years once for all logic
     arrival_years = get_arrival_year_midpoint(person.PEINUSYR)
-    CURRENT_YEAR = 2024
-    years_in_us = CURRENT_YEAR - arrival_years
+    years_in_us = time_period - arrival_years
     age_at_entry = np.maximum(0, person.A_AGE - years_in_us)
 
     # start every non-citizen as LPR so no UNSET survives
@@ -1414,10 +1415,11 @@ def get_arrival_year_midpoint(peinusyr):
 
     # 3. Cuban / Haitian entrants (created by Congress in 1980)
     # Only those who arrived after 1980
+    CUBAN_HAITIAN_ARRIVAL_CUTOFF = 1980
     cuban_haitian_mask = (
         (ssn_card_type != 0)
         & np.isin(birth, list(COUNTRY_CODES["CUBAN_HAITIAN"]))
-        & (arrival_years >= 1980)
+        & (arrival_years >= CUBAN_HAITIAN_ARRIVAL_CUTOFF)
     )
     immigration_status[cuban_haitian_mask] = "CUBAN_HAITIAN_ENTRANT"
 
@@ -1446,19 +1448,6 @@ def get_arrival_year_midpoint(peinusyr):
     )
     immigration_status[mask] = "TPS"
 
-    # ---------------------------------------------------------------
-    # Map custom labels into Enum-approved buckets
-    placeholder_to_specific_status = {
-        "TEMP_NONQUALIFIED": "TPS",
-    }
-    needs_translation = np.isin(
-        immigration_status, list(placeholder_to_specific_status.keys())
-    )
-    immigration_status[needs_translation] = (
-        pd.Series(immigration_status[needs_translation])
-        .replace(placeholder_to_specific_status)
-        .values
-    )
     # Final write (all values now in ImmigrationStatus Enum)
     cps["immigration_status"] = immigration_status.astype("S")
     # ============================================================================