Catch error on update applications route when app name is duplicated within a portfolio

atst/routes/applications/new.py

@@ -1,9 +1,7 @@
-from flask import redirect, render_template, request as http_request, url_for, g
+from flask import redirect, render_template, request as http_request, url_for
 
 from .blueprint import applications_bp
 from atst.domain.applications import Applications
-from atst.domain.exceptions import AlreadyExistsError
-from atst.domain.portfolios import Portfolios
 from atst.forms.application import NameAndDescriptionForm, EnvironmentsForm
 from atst.domain.authz.decorator import user_can_access_decorator as user_can
 from atst.models.permissions import Permissions
@@ -13,6 +11,7 @@ from atst.routes.applications.settings import (
     get_new_member_form,
     handle_create_member,
     handle_update_member,
+    handle_update_application,
 )
 
 
@@ -38,31 +37,6 @@ def render_new_application_form(
     return render_template(template, **render_args)
 
 
-def update_application(form, application_id=None, portfolio_id=None):
-    if form.validate():
-        application = None
-        try:
-            if application_id:
-                application = Applications.get(application_id)
-                application = Applications.update(application, form.data)
-                flash("application_updated", application_name=application.name)
-            else:
-                portfolio = Portfolios.get_for_update(portfolio_id)
-                application = Applications.create(
-                    g.current_user, portfolio, **form.data
-                )
-                flash("application_created", application_name=application.name)
-
-            return application
-
-        except AlreadyExistsError:
-            flash("application_name_error", name=form.data["name"])
-            return False
-
-    else:
-        return False
-
-
 @applications_bp.route("/portfolios/<portfolio_id>/applications/new")
 @applications_bp.route("/applications/<application_id>/new/step_1")
 @user_can(Permissions.CREATE_APPLICATION, message="view create new application form")
@@ -90,7 +64,7 @@ def create_or_update_new_application_step_1(portfolio_id=None, application_id=No
     form = get_new_application_form(
         {**http_request.form}, NameAndDescriptionForm, application_id
     )
-    application = update_application(form, application_id, portfolio_id)
+    application = handle_update_application(form, application_id, portfolio_id)
 
     if application:
         return redirect(

atst/routes/applications/settings.py

@@ -16,6 +16,7 @@ from atst.domain.csp.cloud import GeneralCSPException
 from atst.domain.common import Paginator
 from atst.domain.environment_roles import EnvironmentRoles
 from atst.domain.invitations import ApplicationInvitations
+from atst.domain.portfolios import Portfolios
 from atst.forms.application_member import NewForm as NewMemberForm, UpdateMemberForm
 from atst.forms.application import NameAndDescriptionForm, EditEnvironmentForm
 from atst.forms.data import ENV_ROLE_NO_ACCESS as NO_ACCESS
@@ -275,6 +276,29 @@ def handle_update_environment(form, application=None, environment=None):
         return False
 
 
+def handle_update_application(form, application_id=None, portfolio_id=None):
+    if form.validate():
+        application = None
+
+        try:
+            if application_id:
+                application = Applications.get(application_id)
+                application = Applications.update(application, form.data)
+                flash("application_updated", application_name=application.name)
+            else:
+                portfolio = Portfolios.get_for_update(portfolio_id)
+                application = Applications.create(
+                    g.current_user, portfolio, **form.data
+                )
+                flash("application_created", application_name=application.name)
+
+            return application
+
+        except AlreadyExistsError:
+            flash("application_name_error", name=form.data["name"])
+            return False
+
+
 @applications_bp.route("/applications/<application_id>/settings")
 @user_can(Permissions.VIEW_APPLICATION, message="view application edit form")
 def settings(application_id):
@@ -334,10 +358,9 @@ def new_environment(application_id):
 def update(application_id):
     application = Applications.get(application_id)
     form = NameAndDescriptionForm(http_request.form)
-    if form.validate():
-        application_data = form.data
-        Applications.update(application, application_data)
+    updated_application = handle_update_application(form, application_id)
 
+    if updated_application:
         return redirect(
             url_for(
                 "applications.portfolio_applications",
@@ -345,7 +368,10 @@ def update(application_id):
             )
         )
     else:
-        return render_settings_page(application=application, application_form=form)
+        return (
+            render_settings_page(application=application, show_flash=True),
+            400,
+        )
 
 
 @applications_bp.route("/applications/<application_id>/delete", methods=["POST"])