Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[spaceship] update buildDeliveries request to use app id in path #20268

Merged
merged 2 commits into from
May 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions spaceship/lib/spaceship/connect_api/models/app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -362,9 +362,8 @@ def get_builds(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
def get_build_deliveries(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
client ||= Spaceship::ConnectAPI
filter ||= {}
filter[:app] = id

resps = client.get_build_deliveries(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
resps = client.get_build_deliveries(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
return resps.flat_map(&:to_models)
end

Expand Down
3 changes: 2 additions & 1 deletion spaceship/lib/spaceship/connect_api/models/build_delivery.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ def self.type
def self.all(client: nil, app_id: nil, version: nil, build_number: nil)
client ||= Spaceship::ConnectAPI
resps = client.get_build_deliveries(
filter: { app: app_id, cfBundleShortVersionString: version, cfBundleVersion: build_number },
app_id: app_id,
filter: { cfBundleShortVersionString: version, cfBundleVersion: build_number },
limit: 1
).all_pages
return resps.flat_map(&:to_models)
Expand Down
4 changes: 2 additions & 2 deletions spaceship/lib/spaceship/connect_api/testflight/testflight.rb
Original file line number Diff line number Diff line change
Expand Up @@ -448,9 +448,9 @@ def patch_build_beta_details(build_beta_details_id: nil, attributes: {})
# buildDeliveries
#

def get_build_deliveries(filter: {}, includes: nil, limit: nil, sort: nil)
def get_build_deliveries(app_id:, filter: {}, includes: nil, limit: nil, sort: nil)
params = test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
test_flight_request_client.get("buildDeliveries", params)
test_flight_request_client.get("apps/#{app_id}/buildDeliveries", params)
end

#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,12 @@
"platform" : "IOS",
"uploadedDate" : "2019-05-06T20:14:37-07:00"
},
"relationships" : {
"app" : {
"links" : {
"self" : "https://appstoreconnect.apple.com/iris/v1/buildDeliveries/123456789/relationships/app",
"related" : "https://appstoreconnect.apple.com/iris/v1/buildDeliveries/123456789/app"
}
}
},
"links" : {
"self" : "https://appstoreconnect.apple.com/iris/v1/buildDeliveries/123456789"
"self" : "https://appstoreconnect.apple.com/iris/v1/apps/1234/buildDeliveries/123456789"
}
} ],
"links" : {
"self" : "https://appstoreconnect.apple.com/iris/v1/buildDeliveries?filter%5Bplatform%5D=IOS&filter%5Bapp%5D=1460622096"
"self" : "https://appstoreconnect.apple.com/iris/v1/apps/1234/buildDeliveries?filter%5Bplatform%5D=IOS&filter%5Bapp%5D=1460622096"
},
"meta" : {
"paging" : {
Expand Down
14 changes: 3 additions & 11 deletions spaceship/spec/connect_api/fixtures/testflight/build_delivery.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,11 @@
"platform" : "IOS",
"uploadedDate" : "2019-05-06T20:14:37-07:00"
},
"relationships" : {
"app" : {
"links" : {
"self" : "https://appstoreconnect.apple.com/iris/v1/buildDeliveries/123456789/relationships/app",
"related" : "https://appstoreconnect.apple.com/iris/v1/buildDeliveries/123456789/app"
}
}
},
"links" : {
"self" : "https://appstoreconnect.apple.com/iris/v1/buildDeliveries/123456789"
"self" : "https://appstoreconnect.apple.com/iris/v1/apps/1234/buildDeliveries/123456789"
}
},
"links" : {
"self" : "https://appstoreconnect.apple.com/iris/v1/buildDeliveries/123456789"
"self" : "https://appstoreconnect.apple.com/iris/v1/apps/1234/buildDeliveries/123456789"
}
}
}
2 changes: 1 addition & 1 deletion spaceship/spec/connect_api/models/build_delivery_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

describe '#Spaceship::ConnectAPI' do
it '#get_build_deliveries' do
response = Spaceship::ConnectAPI.get_build_deliveries
response = Spaceship::ConnectAPI.get_build_deliveries(app_id: "1234")
expect(response).to be_an_instance_of(Spaceship::ConnectAPI::Response)

expect(response.count).to eq(1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -773,22 +773,23 @@ def test_request_body(url, body)

describe "buildDeliveries" do
context 'get_build_deliveries' do
let(:path) { "buildDeliveries" }
let(:app_id) { "123" }
let(:path) { "apps/#{app_id}/buildDeliveries" }
let(:version) { "189" }
let(:default_params) { {} }

it 'succeeds' do
params = {}
req_mock = test_request_params(path, params.merge(default_params))
expect(client).to receive(:request).with(:get).and_yield(req_mock).and_return(req_mock)
client.get_build_deliveries
client.get_build_deliveries(app_id: app_id)
end

it 'succeeds with filter' do
params = { filter: { version: version } }
req_mock = test_request_params(path, params.merge(default_params))
expect(client).to receive(:request).with(:get).and_yield(req_mock).and_return(req_mock)
client.get_build_deliveries(**params)
client.get_build_deliveries(app_id: app_id, **params)
end
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def stub_build_beta_details
end

def stub_build_deliveries
stub_request(:get, "https://appstoreconnect.apple.com/iris/v1/buildDeliveries").
stub_request(:get, "https://appstoreconnect.apple.com/iris/v1/apps/1234/buildDeliveries").
to_return(status: 200, body: read_fixture_file('build_deliveries.json'), headers: { 'Content-Type' => 'application/json' })
end

Expand Down