elasticord 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2408da665b98d05d1dde3f3fc1511074b8eaed04
-  data.tar.gz: cf31f46f08bcda7ce6f93ab47ed62f94dd275c88
+  metadata.gz: d5e4119d7285ad68f49090e7b9344e88c24561c8
+  data.tar.gz: 9cbf209b6d0dc56674975cbe9672dcfbba414444
 SHA512:
-  metadata.gz: 670431cec3b786c0ba816939d9b1abfd863536df2c44b7a4d4ecea6e6ea5a597b5dcc13128dcae47c561996d4de747f26bfa28ae6c8f8fe435ea8a47e24b7d81
-  data.tar.gz: c5b7f656b196c76f0feda110371ff3caf0004c44a8e479491fcf8c67309e572acab26930c03dccabb80fc0220af29e8c23735784c1e35631500c668778da2654
+  metadata.gz: 1f6a9926758e9ffdafc6439208ddd82fb96480e7102f1f91914407f7c30be698572703b95d6939c49ae9625a2407403dca8f9510e4a8170ee55982d1703ea018
+  data.tar.gz: 845a169cd4b027b00d26cc7aa76acf5c634fb45d675e55ce6d2c08179003b5f6d1b5df798987975b480f61a6a70db3e2d838f1a246abfbf7fd0f9f40d0e7b840

data/Gemfile.lock

@@ -6,12 +6,14 @@ PATH
       aws-sdk (>= 2.2.35)
       bcrypt (>= 2.0.0)
       dotenv (>= 2.1.1)
-      elasticsearch (>= 5.0.3)
+      elasticord (>= 1.0.0)
       i18n (>= 0.7.0)
       kaminari (>= 1.0.0.rc1)
       object_attorney (>= 3.0.7)
       pg (>= 0.17)
       ransack (>= 1.7.0)
+    elasticord (1.0.1)
+      elasticsearch (~> 5.0)
 
 GEM
   remote: https://rubygems.org/

data/dash_overlord.gemspec

@@ -30,10 +30,10 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'i18n', '>= 0.7.0'
   gem.add_runtime_dependency 'dotenv', '>= 2.1.1'
   gem.add_runtime_dependency 'bcrypt', '>= 2.0.0'
+  gem.add_runtime_dependency 'aws-sdk', '>= 2.2.35'
   gem.add_runtime_dependency 'ransack', '>= 1.7.0'
   gem.add_runtime_dependency 'kaminari', '>= 1.0.0.rc1'
+  gem.add_runtime_dependency 'elasticord', '>= 1.0.0'
   gem.add_runtime_dependency 'activerecord', '>= 3'
-  gem.add_runtime_dependency 'elasticsearch', '>= 5.0.3'
   gem.add_runtime_dependency 'object_attorney', '>= 3.0.7'
-  gem.add_runtime_dependency 'aws-sdk', '>= 2.2.35'
 end

data/elasticord.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.email = "dev@streetbees.com"
   gem.summary = "Elastic search client"
   gem.description = "Elastic search client on top of elasticsearch gem"
-  gem.homepage = "https://github.com/streetbees/dashlord/dash_lord"
+  gem.homepage = "https://github.com/Streetbees/dashlord"
 
   gem.files = `git ls-files`.split($/)
   gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

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

@@ -31,19 +31,28 @@ module DashOverlord
           end
 
           def self.all
-            collection = []
-            params = all_params
-
-            loop do
-              result = client.scan(params)
-              collection += result.items
+            DynamoDb::Scan.new \
+              client: client,
+              table_name: table_name,
+              resource_class: self
+          end
 
-              break unless result.last_evaluated_key
+          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
 
-              params[:exclusive_start_key] = result.last_evaluated_key
-            end
+          end
 
-            collection
+          def self.search(filters)
+            DynamoDb::Scan.new \
+              client: client,
+              table_name: table_name,
+              resource_class: self,
+              filters: filters
           end
 
           def self.table_name
@@ -85,9 +94,11 @@ module DashOverlord
             end
           end
 
-          def self.all_params
+          def self.scan_params
             {
               table_name: table_name,
+              exclusive_start_key: @last_evaluated_key,
+              limit: @per_page
             }
           end
 

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

@@ -20,14 +20,24 @@ module DashOverlord
             {
               table_name: @migration_class.table_name,
               key_schema: [
-                attribute_name: "id",
-                key_type: "HASH"
+                {
+                  attribute_name: "dashboard_id",
+                  key_type: "HASH" #PRIMARY KEY
+                },
+                {
+                  attribute_name: "id",
+                  key_type: "RANGE" # SORT KEY
+                },
               ],
               attribute_definitions: [
                 {
-                  attribute_name: "id",
+                  attribute_name: "dashboard_id",
                   attribute_type: "N"
                 },
+                {
+                  attribute_name: "id",
+                  attribute_type: "N"
+                }
               ],
               provisioned_throughput: {
                 read_capacity_units: 10,

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

@@ -0,0 +1,16 @@
+require 'forwardable'
+
+module DashOverlord
+  module Models
+    module V1
+      module DynamoDb
+        class PaginatedResult < OpenStruct
+          include Enumerable
+          extend Forwardable
+
+          def_delegators :items, :each, :map, :first, :last, :length, :count
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,114 @@
+module DashOverlord
+  module Models
+    module V1
+      module DynamoDb
+        class Scan < DynamoDb::Base
+          # resource.page(page).per(per_page)
+          def search(filters)
+            self.filters = filters
+
+            self
+          end
+
+          def page(page, last_evaluated_key)
+            self.current_page = page
+            self.last_evaluated_key = last_evaluated_key
+
+            self
+          end
+
+          def per(per_page)
+            self.limit = per_page
+
+            self
+          end
+
+          def execute #choose a better name than this...
+            if paginated_scan
+              return scan_page
+            end
+
+            scan_all
+          end
+
+          protected ##################### PROTECTED ###########################
+
+          def scan_all
+            scan_params = params
+            items = []
+
+            loop do
+              result = client.scan(scan_params)
+              items += result.items
+
+              break unless result.last_evaluated_key
+
+              scan_params[:exclusive_start_key] = result.last_evaluated_key
+            end
+
+            items.map{ |item| resource_class.new(item) }
+          end
+
+          def paginated_scan
+            (limit && current_page)
+          end
+
+          def scan_page
+            result = client.scan(params)
+
+            DynamoDb::PaginatedResult.new \
+              items: result.items.map{ |item| resource_class.new(item) },
+              last_evaluated_key: result.last_evaluated_key,
+              exclusive_start_key: last_evaluated_key,
+              limit: limit
+          end
+
+          def params
+            {
+              table_name: "#{table_name}",
+              exclusive_start_key: last_evaluated_key,
+              limit: limit
+            }.merge(filter_params)
+          end
+
+          def filter_params
+            return {} unless filters
+
+            initial_params = {
+              filter_expression: [],
+              expression_attribute_names: {},
+              expression_attribute_values: {}
+            }
+
+            filters_mapped = \
+              filters.each_with_object(initial_params) do |(key, value), object|
+                process_filter(key, value, object)
+
+                object
+              end
+
+            filters_mapped[:filter_expression] = \
+              filters_mapped[:filter_expression].join(' and ')
+
+            filters_mapped
+          end
+
+          private
+
+          def process_filter(attribute_expression, value, object)
+            attribute = attribute_expression.to_s.gsub('_eq', '')
+
+            object[:expression_attribute_names]["##{attribute}"] = \
+              attribute
+
+            object[:expression_attribute_values][":#{attribute}"] = \
+              value
+
+            object[:filter_expression] << \
+              "##{attribute} = :#{attribute}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dash_overlord/use_cases/v1/dummy_data/create/charts/base.rb

@@ -6,7 +6,7 @@ module DashOverlord
           module Charts
 
             class Base < V1::Base
-              context_reader :num_of_records, :repo
+              context_reader :num_of_records, :repo, :table_name
 
               def perform
                 return unless num_of_records && repo
@@ -14,7 +14,8 @@ module DashOverlord
                 invoke! Charts::Build
 
                 repository_create.perform \
-                  items: context.items
+                  items: context.items,
+                  table_name: table_name
               end
 
               protected

data/lib/dash_overlord/use_cases/v1/dummy_data/create/charts/build.rb

@@ -35,7 +35,7 @@ module DashOverlord
                 num_of_records.times.map do |index|
                   build_record(RECORD_STRUCTURE) \
                     .merge \
-                      "submission_id" => "#{index + 1}",
+                      "id" => (index + 1),
                       "dashboard_id" => 1
                 end
               end

data/lib/dash_overlord/use_cases/v1/repositories/dynamo_db/create/batch.rb

@@ -7,7 +7,8 @@ module DashOverlord
 
             class Batch < V1::Base
               context_reader :items,
-                             :client
+                             :client,
+                             :table_name
 
               def perform
                 return unless items
@@ -23,7 +24,7 @@ module DashOverlord
                 records.each_slice(25) do |batch|
                   client.batch_write_item \
                     request_items: {
-                      "sample_data" => batch
+                      "#{table_name}" => batch
                     }
                 end
               end

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

@@ -0,0 +1,21 @@
+module DashOverlord
+  module UseCases
+    module V1
+      module Repositories
+        module DynamoDb
+          module SearchAndPaginate
+
+            class ApplyFilters < V1::Base
+              context_reader :filter_query, :resource
+
+              def perform
+                context.resource = \
+                  resource.search(filter_query.presence)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+module DashOverlord
+  module UseCases
+    module V1
+      module Repositories
+        module DynamoDb
+          module SearchAndPaginate
+
+            class ApplyPagination < V1::Base
+              PAGE_DEFAULT = 1
+              PER_PAGE_DEFAULT = 10
+
+              context_reader  :page,
+                              :last_evaluated_key,
+                              :per_page,
+                              :resources,
+                              :resource
+
+              def perform
+                context.page = fix_page(page)
+
+                if page == 0
+                  no_pagination
+                else
+                  apply_pagination
+                end
+              end
+
+              protected ###################### PROTECTED ###########################
+
+              def no_pagination
+                context.resources = resource.all
+
+                context.per_page = 0
+              end
+
+              def apply_pagination
+                context.per_page = fix_per_page(per_page)
+
+                context.resource = \
+                  resource.page(page, last_evaluated_key).per(per_page)
+              end
+
+              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
+
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+module DashOverlord
+  module UseCases
+    module V1
+      module Repositories
+        module DynamoDb
+          module SearchAndPaginate
+
+            class Base < V1::Base
+
+              # EXPECTED CONTEXT
+              # :resource_class
+              # :page
+              # :per_page
+              # :filter_query
+              # :full_text_term
+
+              def search_and_paginate(resource)
+                context.resource = resource
+
+                invoke! ApplyFilters
+                invoke! ApplyPagination
+
+                context.resource = context.resource.execute
+
+                context.meta = Entities::V1::MetaData.new \
+                  context.attributes.slice :page,
+                                           :per_page,
+                                           :total_pages,
+                                           :total_results
+
+                context.resource
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -10,9 +10,9 @@ module DashOverlord
             context_reader :filter_query, :resources
 
             def perform
-              return unless resources.respond_to?(:search)
+              return unless resources.respond_to?(:ransack)
 
-              context.search_builder = resources.search(filter_query.presence)
+              context.search_builder = resources.ransack(filter_query.presence)
 
               context.resources = context.search_builder.result(distinct: true)
             end