Fix version comparison

Author: Knerio

app/services/namespaces/projects/assign_runtimes_service.rb

@@ -32,7 +32,7 @@ def execute
             )
           end
 
-          UpdateRuntimeCompatibilityJob.perform_later(namespace_project_id: namespace_project.id)
+          UpdateRuntimeCompatibilityJob.perform_later({ namespace_project_id: namespace_project.id })
 
           AuditService.audit(
             :project_runtimes_assigned,

app/services/runtimes/check_runtime_compatibility_service.rb

@@ -14,7 +14,7 @@ def execute
 
       if primary_runtime.nil?
         return ServiceResponse.error(message: 'No primary runtime given',
-                                     payload: :missing_primary_runtime)
+                                     error_code: :missing_primary_runtime)
       end
 
       { DataType => :identifier, FlowType => :identifier,
@@ -31,29 +31,31 @@ def check_versions(model, identifier_field = :identifier)
 
       if to_check_types.size < primary_types.size
         return ServiceResponse.error(message: "#{model} amount dont match",
-                                     payload: :missing_definition)
+                                     error_code: :missing_definition)
       end
 
       primary_types.each do |curr_type|
         to_check = model.find_by(runtime: runtime, identifier_field => curr_type.send(identifier_field))
         if to_check.nil?
           return ServiceResponse.error(message: "#{model} is not present in new runtime",
-                                       payload: :missing_definition)
+                                       error_code: :missing_definition)
         end
 
         result = compare_version(curr_type.parsed_version, to_check.parsed_version)
 
         unless result
           return ServiceResponse.error(message: "#{model} is outdated",
-                                       payload: :outdated_definition)
+                                       error_code: :outdated_definition)
         end
       end
       ServiceResponse.success
     end
 
+    # true: compatible
+    # false: not compatible
     def compare_version(primary_version, to_check_version)
       return false if primary_version.segments[0] != to_check_version.segments[0]
-      return false if primary_version.segments[1] < to_check_version.segments[1]
+      return false if primary_version.segments[1] > to_check_version.segments[1]
 
       true
     end

spec/jobs/update_runtime_compatibility_job_spec.rb

@@ -10,7 +10,7 @@
     assignment2 = create(:namespace_project_runtime_assignment, compatible: false)
 
     success_res = ServiceResponse.success
-    err_response = ServiceResponse.error
+    err_response = ServiceResponse.error(error_code: :outdated_definition, message: 'Runtime is outdated')
 
     service1 = instance_double(Runtimes::CheckRuntimeCompatibilityService, execute: success_res)
     service2 = instance_double(Runtimes::CheckRuntimeCompatibilityService, execute: err_response)

spec/services/runtimes/check_runtime_compatibility_service_spec.rb

@@ -16,7 +16,7 @@
 
     it 'returns an error with :missing_primary_runtime payload' do
       expect(service_response).to be_error
-      expect(service_response.payload).to eq(:missing_primary_runtime)
+      expect(service_response.payload[:error_code]).to eq(:missing_primary_runtime)
     end
   end
 
@@ -27,29 +27,29 @@
 
     it 'returns missing_datatypes error' do
       expect(service_response.error?).to be true
-      expect(service_response.payload).to eq(:missing_definition)
+      expect(service_response.payload[:error_code]).to eq(:missing_definition)
     end
   end
 
-  context 'when a data type version is newer on runtime than primary (outdated primary)' do
+  context 'when secondary runtime has outdated definitions' do
     before do
-      create(:data_type, runtime: primary_runtime, identifier: 'dt1', version: '1.1.0')
+      create(:data_type, runtime: primary_runtime, identifier: 'dt1', version: '1.3.0')
       create(:data_type, runtime: runtime, identifier: 'dt1', version: '1.2.0')
     end
 
     it 'returns outdated_data_type error' do
       expect(service_response.error?).to be true
-      expect(service_response.payload).to eq(:outdated_definition)
+      expect(service_response.payload[:error_code]).to eq(:outdated_definition)
     end
   end
 
   context 'when all models are compatible' do
     before do
-      create(:data_type, runtime: primary_runtime, identifier: 'dt1', version: '1.2.0')
-      create(:data_type, runtime: runtime, identifier: 'dt1', version: '1.1.0')
+      create(:data_type, runtime: primary_runtime, identifier: 'dt1', version: '1.3.0')
+      create(:data_type, runtime: runtime, identifier: 'dt1', version: '1.3.0')
       create(:flow_type, runtime: primary_runtime, identifier: 'ft1', version: '2.1.0')
-      create(:flow_type, runtime: runtime, identifier: 'ft1', version: '2.0.0')
-      create(:runtime_function_definition, runtime_name: 'rfd1', runtime: primary_runtime, version: '3.2.0')
+      create(:flow_type, runtime: runtime, identifier: 'ft1', version: '2.2.0')
+      create(:runtime_function_definition, runtime_name: 'rfd1', runtime: primary_runtime, version: '3.0.0')
       create(:runtime_function_definition, runtime_name: 'rfd1', runtime: runtime, version: '3.1.0')
     end