From 8d8c361b4a308a1bf137aa1935d55cb9bffe6b8a Mon Sep 17 00:00:00 2001
From: Adrian Turjak <adriant@catalystcloud.nz>
Date: Tue, 28 Jan 2020 11:23:13 +1300
Subject: [PATCH] Update Adjutant-UI to handle 202 http codes

This matches the new changes to Adjutant as part of
the refactor to split API and Workflow layers.

202 will be the most common response code when dealing
with the creation of new tasks due to future async
task processing.

Change-Id: Ia09a070709b8a2973c9149df91c67af2b69199a0
---
 adjutant_ui/content/email/forms.py         |  2 +-
 adjutant_ui/content/project_users/forms.py | 10 +++++-----
 adjutant_ui/content/quota/forms.py         |  6 ++----
 adjutant_ui/content/tasks/tables.py        |  2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/adjutant_ui/content/email/forms.py b/adjutant_ui/content/email/forms.py
index 0dde204..ace6a93 100644
--- a/adjutant_ui/content/email/forms.py
+++ b/adjutant_ui/content/email/forms.py
@@ -41,7 +41,7 @@ class EmailForm(forms.SelfHandlingForm):
     def handle(self, request, data):
         try:
             response = api.adjutant.email_update(request, data['new_email'])
-            if response.status_code == 200:
+            if response.status_code == 202:
                 msg = _("Confirmation email sent to %s.")
                 messages.success(request, msg % data['new_email'])
             elif response.status_code == 400:
diff --git a/adjutant_ui/content/project_users/forms.py b/adjutant_ui/content/project_users/forms.py
index fe06081..d7f4531 100644
--- a/adjutant_ui/content/project_users/forms.py
+++ b/adjutant_ui/content/project_users/forms.py
@@ -56,7 +56,7 @@ class InviteUserForm(forms.SelfHandlingForm):
     def handle(self, request, data):
         try:
             response = adjutant.user_invite(request, data)
-            if response.status_code == 200:
+            if response.status_code == 202:
                 messages.success(request, _('Invited user successfully.'))
             else:
                 messages.error(request, _('Failed to invite user.'))
@@ -100,26 +100,26 @@ class UpdateUserForm(forms.SelfHandlingForm):
             roles_removed = list(current_managable_roles - desired_roles)
 
             # Remove roles from user
-            remove_status = 200
+            remove_status = 202
             if len(roles_removed) > 0:
                 remove_response = adjutant.user_roles_remove(
                     request,
                     user_id,
                     roles_removed)
                 remove_status = remove_response.status_code
-            if remove_status != 200:
+            if remove_status != 202:
                 messages.error(request, _('Failed to remove roles from user.'))
                 return False
 
             # Add new roles
-            added_status = 200
+            added_status = 202
             if len(roles_added) > 0:
                 added_response = adjutant.user_roles_add(
                     request,
                     user_id,
                     roles_added)
                 added_status = added_response.status_code
-            if added_status != 200:
+            if added_status != 202:
                 messages.error(request, _('Failed to add roles to user.'))
                 return False
 
diff --git a/adjutant_ui/content/quota/forms.py b/adjutant_ui/content/quota/forms.py
index f36a203..73a3a02 100644
--- a/adjutant_ui/content/quota/forms.py
+++ b/adjutant_ui/content/quota/forms.py
@@ -46,10 +46,8 @@ class UpdateQuotaForm(forms.SelfHandlingForm):
         try:
             response = adjutant.update_quotas(request, data['size'],
                                               regions=[data['region']])
-            if response.status_code == 200:
-                messages.success(request, _('Quota updated sucessfully.'))
-            elif response.status_code == 202:
-                messages.success(request, _('Task created but requires '
+            if response.status_code == 202:
+                messages.success(request, _('Task created and may require '
                                             'admin approval.'))
             elif response.status_code == 400:
                 messages.error(request, _('Failed to update quota. You may'
diff --git a/adjutant_ui/content/tasks/tables.py b/adjutant_ui/content/tasks/tables.py
index 616987f..54de940 100644
--- a/adjutant_ui/content/tasks/tables.py
+++ b/adjutant_ui/content/tasks/tables.py
@@ -77,7 +77,7 @@ class ApproveTask(tables.BatchAction):
 
     def action(self, request, obj_id):
         result = adjutant.task_approve(request, obj_id)
-        if not result or result.status_code != 200:
+        if not result or result.status_code not in [200, 202]:
             exception = exceptions.NotAvailable()
             exception._safe_message = False
             raise exception