Add validation for primary runtime namespace in project updates

Author: Knerio

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

@@ -24,15 +24,7 @@ def resolve(namespace_project_id:, **params)
                      errors: [create_message_error('Invalid project')] }
           end
 
-          if params.key?(:primary_runtime_id)
-            primary_runtime = SagittariusSchema.object_from_id(params[:primary_runtime_id])
-            if primary_runtime.nil?
-              return { namespace_project: nil, errors: [create_message_error('Could not find runtime')] }
-            end
-
-            params[:primary_runtime] = primary_runtime
-            params.delete(:primary_runtime_id)
-          end
+          params[:primary_runtime_id] = params[:primary_runtime_id]&.model_id if params.key?(:primary_runtime_id)
 
           ::Namespaces::Projects::UpdateService.new(
             current_authentication,

app/models/namespace_project.rb

@@ -19,6 +19,15 @@ class NamespaceProject < ApplicationRecord
 
   before_validation :strip_whitespace
 
+  validate :validate_primary_runtime, if: :primary_runtime_changed?
+
+  def validate_primary_runtime
+    return if primary_runtime&.namespace.nil?
+    return if primary_runtime.namespace == namespace
+
+    errors.add(:primary_runtime, :invalid_namespace, message: 'must belong to the same namespace as the project')
+  end
+
   private
 
   def strip_whitespace

app/services/namespaces/projects/update_service.rb

@@ -18,6 +18,8 @@ def execute
           return ServiceResponse.error(message: 'Missing permission', payload: :missing_permission)
         end
 
+        params[:primary_runtime_id] = params.delete(:primary_runtime)&.id if params.key?(:primary_runtime)
+
         transactional do |t|
           success = namespace_project.update(params)
           unless success
@@ -27,20 +29,6 @@ def execute
             )
           end
 
-          if params.key?(:primary_runtime)
-            runtime = params[:primary_runtime]
-
-            if runtime.namespace != namespace_project.namespace
-              return ServiceResponse.error(
-                message: 'Primary runtime must belong to the same namespace as the project',
-                payload: :invalid_primary_runtime
-              )
-            end
-
-            params[:primary_runtime_id] = runtime.id if runtime.is_a?(Runtime)
-            params.delete(:primary_runtime)
-          end
-
           AuditService.audit(
             :namespace_project_updated,
             author_id: current_authentication.user.id,

spec/models/namespace_project_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe NamespaceProject do
-  subject { create(:namespace_project) }
+  subject(:project) { create(:namespace_project) }
 
   describe 'associations' do
     it { is_expected.to belong_to(:namespace).required }
@@ -25,5 +25,18 @@
     it { is_expected.to allow_value(' ').for(:description) }
     it { is_expected.to allow_value('').for(:description) }
     it { is_expected.not_to allow_value(nil).for(:description) }
+
+    it 'detects invalid primary runtime namespace' do
+      runtime = create(:runtime, namespace: create(:namespace))
+      project.primary_runtime = runtime
+      is_expected.not_to be_valid
+      expect(project.errors[:primary_runtime]).to include('must belong to the same namespace as the project')
+    end
+
+    it 'allows primary runtime namespace to be nil' do
+      runtime = create(:runtime, namespace: nil)
+      project.primary_runtime = runtime
+      is_expected.to be_valid
+    end
   end
 end