Skip to content

Commit 8b96824

Browse files
authored
Merge branch 'codeforpdx:master' into new-header
2 parents 89a2add + 0454876 commit 8b96824

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/backend/expungeservice/form_filling_2026.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ def extra_mappings(self):
162162
"(phone)": s.phone_number,
163163

164164
# Certificate of mailing
165-
"(mailing_date)": "", # User fills
165+
"(mailing_date)": today,
166166
"(prosecutor_address)": get_da_address(s.county),
167-
"(certificate_date)": "", # User fills
167+
"(certificate_date)": today,
168168
"(defendant_signature_certificate)": "", # User signs
169169
"(defendant_name_printed)": s.full_name,
170170

src/backend/expungeservice/models/charge_types/traffic_violation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class TrafficViolation(ChargeType):
1919
def type_eligibility(self, disposition):
2020
if ChargeUtil.dismissed(disposition):
2121
return TypeEligibility(
22-
EligibilityStatus.NEEDS_MORE_ANALYSIS,
23-
reason="Dismissed violations are eligible under 137.225(1)(b) but administrative reasons may make this difficult to expunge.",
22+
EligibilityStatus.INELIGIBLE,
23+
reason="Always ineligible under 137.225(7)(a) (for convictions) or by omission from statute (for dismissals)",
2424
)
2525
elif ChargeUtil.convicted(disposition):
2626
return TypeEligibility(EligibilityStatus.INELIGIBLE, reason="Ineligible under 137.225(7)(a)")

src/backend/tests/models/charge_types/test_traffic_offenses.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ def test_dismissed_violation_is_not_type_eligible():
4848
)
4949

5050
assert isinstance(charge.charge_type, TrafficViolation)
51-
assert charge.type_eligibility.status is EligibilityStatus.NEEDS_MORE_ANALYSIS
51+
assert charge.type_eligibility.status is EligibilityStatus.INELIGIBLE
5252
assert (
5353
charge.type_eligibility.reason
54-
== "Dismissed violations are eligible under 137.225(1)(b) but administrative reasons may make this difficult to expunge."
54+
== "Always ineligible under 137.225(7)(a) (for convictions) or by omission from statute (for dismissals)"
5555
)
5656
assert not charge.charge_type.blocks_other_charges
5757

@@ -69,10 +69,10 @@ def test_dismissed_infraction_is_not_type_eligible():
6969
charge = ChargeFactory.create(statute="811135", level="Infraction Class B", disposition=Dispositions.DISMISSED)
7070

7171
assert isinstance(charge.charge_type, TrafficViolation)
72-
assert charge.type_eligibility.status is EligibilityStatus.NEEDS_MORE_ANALYSIS
72+
assert charge.type_eligibility.status is EligibilityStatus.INELIGIBLE
7373
assert (
7474
charge.type_eligibility.reason
75-
== "Dismissed violations are eligible under 137.225(1)(b) but administrative reasons may make this difficult to expunge."
75+
== "Always ineligible under 137.225(7)(a) (for convictions) or by omission from statute (for dismissals)"
7676
)
7777
assert not charge.charge_type.blocks_other_charges
7878

@@ -88,10 +88,10 @@ def test_old_traffic_statute():
8888
)
8989

9090
assert isinstance(charge.charge_type, TrafficViolation)
91-
assert charge.type_eligibility.status is EligibilityStatus.NEEDS_MORE_ANALYSIS
91+
assert charge.type_eligibility.status is EligibilityStatus.INELIGIBLE
9292
assert (
9393
charge.type_eligibility.reason
94-
== "Dismissed violations are eligible under 137.225(1)(b) but administrative reasons may make this difficult to expunge."
94+
== "Always ineligible under 137.225(7)(a) (for convictions) or by omission from statute (for dismissals)"
9595
)
9696
assert not charge.charge_type.blocks_other_charges
9797

src/backend/tests/test_crawler_expunger.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def test_expunger_with_open_case(record_with_open_case):
3636
errors = record_with_open_case.errors
3737
expunger_result = Expunger.run(record_with_open_case)
3838

39-
assert len(expunger_result) == 2
39+
assert len(expunger_result) == 4
4040
assert "All charges are ineligible because there is one or more open case" in errors[0]
4141

4242

0 commit comments

Comments
 (0)