subj_sub_models 0.0.3.25 → 0.0.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52816493b98dd3e9d4521321b876515ee553b7c6
-  data.tar.gz: bea5b8ed8c0f9f3f9df4657829aa7fb2929fc0b2
+  metadata.gz: fce6ce8300b955f3b964930c019699991c4588a0
+  data.tar.gz: aae15f23a478110ab92354cde71d289635fae7eb
 SHA512:
-  metadata.gz: da355780261d61bfb6cf5675a44505028bc0233d19645afa683abe5687cc4de8fe6170c02e221a338e4e20d1d468cd752b7d7a8bca4347801da8803849a5b9d6
-  data.tar.gz: c1a2b7f9c03d35219fe1aca9827fb19992e12165829432ed066618f6a7f0ac452f18123d2b721c084a94cef7a06e9312db63d4864046d2814337cd44da43bb6f
+  metadata.gz: 0416e17adecd52ced25e337312ab5d38b25e805784009906bda82d4ef82b2cb5364c4e10010a95e0c42a2d9d35252605da3c6b05a51e13fbdc43fd2d6aab0a8c
+  data.tar.gz: 21a2419b12c711fb29ae1d7810e45e45cdcb35df81eed1143e654504adabbab74e97565531737951b5803147f871a4dc3f2bec60ef2bfb8ddb4977a1d0812090

data/lib/subj_models/concerns/records_union.rb

@@ -0,0 +1,15 @@
+module SubjModels
+  module RecordsUnion
+
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def union(relations, opts={})
+        query = 'SELECT '+ (opts[:distinct] ? 'DISTINCT ' : '' ) + (!opts[:fields].blank? ? opts[:fields].map(&:to_s).join(' ') : '*') + ' FROM ((' + relations.map { |r| r.ast.to_sql }.join(') UNION (') + ')) AS t'
+        query << " ORDER BY #{opts[:order]}" if opts[:order]
+        query << " LIMIT #{opts[:limit]}" if opts[:limit]
+        find_by_sql(query)
+      end
+    end
+  end
+end

data/lib/subj_models/nomenclature.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'subj_models/concerns/comprising_external_id'
+require 'subj_models/concerns/records_union'
 
 module SubjModels
 
@@ -10,6 +11,7 @@ module SubjModels
       including_class.class_eval do
 
         include SubjModels::ComprisingExternalId
+        include SubjModels::RecordsUnion
 
         belongs_to :brand_line
         belongs_to :brand
@@ -48,11 +50,8 @@ module SubjModels
         end
 
         scope :is_available, -> (params) do
-          is_available = params.first
-          return all unless is_available == 'true'
-          user = User.find_by(id: params.second.to_i)
-          not_professional_ids = Nomenclature.is_professional(false).pluck(:id)
-          ids = user ? user.available_nomenclature_ids.concat(not_professional_ids) : []
+          return all unless params.first == 'true'
+          ids =  (user = User.find_by(id: params.second.to_i)) ? user.available_nomenclature_ids : []
           where(id: ids)
         end
 

data/lib/subj_models/user.rb

@@ -125,7 +125,9 @@ module SubjModels
     end
 
     def available_nomenclature_ids
-      Nomenclature.joins(access_groups: [user_specializations: :users]).where("users.id" => self.id).uniq.pluck(:id)
+      nomenclatures_available_for_user = Nomenclature.joins(access_groups: [user_specializations: :users]).where("users.id" => self.id)
+      nomenclatures_with_b2c_prices = Nomenclature.joins(:nomenclature_prices).where('nomenclature_prices.price_type = ?', NomenclaturePrice.price_types['b2c'] )
+      Nomenclature.union([nomenclatures_available_for_user, nomenclatures_with_b2c_prices], distinct: true).map(&:id)
     end
 
     def available_categories_ids

data/lib/subj_models/version.rb

@@ -1,3 +1,3 @@
 module SubjModels
-  VERSION = '0.0.3.25'
+  VERSION = '0.0.3.26'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subj_sub_models
 version: !ruby/object:Gem::Version
-  version: 0.0.3.25
+  version: 0.0.3.26
 platform: ruby
 authors:
 - A.Nasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,6 +65,7 @@ files:
 - lib/subj_models/category.rb
 - lib/subj_models/city.rb
 - lib/subj_models/concerns/comprising_external_id.rb
+- lib/subj_models/concerns/records_union.rb
 - lib/subj_models/concerns/shared_scopes.rb
 - lib/subj_models/content_block.rb
 - lib/subj_models/document_file.rb