Skip to content

Commit 628dab7

Browse files
committed
revert(API): RHINENG-16382 provide SSG ID for Test Result
This reverts commit db5640f.
1 parent 8b6fb24 commit 628dab7

File tree

4 files changed

+428
-457
lines changed

4 files changed

+428
-457
lines changed

app/models/v2/test_result.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
module V2
44
# Database model representing latest results of compliance scans
5-
# rubocop:disable Metrics/ClassLength
65
class TestResult < ApplicationRecord
76
# FIXME: clean up after the remodel
87
self.table_name = :v2_test_results
@@ -124,10 +123,6 @@ def compliant
124123
!score.nil? && score >= threshold.to_f
125124
end
126125

127-
def security_guide_id
128-
attributes['security_guide__id'] || try(:security_guide)&.id
129-
end
130-
131126
def security_guide_version
132127
attributes['security_guide__version'] || try(:security_guide)&.version
133128
end
@@ -148,5 +143,4 @@ def self.security_guide_versions
148143
.uniq # using this instead of `.distinct` to properly handle sorting of versions. It should still perform fine.
149144
end
150145
end
151-
# rubocop:enable Metrics/ClassLength
152146
end

app/serializers/v2/test_result_serializer.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@ class TestResultSerializer < V2::ApplicationSerializer
1313
derived_attribute :compliant, :score, report: [:compliance_threshold]
1414
derived_attribute :system_id, :system_id
1515
derived_attribute :security_guide_version, security_guide: [:version]
16-
derived_attribute :security_guide_id, security_guide: [:id]
1716
end
1817
end

spec/controllers/v2/test_results_controller_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
end_time: -> { end_time.as_json },
99
failed_rule_count: :failed_rule_count,
1010
display_name: :display_name,
11-
security_guide_id: :security_guide_id,
1211
security_guide_version: :security_guide_version,
1312
groups: :groups,
1413
tags: -> { tags.map { |t| t.slice('key', 'namespace', 'value') } },

0 commit comments

Comments
 (0)