Description of problem:


When doing a GET request to the /upstream_subscriptions API the result contains candlepin id twice and misses the local katello id (which is important as is the only local reference to perform other operations like PUT, POST and DELETE)


Version-Release number of selected component (if applicable):

satellite-6.4.0-5.beta.el7sat.noarch

How reproducible:

Always

Steps to Reproduce:


curl --request GET \
  --url 'https://FQDN:443/katello/api/v2/organizations/1/upstream_subscriptions?page=1&per_page=4&sort_by=quantity' \
  --header 'authorization: Basic YWRtaW46Y2hhbmdlbWU=' \
  --header 'content-type: application/json' \
  --header 'verify: false' \

Actual results:

result contains upstream ID twice

{
    "id": "8a85f98c60f009560160f0465cde1ac5",        # This is the candlepin id
    "pool_id": "8a85f98c60f009560160f0465cde1ac5",   # This is the candlepin id repeated
    "quantity": 1200,
    ...
}

Expected results:

pool_id should be the local katello subscription id, and the id should be the candlepin upstream id.

{
    "id": "8a85f98c60f009560160f0465cde1ac5",   # This is the candlepin id
    "pool_id": 6,   # This should be the local katello subscription id
    "quantity": 1200,
    ...
}


Additional info:

The problem seems to be related to the id mappings here https://github.com/Katello/katello/commit/023da41db131d3b294b2c11d0b6b68da752f2594