Skip to content

Commit

Permalink
Merge pull request #1595 from KentShikama/fix-mj-eligible
Browse files Browse the repository at this point in the history
Ensure MJ Eligible is reclassified as a Class C Felony
  • Loading branch information
KentShikama authored Feb 7, 2022
2 parents 5092bec + bcfb286 commit c516d77
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
13 changes: 12 additions & 1 deletion src/backend/expungeservice/expunger.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
from expungeservice.models.charge import Charge, EditStatus
from expungeservice.models.charge_types.felony_class_b import FelonyClassB
from expungeservice.models.charge_types.juvenile_charge import JuvenileCharge
from expungeservice.models.charge_types.marijuana_eligible import MarijuanaUnder21, MarijuanaViolation
from expungeservice.models.charge_types.marijuana_eligible import (
MarijuanaUnder21,
MarijuanaViolation,
MarijuanaEligible,
)
from expungeservice.models.charge_types.traffic_violation import TrafficViolation
from expungeservice.models.charge_types.violation import Violation
from expungeservice.models.disposition import DispositionStatus
Expand Down Expand Up @@ -54,6 +58,13 @@ def run(record: Record, today: date = date.today()) -> Dict[str, TimeEligibility
"One year from date of conviction (137.226)",
)
)
elif isinstance(charge.charge_type, MarijuanaEligible):
eligibility_dates.append(
(
charge.disposition.date + relativedelta(years=5),
"Conservatively reclassified as Class C Felony (137.226)",
)
)
else:
eligibility_dates.append(
Expunger._single_conviction_years_by_level(
Expand Down
2 changes: 1 addition & 1 deletion src/backend/tests/test_crawler_expunger.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ def test_expunger_for_record_with_mj_over_21(record_with_mj_over_21):
expunger_result = Expunger.run(record_with_mj_over_21)
assert expunger_result == {
"CASEJD1-1": TimeEligibility(
status=EligibilityStatus.ELIGIBLE, reason="Eligible now", date_will_be_eligible=date(2001, 3, 3)
status=EligibilityStatus.ELIGIBLE, reason="Eligible now", date_will_be_eligible=date(2003, 3, 3)
)
}

Expand Down

0 comments on commit c516d77

Please sign in to comment.