Merge pull request #5888 from hennevogel/bugfix/status

Bugfix/status

src/api/app/models/status/report.rb

@@ -12,18 +12,23 @@ class Status::Report < ApplicationRecord
   has_many :checks, class_name: 'Status::Check', dependent: :destroy, foreign_key: 'status_reports_id'
 
   #### Callbacks macros: before_save, after_save, etc.
+  after_initialize :set_request_uuid, if: proc { |record| record.checkable.is_a?(BsRequest) }
 
   #### Scopes (first the default_scope macro if is used)
 
   #### Validations macros
   validates :checkable, presence: true
-  validates :uuid, presence: true, if: proc { |record| record.checkable.is_a?(Repository) }
+  validates :uuid, presence: true
 
   #### Class methods using self. (public and then private)
 
   #### To define class methods as private use private_class_method
   #### private
 
+  def set_request_uuid
+    self.uuid = checkable.number
+  end
+
   def missing_checks
     checkable.required_checks - checks.pluck(:name)
   end

src/api/app/views/status/checks/_check.xml.builder

@@ -1,5 +1,4 @@
-builder.check(id: object.id, required: object.required?) do |check|
-  check.name object.name
+builder.check(name: object.name, required: object.required?) do |check|
   check.state object.state
   check.short_description object.short_description
   check.url object.url

src/api/app/views/status/reports/show.xml.builder

@@ -1,6 +1,6 @@
 xml.status_report(uuid: @status_report.uuid) do |xml|
   @checks.each do |check|
-    render(partial: 'check', locals: { builder: xml, object: check })
+    render(partial: 'status/checks/check', locals: { builder: xml, object: check })
   end
 
   @missing_checks.each do |name|

src/api/spec/models/status/report_spec.rb

@@ -3,26 +3,6 @@
 RSpec.describe Status::Report, type: :model do
   describe 'validations' do
     it { is_expected.to validate_presence_of(:checkable) }
-
-    context 'for bs requests' do
-      let(:source_project) { create(:project_with_package) }
-      let(:target_project) { create(:project_with_package) }
-      let(:bs_request) do
-        create(:bs_request_with_submit_action,
-               source_project: source_project,
-               source_package: source_project.packages.first,
-               target_project: target_project,
-               target_package: target_project.packages.first)
-      end
-      let(:status_report) { create(:status_report, checkable: bs_request) }
-
-      it { expect(status_report).not_to validate_presence_of(:uuid) }
-    end
-
-    context 'for repositories' do
-      let(:status_report) { create(:status_report, checkable: create(:repository)) }
-
-      it { expect(status_report).to validate_presence_of(:uuid) }
-    end
+    it { is_expected.to validate_presence_of(:uuid) }
   end
 end