326 provide basic search functionality #459

DerProfessor · 2018-06-28T09:40:02Z

Provides a basic search functionality described in #326

stickler-ci · 2018-06-28T09:40:27Z

lib/search_resolver.rb

+
+# Returns a search result to the GraphQL API
+class SearchResolver
+  def call(root, arguments, _context)


C: Assignment Branch Condition size for call is too high. [17.26/15]
C: Method has too many lines. [38/10]

stickler-ci · 2018-06-28T09:40:27Z

lib/search_resolver.rb

+    end
+    result = result.flatten
+    graphQLResult = OpenStruct.new(
+      entries: createEntries(result),


W: Useless assignment to variable - graphQLResult.
C: Use snake_case for variable names.

stickler-ci · 2018-06-28T09:40:28Z

lib/search_resolver.rb

+  private
+  def allOrganizationalUnits(result)
+    search_result = 0
+    result.each do |element|


C: Use snake_case for method names.

stickler-ci · 2018-06-28T09:40:28Z

lib/search_resolver.rb

+      elem = element._data["_index"]
+      if elem == 'user' || elem == 'organization'
+        search_result+=1
+      end


C: Avoid comparing a variable with multiple items in a conditional, use Array#include? instead.

stickler-ci · 2018-06-28T09:40:28Z

lib/search_resolver.rb

+    search_result
+  end
+
+  private


W: Useless private access modifier.

stickler-ci · 2018-06-28T09:40:30Z

spec/graphql/queries/search_query_spec.rb

+
+    ::Index::RepositoryIndex.import(create :repository, name: 'Ada/repository', owner: ada)
+    ::Index::RepositoryIndex.import(create :repository, name: 'Bob/repository', owner: bob)
+    ::Index::RepositoryIndex.import(create :repository, name: 'Adc/repository', owner: adc)


C: Line is too long. [92/80]

stickler-ci · 2018-06-28T09:40:30Z

spec/graphql/queries/search_query_spec.rb

+    ::Index::RepositoryIndex.import(create :repository, name: 'Ada/repository', owner: ada)
+    ::Index::RepositoryIndex.import(create :repository, name: 'Bob/repository', owner: bob)
+    ::Index::RepositoryIndex.import(create :repository, name: 'Adc/repository', owner: adc)
+    ::Index::RepositoryIndex.import(create :repository, name: 'Bob/AdaRepository', owner: bob)


C: Line is too long. [95/80]

stickler-ci · 2018-06-28T09:40:30Z

spec/graphql/queries/search_query_spec.rb

      end

      it 'returns the organizational units' do
        organizational_units = search_result['entries'].select do |e|
          %w(User Organization).include?(e['entry']['__typename'])
        end
-        expect(organizational_units.length).to eq(5)
+        expect(organizational_units.length).to eq(expected_count_organizational_units)


C: Line is too long. [86/80]

stickler-ci · 2018-06-28T09:40:30Z

spec/graphql/queries/search_query_spec.rb

      end

      it 'returns the organizational units' do
        organizational_units = search_result['entries'].select do |e|
          %w(User Organization).include?(e['entry']['__typename'])
        end
-        expect(organizational_units.length).to eq(5)
+        expect(organizational_units.length).to eq(expected_count_organizational_units)


C: Line is too long. [86/80]

stickler-ci · 2018-06-28T09:40:30Z

spec/graphql/queries/search_query_spec.rb

      it 'returns the organizational units' do
        organizational_units = search_result['entries'].select do |e|
          %w(User Organization).include?(e['entry']['__typename'])
        end
-        expect(organizational_units.length).to eq(5)
+        expect(organizational_units.length).to eq(expected_count_organizational_units)


C: Line is too long. [86/80]

stickler-ci · 2018-06-28T09:40:48Z

lib/search_resolver.rb

+                                )}).entries
+    end
+    result = result.flatten
+    graphQLResult = OpenStruct.new(


W: Useless assignment to variable - graphQLResult.
C: Use snake_case for variable names.

stickler-ci · 2018-06-28T09:40:48Z

lib/search_resolver.rb

+
+  private
+
+  def allOrganizationalUnits(result)


C: Use snake_case for method names.

stickler-ci · 2018-06-28T09:40:49Z

lib/search_resolver.rb

+    search_result = 0
+    result.each do |element|
+      elem = element._data['_index']
+      search_result += 1 if elem == 'user' || elem == 'organization'


C: Avoid comparing a variable with multiple items in a conditional, use Array#include? instead.

stickler-ci · 2018-06-28T09:40:49Z

lib/search_resolver.rb

+
+  private
+
+  def allRepositories(result)


C: Use snake_case for method names.

stickler-ci · 2018-06-28T09:40:49Z

lib/search_resolver.rb

+    search_result
+  end
+
+  private


W: Useless private access modifier.

stickler-ci · 2018-06-28T09:40:50Z

spec/graphql/queries/search_query_spec.rb

+    ::Index::OrganizationIndex.import(create(:organization, display_name: 'Abc_Organization'))
+
+    ::Index::RepositoryIndex.import(create(:repository, name: 'Ada/repository', owner: ada))
+    ::Index::RepositoryIndex.import(create(:repository, name: 'Bob/repository', owner: bob))


C: Line is too long. [92/80]

stickler-ci · 2018-06-28T09:40:50Z

spec/graphql/queries/search_query_spec.rb

+
+    ::Index::RepositoryIndex.import(create(:repository, name: 'Ada/repository', owner: ada))
+    ::Index::RepositoryIndex.import(create(:repository, name: 'Bob/repository', owner: bob))
+    ::Index::RepositoryIndex.import(create(:repository, name: 'Adc/repository', owner: adc))


C: Line is too long. [92/80]

stickler-ci · 2018-06-28T09:40:50Z

spec/graphql/queries/search_query_spec.rb

+    ::Index::RepositoryIndex.import(create(:repository, name: 'Ada/repository', owner: ada))
+    ::Index::RepositoryIndex.import(create(:repository, name: 'Bob/repository', owner: bob))
+    ::Index::RepositoryIndex.import(create(:repository, name: 'Adc/repository', owner: adc))
+    ::Index::RepositoryIndex.import(create(:repository, name: 'Bob/AdaRepository', owner: bob))


C: Line is too long. [95/80]

stickler-ci · 2018-06-28T09:40:50Z

spec/graphql/queries/search_query_spec.rb

      end

      it 'returns the organizational units' do
        organizational_units = search_result['entries'].select do |e|
          %w(User Organization).include?(e['entry']['__typename'])
        end
-        expect(organizational_units.length).to eq(5)
+        expect(organizational_units.length).to eq(expected_count_organizational_units)


C: Line is too long. [86/80]

stickler-ci · 2018-06-28T09:40:51Z

spec/graphql/queries/search_query_spec.rb

      it 'returns the organizational units' do
        organizational_units = search_result['entries'].select do |e|
          %w(User Organization).include?(e['entry']['__typename'])
        end
-        expect(organizational_units.length).to eq(5)
+        expect(organizational_units.length).to eq(expected_count_organizational_units)


C: Line is too long. [86/80]

codecov-io · 2018-06-28T09:43:57Z

Codecov Report

Merging #459 into master will decrease coverage by <.01%.
The diff coverage is 98.7%.

@@            Coverage Diff             @@
##           master     #459      +/-   ##
==========================================
- Coverage     100%   99.99%   -0.01%     
==========================================
  Files         399      399              
  Lines       10675    10696      +21     
==========================================
+ Hits        10675    10695      +20     
- Misses          0        1       +1

Impacted Files	Coverage Δ
spec/graphql/queries/search_query_spec.rb	`100% <100%> (ø)`	⬆️
app/graphql/types/query_type.rb	`100% <100%> (ø)`	⬆️
app/graphql/types/search_result_type.rb	`100% <100%> (ø)`	⬆️
lib/search_resolver.rb	`96.96% <96.96%> (ø)`
app/models/search_result.rb

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 96bf8b5...547dc78. Read the comment docs.

phyrog · 2018-06-28T09:46:01Z

lib/search_resolver.rb

+  private
+  def allOrganizationalUnits(result)
+    search_result = 0
+    result.each do |element|


Check out Enumerable#count

phyrog · 2018-06-28T09:46:50Z

lib/search_resolver.rb

+  private
+  def allRepositories(result)
+    search_result = 0
+    result.each do |element|


Check out Enumerable#count

phyrog · 2018-06-28T09:53:31Z

lib/search_resolver.rb

+                  ::Index::OrganizationIndex::Organization,
+                  ::Index::UserIndex::User]
+    else
+      indices = categories.map do |category|


Check out Enumerable#reduce:

indices = categories.reduce([]) do |indices, category| ... when 'repositories' indices + [::Index::RepositoryIndex::Repository] ... end

that way you don't need to flatten the array at the end, which might make it faster.

phyrog · 2018-06-28T09:54:37Z

lib/search_resolver.rb

+      end
+      indices = indices.flatten
+    end
+    result = indices.map do |index|


Could be done using reduce as well, but I think here flatten is fine.

stickler-ci · 2018-06-28T10:06:06Z

lib/search_resolver.rb

+    )
+  end
+
+  def search_index(query, indices)


C: Method has too many lines. [11/10]

stickler-ci · 2018-06-28T10:06:07Z

lib/search_resolver.rb

+  end
+
+  def create_indices(categories)
+    if categories.blank?


C: Method has too many lines. [17/10]

stickler-ci · 2018-06-28T10:06:07Z

lib/search_resolver.rb

+    result.each do |element|
+      elem = element._data['_index']
+      if elem == 'user' || elem == 'organization'
+        search_result += 1


C: Avoid comparing a variable with multiple items in a conditional, use Array#include? instead.

stickler-ci · 2018-06-28T10:06:07Z

lib/search_resolver.rb

+        search_result += 1
+      end
+    end
+    search_result


C: Assignment Branch Condition size for create_entries is too high. [19.1/15]
C: Method has too many lines. [13/10]

stickler-ci · 2018-06-28T10:06:28Z

lib/search_resolver.rb

+    result.flatten
+  end
+
+  def create_indices(categories)


C: Method has too many lines. [17/10]

stickler-ci · 2018-06-28T10:06:29Z

lib/search_resolver.rb

+    search_result = 0
+    result.each do |element|
+      elem = element._data['_index']
+      search_result += 1 if elem == 'user' || elem == 'organization'


C: Avoid comparing a variable with multiple items in a conditional, use Array#include? instead.

stickler-ci · 2018-06-28T10:06:29Z

lib/search_resolver.rb

+    search_result
+  end
+
+  def create_entries(result)


C: Assignment Branch Condition size for create_entries is too high. [19.1/15]
C: Method has too many lines. [13/10]

stickler-ci · 2018-06-28T10:19:56Z

lib/search_resolver.rb

+require 'ostruct'
+
+# Returns a search result to the GraphQL API
+class SearchResolver


E: class definition in method body (Using Ruby 2.5 parser; configure using TargetRubyVersion parameter, under AllCops)

stickler-ci · 2018-06-28T10:19:56Z

lib/search_resolver.rb

+  def all_organizational_units(result)
+    result.count do |element|
+      elem = element._data['_index']
+<<<<<<< HEAD


E: unexpected token tLSHFT (Using Ruby 2.5 parser; configure using TargetRubyVersion parameter, under AllCops)

stickler-ci · 2018-06-28T10:19:56Z

lib/search_resolver.rb

+      elem = element._data['_index']
+<<<<<<< HEAD
+      search_result += 1 if elem == 'user' || elem == 'organization'
+=======


E: unexpected token tEQQ (Using Ruby 2.5 parser; configure using TargetRubyVersion parameter, under AllCops)

stickler-ci · 2018-06-28T10:19:57Z

lib/search_resolver.rb

+      search_result += 1 if elem == 'user' || elem == 'organization'
+=======
+      elem == 'organization' || elem == 'user'
+>>>>>>> Obey review comments


E: unexpected token tRSHFT (Using Ruby 2.5 parser; configure using TargetRubyVersion parameter, under AllCops)

stickler-ci · 2018-06-28T10:19:57Z

lib/search_resolver.rb

+  end
+
+  def all_repositories(result)
+<<<<<<< HEAD


E: unexpected token tLSHFT (Using Ruby 2.5 parser; configure using TargetRubyVersion parameter, under AllCops)

stickler-ci · 2018-06-28T10:19:57Z

lib/search_resolver.rb

+    result.each do |element|
+      elem = element._data['_index']
+      search_result += 1 if elem == 'repository'
+=======


E: unexpected token tEQQ (Using Ruby 2.5 parser; configure using TargetRubyVersion parameter, under AllCops)

stickler-ci · 2018-06-28T10:19:57Z

lib/search_resolver.rb

+=======
+    result.count do |element|
+      element._data['_index'] == 'repository'
+>>>>>>> Obey review comments


E: unexpected token tRSHFT (Using Ruby 2.5 parser; configure using TargetRubyVersion parameter, under AllCops)

stickler-ci · 2018-06-28T10:19:57Z

lib/search_resolver.rb

+      element._data['_index'] == 'repository'
+>>>>>>> Obey review comments
+    end
+  end


E: unexpected token kEND (Using Ruby 2.5 parser; configure using TargetRubyVersion parameter, under AllCops)

stickler-ci · 2018-06-28T10:19:57Z

lib/search_resolver.rb

+      )
+    end
+  end
+end


E: unexpected token kEND (Using Ruby 2.5 parser; configure using TargetRubyVersion parameter, under AllCops)

stickler-ci · 2018-06-28T10:26:39Z

lib/search_resolver.rb

+       ::Index::OrganizationIndex::Organization,
+       ::Index::UserIndex::User]
+    else
+      indices = categories.reduce([]) do |indices, category|


W: Useless assignment to variable - indices.
W: Shadowing outer local variable - indices.

stickler-ci · 2018-06-28T10:26:39Z

lib/search_resolver.rb

+    end
+  end
+
+  def create_entries(result)


C: Assignment Branch Condition size for create_entries is too high. [19.1/15]
C: Method has too many lines. [13/10]

stickler-ci · 2018-06-28T10:38:29Z

lib/search_resolver.rb

+    end
+  end
+
+  def reduce_categories(categories)


C: Method has too many lines. [11/10]

phyrog · 2018-06-28T10:40:52Z

lib/search_resolver.rb

+    end.flatten
+  end
+
+  def create_indices(categories)


map_categories_to_indices might be a better name

phyrog · 2018-06-28T10:41:32Z

lib/search_resolver.rb

+    end
+  end
+
+  def all_organizational_units(result)


organizational_units_count might be a better name

phyrog · 2018-06-28T10:41:45Z

lib/search_resolver.rb

+    end
+  end
+
+  def all_repositories(result)


repositories_count might be a better name

phyrog · 2018-06-28T10:42:17Z

lib/search_resolver.rb

+    end
+  end
+
+  def create_entries(result)


map_entries_to_models might be a better name

phyrog · 2018-06-28T10:42:53Z

lib/search_resolver.rb

+      when 'repositories'
+        indices + [::Index::RepositoryIndex::Repository]
+      else
+        indices + []


can be replaced by just indices as concatenating an empty list is a no-op.

stickler-ci · 2018-06-28T10:46:13Z

lib/search_resolver.rb

+    end
+  end
+
+  def map_entries_to_models(result)


C: Assignment Branch Condition size for map_entries_to_models is too high. [19.1/15]
C: Method has too many lines. [13/10]

DerProfessor added 13 commits June 21, 2018 14:57

WIP Search index

d1f09f1

WIP

7f0dddc

WIP

e38f98d

WIP

6bb9b2e

WIP

1771a0c

GraphQL SearchResult implemented

d29bf59

WIP Repostiories not query

0b84acc

Updates Chewy to 5.0.0

b5a73eb

Remove comments

7911016

Fix Gemfile merge

ff264d5

WIP Tests for global search

53c97a1

WIP Tests with categories

f25fae6

Tests do work now

cf77217

DerProfessor requested a review from phyrog June 28, 2018 09:40

Fixing style errors.

bba8e25

stickler-ci reviewed Jun 28, 2018

View reviewed changes

phyrog requested changes Jun 28, 2018

View reviewed changes

DerProfessor and others added 2 commits June 28, 2018 12:05

Fixes some style errors

97e5dbb

Fixing style errors.

4b4f008

stickler-ci reviewed Jun 28, 2018

View reviewed changes

Obey review comments

605bc17

stickler-ci reviewed Jun 28, 2018

View reviewed changes

Forgot a file

4febae6

stickler-ci reviewed Jun 28, 2018

View reviewed changes

Obey Stickler

768e433

stickler-ci reviewed Jun 28, 2018

View reviewed changes

lib/search_resolver.rb Outdated

end

end

def reduce_categories(categories)

Copy link

Contributor

stickler-ci Jun 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

C: Method has too many lines. [11/10]

phyrog requested changes Jun 28, 2018

View reviewed changes

Obey second review

ea14b10

stickler-ci reviewed Jun 28, 2018

View reviewed changes

DerProfessor added 2 commits June 28, 2018 12:50

Disable unnecessary rubocop for two cases

92a5b38

Fix changed method names

547dc78

326 provide basic search functionality #459

Are you sure you want to change the base?

326 provide basic search functionality #459

Conversation

DerProfessor commented Jun 28, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Jun 28, 2018 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

phyrog Jun 28, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Jun 28, 2018 •

edited

phyrog Jun 28, 2018 •

edited