Skip to content
This repository was archived by the owner on Jun 2, 2021. It is now read-only.

Commit 9beb23a

Browse files
authored
v3(services): test order_by for services resources (cloudfoundry#1797)
* v3(services): refactor some inconsistent whitespace [#169146261](https://www.pivotaltracker.com/story/show/169146261) * v3(services): test order_by for services resources - implemented order_by name where it was not implemented already except for service offerings where it is complex due to the DB column being called label rather than name - improved the pagination shared example to check links [#169146261](https://www.pivotaltracker.com/story/show/169146261) * v3(services): action comments from review [#169146261](https://www.pivotaltracker.com/story/show/169146261)
1 parent d063890 commit 9beb23a

21 files changed

Lines changed: 985 additions & 833 deletions

app/controllers/v3/service_credential_bindings_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def index
1515

1616
presenter = Presenters::V3::PaginatedListPresenter.new(
1717
presenter: Presenters::V3::ServiceCredentialBindingPresenter,
18-
paginated_result: SequelPaginator.new.get_page(results, pagination_options),
18+
paginated_result: SequelPaginator.new.get_page(results, message.try(:pagination_options)),
1919
path: '/v3' + service_credential_bindings_path,
2020
message: message,
2121
decorators: decorators(message)

app/messages/apps_list_message.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class AppsListMessage < MetadataListMessage
2323
validates :stacks, array: true, allow_nil: true
2424

2525
def valid_order_by_values
26-
super << :name
26+
super + [:name]
2727
end
2828

2929
def self.from_params(params)

app/messages/isolation_segments_list_message.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def self.from_params(params)
1919
end
2020

2121
def valid_order_by_values
22-
super << :name
22+
super + [:name]
2323
end
2424
end
2525
end

app/messages/orgs_list_message.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def self.from_params(params)
2222
end
2323

2424
def valid_order_by_values
25-
super << :name
25+
super + [:name]
2626
end
2727
end
2828
end

app/messages/service_brokers_list_message.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class ServiceBrokersListMessage < MetadataListMessage
1414
validates :names, array: true, allow_nil: true
1515

1616
def valid_order_by_values
17-
super << :name
17+
super + [:name]
1818
end
1919

2020
def self.from_params(params)

app/messages/service_credential_bindings_list_message.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,9 @@ class ServiceCredentialBindingsListMessage < ListMessage
2424
def self.from_params(params)
2525
super(params, ARRAY_KEYS.map(&:to_s))
2626
end
27+
28+
def valid_order_by_values
29+
super + [:name]
30+
end
2731
end
2832
end

app/messages/service_instances_list_message.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def to_param_hash
4343
end
4444

4545
def valid_order_by_values
46-
super << :name
46+
super + [:name]
4747
end
4848
end
4949
end

app/messages/service_plans_list_message.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ class ServicePlansListMessage < MetadataListMessage
3232
}
3333
}
3434

35+
def valid_order_by_values
36+
super + [:name]
37+
end
38+
3539
def self.from_params(params)
3640
super(params, @array_keys.map(&:to_s), fields: %w(fields))
3741
end

app/messages/spaces_list_message.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def self.from_params(params)
2121
end
2222

2323
def valid_order_by_values
24-
super << :name
24+
super + [:name]
2525
end
2626
end
2727
end

app/messages/stacks_list_message.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def self.from_params(params)
1515
end
1616

1717
def valid_order_by_values
18-
super << :name
18+
super + [:name]
1919
end
2020
end
2121
end

0 commit comments

Comments
 (0)