elasticord 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7d122cf6a147910ddcb4626cbcd0ca47c7ecf65
-  data.tar.gz: b73e1187a53381158be36e975b36b26e9c0ab931
+  metadata.gz: fc79df0348d2af67fe3b48daf37b032356a5047d
+  data.tar.gz: 667711293ae4e3395b688c49121bc273c8f38701
 SHA512:
-  metadata.gz: 3fb456198e61048fc0306bdd2b8fe34ba3ddf7c2bf4928a57419aef2f1faee7f3035e4b39f09291897bb4380068e3a106521b557c5c6e8da9536dffec62dec43
-  data.tar.gz: 37f67729dc2d7b531e3ee26dd64035f8fc88be56bcb5fe55150bae9b25794c38e2270f69c6595649d4c7a620feed9b35901d6186d4b0e7d0acf12af7a76d1106
+  metadata.gz: bebc8fa99c4adff7c2be20515d1d479abc002a850680bbc9dc3f53f120156a38bb112a06ec80245923db2b5f38b7c2e100d9795ac71ab45c4ed219f9859ea16e
+  data.tar.gz: da6a8bf8bf8aba80b42e06533c953c1c09aa7ebb0a50b6bc77c607d266a4f6c9aa18661fae8dffba9decd8c32592fc6aa60b410c8dcc5a33127c5c2e94300f42

data/Gemfile.lock

@@ -12,7 +12,7 @@ PATH
       object_attorney (>= 3.0.7)
       pg (>= 0.17)
       ransack (>= 1.7.0)
-    elasticord (1.0.4)
+    elasticord (1.0.6)
       elasticsearch (~> 5.0)
 
 GEM

data/config/boot.rb

@@ -15,25 +15,11 @@ require 'dash_overlord'
 DashOverlord::V1.configure do |config|
   config.set(:env, ENV.fetch('ENV'))
   config.set(:db_config, ENV.fetch('DASH_OVERLORD_V1_DATABASE_URL'))
-
-  config.set(:dynamodb_access_key, ENV.fetch('DASH_OVERLORD_DYNAMODB_ACCESS_KEY'))
-  config.set(:dynamodb_secret_key, ENV.fetch('DASH_OVERLORD_DYNAMODB_SECRET_KEY'))
-  config.set(:dynamodb_region, ENV.fetch('DASH_OVERLORD_DYNAMODB_REGION'))
 end
 
 DashOverlord::Models::V1::Base.establish_connection \
   DashOverlord::V1::Config.get(:db_config)
 
-if ENV['ENV'] == 'test'
-  credentials = Aws::Credentials.new(
-    DashOverlord::V1::Config.get(:dynamodb_access_key),
-    DashOverlord::V1::Config.get(:dynamodb_secret_key)
-  )
-
-  Aws.config.update({
-    region: "us-west-2",
-    endpoint: "http://localhost:8000",
-    credentials: credentials
-  })
-
+Dir[File.expand_path('../initializers/**{,/*/**}/*.rb', __FILE__)].each do |f|
+  require f
 end

data/config/initializers/elasticord.rb

@@ -0,0 +1,7 @@
+require 'elasticord'
+
+Elasticord.configure do |config|
+  config.set :log, false
+  config.set \
+    :index_namespace, "#{DashOverlord::V1::Config.get(:env)}_not_heroku_at_all"
+end

data/lib/dash_overlord/models/v1/dynamo_db/base.rb

@@ -10,8 +10,10 @@ module DashOverlord
           end
 
           def self.create_all(items)
-            client.batch_write_item \
-              create_all_params(items)
+            items.each_slice(25) do |batch|
+              client.batch_write_item \
+                create_all_params(batch)
+            end
           end
 
           def self.create(attributes = {})
@@ -37,17 +39,22 @@ module DashOverlord
               resource_class: self
           end
 
-          def self.page(page, last_evaluated_key)
-            DynamoDb::Scan.new \
-              current_page: page,
-              last_evaluated_key: last_evaluated_key,
-              client: client,
-              table_name: table_name,
-              resource_class: self
-
+          def result(args)
+            self
           end
 
-          def self.search(filters)
+          # def self.page(page, last_evaluated_key)
+          #   DynamoDb::Scan.new \
+          #     current_page: page,
+          #     last_evaluated_key: last_evaluated_key,
+          #     client: client,
+          #     table_name: table_name,
+          #     resource_class: self
+          # end
+
+          def self.ransack(filters)
+            return unless filters
+
             DynamoDb::Scan.new \
               client: client,
               table_name: table_name,

data/lib/dash_overlord/models/v1/dynamo_db/scan.rb

@@ -4,30 +4,30 @@ module DashOverlord
       module DynamoDb
         class Scan < DynamoDb::Base
           # resource.page(page).per(per_page)
-          def search(filters)
+          def ransack(filters)
             self.filters = filters
 
             self
           end
 
-          def page(page, last_evaluated_key)
-            self.current_page = page
-            self.last_evaluated_key = last_evaluated_key
+          # def page(page, last_evaluated_key)
+          #   self.current_page = page
+          #   self.last_evaluated_key = last_evaluated_key
 
-            self
-          end
+          #   self
+          # end
+
+          # def per(per_page)
+          #   self.limit = per_page
 
-          def per(per_page)
-            self.limit = per_page
+          #   self
+          # end
 
+          def result(distinct)
             self
           end
 
-          def execute #choose a better name than this...
-            if paginated_scan
-              return scan_page
-            end
-
+          def load
             scan_all
           end
 
@@ -38,7 +38,7 @@ module DashOverlord
             items = []
 
             loop do
-              result = client.scan(scan_params)
+              result = client.query(scan_params)
               items += result.items
 
               break unless result.last_evaluated_key
@@ -54,7 +54,7 @@ module DashOverlord
           end
 
           def scan_page
-            result = client.scan(params)
+            result = client.query(params)
 
             DynamoDb::PaginatedResult.new \
               items: result.items.map{ |item| resource_class.new(item) },
@@ -75,9 +75,14 @@ module DashOverlord
             return {} unless filters
 
             initial_params = {
+              key_condition_expression: "#dashboard_id = :dashboard_id",
               filter_expression: [],
-              expression_attribute_names: {},
-              expression_attribute_values: {}
+              expression_attribute_names: {
+                "#dashboard_id" => "dashboard_id"
+              },
+              expression_attribute_values: {
+                ':dashboard_id' => 1
+              }
             }
 
             filters_mapped = \

data/lib/dash_overlord/models/v1/{elastic_search.rb → elastic_search/base.rb}

@@ -3,10 +3,12 @@ require 'elasticord'
 module DashOverlord
   module Models
     module V1
+      module ElasticSearch
 
-      class ElasticSearch < Elasticord::Base
-      end
+        class Base < Elasticord::Base
+        end
 
+      end
     end
   end
 end

data/lib/dash_overlord/models/v1/elastic_search/bee_video.rb

@@ -0,0 +1,15 @@
+module DashOverlord
+  module Models
+    module V1
+      module ElasticSearch
+
+        class BeeVideo < ElasticSearch::Base
+          def self.by_dashboard(dashboard_uid)
+            client(dashboard_uid)
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/dash_overlord/use_cases/v1/repositories/dynamo_db/search_and_paginate/base.rb

@@ -18,9 +18,11 @@ module DashOverlord
                 context.resource = resource
 
                 invoke! ApplyFilters
-                invoke! ApplyPagination
 
+                # invoke! ApplyPagination
+                puts "Before executing... #{DateTime.now}"
                 context.resource = context.resource.execute
+                puts "After executing... #{DateTime.now}"
 
                 context.meta = Entities::V1::MetaData.new \
                   context.attributes.slice :page,

data/lib/dash_overlord/use_cases/v1/videos/import/from_postgres_to_elastic_search/base.rb

@@ -0,0 +1,32 @@
+module DashOverlord
+  module UseCases
+    module V1
+      module Videos
+        module Import
+          module FromPostgresToElasticSearch
+
+            # DashOverlord::UseCases::V1::Videos::Import::FromPostgresToElasticSearch::Base.perform
+            class Base < V1::Base
+              context_reader :segment_uid
+
+              def perform
+                context.segment_uid = 'hhc'
+
+                invoke! DeleteElasticSearchBeeVideos
+
+                postgres_bee_videos.each do |postgres_bee_video|
+                  invoke! StoreBeeVideo, postgres_bee_video: postgres_bee_video
+                end
+              end
+
+              def postgres_bee_videos
+                Models::V1::BeeVideo.where(segment_uid: segment_uid)
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dash_overlord/use_cases/v1/videos/import/from_postgres_to_elastic_search/delete_elastic_search_records.rb

@@ -0,0 +1,23 @@
+module DashOverlord
+  module UseCases
+    module V1
+      module Videos
+        module Import
+          module FromPostgresToElasticSearch
+
+            class DeleteElasticSearchBeeVideos < V1::Base
+              context_reader :segment_uid
+
+              def perform
+                DashOverlord::Models::V1::ElasticSearch::BeeVideo
+                  .by_dashboard('hhc')
+                  .delete_all
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dash_overlord/use_cases/v1/videos/import/from_postgres_to_elastic_search/parse_hhc_bee_video.rb

@@ -0,0 +1,21 @@
+module DashOverlord
+  module UseCases
+    module V1
+      module Videos
+        module Import
+          module FromPostgresToElasticSearch
+
+            module ParseHhcBeeVideo
+              module_function
+
+              def run(postgres_bee_video)
+                postgres_bee_video.attributes
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dash_overlord/use_cases/v1/videos/import/from_postgres_to_elastic_search/store_bee_video.rb

@@ -0,0 +1,37 @@
+module DashOverlord
+  module UseCases
+    module V1
+      module Videos
+        module Import
+          module FromPostgresToElasticSearch
+
+            class StoreBeeVideo < V1::Base
+              context_reader :segment_uid, :postgres_bee_video
+
+              def perform
+                # results = DashOverlord::Models::V1::ElasticSearch::BeeVideo.by_dashboard('hhc').search
+
+                Models::V1::ElasticSearch::BeeVideo
+                  .by_dashboard(segment_uid)
+                  .create bee_video_attributes
+              end
+
+              def bee_video_attributes
+                attributes = postgres_bee_video.attributes.dup
+
+                attributes.delete(:extra)
+
+                attributes.merge!(postgres_bee_video.extra || {})
+
+                attributes[:title] = "#{attributes['country']}, #{attributes['category']}"
+
+                attributes
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dash_overlord/use_cases/v1/videos/index/base.rb

@@ -5,7 +5,7 @@ module DashOverlord
         module Index
 
           class Base < V1::Base
-            DEFAULT_SEARCH_ADAPTER_USE_CASE = Postgres::Base
+            DEFAULT_SEARCH_ADAPTER_USE_CASE = ElasticSearch::Base
 
             def perform
               invoke! Users::FindCurrentUser

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

@@ -5,7 +5,7 @@ module DashOverlord
         module Index
           module DynamoDb
 
-            class SearchAndPaginateVideos < Repositories::DynamoDb::SearchAndPaginate::Base
+            class SearchAndPaginateVideos < Shared::SearchAndPaginate::Base
               def perform
                 context.videos = search_and_paginate(resource_class)
               end

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

@@ -8,6 +8,7 @@ module DashOverlord
             class Base < V1::Base
               def perform
                 invoke! SearchAndPaginateVideos
+                invoke! Postgres::GetFilters
               end
             end
 

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

@@ -6,8 +6,18 @@ module DashOverlord
           module ElasticSearch
 
             class SearchAndPaginateVideos < Shared::SearchAndPaginate::Base
+              context_reader :segment_uid
+
               def perform
-                context.videos = search_and_paginate Models::V1::Answer.none
+                context.videos = search_and_paginate bee_videos
+              end
+
+              protected
+
+              def bee_videos
+                Models::V1::ElasticSearch::BeeVideo
+                  .by_dashboard(segment_uid)
+                  .none
               end
             end
 

data/lib/dash_overlord/use_cases/v1/videos/index/postgres/get_filters.rb

@@ -17,8 +17,7 @@ module DashOverlord
               end
 
               def hhc
-                {}
-                # JSON.parse(File.read('./dash_overlord/lib/dash_overlord/use_cases/v1/video_filters/index/hhc.json'))
+                JSON.parse(File.read(File.expand_path('../hhc.json', __FILE__)))
               end
 
               def laundry

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

@@ -6,7 +6,7 @@ module DashOverlord
           module Postgres
 
             class SearchAndPaginateVideos < Shared::SearchAndPaginate::Base
-              context_reader :subtitle_lines
+              context_reader :subtitle_lines, :segment_uid
 
               def perform
                 context.videos = search_and_paginate bee_videos
@@ -17,6 +17,7 @@ module DashOverlord
               def bee_videos
                 scope = Models::V1::BeeVideo
                   .where(rejected_by_system: false)
+                  .where(segment_uid: segment_uid)
                   .includes(:subtitle_lines)
 
                 return scope if subtitle_lines.blank?

data/lib/dash_overlord/use_cases/v1/videos/index/postgres/search_on_subtitle_lines.rb

@@ -6,7 +6,7 @@ module DashOverlord
           module Postgres
 
             class SearchOnSubtitleLines < V1::Base
-              context_reader :full_text_term
+              context_reader :full_text_term, :segment_uid
 
               def perform
                 return if full_text_term.blank?
@@ -14,6 +14,7 @@ module DashOverlord
                 context.subtitle_lines =
                   Models::V1::SubtitleLine
                     .order(:start_time)
+                    .where(segment_uid: segment_uid)
                     .ft(full_text_term)
               end
             end

data/lib/elasticord.rb

@@ -18,8 +18,4 @@ module Elasticord
   def self.configure
     yield(Config)
   end
-
-  # Default values
-  Config.set(:log, false)
-  Config.set(:index_namespace, ENV['ENV'] || 'development')
 end

data/lib/elasticord/client/base.rb

@@ -14,6 +14,8 @@ module Elasticord
           elastic_search_client, entity, index, type
       end
 
+      attr_reader :index, :type
+
       def create(attributes = {})
         result = Client::Create.one \
           elastic_search_client, index, type, attributes
@@ -51,7 +53,7 @@ module Elasticord
 
       protected
 
-      attr_reader :elastic_search_client, :entity, :index, :type
+      attr_reader :elastic_search_client, :entity
     end
   end
 end

data/lib/elasticord/client/search_builder.rb

@@ -13,6 +13,8 @@ module Elasticord
           elastic_search_client, entity, index, type
       end
 
+      attr_reader :index, :type
+
       def_delegators :results, :current_page, :per_page, :size, :from
 
       def page(new_page)
@@ -59,13 +61,14 @@ module Elasticord
       def ransack(ransack_filters = {})
         return self unless ransack_filters
 
-        params = (body_params[:query][:bool][:filter] ||= [])
+        params = body_params[:query][:bool]
 
         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 } })
+          if key['_eq_any']
+            add_should_clause(params, key, value)
+          elsif key['_eq']
+            add_must_clause(params, key, value)
+          end
         end
 
         self
@@ -77,7 +80,7 @@ module Elasticord
 
       protected
 
-      attr_reader :elastic_search_client, :entity, :index, :type
+      attr_reader :elastic_search_client, :entity
 
       def results
         @results ||= ArrayWithMetaData.new \
@@ -92,6 +95,32 @@ module Elasticord
 
         (hits && hits['total'].to_i > 0) ? hits : { 'hits' => [], 'total' => 0 }
       end
+
+      def add_must_clause(params, key, value)
+        params[:must] ||= []
+
+        key = key.to_s.split('_eq').first.to_sym
+
+        add_term(params[:must], key, value)
+      end
+
+      def add_should_clause(params, key, values)
+        params[:boost] = 1.0
+        params[:should] ||= []
+        params[:minimum_should_match] = 1
+
+        key = key.to_s.split('_eq_any').first.to_sym
+
+        [*values].each { |value| add_term(params[:should], key, value) }
+      end
+
+      private
+
+      def add_term(params, key, value)
+        value = value.downcase if value.is_a? String
+
+        params.push({ term: { key => value } })
+      end
     end
   end
 end

data/lib/elasticord/version.rb

@@ -1,3 +1,3 @@
 module Elasticord
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.6'.freeze
 end

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

@@ -18,20 +18,22 @@ describe DashOverlord::UseCases::V1::Videos::Index::Base,
   end
 
   before(:all) do
-    migration = DashOverlord::Models::V1::DynamoDb::Migration.new \
-      DashOverlord::Models::V1::DynamoDb::Video
+    # migration = DashOverlord::Models::V1::DynamoDb::Migration.new \
+    #   DashOverlord::Models::V1::DynamoDb::Video
 
-    migration.create!
+    # migration.create!
 
   end
 
   after(:all) do
-    migration = DashOverlord::Models::V1::DynamoDb::Migration.new \
-      DashOverlord::Models::V1::DynamoDb::Video
+    # migration = DashOverlord::Models::V1::DynamoDb::Migration.new \
+    #   DashOverlord::Models::V1::DynamoDb::Video
 
-    migration.delete!
+    # migration.delete!
   end
 
+  let(:number_of_records) { 20 }
+
   def build_answer
     {
       "url": "https://s3-eu-west-1.amazonaws.com/streetbees-assets/dashboards/home_selfie/videos_1/11264-kitchen.MOV",
@@ -54,7 +56,7 @@ describe DashOverlord::UseCases::V1::Videos::Index::Base,
   end
 
   def create_answers
-    @videos = 20.times.map do |index|
+    @videos = number_of_records.times.map do |index|
       build_answer.merge(
         "id" => (index + 1),
         "dashboard_id": 1
@@ -65,82 +67,82 @@ describe DashOverlord::UseCases::V1::Videos::Index::Base,
       @videos
   end
 
-  context 'when no filter params are used' do
-    before do
-      @current_user = create('v1/user', :unilever)
+  # context 'when no filter params are used' do
+  #   before do
+  #     @current_user = create('v1/user', :unilever)
 
-      create_answers
+  #     create_answers
 
-      make_the_call
-    end
+  #     make_the_call
+  #   end
 
-    it '@context.status should be ok' do
-      expect(@context.status).to eq 'ok'
-    end
+  #   it '@context.status should be ok' do
+  #     expect(@context.status).to eq 'ok'
+  #   end
 
-    it 'should have the right ammount of data' do
-      expect(DashOverlord::Models::V1::DynamoDb::Video.all.count) \
-        .to eq(20)
-    end
+  #   it 'should have the right ammount of data' do
+  #     expect(DashOverlord::Models::V1::DynamoDb::Video.all.count) \
+  #       .to eq(20)
+  #   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 pagination meta_data' do
+  #     expect(@context.meta.page).to be 1
+  #     expect(@context.meta.per_page).to be 10
+  #   end
 
-    it 'should return 10 results' do
-      expect(@context.videos.length).to be 10
-    end
-  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)
+  # context 'when filtering by page = 0' do
+  #   before do
+  #     @current_user = create('v1/user', :unilever)
 
-      create_answers
+  #     create_answers
 
-      make_the_call page: 0
-    end
+  #     make_the_call page: 0
+  #   end
 
-    it '@context.status should be ok' do
-      expect(@context.status).to eq 'ok'
-    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 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
+  #   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)
+  # context 'when filtering by something' do
+  #   before do
+  #     @current_user = create('v1/user', :unilever)
 
-      create_answers
+  #     create_answers
 
-      @female_videos = @videos.select{|el| el[:gender] == "Female" }
+  #     @female_videos = @videos.select{|el| el[:gender] == "Female" }
 
-      make_the_call \
-        filter_query: {
-          gender_eq: 'Female'
-        }
-    end
+  #     make_the_call \
+  #       filter_query: {
+  #         gender_eq: 'Female'
+  #       }
+  #   end
 
-    it '@context.status should be ok' do
-      expect(@context.status).to eq 'ok'
-    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 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
+  #   it 'should return only filtered results', :focusrite do
+  #     expect(@context.videos.length).to be @female_videos.count
+  #   end
+  # end
 end

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

@@ -2,8 +2,12 @@ require 'spec_helper'
 
 describe DashOverlord::UseCases::V1::Videos::Index::ElasticSearch::Base,
          elasticsearch: true do
+  def bee_video_client(segment_uid)
+    DashOverlord::Models::V1::ElasticSearch::BeeVideo.by_dashboard(segment_uid)
+  end
+
   def make_the_call(params = nil)
-    DashOverlord::Models::V1::Answer.refresh_index
+    bee_video_client(params[:segment_uid]).refresh_index
 
     @context = described_class.perform \
       (params || {}).merge({ session: user_session })
@@ -11,15 +15,15 @@ describe DashOverlord::UseCases::V1::Videos::Index::ElasticSearch::Base,
     raise_context_unknown_error @context
   end
 
-  def create_answer(attributes = {})
-    DashOverlord::Models::V1::Answer.create attributes
+  def create_answer(segment_uid, attributes = {})
+    bee_video_client(segment_uid).create attributes
   end
 
   context 'when no bee_videos are available' do
     before(:all) do
-      DashOverlord::Models::V1::Answer.delete_all
+      bee_video_client('hhc').delete_all
 
-      make_the_call
+      make_the_call segment_uid: 'hhc'
     end
 
     it '@context.status should be ok' do
@@ -40,10 +44,11 @@ describe DashOverlord::UseCases::V1::Videos::Index::ElasticSearch::Base,
 
   context 'when no filter params are used' do
     before(:all) do
-      DashOverlord::Models::V1::Answer.delete_all
-      20.times { create_answer title: 'Test' }
+      bee_video_client('hhc').delete_all
+
+      20.times { create_answer('hhc', title: 'Test') }
 
-      make_the_call
+      make_the_call segment_uid: 'hhc'
     end
 
     it '@context.status should be ok' do
@@ -62,12 +67,13 @@ describe DashOverlord::UseCases::V1::Videos::Index::ElasticSearch::Base,
     end
   end
 
-  context 'when filtering by page = 2' do
+  context 'when filtering by page = 3' do
     before(:all) do
-      DashOverlord::Models::V1::Answer.delete_all
-      35.times { create_answer title: 'Test' }
+      bee_video_client('hhc').delete_all
 
-      make_the_call page: 2, per_page: 15
+      35.times { create_answer('hhc', title: 'Test') }
+
+      make_the_call segment_uid: 'hhc', page: 3, per_page: 15
     end
 
     it '@context.status should be ok' do
@@ -75,31 +81,31 @@ describe DashOverlord::UseCases::V1::Videos::Index::ElasticSearch::Base,
     end
 
     it 'should return pagination meta_data' do
-      expect(@context.meta.page).to be 2
+      expect(@context.meta.page).to be 3
       expect(@context.meta.per_page).to be 15
       expect(@context.meta.total_pages).to be 3
       expect(@context.meta.total_results).to be 35
     end
 
-    it 'should return 15 results' do
-      expect(@context.videos.length).to be 15
+    it 'should return 5 results' do
+      expect(@context.videos.length).to be 5
     end
   end
 
   context 'when filtering by something' do
     before(:all) do
-      DashOverlord::Models::V1::Answer.delete_all
+      bee_video_client('hhc').delete_all
 
-      15.times { create_answer user_id: 1, gender: 'Female', segment_uid: 'laundry' }
-      10.times { create_answer user_id: 1, gender: 'Male', segment_uid: 'hhc' }
-      5.times { create_answer user_id: 1, gender: 'Female', segment_uid: 'hhc' }
-      20.times { create_answer user_id: 2, gender: 'Female', segment_uid: 'hhc' }
+      15.times { create_answer('laundry', user_id: 1, gender: 'Female') }
+      10.times { create_answer('hhc', user_id: 1, gender: 'Male') }
+      5.times { create_answer('hhc', user_id: 1, gender: 'Female') }
+      20.times { create_answer('hhc', user_id: 2, gender: 'Female') }
 
       make_the_call \
+        segment_uid: 'hhc',
         filter_query: {
           user_id_eq: 1,
-          gender_eq: 'Female',
-          segment_uid_eq: 'hhc'
+          gender_eq: 'Female'
         }
     end
 

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

@@ -91,10 +91,10 @@ describe DashOverlord::UseCases::V1::Videos::Index::Postgres::Base do
       20.times { create_bee_video(:female_hhc, user_id: 2) }
 
       make_the_call \
+        segment_uid: 'hhc',
         filter_query: {
           user_id_eq: 1,
-          gender_eq: 'Female',
-          segment_uid_eq: 'hhc'
+          gender_eq: 'Female'
         }
     end
 

data/spec/elasticord/base_spec.rb

@@ -1,16 +1,18 @@
 require 'spec_helper'
 
 describe Elasticord::Base, elasticsearch: true do
+  let(:index_namespace) { Elasticord::Config.get(:index_namespace) }
+
   describe '.index' do
-    it 'described_class should return the current env' do
-      expect(described_class.index).to eq ENV['ENV']
+    it 'described_class should return index_namespace' do
+      expect(described_class.index).to eq index_namespace
     end
 
     context 'given a child class' do
       let(:child_class) { Class.new(described_class) }
 
-      it 'child_class should return the same current env' do
-        expect(child_class.index).to eq ENV['ENV']
+      it 'child_class should return the index_namespace' do
+        expect(child_class.index).to eq index_namespace
       end
 
       context 'given that the child class sets a new index' do
@@ -18,8 +20,8 @@ describe Elasticord::Base, elasticsearch: true do
           child_class.index = 'child_class_new_index'
         end
 
-        it 'described_class should return the current env' do
-          expect(described_class.index).to eq ENV['ENV']
+        it 'described_class should return index_namespace' do
+          expect(described_class.index).to eq index_namespace
         end
 
         it 'child_class should return "child_class_new_index"' do
@@ -63,12 +65,12 @@ describe Elasticord::Base, elasticsearch: true do
         expect(@client.send(:entity)).to eq described_class
       end
 
-      it 'reaturned client should have a protected #index set up' do
-        expect(@client.send(:index)).to eq ENV['ENV']
+      it 'reaturned client should have a #index set up' do
+        expect(@client.index).to eq index_namespace
       end
 
-      it 'reaturned client should have a protected #type set up' do
-        expect(@client.send(:type)).to eq '_all'
+      it 'reaturned client should have a #type set up' do
+        expect(@client.type).to eq '_all'
       end
     end
 
@@ -86,7 +88,7 @@ describe Elasticord::Base, elasticsearch: true do
       end
 
       it 'reaturned client should have a protected #index set up' do
-        expect(@client.send(:index)).to eq "#{ENV['ENV']}_project_1"
+        expect(@client.send(:index)).to eq "#{index_namespace}_project_1"
       end
 
       it 'reaturned client should have a protected #type set up' do
@@ -108,7 +110,7 @@ describe Elasticord::Base, elasticsearch: true do
       end
 
       it 'reaturned client should have a protected #index set up' do
-        expect(@client.send(:index)).to eq "#{ENV['ENV']}_project_5"
+        expect(@client.send(:index)).to eq "#{index_namespace}_project_5"
       end
 
       it 'reaturned client should have a protected #type set up' do

data/spec/elasticord/client/base_spec.rb

@@ -101,12 +101,12 @@ describe Elasticord::Client::Base, elasticsearch: true do
       expect(@search_builder.send(:entity)).to eq OpenStruct
     end
 
-    it 'reaturned search_builder should have a protected #index set up' do
-      expect(@search_builder.send(:index)).to eq ENV['ENV']
+    it 'reaturned search_builder should have a #index set up' do
+      expect(@search_builder.index).to eq ENV['ENV']
     end
 
-    it 'reaturned search_builder should have a protected #type set up' do
-      expect(@search_builder.send(:type)).to eq 'child_class'
+    it 'reaturned search_builder should have a #type set up' do
+      expect(@search_builder.type).to eq 'child_class'
     end
   end
 end

data/spec/elasticord/client/search_builder_spec.rb

@@ -55,13 +55,9 @@ describe Elasticord::Client::SearchBuilder, elasticsearch: true do
   end
 
   describe '#page' do
-    def search_builder
-      @search_builder ||= described_instance
-    end
-
     context 'sending 3 as an argument' do
       before do
-        @result = search_builder.page(3)
+        @result = described_instance.page(3)
       end
 
       it 'should return a SearchBuilder instance' do
@@ -79,13 +75,9 @@ describe Elasticord::Client::SearchBuilder, elasticsearch: true do
   end
 
   describe '#per' do
-    def search_builder
-      @search_builder ||= described_instance
-    end
-
     context 'sending 15 as an argument' do
       before do
-        @result = search_builder.per(15)
+        @result = described_instance.per(15)
       end
 
       it 'should return a SearchBuilder instance' do
@@ -146,7 +138,7 @@ describe Elasticord::Client::SearchBuilder, elasticsearch: true do
     end
   end
 
-  context 'given that 30 records have been created' do
+  context 'given that 35 records have been created' do
     before do
       client_base.delete_all
 
@@ -161,6 +153,10 @@ describe Elasticord::Client::SearchBuilder, elasticsearch: true do
         client_base.create(title: 'child', brand: 'unoficial', locked: false)
       end
 
+      5.times do
+        client_base.create(title: 'snow', brand: 'fake', locked: false)
+      end
+
       client_base.refresh_index
     end
 
@@ -170,8 +166,8 @@ describe Elasticord::Client::SearchBuilder, elasticsearch: true do
           @search_result = described_instance.load({})
         end
 
-        it 'should find 30 total_results' do
-          expect(@search_result.total_results).to be 30
+        it 'should find 35 total_results' do
+          expect(@search_result.total_results).to be 35
         end
 
         it 'should return a pagination object with 10 instances of the class' do
@@ -196,7 +192,7 @@ describe Elasticord::Client::SearchBuilder, elasticsearch: true do
           context 'when #ransack with multiple query params was called' do
             before do
               @search_builder = @search_builder.ransack({
-                brand_eq: 'oficial',
+                brand_eq_any: ['oficial', 'unoficial'],
                 locked_eq: false
               })
 
@@ -207,8 +203,8 @@ describe Elasticord::Client::SearchBuilder, elasticsearch: true do
               expect(@search_result.per_page).to be 15
               expect(@search_result.total_pages).to be 2
               expect(@search_result.current_page).to be 2
-              expect(@search_result.total_results).to be 24
-              expect(@search_result.length).to be 9
+              expect(@search_result.total_results).to be 29
+              expect(@search_result.length).to be 14
             end
           end
         end
@@ -231,24 +227,26 @@ describe Elasticord::Client::SearchBuilder, elasticsearch: true do
         end
       end
 
-      context 'when multi query params are passed' do
+      context 'when search for "uniq" and "any" values' do
         before do
           @search_result = described_instance.load \
             query: {
               bool: {
                 must: [
-                  { match: { title: 'child class' } }
+                  { term: { locked: false } }
                 ],
-                filter: [
+                should: [
                   { term: { brand: 'oficial' } },
-                  { term: { locked: false } }
-                ]
+                  { term: { brand: 'unoficial' } }
+                ],
+                minimum_should_match: 1,
+                boost: 1.0
               }
             }
         end
 
-        it 'should find 24 total_results' do
-          expect(@search_result.total_results).to be 24
+        it 'should find 29 total_results' do
+          expect(@search_result.total_results).to be 29
         end
 
         it 'should return a pagination object with 10 resources' do

data/spec/spec_helper.rb

@@ -10,6 +10,9 @@ Dir[File.expand_path('../**/support/**/*.rb', __FILE__)].each do |file|
   require file
 end
 
+Elasticord::Config.set(:log, false)
+Elasticord::Config.set(:index_namespace, ENV['ENV'])
+
 # I guess either "FactoryGirl" or "DatabaseCleaner" needs this line bellow
 ActiveRecord::Base.establish_connection DashOverlord::V1::Config.get(:db_config)
 
@@ -34,11 +37,6 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
-  config.before(:each, elasticsearch: true) do
-    DashOverlord::Models::V1::ElasticSearch.delete_all
-    DashOverlord::Models::V1::ElasticSearch.refresh_index
-  end
-
   BCrypt::Engine.cost = 1
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticord
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - StreetBees Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -65,6 +65,7 @@ files:
 - Rakefile
 - bin/setup_config_files.sh
 - config/boot.rb
+- config/initializers/elasticord.rb
 - dash_overlord.gemspec
 - db/migrate/20160321174733_devise_create_users.rb
 - db/migrate/20161014155300_create_bee_videos.rb
@@ -95,7 +96,6 @@ files:
 - lib/dash_overlord/locales/v1/en/users.yml
 - lib/dash_overlord/models/base.rb
 - lib/dash_overlord/models/v1/admin.rb
-- lib/dash_overlord/models/v1/answer.rb
 - lib/dash_overlord/models/v1/base.rb
 - lib/dash_overlord/models/v1/basic_user.rb
 - lib/dash_overlord/models/v1/bee_video.rb
@@ -106,7 +106,8 @@ files:
 - lib/dash_overlord/models/v1/dynamo_db/paginated_result.rb
 - lib/dash_overlord/models/v1/dynamo_db/scan.rb
 - lib/dash_overlord/models/v1/dynamo_db/video.rb
-- lib/dash_overlord/models/v1/elastic_search.rb
+- lib/dash_overlord/models/v1/elastic_search/base.rb
+- lib/dash_overlord/models/v1/elastic_search/bee_video.rb
 - lib/dash_overlord/models/v1/subtitle_line.rb
 - lib/dash_overlord/models/v1/user.rb
 - lib/dash_overlord/requirable.rb
@@ -217,6 +218,10 @@ files:
 - lib/dash_overlord/use_cases/v1/users/show_current_user/find_current_user.rb
 - lib/dash_overlord/use_cases/v1/users/show_current_user/get_current_user.rb
 - lib/dash_overlord/use_cases/v1/users/update/base.rb
+- lib/dash_overlord/use_cases/v1/videos/import/from_postgres_to_elastic_search/base.rb
+- lib/dash_overlord/use_cases/v1/videos/import/from_postgres_to_elastic_search/delete_elastic_search_records.rb
+- lib/dash_overlord/use_cases/v1/videos/import/from_postgres_to_elastic_search/parse_hhc_bee_video.rb
+- lib/dash_overlord/use_cases/v1/videos/import/from_postgres_to_elastic_search/store_bee_video.rb
 - lib/dash_overlord/use_cases/v1/videos/index/base.rb
 - lib/dash_overlord/use_cases/v1/videos/index/dynamodb/base.rb
 - lib/dash_overlord/use_cases/v1/videos/index/dynamodb/search_and_paginate_videos.rb

data/lib/dash_overlord/models/v1/answer.rb

@@ -1,10 +0,0 @@
-module DashOverlord
-  module Models
-    module V1
-
-      class Answer < V1::ElasticSearch
-      end
-
-    end
-  end
-end