fix: adding of project tags and failing activity logs (#608)

* add admin truethy on login

* fix project tags creation

Author: Mubangizi

app/controllers/project.py

@@ -8,6 +8,7 @@
 from app.helpers.activity_logger import log_activity
 from app.helpers.kube import (create_kube_clients, delete_cluster_app,
                               disable_project, enable_project, check_kube_error_code, deploy_user_app)
+from app.helpers.tags import add_tags_to_project, remove_tags_from_project
 from app.models.billing_invoice import BillingInvoice
 from app.models.project_users import ProjectUser
 from app.models.user import User
@@ -67,6 +68,8 @@ def post(self):
             cluster_id = validated_project_data['cluster_id']
             cluster = Cluster.get_by_id(cluster_id)
 
+            tags = validated_project_data.pop('tags_add', None)
+
             if not cluster:
                 return dict(
                     status='fail',
@@ -153,6 +156,9 @@ def post(self):
 
                 return dict(status="fail", message="Internal Server Error"), 500
 
+            if tags:
+                add_tags_to_project(tags, project)
+
             # create a billing invoice on project creation
             new_invoice = BillingInvoice(project_id=project.id)
 
@@ -177,7 +183,7 @@ def post(self):
             log_activity('Project', status='Success',
                          operation='Create',
                          description='Created project Successfully',
-                         a_project=project.id,
+                         a_project=project,
                          a_cluster_id=cluster_id,
                          )
 
@@ -186,14 +192,19 @@ def post(self):
         except client.rest.ApiException as e:
             log_activity('Project', status='Failed',
                          operation='Create',
+                         a_project=project,
                          description=e.body,
                          a_cluster_id=cluster_id)
             return dict(status='fail', message=str(e.body)), check_kube_error_code(e.status)
 
         except Exception as err:
+            try:
+                err = err.body
+            except:
+                err = str(err)
             log_activity('Project', status='Failed',
                          operation='Create',
-                         description=err.body,
+                         description=err,
                          a_cluster_id=cluster_id)
             return dict(status='fail', message=str(err)), 500
 
@@ -446,14 +457,14 @@ def delete(self, project_id):
                 log_activity('Project', status='Failed',
                              operation='Delete',
                              description='Internal server error',
-                             a_project=project_id,
+                             a_project=project,
                              a_cluster_id=project.cluster_id)
                 return dict(status='fail', message='deletion failed'), 500
 
             log_activity('Project', status='Success',
                          operation='Delete',
                          description='Deleted project Successfully',
-                         a_project=project.id,
+                         a_project=project,
                          a_cluster_id=project.cluster_id)
             return dict(
                 status='success',
@@ -478,7 +489,7 @@ def delete(self, project_id):
                 log_activity('Project', status='Success',
                              operation='Delete',
                              description='Deleted project Successfully',
-                             a_project=project.id,
+                             a_project=project,
                              a_cluster_id=project.cluster_id)
                 return dict(
                     status='success',
@@ -487,15 +498,15 @@ def delete(self, project_id):
             log_activity('Project', status='Failed',
                          operation='Delete',
                          description=e.reason,
-                         a_project=project_id,
+                         a_project=project,
                          a_cluster_id=project.cluster_id)
             return dict(status='fail', message=e.reason), check_kube_error_code(e.status)
 
         except Exception as e:
             log_activity('Project', status='Failed',
                          operation='Delete',
                          description=str(e),
-                         a_project=project_id,
+                         a_project=project,
                          a_cluster_id=project.cluster_id)
             return dict(status='fail', message=str(e)), 500
 
@@ -509,7 +520,7 @@ def patch(self, project_id):
             current_user_roles = get_jwt_claims()['roles']
 
             project_schema = ProjectSchema(
-                only=("name", "description", "organisation", "project_type"), partial=True)
+                only=("name", "description", "organisation", "project_type", "is_public", "tags_add", "tags_remove"), partial=True)
 
             project_data = request.get_json()
 
@@ -541,21 +552,29 @@ def patch(self, project_id):
                 if not is_authorised_project_user(project, current_user_id, 'admin'):
                     return dict(status='fail', message='unauthorised'), 403
 
+            if validate_project_data.get('tags_add'):
+                add_tags_to_project(validate_project_data['tags_add'], project)
+                validate_project_data.pop('tags_add', None)
+            if validate_project_data.get('tags_remove'):
+                remove_tags_from_project(
+                    validate_project_data['tags_remove'], project)
+                validate_project_data.pop('tags_remove', None)
+
             updated = Project.update(project, **validate_project_data)
 
             if not updated:
                 log_activity('Project', status='Failed',
                              operation='Update',
                              description='Internal Server Error',
-                             a_project=project.id,
+                             a_project=project,
                              a_cluster_id=project.cluster_id
                              )
                 return dict(status='fail', message='internal server error'), 500
 
             log_activity('Project', status='Success',
                          operation='Update',
                          description='Updated project Successfully',
-                         a_project=project.id,
+                         a_project=project,
                          a_cluster_id=project.cluster_id)
             return dict(
                 status='success',
@@ -596,7 +615,7 @@ def get(self, user_id):
 
         # returns deleted projects
         # pagination_meta_data, projects = paginate(
-        #     user.projects, per_page, page)
+        #     user.projects[::-1], per_page, page)
 
         pagination = Project.query.filter(or_(Project.owner_id == current_user_id, Project.users.any(
             ProjectUser.user_id == current_user_id))).order_by(Project.date_created.desc()).paginate(
@@ -627,7 +646,6 @@ def get(self, user_id):
                 pagination={**pagination_data,
                             'pinned_count': len(parsed_pinned_projects)},
                 pinned=parsed_pinned_projects,
-
                 projects=json.loads(user_projects),
             )
         ), 200

app/helpers/kube.py

@@ -623,7 +623,7 @@ def disable_user_app(app: App, is_admin=False):
         log_activity('App', status='Success',
                      operation='Disable',
                      description='Disabled app Successfully',
-                     a_project=app.project.id,
+                     a_project=app.project,
                      a_cluster_id=app.project.cluster_id)
         return True
 
@@ -632,7 +632,7 @@ def disable_user_app(app: App, is_admin=False):
         log_activity('App', status='Failed',
                      operation='Disable',
                      description='Error disabling application',
-                     a_project=app.project.id,
+                     a_project=app.project,
                      a_cluster_id=app.project.cluster_id)
         return SimpleNamespace(
             message=json.loads(e.body),
@@ -678,7 +678,7 @@ def enable_user_app(app: App):
         log_activity('App', status='Success',
                      operation='Enable',
                      description='Enabled app Successfully',
-                     a_project=app.project.id,
+                     a_project=app.project,
                      a_cluster_id=app.project.cluster_id)
         return True
 
@@ -687,7 +687,7 @@ def enable_user_app(app: App):
         log_activity('App', status='Failed',
                      operation='Enable',
                      description='Error enabling application',
-                     a_project=app.project.id,
+                     a_project=app.project,
                      a_cluster_id=app.project.cluster_id)
         return SimpleNamespace(
             message=json.loads(e.body),