Skip to content

Commit

Permalink
put collections mergin only for class search
Browse files Browse the repository at this point in the history
  • Loading branch information
Bilelkihal committed Sep 6, 2024
1 parent 230cb44 commit 4cff0f5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
10 changes: 8 additions & 2 deletions lib/ontologies_api_client/models/class.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,16 @@ def self.search(*args)

raise ArgumentError, "You must provide a search query: Class.search(query: 'melanoma')" if query.nil? || !query.is_a?(String)

if params[:federate]
federated_get(params) do |url|
if params[:federate] || params[:portals]
search_result = federated_get(params) do |url|
"#{url}/search"
end

merged_collections = []
search_result.each do |result|
merged_collections.concat(result.collection)
end
merged_collections
else
HTTP.get("/search", params)
end
Expand Down
11 changes: 1 addition & 10 deletions lib/ontologies_api_client/request_federation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,10 @@ def federated_get(params = {}, &link)
end
end

connections = params[:is_collection] ? merge_collections(connections) : connections.flatten

connections
connections.flatten
end

def merge_collections(connections)
merged_collections = []

connections.each do |connection|
merged_collections.concat(connection.collection)
end
merged_collections
end

def request_portals(params = {})
federate = params.delete(:federate) || ::RequestStore.store[:federated_portals]
Expand Down
2 changes: 1 addition & 1 deletion ontologies_api_client.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
gem.require_paths = ["lib"]
gem.version = "2.2.0"

gem.add_dependency('activesupport', '~> 7.0.4')
gem.add_dependency('activesupport', '~> 7.0.3')
gem.add_dependency('excon')
gem.add_dependency('faraday')
gem.add_dependency('faraday-excon', '~> 2.0.0')
Expand Down

0 comments on commit 4cff0f5

Please sign in to comment.