Merge pull request #1726 from wittejm/remove-douglas-county-form

Remove douglas county form
codeforpdx · Jul 16, 2024 · 18d73bf · 18d73bf
2 parents 46ed0e1 + 729283f
commit 18d73bf
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 16 deletions.
diff --git a/src/backend/expungeservice/files/OSP_Form_No_Court_Fields.pdf b/src/backend/expungeservice/files/OSP_Form_No_Court_Fields.pdf
diff --git a/src/backend/expungeservice/files/oregon_conviction_old_with_date_of_arrest_bugged_field.pdf b/src/backend/expungeservice/files/oregon_conviction_old_with_date_of_arrest_bugged_field.pdf
diff --git a/src/backend/expungeservice/files/oregon_old_with_date_of_arrest_bugged_field.pdf b/src/backend/expungeservice/files/oregon_old_with_date_of_arrest_bugged_field.pdf
diff --git a/src/backend/expungeservice/form_filling.py b/src/backend/expungeservice/form_filling.py
@@ -568,8 +568,8 @@ def validate_initial_state(self):
 class FormFilling:
     OREGON_PDF_NAME = "oregon"
     NON_OREGON_PDF_COUNTIES = ["multnomah"]
-    COUNTIES_NEEDING_CONVICTION_OR_ARREST_ORDER = ["douglas", "umatilla", "multnomah"]
-    COUNTIES_NEEDING_COUNTY_SPECIFIC_DOWNLOAD_NAME = ["douglas", "umatilla"]
+    COUNTIES_NEEDING_CONVICTION_OR_ARREST_ORDER = ["umatilla", "multnomah"]
+    COUNTIES_NEEDING_COUNTY_SPECIFIC_DOWNLOAD_NAME = ["umatilla"]
     OSP_PDF_NAME = "OSP_Form"
 
     @staticmethod

diff --git a/src/backend/tests/test_form_filling.py b/src/backend/tests/test_form_filling.py
@@ -201,9 +201,6 @@ def assert_correct_download_file_path(self, county: str, expected_file_name: str
         assert file_path == "dir/case_name_case_number_" + expected_file_name
 
     def test_correct_pdf_path_is_built(self):
-        self.assert_correct_pdf_file_name("Douglas", "oregon_arrest.pdf", has_convictions=False)
-        self.assert_correct_pdf_file_name("Douglas", "oregon_conviction.pdf", has_convictions=True)
-
         self.assert_correct_pdf_file_name("Umatilla", "oregon_arrest.pdf", has_convictions=False)
         self.assert_correct_pdf_file_name("Umatilla", "oregon_conviction.pdf", has_convictions=True)
 
@@ -214,9 +211,6 @@ def test_correct_pdf_path_is_built(self):
         self.assert_correct_pdf_file_name("unknown", "oregon.pdf", has_convictions=True)
 
     def test_correct_download_file_path_is_built(self):
-        self.assert_correct_download_file_path("Douglas", "douglas_with_arrest_order.pdf", has_convictions=False)
-        self.assert_correct_download_file_path("Douglas", "douglas_with_conviction_order.pdf", has_convictions=True)
-
         self.assert_correct_download_file_path("Umatilla", "umatilla_with_arrest_order.pdf", has_convictions=False)
         self.assert_correct_download_file_path("Umatilla", "umatilla_with_conviction_order.pdf", has_convictions=True)
 
@@ -581,14 +575,14 @@ def test_has_misdemeanor_class_a_severity_level(self, conviction_charge: Mock, p
         )
 
 
-class TestBuildDouglasPDF(TestBuildOregonPDF):
-    county = "Douglas"
+class TestBuildUmatillaPDF(TestBuildOregonPDF):
+    county = "Umatilla"
     expected_county_data = {
         # county
-        "(FOR THE COUNTY OF)": "(Douglas)",
+        "(FOR THE COUNTY OF)": "(Umatilla)",
         # da_address
-        "(the District Attorney at address 2)": "(District Attorney - 1036 SE Douglas Avenue - Justice Building, Room 204 - Roseburg, OR 97470)",
-        "(County)": "(Douglas)",
+        "(the District Attorney at address 2)": "(District Attorney - 216 SE 4th St, Pendleton, OR 97801)",
+        "(County)": "(Umatilla)",
     }
     expected_conviction_order_values = {
         "(Case Number)": "(base case number)",

diff --git a/src/frontend/src/components/About/__snapshots__/About.test.tsx.snap b/src/frontend/src/components/About/__snapshots__/About.test.tsx.snap
@@ -115,7 +115,7 @@ exports[`renders correctly 1`] = `
             <dd
               className="lh-copy"
             >
-              Jordan studied computer science and machine learning at Portland State University, completing his masters in 2019. Seeking ways to contribute locally to progressive causes, he joined Code for PDX in March of 2019 to work on its Record Expungement software project. He currently volunteers full-time at Code for PDX.
+              Jordan studied computer science and machine learning at Portland State University, completing his masters in 2019. Seeking ways to contribute locally to progressive causes, he joined Code for PDX in March of 2019 to work on its Record Expungement software project. He has since continued to pursue social impact work through software engineering.
             </dd>
           </dl>
         </div>

diff --git a/src/frontend/src/components/About/index.tsx b/src/frontend/src/components/About/index.tsx
@@ -96,8 +96,9 @@ export default class About extends React.Component {
                     Portland State University, completing his masters in 2019.
                     Seeking ways to contribute locally to progressive causes, he
                     joined Code for PDX in March of 2019 to work on its Record
-                    Expungement software project. He currently volunteers
-                    full-time at Code for PDX.
+                    Expungement software project. He has since continued to pursue
+                    social impact work through software engineering.
+
                   </dd>
                 </dl>
               </div>