subj_models 0.4.3 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84241f6129048ebc4734a5b85a99d1ca8dbf02d0
-  data.tar.gz: f626cdcd3b1d2b5b06f617733b6c4ff97c884d5a
+  metadata.gz: 83658738a7ab8465ad59311cc0045293dcd9dafd
+  data.tar.gz: 454ba909f7b04f33c533e5d3dc8379b7ca6fb407
 SHA512:
-  metadata.gz: 1e182bdd11fee25f45f63acb62500d154679df971a5de1d7da2ef6c317e21c09fb910a584babaaf6c434aef149b972830e39ee8c93ea9f7c25e46f72942b71e6
-  data.tar.gz: 6455c3d590b45ee561f73114569c59fd620b24491b2e2555ef76b8498c53dcb9d60a1fd40461df7898f15c73b0930a741a0ec6be25501f49ff3f0c3524e9b4c6
+  metadata.gz: b8aa9974e7dd80d9409e26c6ed2ff2cf0ce3dc2a81d34870e94dd2c4d14357c0f16e011f759e47b22dba605d9e82a2714cbc46fa73045fc05ff6d7634db5a7ea
+  data.tar.gz: beea5614269b216341631d6f8e40ae1372d7db27c3f4c49ce59c854cf9b77c545d598dc053a093b36bf34319fc3e3462a14aa08e9b9b30ee992a384f0fcff358

data/lib/subj_models/action.rb

@@ -13,6 +13,7 @@ module SubjModels
         has_and_belongs_to_many :cities
         has_and_belongs_to_many :nomenclatures
         belongs_to :image, class_name: "DocumentFile"
+        belongs_to :categories_list_image, class_name: "DocumentFile"
 
         validates :name, :discount_percent, presence: true
 

data/lib/subj_models/brand.rb

@@ -15,6 +15,8 @@ module SubjModels
         has_many :brand_lines, dependent: :destroy
         has_many :nomenclatures
         has_many :videos
+        has_many :events
+
         has_and_belongs_to_many :users
 
         belongs_to :content_block1, class_name: "ContentBlock"

data/lib/subj_models/brand_line.rb

@@ -34,7 +34,7 @@ module SubjModels
 
         scope :brand_ids, -> (brand_ids_string) do
           unless brand_ids_string.blank?
-            joins(:brand, nomenclatures: :specialist_activity).where('brands.id' => brand_ids_string.split(','))
+            joins(:brand).where('brands.id' => brand_ids_string.split(','))
           end
         end
 

data/lib/subj_models/document_file.rb

@@ -16,7 +16,6 @@ module SubjModels
         has_one :user
         has_one :manager
         has_one :user_specialization_approval
-        has_one :event
 
         has_many :videos
         has_many :brands

data/lib/subj_models/event.rb

@@ -14,10 +14,52 @@ module SubjModels
         belongs_to :event_type
         belongs_to :nomenclature
         belongs_to :document_file
+        belongs_to :brand
 
         has_one :event_schedule
+        has_one :nomenclature_price
 
-        validates :document_file, presence: true
+        has_many :order_items
+        has_many :event_bookings
+
+        has_and_belongs_to_many :user_specializations
+        has_and_belongs_to_many :nomenclatures
+
+        validates :document_file, :title, presence: true
+
+        scope :from_today, -> {
+          joins(:event_schedule).where('event_schedules.event_date >= ?',  DateTime.now.beginning_of_day )
+          .order( 'event_schedules.event_date ASC' )
+          # .unscope(:event_schedule)
+        }
+
+        scope :where_nomenclature_ids, -> (ids) do
+          joins(:nomenclatures).where(nomenclatures: {id: ids})
+        end
+
+        scope :office_ids, -> (ids) do
+          joins(event_schedule: [:office]).where(event_schedule: { office: {id: ids}})
+        end
+
+        scope :type_ids, -> (ids) do
+          joins(:event_type).where(event_type: {id: ids})
+        end
+
+        scope :brand_ids, -> (ids) do
+          joins(:brand).where(brand: { id: ids})
+        end
+
+        scope :only_free, -> do
+          joins(:event_schedule).where(event_schedule: { is_free: true } )
+        end
+
+        scope :specialities_ids, -> (ids) do
+          joins(:user_specializations).where(user_specializations: { id: ids})
+        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 } )
+        end
 
         scope :today_events, -> {
           includes(:event_schedule).where(event_schedule: { event_date: DateTime.now.beginning_of_day..DateTime.now.end_of_day } )
@@ -29,7 +71,7 @@ module SubjModels
     end
 
     def to_s
-      id.to_s # TODO
+      title.to_s
     end
 
   end

data/lib/subj_models/event_booking.rb

@@ -0,0 +1,39 @@
+require 'subj_models/concerns/comprising_external_id'
+
+module SubjModels
+
+  module EventBookingModule
+
+    def self.included(including_class)
+
+      including_class.class_eval do
+
+        include SubjModels::ComprisingExternalId
+
+        belongs_to :order
+        belongs_to :user
+        belongs_to :event
+
+        validates :user, uniqueness: { scope: :event }
+
+        scope :user_id , -> (user_id) {where(user_id: user_id)}
+        scope :event_id , -> (event_id) {where(event_id: event_id)}
+        scope :only_new, -> (condition) do
+          if condition
+            where(external_id: nil)
+          else
+            all
+          end
+        end
+
+      end
+
+    end
+
+    def to_s
+      id.to_s
+    end
+
+  end
+
+end

data/lib/subj_models/event_schedule.rb

@@ -18,15 +18,11 @@ module SubjModels
         enum event_type: EVENT_TYPES
 
         belongs_to :event
-        belongs_to :city
         belongs_to :office
 
-        has_many :order_items
+        validates :event_date, presence: true
 
-        validates :event_type, presence: true, inclusion: { in: event_types.keys }
-        validates :event_date, :event_price, :title, presence: true
-
-        scope :event_id, -> (event_id) { parent_id_scope("event", event_id) }
+        scope :event_id, -> (event_id) { parent_id_scope(event_id: event_id) }
 
       end
 

data/lib/subj_models/manager.rb

@@ -13,6 +13,7 @@ module SubjModels
         include SubjModels::ComprisingExternalId
 
         belongs_to :document_file
+        has_many :events
 
         validates :email, uniqueness: { case_sensitive: false }
         validates :first_name, :last_name, :email, :phone, :document_file, presence: true

data/lib/subj_models/nomenclature.rb

@@ -13,14 +13,13 @@ module SubjModels
 
         belongs_to :brand_line
         belongs_to :brand
-        belongs_to :specialist_activity
+        belongs_to :user_specialization
         belongs_to :category
 
         has_many :nomenclature_varieties, dependent: :destroy
         has_many :nomenclature_photos, dependent: :destroy
         has_many :nomenclature_reviews, dependent: :destroy
         has_many :nomenclature_files, dependent: :destroy
-        has_many :events
         has_many :attribute_values, dependent: :destroy
         has_many :nomenclature_prices, dependent: :destroy
 
@@ -31,6 +30,7 @@ module SubjModels
 
         has_and_belongs_to_many :actions
         has_and_belongs_to_many :access_groups, through: :nomenclature_access_groups
+        has_and_belongs_to_many :events
 
         validates :name, presence: true
 
@@ -40,7 +40,7 @@ module SubjModels
         scope :is_recommended, -> condition { where(is_recommended: condition) }
         scope :in_index_list, -> condition { where(show_on_index: condition) }
         scope :is_stock, -> (condition) do
-          nomenclature_prices_join.joins("LEFT OUTER JOIN qualities ON qualities.id = nomenclature_prices.quality_id").where("qualities.is_stock" => condition)
+          nomenclature_prices_join.joins("LEFT OUTER JOIN qualities ON qualities.id = nomenclature_prices.quality_id").where("qualities.is_stock" => condition).uniq
         end
 
         scope :bought_together_external_id, -> (ids) do

data/lib/subj_models/nomenclature_price.rb

@@ -14,6 +14,7 @@ module SubjModels
         belongs_to :nomenclature_variety
         belongs_to :quality
         belongs_to :measure_unit
+        belongs_to :event
 
         has_many :order_items
 

data/lib/subj_models/order.rb

@@ -32,6 +32,7 @@ module SubjModels
         has_one :order_delivery_subj_courier
         has_one :order_delivery_nova_poshta_warhouse
         has_many :order_items, dependent: :destroy
+        has_many :event_bookings
 
         validates :order_status, inclusion: { in: order_statuses.keys }, on: :update
         validates :delivery_type, inclusion: { in: delivery_types.keys }, on: :update
@@ -40,14 +41,33 @@ module SubjModels
 
         scope :user_id, ->  user  { where(user_id: user) }
 
+        scope :with_status, -> (status) do
+          where(order_status: Order.order_statuses[status] || status)
+        end
+
         scope :last_order, -> (user_id) do
-          Order.joins(:user).where("users.id" => user_id).last
+          Order.joins(:user, :order_items)
+          .where("users.id" => user_id)
+          .where(order_items: {item_type: 1})
+          .last
         end
 
       end
 
     end
 
+    def order_status_value
+      self[:order_status]
+    end
+
+    def delivery_type_value
+      self[:delivery_type]
+    end
+
+    def payment_type_value
+      self[:payment_type]
+    end
+
     def to_s
       id.to_s # TODO
     end

data/lib/subj_models/order_delivery_courier.rb

@@ -13,8 +13,8 @@ module SubjModels
         belongs_to :order
         belongs_to :city
 
-        validates :user_first_name, :user_last_name, :delivery_address, :street_name,
-                  :house_number, :delivery_time,  presence: true
+        validates :street_name,:delivery_time_from, :delivery_time_to,
+                  :house_number, presence: true
 
         scope :order_id, -> (order_id) { parent_id_scope("order", order_id) }
 
@@ -23,7 +23,7 @@ module SubjModels
     end
 
     def to_s
-      id.to_s # TODO
+      "#{street_name}, #{house_number}"
     end
 
   end

data/lib/subj_models/order_delivery_nova_poshta_warhouse.rb

@@ -8,6 +8,8 @@ module SubjModels
 
         belongs_to :order
 
+        scope :order_id, -> (order_id) { where(order_id: order_id) }
+
       end
 
     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) { parent_id_scope("order", order_id) }
+        scope :order_id, -> (order_id) { where(order_id: order_id) }
 
       end
 

data/lib/subj_models/order_delivery_privatbank.rb

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

data/lib/subj_models/order_delivery_subj_courier.rb

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

data/lib/subj_models/order_item.rb

@@ -20,7 +20,7 @@ module SubjModels
         enum item_type: ITEM_TYPES
 
         belongs_to :order
-        belongs_to :event_schedule
+        belongs_to :event
         belongs_to :nomenclature_variety
         belongs_to :nomenclature
 
@@ -44,10 +44,21 @@ module SubjModels
     private
 
     def update_nomenclature_popularity
-      current_popularity = (nomenclature.popularity && nomenclature.popularity > 0) ? nomenclature.popularity : 0
-      method = transaction_include_any_action?([:create]) ? :+ : :-
-      new_popularity = current_popularity.send(method, self.item_count)
-      nomenclature.update(popularity: new_popularity)
+      if nomenclature
+        current_popularity = (nomenclature.popularity && nomenclature.popularity > 0) ? nomenclature.popularity : 0
+        method = transaction_include_any_action?([:create]) ? :+ : :-
+        new_popularity = current_popularity.send(method, self.item_count)
+        nomenclature.update(popularity: new_popularity)
+      end
+    end
+
+    def add_nomenclature_quality
+      founded_quality_id = if nomenclature_variety
+        nomenclature_variety.nomenclature_price.try(:quality_id)
+      else
+        nomenclature.nomenclature_prices.try(:last).try(:quality_id)
+      end
+      self.quality_id = founded_quality_id if founded_quality_id
     end
 
   end

data/lib/subj_models/quality.rb

@@ -16,6 +16,10 @@ module SubjModels
 
     end
 
+    def to_s
+      name
+    end
+
   end
 
 end

data/lib/subj_models/services/types_support.rb

@@ -10,7 +10,12 @@ module SubjModels
       NATURAL_PERSON = 3
       DISTRIBUTOR = 4
 
-      USER_TYPES = { 'админ' => ADMIN, 'юридическое лицо' => LEGAL_PERSON, 'физическое лицо' => NATURAL_PERSON, 'поставщик' => DISTRIBUTOR }
+      USER_TYPES = {
+                      'админ' => ADMIN,
+                      'юридическое лицо' => LEGAL_PERSON,
+                      'физическое лицо' => NATURAL_PERSON,
+                      'поставщик' => DISTRIBUTOR
+                    }
     end
 
     module EventTypes
@@ -55,12 +60,14 @@ module SubjModels
       PROCESSED = 2
       EN_ROUTE_EXTERNAL_COURIER = 3
       EN_ROUTE_INTERNAL_COURIER = 4
+      DELIVERED = 5
 
       ORDER_STATUSES = {
                          'принят'                 => RECEIVED,
                          'в обработке'            => PROCESSED,
                          'в пути(внешний курьер)' => EN_ROUTE_EXTERNAL_COURIER,
-                         'внутренний курьер'      => EN_ROUTE_INTERNAL_COURIER
+                         'внутренний курьер'      => EN_ROUTE_INTERNAL_COURIER,
+                         'получен'                => DELIVERED
                        }
     end
 

data/lib/subj_models/specialist_activity_document_type.rb

@@ -10,11 +10,11 @@ module SubjModels
 
         include SubjModels::ComprisingExternalId
 
-        belongs_to :specialist_activity
+        belongs_to :user_specialization
 
         validates :name, presence: true
 
-        scope :specialist_activity_id, -> (specialist_activity_id) { parent_id_scope("specialist_activity", specialist_activity_id) }
+        scope :user_specialization_id, -> (user_specialization_id) { parent_id_scope("user_specialization", user_specialization_id) }
 
       end
 

data/lib/subj_models/user.rb

@@ -34,7 +34,9 @@ module SubjModels
         has_many :user_specialization_approvals, dependent: :destroy
         has_many :user_cards, dependent: :destroy
         has_one  :user_work_place, dependent: :destroy
+        has_one  :user_card_delivery
         has_many :user_delivery_addresses, dependent: :destroy
+        has_many :event_bookings, dependent: :destroy
 
         has_and_belongs_to_many :user_specializations
         has_and_belongs_to_many :brands
@@ -46,12 +48,13 @@ module SubjModels
         validates :first_name, :last_name, presence: true,
                   on: :update,
                   unless: lambda { |user| user.legal_person? || user.skip_validations }
-        validates :email, uniqueness: { case_sensitive: false }, presence: true,
-                  on: :update,
-                  unless: :skip_validations
-        validates :phone, uniqueness: { case_sensitive: false }, presence: true,
-                  on: :update,
-                  unless: :skip_validations
+        # Валидация отключена на время тестирования. После её надо разкоментировать сдесь и в контроллере.
+        # validates :email, uniqueness: { case_sensitive: false }, presence: true,
+        #           on: :update,
+        #           unless: :skip_validations
+        # validates :phone, uniqueness: { case_sensitive: false }, presence: true,
+        #           on: :update,
+        #           unless: :skip_validations
         validates :user_type, inclusion: { in: user_types.keys },
                   on: :update,
                   unless: :skip_validations
@@ -62,6 +65,10 @@ module SubjModels
           external_id ? where(external_id: external_id) : User.none
         end 
 
+        scope :internal_users, -> (condition) do
+          joins(:user_card_delivery).where.not(user_card_deliveries: {id: nil} ).where(external_id: nil)
+        end
+
       end
 
     end
@@ -74,6 +81,10 @@ module SubjModels
       user_type == USER_TYPES.key(LEGAL_PERSON)
     end
 
+    def user_type_value
+      self[:user_type]
+    end
+
     def user_type=(value)
       super(check_string_for_int(value))
     end

data/lib/subj_models/user_card_delivery.rb

@@ -0,0 +1,29 @@
+require 'subj_models/services/types_support'
+module SubjModels
+
+  module UserCardDeliveryModule
+
+    include SubjModels::TypesSupport::CardReceiveTypes
+
+    def self.included(including_class)
+
+      including_class.class_eval do
+
+
+        # enum delivery_type: CARD_RECEIVE_TYPES
+
+        belongs_to :user
+
+        scope :user_id, -> (user_id) { where(user_id: user_id) }
+
+
+        def delivery_type_value
+          self[:delivery_type]
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/subj_models/user_delivery_address.rb

@@ -19,7 +19,7 @@ module SubjModels
 
         attr_accessor :skip_validations
 
-        scope :user_id, -> (user_id) { parent_id_scope("user", user_id) }
+        scope :user_id, -> (user_id) { where(user_id: user_id) }
 
       end
 

data/lib/subj_models/user_specialization.rb

@@ -12,9 +12,23 @@ module SubjModels
 
         has_and_belongs_to_many :users
         has_and_belongs_to_many :access_groups
+        has_and_belongs_to_many :events
+
+        has_many :specialist_activity_document_types, dependent: :destroy
+        has_many :user_specialization_approvals, dependent: :destroy
+        has_many :nomenclatures
+
+        validates :name, presence: true
+
 
         scope :user_id, -> (user_id) { parent_id_scope("user", user_id) }
 
+        scope :unavailable_for_current_user, -> ids { where.not(id: ids) }
+
+      end
+
+      def to_s
+        name.to_s
       end
 
     end

data/lib/subj_models/user_specialization_approval.rb

@@ -14,10 +14,10 @@ module SubjModels
 
         belongs_to :document_file
         belongs_to :user
-        belongs_to :specialist_activity
+        belongs_to :user_specialization
         belongs_to :specialist_activity_document_type
 
-        scope :user_id, -> (user_id) { parent_id_scope("user", user_id) }
+        scope :user_id, -> (user_id) { where(user_id: user_id) }
 
       end
 

data/lib/subj_models/version.rb

@@ -1,3 +1,3 @@
 module SubjModels
-  VERSION = "0.4.3"
+  VERSION = "0.5.1"
 end

data/lib/subj_models.rb

@@ -5,6 +5,7 @@ require 'subj_models/document_file'
 require 'subj_models/manager'
 require 'subj_models/event_schedule'
 require 'subj_models/event'
+require 'subj_models/event_booking'
 require 'subj_models/brand_line'
 require 'subj_models/brand'
 require 'subj_models/user_specialization_approval'
@@ -20,6 +21,7 @@ require 'subj_models/attribute_value'
 require 'subj_models/nomenclature_price'
 require 'subj_models/order'
 require 'subj_models/user_card'
+require 'subj_models/user_card_delivery'
 require 'subj_models/user_work_place'
 require 'subj_models/user_delivery_address'
 require 'subj_models/user_specialization'
@@ -42,7 +44,6 @@ require 'subj_models/quality'
 require 'subj_models/nomenclature_access_group'
 require 'subj_models/faq'
 require 'subj_models/global_notification'
-
 module SubjModels
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subj_models
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.1
 platform: ruby
 authors:
 - Denys Dvoriashyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,7 @@ files:
 - lib/subj_models/content_block.rb
 - lib/subj_models/document_file.rb
 - lib/subj_models/event.rb
+- lib/subj_models/event_booking.rb
 - lib/subj_models/event_schedule.rb
 - lib/subj_models/event_type.rb
 - lib/subj_models/faq.rb
@@ -100,6 +101,7 @@ files:
 - lib/subj_models/template.rb
 - lib/subj_models/user.rb
 - lib/subj_models/user_card.rb
+- lib/subj_models/user_card_delivery.rb
 - lib/subj_models/user_delivery_address.rb
 - lib/subj_models/user_specialization.rb
 - lib/subj_models/user_specialization_approval.rb