Skip to content

Commit c516d77

Browse files
authored
Merge pull request #1595 from KentShikama/fix-mj-eligible
Ensure MJ Eligible is reclassified as a Class C Felony
2 parents 5092bec + bcfb286 commit c516d77

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

src/backend/expungeservice/expunger.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
from expungeservice.models.charge import Charge, EditStatus
1313
from expungeservice.models.charge_types.felony_class_b import FelonyClassB
1414
from expungeservice.models.charge_types.juvenile_charge import JuvenileCharge
15-
from expungeservice.models.charge_types.marijuana_eligible import MarijuanaUnder21, MarijuanaViolation
15+
from expungeservice.models.charge_types.marijuana_eligible import (
16+
MarijuanaUnder21,
17+
MarijuanaViolation,
18+
MarijuanaEligible,
19+
)
1620
from expungeservice.models.charge_types.traffic_violation import TrafficViolation
1721
from expungeservice.models.charge_types.violation import Violation
1822
from expungeservice.models.disposition import DispositionStatus
@@ -54,6 +58,13 @@ def run(record: Record, today: date = date.today()) -> Dict[str, TimeEligibility
5458
"One year from date of conviction (137.226)",
5559
)
5660
)
61+
elif isinstance(charge.charge_type, MarijuanaEligible):
62+
eligibility_dates.append(
63+
(
64+
charge.disposition.date + relativedelta(years=5),
65+
"Conservatively reclassified as Class C Felony (137.226)",
66+
)
67+
)
5768
else:
5869
eligibility_dates.append(
5970
Expunger._single_conviction_years_by_level(

src/backend/tests/test_crawler_expunger.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ def test_expunger_for_record_with_mj_over_21(record_with_mj_over_21):
266266
expunger_result = Expunger.run(record_with_mj_over_21)
267267
assert expunger_result == {
268268
"CASEJD1-1": TimeEligibility(
269-
status=EligibilityStatus.ELIGIBLE, reason="Eligible now", date_will_be_eligible=date(2001, 3, 3)
269+
status=EligibilityStatus.ELIGIBLE, reason="Eligible now", date_will_be_eligible=date(2003, 3, 3)
270270
)
271271
}
272272

0 commit comments

Comments
 (0)