subj_models 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6be86b8073df7d9487f0477643a54708def640ba
-  data.tar.gz: 00872dd31df04e47fe7d84de05ed4fc83525b851
+  metadata.gz: a94ab8194d87cfbd2b7e52411ab1ebd32e2c562b
+  data.tar.gz: 68b33566222d4dacf13fadcf47d5aced80640028
 SHA512:
-  metadata.gz: 58c7a3f683cdda033b0fa901d19b7d1575d585a02b6aff2b0454e8347b1fcbe904f1cff6465c65c88847ce9e7a31787cadf2f12bb3c7f2a2342258e15382c02a
-  data.tar.gz: 9506865fd2526a71e9b56248d4aa9e6303edcf713735f867de0246ec8c38b847ade587e12d4cad7a8929de4d735958ed1265bdea1c1dbf4140f7bde95b179d33
+  metadata.gz: 3976a2e940b0ba3fa0a5c52c88d1d09041959df69e9a05f4248f0af70f863736b4c3a02c5c056894afec0e6f864903ac07e19ab60eeed354e3eb9d3973be37be
+  data.tar.gz: 81bdb72f9e187f4db292818070aa9a36f118022f4e44e72fbe933ab045a9527d7fe6eaee23ab49f274fb6db6fdef2d6314811332c0629ac9ad6989e3ba2ade01

data/lib/subj_models/event.rb

@@ -57,7 +57,8 @@ module SubjModels
         end
 
         scope :date_range, -> (date) do
-          joins(:event_schedule).where(event_schedule: { event_date: DateTime.parse(date['from']).beginning_of_day..DateTime.parse(date['to']).end_of_day } )
+          joins(:event_schedule)
+          .where(event_schedule: { event_date: DateTime.parse(date['from']).beginning_of_day..DateTime.parse(date['to']).end_of_day } )
         end
 
         scope :today_events, -> {

data/lib/subj_models/order_delivery_nova_poshta_warhouse.rb

@@ -5,10 +5,11 @@ module SubjModels
     def self.included(including_class)
 
       including_class.class_eval do
+        include SubjModels::ComprisingExternalId
 
         belongs_to :order
 
-        scope :order_id, -> (order_id) { where(order_id: order_id) }
+        scope :order_id, -> (order_id) { parent_id_scope("order", order_id) }
 
       end
 

data/lib/subj_models/order_delivery_pickup.rb

@@ -13,7 +13,7 @@ module SubjModels
         belongs_to :order
         belongs_to :office
 
-        scope :order_id, -> (order_id) { where(order_id: order_id) }
+        scope :order_id, -> (order_id) { parent_id_scope("order", order_id) }
 
       end
 

data/lib/subj_models/order_delivery_privatbank.rb

@@ -14,7 +14,7 @@ module SubjModels
 
         validates :privat_bank_address, presence: true
 
-        scope :order_id, -> (order_id) { where(order_id: order_id) }
+        scope :order_id, -> (order_id) { parent_id_scope("order", order_id) }
 
       end
 

data/lib/subj_models/order_delivery_subj_courier.rb

@@ -5,11 +5,12 @@ module SubjModels
     def self.included(including_class)
 
       including_class.class_eval do
+        include SubjModels::ComprisingExternalId
 
         belongs_to :order
         belongs_to :city
 
-        scope :order_id, -> (order_id) { where(order_id: order_id) }
+        scope :order_id, -> (order_id) { parent_id_scope("order", order_id) }
 
       end
 

data/lib/subj_models/user.rb

@@ -69,6 +69,12 @@ module SubjModels
           joins(:user_card_delivery).where.not(user_card_deliveries: {id: nil} ).where(external_id: nil)
         end
 
+        scope :updated_at_last_day, -> (date) do
+          where.not(external_id: nil)
+          .joins(:user_specialization_approvals)
+          .where("user_specialization_approvals.updated_at > ? OR users.updated_at > ?", date.to_datetime, date.to_datetime)
+        end
+
       end
 
     end

data/lib/subj_models/version.rb

@@ -1,3 +1,3 @@
 module SubjModels
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subj_models
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Denys Dvoriashyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler