elasticord 1.0.0 → 1.0.1

data/lib/dash_overlord/use_cases/v1/shared/search_and_paginate/apply_pagination.rb

@@ -15,15 +15,12 @@ module DashOverlord
 
             def perform
               context.page = fix_page(page)
+              context.per_page = fix_per_page(per_page)
 
-              if page == 0
-                no_pagination
-              else
-                apply_pagination
-              end
+              page == 0 ? no_pagination : apply_pagination
             end
 
-            protected ###################### PROTECTED ###########################
+            protected
 
             def no_pagination
               context.per_page = 0
@@ -32,13 +29,9 @@ module DashOverlord
             end
 
             def apply_pagination
-              context.per_page = fix_per_page(per_page)
-
               context.resources = paginated_resources.page(page).per(per_page)
 
               context.page = resources.current_page
-              context.total_pages = resources.total_pages
-              context.total_results = resources.total_count
             end
 
             def fix_page(page)
@@ -54,7 +47,7 @@ module DashOverlord
               (per_page_or_nil || PER_PAGE_DEFAULT).to_i
             end
 
-            private ######################## PRIVATE #############################
+            private
 
             def paginated_resources
               if resources.respond_to?(:page)

data/lib/dash_overlord/use_cases/v1/shared/search_and_paginate/base.rb

@@ -18,12 +18,8 @@ module DashOverlord
               invoke! ApplyFullTextSearch
               invoke! ApplyFilters
               invoke! ApplyPagination
-
-              context.meta = Entities::V1::MetaData.new \
-                context.attributes.slice :page,
-                                         :per_page,
-                                         :total_pages,
-                                         :total_results
+              invoke! ExecuteQuery
+              invoke! BuildMetaData
 
               context.resources
             end

data/lib/dash_overlord/use_cases/v1/shared/search_and_paginate/build_meta_data.rb

@@ -0,0 +1,26 @@
+module DashOverlord
+  module UseCases
+    module V1
+      module Shared
+        module SearchAndPaginate
+
+          class BuildMetaData < V1::Base
+            context_reader :resources
+
+            def perform
+              context.total_pages ||= resources.total_pages
+              context.total_results ||= resources.total_count
+
+              context.meta = Entities::V1::MetaData.new \
+                context.attributes.slice :page,
+                                         :per_page,
+                                         :total_pages,
+                                         :total_results
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/dash_overlord/use_cases/v1/shared/search_and_paginate/execute_query.rb

@@ -0,0 +1,21 @@
+module DashOverlord
+  module UseCases
+    module V1
+      module Shared
+        module SearchAndPaginate
+
+          class ExecuteQuery < V1::Base
+            context_reader :resources
+
+            def perform
+              return unless resources.respond_to?(:load)
+
+              context.resources = resources.load
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/dash_overlord/use_cases/v1/videos/index/dynamodb/search_and_paginate_videos.rb

@@ -5,11 +5,16 @@ module DashOverlord
         module Index
           module DynamoDb
 
-            class SearchAndPaginateVideos < Shared::SearchAndPaginate::Base
+            class SearchAndPaginateVideos < Repositories::DynamoDb::SearchAndPaginate::Base
               def perform
+                context.videos = search_and_paginate(resource_class)
               end
 
-              protected
+              protected ################## PROTECTED ###################
+
+              def resource_class
+                DashOverlord::Models::V1::DynamoDb::Video
+              end
             end
 
           end

data/lib/dash_overlord/use_cases/v1/videos/index/elastic_search/search_and_paginate_videos.rb

@@ -5,87 +5,9 @@ module DashOverlord
         module Index
           module ElasticSearch
 
-            class SearchAndPaginateVideos < V1::Base
-              PAGE_DEFAULT = 1
-              PER_PAGE_DEFAULT = 10
-
-              context_reader :page, :per_page, :filter_query, :full_text_term
-
+            class SearchAndPaginateVideos < Shared::SearchAndPaginate::Base
               def perform
-                context.page = fix_page(page)
-                context.per_page = fix_per_page(per_page)
-
-                context.videos = search_results[:data]
-
-                context.meta = Entities::V1::MetaData.new \
-                  page: page,
-                  per_page: per_page,
-                  total_pages: total_pages,
-                  total_results: total_results
-              end
-
-              protected
-
-              def fix_page(page)
-                page_or_nil = page.class == String ? page.presence : page
-
-                (page_or_nil || PAGE_DEFAULT).to_i
-              end
-
-              def fix_per_page(per_page)
-                per_page_or_nil = \
-                  per_page.class == String ? per_page.presence : per_page
-
-                (per_page_or_nil || PER_PAGE_DEFAULT).to_i
-              end
-
-              def search_results
-                @search_results ||= Models::V1::Answer.search(search_params)
-              end
-
-              def total_results
-                search_results[:total_results]
-              end
-
-              def total_pages
-                (total_results / per_page.to_f).ceil
-              end
-
-              private
-
-              def search_params
-                search_params = {
-                  size: per_page,
-                  from: (page - 1) * per_page,
-                  query: { bool: {} }
-                }
-
-                build_query_params(search_params)
-
-                build_filter_params(search_params)
-
-                search_params
-              end
-
-              def build_query_params(search_params)
-                return unless full_text_term
-
-                params = (search_params[:query][:bool][:must] ||= [])
-
-                # params[:must] << { match: { title: full_text_term } }
-              end
-
-              def build_filter_params(search_params)
-                return unless filter_query
-
-                params = (search_params[:query][:bool][:filter] ||= [])
-
-                filter_query.each do |key, value|
-                  key = key.to_s.split('_eq').first.to_sym
-                  value = value.downcase if value.is_a? String
-
-                  params.push({ term: { key => value } })
-                end
+                context.videos = search_and_paginate Models::V1::Answer.none
               end
             end
 

data/lib/elasticord/base.rb

@@ -1,9 +1,10 @@
 require 'ostruct'
 
-require_relative 'orm/get'
-require_relative 'orm/index'
-require_relative 'orm/create'
-require_relative 'orm/delete'
+require 'elasticord/orm/get'
+require 'elasticord/orm/index'
+require 'elasticord/orm/create'
+require 'elasticord/orm/delete'
+require 'elasticord/orm/search_builder'
 
 module Elasticord
   class Base < OpenStruct
@@ -26,14 +27,12 @@ module Elasticord
         self.new(result.merge({ 'id' => id }))
       end
 
-      def search(query = {})
-        results = ORM::Get.by_query(index, type, query)
-
-        results[:data] = results[:data].map do |attributes|
-          self.new(attributes)
-        end
+      def search(body = {})
+        none.load(body)
+      end
 
-        results
+      def none
+        ORM::SearchBuilder.new(self, index, type)
       end
 
       def delete_by_query(attributes = {})

data/lib/elasticord/entities/array_with_meta_data.rb

@@ -0,0 +1,37 @@
+module Elasticord
+  module Entities
+    class ArrayWithMetaData < SimpleDelegator
+      attr_accessor :per_page, :current_page, :total_results
+
+      def initialize(page_default, per_page_default)
+        @internal_array = []
+
+        @per_page = per_page_default
+        @current_page = page_default
+        @total_results = 0
+
+        super(@internal_array)
+      end
+
+      alias total_count total_results
+
+      def total_pages
+        (total_results / per_page.to_f).ceil
+      end
+
+      def size
+        per_page
+      end
+
+      def from
+        (current_page - 1) * size
+      end
+
+      protected
+
+      def parse_string_number(number)
+        number.class == String ? number.presence : number
+      end
+    end
+  end
+end

data/lib/elasticord/orm/search_builder.rb

@@ -0,0 +1,101 @@
+require 'forwardable'
+require 'elasticord/entities/array_with_meta_data'
+
+module Elasticord
+  module ORM
+    class SearchBuilder
+      extend Forwardable
+
+      PAGE_DEFAULT = 1
+      PER_PAGE_DEFAULT = 10
+
+      def initialize(entity, index, type)
+        @entity, @index, @type = entity, index, type
+      end
+
+      def_delegators :results, :current_page, :per_page, :size, :from
+
+      def page(new_page)
+        results.current_page = new_page
+
+        body_params[:from] = results.from
+
+        self
+      end
+
+      def per(new_per_page)
+        results.per_page = new_per_page
+
+        body_params[:size] = results.size
+        body_params[:from] = results.from
+
+        self
+      end
+
+      def load(body = {})
+        begin
+          elastic_results = execute_search(body)
+
+          results.total_results = elastic_results['total']
+
+          elastic_results['hits'].map do |result|
+            results.push entity.new(result['_source'])
+          end
+        rescue Elasticsearch::Transport::Transport::Errors::NotFound
+          nil
+        end
+
+        results
+      end
+
+      # def ft(full_text_term)
+      #   return self unless full_text_term
+      #
+      #   params = (body_params[:query][:bool][:must] ||= [])
+      #
+      #   # params[:must] << { match: { title: full_text_term } }
+      # end
+
+      def ransack(ransack_filters = {})
+        return self unless ransack_filters
+
+        params = (body_params[:query][:bool][:filter] ||= [])
+
+        ransack_filters.each do |key, value|
+          key = key.to_s.split('_eq').first.to_sym
+          value = value.downcase if value.is_a? String
+
+          params.push({ term: { key => value } })
+        end
+
+        self
+      end
+
+      def result(*_args)
+        self
+      end
+
+      def body_params
+        @body_params ||= { size: size, from: from, query: { bool: {} } }
+      end
+
+      protected
+
+      attr_reader :type, :index, :entity
+
+      def results
+        @results ||= Entities::ArrayWithMetaData.new \
+          PAGE_DEFAULT, PER_PAGE_DEFAULT
+      end
+
+      def execute_search(body)
+        elastic_results = Elasticord.client.search \
+          index: index, type: type, body: body_params.merge(body)
+
+        hits = elastic_results['hits']
+
+        (hits && hits['total'].to_i > 0) ? hits : { 'hits' => [], 'total' => 0 }
+      end
+    end
+  end
+end

data/lib/elasticord/version.rb

@@ -1,3 +1,3 @@
 module Elasticord
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/lib/tasks/create_dummy_data.rake

@@ -6,6 +6,7 @@ namespace :dash_overlord do
 
     DashOverlord::UseCases::V1::DummyData::Create::Charts::Base.perform \
       num_of_records: NUM_OF_RECORDS,
+      table_name: paginated_table,
       repo: 'dynamo_db'
   end
 end

data/spec/dash_overlord/use_cases/v1/videos/index/dynamo_db_spec.rb

@@ -1,11 +1,18 @@
 require 'spec_helper'
 
-describe DashOverlord::UseCases::V1::Videos::Index::DynamoDb::Base,
+describe DashOverlord::UseCases::V1::Videos::Index::Base,
          dynamodb: true do
 
+  def search_adapter
+    DashOverlord::UseCases::V1::Videos::Index::DynamoDb::Base
+  end
+
   def make_the_call(params = nil)
     @context = described_class.perform \
-      (params || {}).merge({ session: user_session })
+      (params || {}).merge({
+        search_adapter_use_case: search_adapter,
+        session: user_session
+      })
 
     raise_context_unknown_error @context
   end
@@ -15,6 +22,7 @@ describe DashOverlord::UseCases::V1::Videos::Index::DynamoDb::Base,
       DashOverlord::Models::V1::DynamoDb::Video
 
     migration.create!
+
   end
 
   after(:all) do
@@ -29,14 +37,14 @@ describe DashOverlord::UseCases::V1::Videos::Index::DynamoDb::Base,
       "url": "https://s3-eu-west-1.amazonaws.com/streetbees-assets/dashboards/home_selfie/videos_1/11264-kitchen.MOV",
       "original_url": "https://streetbees-photos.s3-eu-west-1.amazonaws.com/uploads/bee_videos/temporary/original_11264-kitchen.jpg",
       "subtitle_url": "/subtitles//unilever/hhc/11264-kitchen.en.vtt",
-      "country": "UK",
+      "country": ["UK", "US", "PT", "GB"].sample,
       "category": "Kitchen floor",
       "extra": nil,
       "segment_uid": "hhc",
       "lsm": "13+",
       "age": nil,
       "room": "Kitchen",
-      "gender": "Male",
+      "gender": ["Male", "Female"].sample,
       "user_id": 835,
       "children": true,
       "age_group": "46+",
@@ -46,16 +54,21 @@ describe DashOverlord::UseCases::V1::Videos::Index::DynamoDb::Base,
   end
 
   def create_answers
-    videos = 20.times.map do |index|
-      build_answer.merge("id" => index + 1)
+    @videos = 20.times.map do |index|
+      build_answer.merge(
+        "id" => (index + 1),
+        "dashboard_id": 1
+      )
     end
 
     DashOverlord::Models::V1::DynamoDb::Video.create_all \
-      videos
+      @videos
   end
 
   context 'when no filter params are used' do
     before do
+      @current_user = create('v1/user', :unilever)
+
       create_answers
 
       make_the_call
@@ -73,12 +86,61 @@ describe DashOverlord::UseCases::V1::Videos::Index::DynamoDb::Base,
     it 'should return pagination meta_data' do
       expect(@context.meta.page).to be 1
       expect(@context.meta.per_page).to be 10
-      expect(@context.meta.total_pages).to be 2
-      expect(@context.meta.total_results).to be 20
     end
 
     it 'should return 10 results' do
       expect(@context.videos.length).to be 10
     end
   end
+
+  context 'when filtering by page = 0' do
+    before do
+      @current_user = create('v1/user', :unilever)
+
+      create_answers
+
+      make_the_call page: 0
+    end
+
+    it '@context.status should be ok' do
+      expect(@context.status).to eq 'ok'
+    end
+
+    it 'should return pagination meta_data' do
+      expect(@context.meta.page).to be 0
+      expect(@context.meta.per_page).to be 0
+    end
+
+    it 'should return 20 results', :cana do
+      expect(@context.videos.length).to be 20
+    end
+  end
+
+  context 'when filtering by something' do
+    before do
+      @current_user = create('v1/user', :unilever)
+
+      create_answers
+
+      @female_videos = @videos.select{|el| el[:gender] == "Female" }
+
+      make_the_call \
+        filter_query: {
+          gender_eq: 'Female'
+        }
+    end
+
+    it '@context.status should be ok' do
+      expect(@context.status).to eq 'ok'
+    end
+
+    it 'should return pagination meta_data' do
+      expect(@context.meta.page).to be 1
+      expect(@context.meta.per_page).to be 10
+    end
+
+    it 'should return only female results', :focusrite do
+      expect(@context.videos.length).to be @female_videos.count
+    end
+  end
 end