subj_sub_models 0.0.3.26 → 0.0.3.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fce6ce8300b955f3b964930c019699991c4588a0
-  data.tar.gz: aae15f23a478110ab92354cde71d289635fae7eb
+  metadata.gz: 87178a87b9092bde0c17330775f657dd9d206909
+  data.tar.gz: f73edced2a442469abe4a1816e49dbd0b50c1769
 SHA512:
-  metadata.gz: 0416e17adecd52ced25e337312ab5d38b25e805784009906bda82d4ef82b2cb5364c4e10010a95e0c42a2d9d35252605da3c6b05a51e13fbdc43fd2d6aab0a8c
-  data.tar.gz: 21a2419b12c711fb29ae1d7810e45e45cdcb35df81eed1143e654504adabbab74e97565531737951b5803147f871a4dc3f2bec60ef2bfb8ddb4977a1d0812090
+  metadata.gz: 9370e5d7a6716af2048a23e01e9658d13c4c6adaf76f85357bd04b665258f08b5883f238d4a192c8fcb0f9eedd0fcce5e4eea1b70ee00894e49c5864f77a14d2
+  data.tar.gz: 887cb891bb6f32fe3e7854bab4110c066d4f66403e59f4447ae1c4fca996188e8a58f1638a0ca6e952d1c63ea9db39fa4c8f33366461b8d264401e4dbf5c077f

data/lib/subj_models/nomenclature.rb

@@ -51,7 +51,10 @@ module SubjModels
 
         scope :is_available, -> (params) do
           return all unless params.first == 'true'
-          ids =  (user = User.find_by(id: params.second.to_i)) ? user.available_nomenclature_ids : []
+          user = User.find_by(id: params.second.to_i)
+          nomenclatures_available_for_user = Nomenclature.joins({access_groups: [user_specializations: :users]}, :attribute_values).where("users.id = ?", user.id)
+          nomenclatures_with_b2c_prices = Nomenclature.joins(:nomenclature_prices, :attribute_values).where('nomenclature_prices.price_type = ?', NomenclaturePrice.price_types['b2c'] )
+          ids = Nomenclature.union([nomenclatures_available_for_user, nomenclatures_with_b2c_prices], distinct: true).map(&:id)
           where(id: ids)
         end
 

data/lib/subj_models/user.rb

@@ -125,7 +125,7 @@ module SubjModels
     end
 
     def available_nomenclature_ids
-      nomenclatures_available_for_user = Nomenclature.joins(access_groups: [user_specializations: :users]).where("users.id" => self.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

data/lib/subj_models/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subj_sub_models
 version: !ruby/object:Gem::Version
-  version: 0.0.3.26
+  version: 0.0.3.27
 platform: ruby
 authors:
 - A.Nasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-19 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler