Merge pull request #1763 from wittejm/restitution

Restitution

Author: wittejm

src/backend/expungeservice/charges_summarizer.py

@@ -38,7 +38,7 @@ def _primary_sort(charge: Charge, record: Record):
 
         '''
             Order is:
-            0 Needs More Analysis
+            0 Needs More Analysis / Restitution Owed
             1 Ineligible
             2 Eligible Now
             3 Eligible on case with Ineligible charge
@@ -56,7 +56,7 @@ def _primary_sort(charge: Charge, record: Record):
             label = charge_eligibility.label
             has_balance = this_case.summary.balance_due_in_cents != 0
 
-            if label == "Needs More Analysis":
+            if label == "Needs More Analysis" or label == "Ineligible If Restitution Owed":
                 return 0, label, charge.case_number
             elif label == "Ineligible":
                 return 1, label, charge.case_number

src/backend/expungeservice/crawler/crawler.py

@@ -89,6 +89,7 @@ def _read_case(session: Session, case_summary: CaseSummary) -> OeciCase:
         case_parser_data = Crawler._parse_case(session, case_summary)
         district_attorney_number = case_parser_data.district_attorney_number
         sid = case_parser_data.sid
+        resitution = case_parser_data.restitution
         balance_due_in_cents = CaseCreator.compute_balance_due_in_cents(case_parser_data.balance_due)
         charges: List[OeciCharge] = []
         for charge_id, charge_dict in case_parser_data.hashed_charge_data.items():
@@ -102,6 +103,7 @@ def _read_case(session: Session, case_summary: CaseSummary) -> OeciCase:
             district_attorney_number=district_attorney_number,
             sid=sid,
             balance_due_in_cents=balance_due_in_cents,
+            restitution=resitution,
             edit_status=EditStatus.UNCHANGED,
         )
         return OeciCase(updated_case_summary, charges=tuple(charges))

src/backend/expungeservice/crawler/parsers/case_parser.py

@@ -22,6 +22,7 @@ class CaseParserData:
     hashed_charge_data: Dict[int, Dict[str, str]]
     hashed_dispo_data: Dict[int, Dict[str, str]]
     balance_due: str
+    restitution: bool
     probation_revoked: Optional[date]
 
 
@@ -41,8 +42,9 @@ def feed(data) -> CaseParserData:
             probation_revoked = date.fromdatetime(datetime.strptime(probation_revoked_date_string, "%m/%d/%Y"))
         else:
             probation_revoked = None  # type: ignore
+        restitution = "restitution" in soup.text.lower()
         return CaseParserData(
-            district_attorney_number, sid, hashed_charge_data, hashed_dispo_data, balance_due, probation_revoked
+            district_attorney_number, sid, hashed_charge_data, hashed_dispo_data, balance_due, restitution, probation_revoked
         )
 
     @staticmethod

src/backend/expungeservice/crawler/parsers/record_parser.py

@@ -83,6 +83,8 @@ def __record_case(self):
                 self.date_location,
                 self.type_status,
                 self.case_detail_link,
+                False,
+                "0"
             )
         )
 

src/backend/expungeservice/demo_records.py

@@ -50,6 +50,7 @@ def build_search_results(
         "date": date_class.today(),
         "district_attorney_number": "01234567",
         "sid": "OR12345678",
+        "restitution": False
     }
     shared_charge_data = {
         "balance_due_in_cents": 0,

src/backend/expungeservice/models/case.py

@@ -22,6 +22,7 @@ class CaseSummary:
     violation_type: str
     current_status: str
     case_detail_link: str
+    restitution: bool
     balance_due_in_cents: int
     edit_status: EditStatus
 
@@ -61,6 +62,7 @@ def empty(case_number: str):
                 current_status="",
                 case_detail_link="",
                 balance_due_in_cents=0,
+                restitution=False,
                 edit_status=EditStatus.UNCHANGED,
             ),
             (),
@@ -112,7 +114,8 @@ def create(
         date_location,
         type_status,
         case_detail_link,
-        balance="0",
+        restitution,
+        balance,
     ) -> CaseSummary:
         name = info[0]
         birth_year = CaseSummary._parse_birth_year(info)
@@ -133,6 +136,7 @@ def create(
             violation_type,
             current_status,
             case_detail_link,
+            restitution,
             balance_due_in_cents,
             EditStatus.UNCHANGED,
         )

src/backend/expungeservice/models/expungement_result.py

@@ -21,6 +21,7 @@ class ChargeEligibilityStatus(str, Enum):
     POSSIBLY_WILL_BE_ELIGIBLE = "Possibly Will Be Eligible"
     INELIGIBLE = "Ineligible"
     NEEDS_MORE_ANALYSIS = "Needs More Analysis"
+    INELIGIBLE_IF_RESTITUTION_OWED = "Ineligible If Restitution Owed"
 
     def __repr__(self):
         return f"{self.__class__.__name__}.{self.name}"

src/backend/expungeservice/record_editor.py

@@ -46,6 +46,8 @@ def _edit_case(case: OeciCase, case_edits) -> Tuple[OeciCase, List[Charge]]:
                 case_summary_edits["balance_due_in_cents"] = CaseCreator.compute_balance_due_in_cents(value)
             elif key == "birth_year":
                 case_summary_edits["birth_year"] = int(value)
+            elif key == "restitution":
+                case_summary_edits["restitution"] = value == "True"
             else:
                 case_summary_edits[key] = value
         edited_summary = replace(case.summary, **case_summary_edits)

src/backend/expungeservice/record_merger.py

@@ -61,6 +61,10 @@ def merge(
                             charge_eligibility,
                             label=f"Eligibility date dependent on open charge: {charge_eligibility.label}",
                         )
+                if case.summary.restitution and charge_eligibility.status != ChargeEligibilityStatus.INELIGIBLE :
+                    charge_eligibility = ChargeEligibility(
+                        ChargeEligibilityStatus.INELIGIBLE_IF_RESTITUTION_OWED, "Ineligible If Restitution Owed"
+                    )
                 expungement_result = ExpungementResult(
                     type_eligibility=merged_type_eligibility,
                     time_eligibility=merged_time_eligibility,

src/backend/expungeservice/serializer.py

@@ -52,6 +52,7 @@ def case_summary_to_json(self, case):
             "case_detail_link": case.case_detail_link,
             "district_attorney_number": case.district_attorney_number,
             "sid": case.sid,
+            "restitution": case.restitution,
             "edit_status": case.edit_status,
         }