Navigating to org details from unrelated paths now redirects the user…

… back to the contact page (#1654)

* Navigating to org details from unrelated paths now redirects the user back to the contact page

* Fix 500 error when navigating to /contact/organization-details

* Re-arrange some route validation logic

* fix test

* Formatting

* Fix issue navigating to org details after selecting a non-demo support_type

* formatting

* Revert unintended commit of files

* Restore edited devcontainer.json

app/main/views/contact.py

@@ -128,10 +128,14 @@ def _validate_fields_present(current_step: str, form_data: dict) -> bool:
     base_requirement = {"name", "support_type", "email_address"}
     primary_purpose_requirement = base_requirement.union({"department_org_name", "program_service_name", "intended_recipients"})
 
-    if current_step in ["message", "demo.org_details"]:
+    if not form_data or SESSION_FORM_KEY not in session:
+        return False
+    if current_step == "message":
         return base_requirement.issubset(form_data)
+    elif current_step == "demo.org_details":
+        return base_requirement.issubset(form_data) and form_data.get("support_type") == "demo"
     elif current_step == "demo.primary_purpose":
-        return set(form_data).issuperset(primary_purpose_requirement)
+        return set(form_data).issuperset(primary_purpose_requirement) and form_data.get("support_type") == "demo"
 
     return False
 

tests/app/main/test_contact.py

@@ -92,29 +92,50 @@ def test_back_link_goes_to_previous_step(client_request):
 @pytest.mark.parametrize(
     "view, expected_view, request_data",
     [
-        (".demo_organization_details", ".contact", [{}]),
+        (".demo_organization_details", ".contact", {}),
+        (
+            ".demo_organization_details",
+            ".contact",
+            {
+                "name": "John",
+                "email_address": "[email protected]",
+                "support_type": "Bad_support_type",
+            },
+        ),
+        (
+            ".demo_organization_details",
+            ".contact",
+            {
+                "name": "John",
+                "email_address": "[email protected]",
+                "support_type": "other",
+            },
+        ),
+        (
+            ".demo_organization_details",
+            ".contact",
+            {
+                "name": "John",
+                "email_address": "[email protected]",
+                "support_type": "ask_question",
+            },
+        ),
         (
             ".demo_primary_purpose",
             ".contact",
-            [
-                {
-                    "name": "John",
-                    "email_address": "[email protected]",
-                    "support_type": "demo",
-                },
-                {},
-            ],
+            {
+                "name": "John",
+                "email_address": "[email protected]",
+                "support_type": "demo",
+            },
         ),
-        (".message", ".contact", [{}]),
+        (".message", ".contact", {}),
     ],
 )
 def test_nav_to_invalid_step_redirects_to_contact(client_request, view, expected_view, request_data):
     with client_request.session_transaction() as session:
-        for data in request_data:
-            session["contact_form"] = data
-            client_request.get_url(
-                url_for(view), _expected_status=302, _test_page_title=False, _expected_redirect=url_for(".contact")
-            )
+        session["contact_form"] = request_data
+    client_request.get_url(url_for(view), _expected_status=302, _test_page_title=False, _expected_redirect=url_for(".contact"))
 
 
 @pytest.mark.parametrize("support_type", ["ask_question", "technical_support", "give_feedback", "other"])