When user not found, redirect to users page and show flash message

atst/routes/ccpo.py

@@ -43,8 +43,8 @@ def submit_new_user():
         new_user = Users.get_by_dod_id(request.form["dod_id"])
         form = CCPOUserForm(obj=new_user)
     except NotFoundError:
-        new_user = None
-        form = CCPOUserForm()
+        flash("ccpo_user_not_found")
+        return redirect(url_for("ccpo.users"))
 
     return render_template("ccpo/confirm_user.html", new_user=new_user, form=form)
 

atst/utils/flash.py

@@ -35,6 +35,11 @@ MESSAGES = {
         "message_template": "You have successfully given {{ user_name }} CCPO permissions.",
         "category": "success",
     },
+    "ccpo_user_not_found": {
+        "title_template": translate("ccpo.form.user_not_found_title"),
+        "message_template": translate("ccpo.form.user_not_found_text"),
+        "category": "info",
+    },
     "environment_added": {
         "title_template": translate("flash.success"),
         "message_template": """

templates/ccpo/confirm_user.html

@@ -30,15 +30,5 @@
         </a>
       </div>
     </form>
-  {% else %}
-    <h3>{{ 'ccpo.form.user_not_found_title' | translate }}</h3>
-    <p>
-      {{ "ccpo.form.user_not_found_text" | translate }}
-    </p>
-    <div class='action-group'>
-      <a class='action-group__action icon-link icon-link--default' href="{{ url_for('ccpo.users') }}">
-        {{ "ccpo.form.return_link" | translate }}
-      </a>
-    </div>
   {% endif %}
 {% endblock %}

tests/routes/test_ccpo.py

@@ -24,11 +24,11 @@ def test_submit_new_user(user_session, client):
     )
     assert new_user.email in response.data.decode()
 
-    # give person with out ATAT account CCPO permissions
+    # give person without ATAT account CCPO permissions
     response = client.post(
         url_for("ccpo.submit_new_user"), data={"dod_id": random_dod_id}
     )
-    assert translate("ccpo.form.user_not_found_title") in response.data.decode()
+    assert url_for("ccpo.users") in response.location
 
 
 def test_confirm_new_user(user_session, client):

tests/test_access.py

@@ -146,7 +146,7 @@ def test_ccpo_submit_new_user_access(post_url_assert_status):
     rando = user_with()
 
     url = url_for("ccpo.submit_new_user")
-    post_url_assert_status(ccpo, url, 200, data={"dod_id": "1234567890"})
+    post_url_assert_status(ccpo, url, 302, data={"dod_id": "1234567890"})
     post_url_assert_status(rando, url, 404, data={"dod_id": "1234567890"})