subj_models 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffa0c2a11913afea11257be5d268b5b4efb9bcf8
-  data.tar.gz: 7d314c1212c40c3d8edd8551791403c0028e92c9
+  metadata.gz: 958eb3c88e4357f059d9a8927db46350878a4f17
+  data.tar.gz: 582937b4853a504f34e6a33f21ec3232dfa19094
 SHA512:
-  metadata.gz: 6b5af94dcf10b00680b5262e55f9ba7afec7a8cc3aa20ff42a11d250944a21d4decbbc35a4d6a5c5f1b5541631c58f5341c60133838f558f9e3c46ea84d4b197
-  data.tar.gz: d8c6803edd8361cb13aeeb417c684107c06186b6cea9bc5170356d17f25f56d99f0c9a80ac8f4ef5a122216b39f962a6cd3a8eb615937a5c046b54772f993fa1
+  metadata.gz: e693532fbe0e4c003034b410e54b5032fdaae5c18da50d38e42ecee6e5a71f42d1330dd1845c372ef91c5637980547077ddf5616fa25e55badc99054128906f6
+  data.tar.gz: 7c44584ddde51d6ddaf9f4fd782138ab4d919406a4697d01c414f25277184f8d9f4bb93c6dd1f31898a7f2f808d8f6395c7c5497d0a3f63bbe61a56777b970f9

data/lib/subj_models/faq.rb

@@ -15,7 +15,6 @@ module SubjModels
 
         enum faq_type: FAQ_TYPES
 
-        after_create :notify_manager
         after_save :notify_user
 
         validates :question, presence: true, allow_blank: false,
@@ -42,10 +41,6 @@ module SubjModels
 
     private
 
-    def notify_manager
-      FaqMailer.notify_manager(self).deliver
-    end
-
     def notify_user
       FaqMailer.notify_user(self).deliver if send_to_user
     end

data/lib/subj_models/order.rb

@@ -52,6 +52,8 @@ module SubjModels
           .last
         end
 
+        scope :has_items, -> { joins(:order_items).where.not(order_items: {order_id: nil}).uniq }
+
       end
 
     end

data/lib/subj_models/order_delivery_privatbank.rb

@@ -11,7 +11,6 @@ module SubjModels
         include SubjModels::ComprisingExternalId
 
         belongs_to :order
-        belongs_to :city
 
         validates :privat_bank_address, presence: true
 

data/lib/subj_models/order_item.rb

@@ -14,8 +14,8 @@ module SubjModels
 
         include SubjModels::ComprisingExternalId
 
-        before_destroy :update_nomenclature_popularity
-        after_create :update_nomenclature_popularity
+        before_destroy :decrease_nomenclature_popularity
+        after_create :increase_nomenclature_popularity
 
         enum item_type: ITEM_TYPES
 
@@ -43,6 +43,22 @@ module SubjModels
 
     private
 
+    def increase_nomenclature_popularity
+      if nomenclature
+        current_popularity = (nomenclature.popularity && nomenclature.popularity > 0) ? nomenclature.popularity : 0
+        nomenclature.update(popularity: current_popularity + item_count)
+      end
+    end
+
+    def decrease_nomenclature_popularity
+      if nomenclature
+        current_popularity = (nomenclature.popularity && nomenclature.popularity > item_count) ? nomenclature.popularity : item_count
+        nomenclature.update(popularity: current_popularity - item_count)
+      end
+    end
+
+
+
     def update_nomenclature_popularity
       if nomenclature
         current_popularity = (nomenclature.popularity && nomenclature.popularity > 0) ? nomenclature.popularity : 0

data/lib/subj_models/version.rb

@@ -1,3 +1,3 @@
 module SubjModels
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

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