Fixes #14933 - Content Host Counts column on the Errata page should o…

[sean797]

…nly count hosts in the current org

If organization_id is supplied we only return applicable & available hosts in that org, if it isn't supplied we keep the current behavior and count all hosts across every org.

I#m not sure if we should be requiring organization_id to be supplied with this API GET /katello/api/errata ?

[theforeman-bot]

There were the following issues with the commit message:

• length of the first commit message line for 9dd52ea57a70a498fc39eb5cea608f3f7e957887 exceeds 65 characters
• commit message for 9dd52ea57a70a498fc39eb5cea608f3f7e957887 is not wrapped at 72nd column

If you don't have a ticket number, please create an issue in Redmine, selecting the appropriate project.

More guidelines are available in Coding Standards or on the Foreman wiki.

---

This message was auto-generated by Foreman's prprocessor

[theforeman-bot]

There were the following issues with the commit message:

• length of the first commit message line for 46b265dc952fbb5f8e7eb07b281ec14e38fe3de9 exceeds 65 characters
• commit message for 46b265dc952fbb5f8e7eb07b281ec14e38fe3de9 is not wrapped at 72nd column

If you don't have a ticket number, please create an issue in Redmine, selecting the appropriate project.

More guidelines are available in Coding Standards or on the Foreman wiki.

---

This message was auto-generated by Foreman's prprocessor

[theforeman-bot]

There were the following issues with the commit message:

• length of the first commit message line for e11cce88f2019a8e4ecc308081591f3d7eca15e7 exceeds 65 characters

If you don't have a ticket number, please create an issue in Redmine, selecting the appropriate project.

More guidelines are available in Coding Standards or on the Foreman wiki.

---

This message was auto-generated by Foreman's prprocessor

[jlsherrill]

I think you could do something like:

 self.content_facets_applicable.joins(:host).where("#{::Host.table_name}.organization_id" => org_id)

and that avoids the sub query

[jlsherrill]

@sean797 looks like a couple tests are failing, if you have any trouble feel free to ping me, i'm happy to help. Overall this looks good, just one minor comment.

[theforeman-bot]

There were the following issues with the commit message:

• length of the first commit message line for 02f7ad80d2872f1ba38531b653a2d092790e08c7 exceeds 65 characters

If you don't have a ticket number, please create an issue in Redmine, selecting the appropriate project.

More guidelines are available in Coding Standards or on the Foreman wiki.

---

This message was auto-generated by Foreman's prprocessor

[sean797]

Thanks for review @jlsherrill, some help with the tests would be appreciated 👍 I'm not sure if theres a better way of doing params[:organization_id] that will make Katello::ErratumViewTest.test_show pass?

[sean797]

[test] - old test results aren't there 👎 http://ci.theforeman.org/job/test_katello_pr_core/2313/

[jlsherrill]

I think one of the tests is failing because here you'd want to pass in @host.organization.id (rather than Organization.first.id.

Could you test for both, i want to make sure that the condition where id is passed in and when its not passed in are both covered.

[sean797]

@host.organization work 👍

[jlsherrill]

To fix your 2nd test failure, just change:

https://github.com/Katello/katello/blob/master/test/katello_test_helper.rb#L198-L199

to:

    Rabl::Renderer.new(filepath, resource, :view_path => "#{Katello::Engine.root}/app/views/",
                       :format => 'hash', :locals => {:resource => resource}, :scope => OpenStruct.new(:params => {})).render

[sean797]

Thanks for you help with the tests @jlsherrill! There passing now 👍

[jlsherrill]

ACK thanks @sean797 merging!