Merge pull request #670 from code0-tech/646-adjust-mutation-error-responses

Adjust mutation error responses

Author: Taucher2003

app/graphql/mutations/base_mutation.rb

@@ -26,8 +26,13 @@ def current_authentication
       context[:current_authentication]
     end
 
-    def create_message_error(message)
-      Sagittarius::Graphql::ErrorMessageContainer.new(message: message)
+    def create_error(code, message)
+      ErrorCode.validate_error_code!(code)
+
+      Sagittarius::Graphql::ErrorContainer.new(
+        code,
+        [{ message: message }]
+      )
     end
   end
 end

app/graphql/mutations/namespaces/members/assign_roles.rb

@@ -18,8 +18,14 @@ def resolve(member_id:, role_ids:)
           member = SagittariusSchema.object_from_id(member_id)
           roles = role_ids.map { |id| SagittariusSchema.object_from_id(id) }
 
-          return { namespace_member_roles: nil, errors: [create_message_error('Invalid member')] } if member.nil?
-          return { namespace_member_roles: nil, errors: [create_message_error('Invalid role')] } if roles.any?(&:nil?)
+          if member.nil?
+            return { namespace_member_roles: nil,
+                     errors: [create_error(:namespace_member_not_found, 'Invalid member')] }
+          end
+          if roles.any?(&:nil?)
+            return { namespace_member_roles: nil,
+                     errors: [create_error(:namespace_role_not_found, 'Invalid role')] }
+          end
 
           ::Namespaces::Members::AssignRolesService.new(
             current_authentication,

app/graphql/mutations/namespaces/members/delete.rb

@@ -16,7 +16,7 @@ def resolve(namespace_member_id:)
 
           if namespace_member.nil?
             return { namespace_member: nil,
-                     errors: [create_message_error('Invalid member')] }
+                     errors: [create_error(:namespace_member_not_found, 'Invalid member')] }
           end
 
           ::Namespaces::Members::DeleteService.new(

app/graphql/mutations/namespaces/members/invite.rb

@@ -16,8 +16,11 @@ def resolve(namespace_id:, user_id:)
           namespace = SagittariusSchema.object_from_id(namespace_id)
           user = SagittariusSchema.object_from_id(user_id)
 
-          return { namespace_member: nil, errors: [create_message_error('Invalid namespace')] } if namespace.nil?
-          return { namespace_member: nil, errors: [create_message_error('Invalid user')] } if user.nil?
+          if namespace.nil?
+            return { namespace_member: nil,
+                     errors: [create_error(:namespace_not_found, 'Invalid namespace')] }
+          end
+          return { namespace_member: nil, errors: [create_error(:user_not_found, 'Invalid user')] } if user.nil?
 
           ::Namespaces::Members::InviteService.new(
             current_authentication,

app/graphql/mutations/namespaces/projects/assign_runtimes.rb

@@ -17,8 +17,14 @@ def resolve(namespace_project_id:, runtime_ids:)
           namespace_project = SagittariusSchema.object_from_id(namespace_project_id)
           runtimes = runtime_ids.map { |runtime_id| SagittariusSchema.object_from_id(runtime_id) }
 
-          return { namespace_project: nil, errors: [create_message_error('Invalid project')] } if namespace_project.nil?
-          return { namespace_project: nil, errors: [create_message_error('Invalid runtime')] } if runtimes.any?(&:nil?)
+          if namespace_project.nil?
+            return { namespace_project: nil,
+                     errors: [create_error(:project_not_found, 'Invalid project')] }
+          end
+          if runtimes.any?(&:nil?)
+            return { namespace_project: nil,
+                     errors: [create_error(:runtime_not_found, 'Invalid runtime')] }
+          end
 
           ::Namespaces::Projects::AssignRuntimesService.new(
             current_authentication,

app/graphql/mutations/namespaces/projects/create.rb

@@ -19,7 +19,7 @@ def resolve(namespace_id:, **params)
 
           if namespace.nil?
             return { organization_project: nil,
-                     errors: [create_message_error('Invalid namespace')] }
+                     errors: [create_error(:namespace_not_found, 'Invalid namespace')] }
           end
 
           ::Namespaces::Projects::CreateService.new(

app/graphql/mutations/namespaces/projects/delete.rb

@@ -16,7 +16,7 @@ def resolve(namespace_project_id:)
 
           if project.nil?
             return { organization_project: nil,
-                     errors: [create_message_error('Invalid project')] }
+                     errors: [create_error(:project_not_found, 'Invalid project')] }
           end
 
           ::Namespaces::Projects::DeleteService.new(

app/graphql/mutations/namespaces/projects/flows/create.rb

@@ -17,10 +17,20 @@ class Create < BaseMutation
           def resolve(project_id:, flow:, **_params)
             project = SagittariusSchema.object_from_id(project_id)
 
-            return error('Invalid project id') if project.nil?
+            if project.nil?
+              return {
+                flow: nil,
+                errors: [create_error(:project_not_found, 'Invalid project id')],
+              }
+            end
 
             flow_type = SagittariusSchema.object_from_id(flow.type)
-            return error('Invalid flow type id') if flow_type.nil?
+            if flow_type.nil?
+              return {
+                flow: nil,
+                errors: [create_error(:flow_type_not_found, 'Invalid flow type id')],
+              }
+            end
 
             ::Namespaces::Projects::Flows::CreateService.new(
               current_authentication,
@@ -31,13 +41,6 @@ def resolve(project_id:, flow:, **_params)
               name: flow.name
             ).execute.to_mutation_response(success_key: :flow)
           end
-
-          def error(message)
-            {
-              flow: nil,
-              errors: [create_message_error(message)],
-            }
-          end
         end
       end
     end

app/graphql/mutations/namespaces/projects/flows/delete.rb

@@ -17,7 +17,7 @@ def resolve(flow_id:)
 
             if flow.nil?
               return { flow: nil,
-                       errors: [create_message_error('Invalid flow')] }
+                       errors: [create_error(:flow_not_found, 'Invalid flow')] }
             end
 
             ::Namespaces::Projects::Flows::DeleteService.new(

app/graphql/mutations/namespaces/projects/update.rb

@@ -21,7 +21,7 @@ def resolve(namespace_project_id:, **params)
 
           if project.nil?
             return { organization_project: nil,
-                     errors: [create_message_error('Invalid project')] }
+                     errors: [create_error(:project_not_found, 'Invalid project')] }
           end
 
           params[:primary_runtime_id] = params[:primary_runtime_id]&.model_id if params.key?(:primary_runtime_id)