c80_shared 0.1.88 → 0.1.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61b7931d732a9a523a5a51216ca21e61ddc316969b5d7ace49089c0eddd1468e
-  data.tar.gz: d50bd2025b89ed7a4d3908c9286487471bc75213dfbfce75c7442f81ce47e65e
+  metadata.gz: e114f4ccad407d3a6732e2a0e07729773d6bb92472263cd3f70d9d5fd8b26117
+  data.tar.gz: 7691bb109800eb0b7ef0d68a673db25a79ecf065aa2fbabbebb5b06b064cce8b
 SHA512:
-  metadata.gz: 182856e0f34f12af6989bc97f64d1a3bfedf770674a231080b1dcddecf1bf759008afb8c4fe066905edd405b95007861fbbfd3e0f1b31675e506e121e36a1cb0
-  data.tar.gz: fb34a0f7ecbfa99f6fd789f8d5eb310bdaddc20f761c733cfc10a4535bb5a501a59ad98f58db585d8955ee4a2dbc8305616ec1057e77f8410faff162c8e6f41f
+  metadata.gz: 930f03a3425b558ee46aac194475c1de1eebb9e1af6ecfb8df3f3efe5f1e1640a8f79887e1eeecd1a3e590bb37450a60bc8e6dd5e2d040a30e3e095acc4bd045
+  data.tar.gz: bfb06d06cf07aeae05027f681db27c4c53c6da900814630dc6e5ffe0ed408e1a903464379a5511e248566000239c4fbfaf7e19fc7c9935818f1baede23c4c16e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    c80_shared (0.1.87)
+    c80_shared (0.1.90)
 
 GEM
   remote: https://rubygems.org/

data/app/serializers/account_serializer.rb

@@ -7,6 +7,7 @@ class AccountSerializer < AbstractSerializer
         id
         type_index
         props
+        abilities
       ]
     end
 
@@ -38,5 +39,23 @@ class AccountSerializer < AbstractSerializer
               end
       { props: props }
     end
+
+    # список возможностей с учётом запретов
+    def abilities(account)
+      account_class     = ::Dictionaries::AccountType::CLASS_BY_TYPE[account.type_id]
+      default_abilities = ::Dicts::Accounts::Ability.all_for_account_class(account_class)
+      prohibited        = account.user.permissions
+
+      # отнимаем запрещённые действия из дефолтных
+      not_prohibited = ->(ability) { prohibited.none? { |a| a.action.to_s == ability.index.to_s } }
+      abilities      = default_abilities.map do |a|
+        {
+          action: a.index,
+          can:    not_prohibited[a]
+        }
+      end
+
+      { abilities: abilities }
+    end
   end
-end
+end

data/app/serializers/boat_serializer.rb

@@ -192,7 +192,6 @@ class BoatSerializer < AbstractSerializer
         horn
         lifebuoy
         life_jackets
-        personal_flotation_devices
         raft
         smoke_detector
         vessel_lighting

data/app/serializers/lease/inquiry_serializer.rb

@@ -24,7 +24,6 @@ module Lease
           kids
           latitude
           longitude
-          manager_email
           my_price
           my_price_currency
           name
@@ -32,6 +31,7 @@ module Lease
           period
           period_formatted
           phone_number
+          responsible_managers
           state
           to
           token
@@ -171,8 +171,13 @@ module Lease
         }
       end
 
-      def manager_email(inquiry)
-        { manager_email: inquiry.manager_account&.user&.email }
+      def responsible_managers(inquiry)
+        res = inquiry.responsible_managers.includes(:user).map do |acc|
+          { id:    acc.user.id,
+            email: acc.user.email
+          }
+        end
+        { responsible_managers: res }
       end
 
       def hours_per_day(inquiry)

data/app/validators/boats/is_for_rent.rb

@@ -0,0 +1,22 @@
+module Boats
+  # определяем, указана ли хоть какая-нибудь цена аренды?
+  #
+  module IsForRent
+    module_function
+
+    # @param [Boat || Form] record
+    # @return [TrueClass || FalseClass]
+    #
+    def check?(record)
+      ::Dictionaries::BoatCharterAttribute::ALL.map do |attr|
+        ::Dicts::Currency::ALL.map do |currency|
+          field = Currency.attribute_name currency.index, attr
+          value = record.try field
+          # puts '%s = %s' % [field, value]
+          # noinspection RubySimplifyBooleanInspection
+          !!(value&.>0)
+        end
+      end.flatten.any?
+    end
+  end
+end

data/app/validators/boats/is_for_sell.rb

@@ -0,0 +1,19 @@
+module Boats
+  # определяем, указана ли хоть какая-нибудь цена продажи?
+  #
+  module IsForSell
+    module_function
+
+    # @param [Boat] record
+    # @return [TrueClass || FalseClass]
+    #
+    def check?(record)
+      ::Dicts::Currency::ALL.map do |currency|
+        field = Currency.attribute_name currency.index, 'sale_price'
+        value = record.send field
+        # noinspection RubySimplifyBooleanInspection
+        !!(value&.>0)
+      end.any?
+    end
+  end
+end

data/app/validators/currency_presence_validator.rb

@@ -0,0 +1,17 @@
+class CurrencyPresenceValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    unless record.currency
+      raise ArgumentError, 'record.currency does not exist'
+    end
+    available_currencies = I18n::t('static.currencies').map{|currency| currency[:id]}
+    record_currency = record.currency.upcase
+    if available_currencies.include? record_currency
+      attribute_currency = attribute.to_s.split('_')[-1].upcase
+      if record_currency == attribute_currency && record.attributes[attribute.to_s].nil?
+        record.errors[attribute] << "can't be blank!"
+      end
+    else
+      raise ArgumentError, 'Model record.currency does not exist in I18n::t(\'static.currencies\')'
+    end
+  end
+end

data/app/validators/dimension_presence_validator.rb

@@ -0,0 +1,17 @@
+class DimensionPresenceValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    unless record.dimension
+      raise ArgumentError, 'record.dimension does not exist'
+    end
+    available_dimensions = I18n::t('static.dimensions').map{|dimension| dimension[:id]}
+    record_dimension = record.dimension.downcase
+    if available_dimensions.include? record_dimension
+      attribute_dimension = attribute.to_s.split('_')[-1].downcase
+      if record_dimension == attribute_dimension && record.attributes[attribute.to_s].nil?
+        record.errors[attribute] << "can't be blank!"
+      end
+    else
+      raise ArgumentError, 'Model record.dimension does not exist in I18n::(\'static.dimensions\')'
+    end
+  end
+end

data/app/validators/sale_inquiry_assign_validator.rb

@@ -0,0 +1,8 @@
+class SaleInquiryAssignValidator < ActiveModel::Validator
+  def validate(record)
+    record.errors.add(:sale_inquiry, :blank) and return false if record.sale_inquiry.nil?
+    record.errors.add(:assignee, :blank) and return false     if record.assignee.nil?
+    record.errors.add(:author, :blank) and return false       if record.author.nil?
+    true
+  end
+end

data/app/validators/sale_inquiry_comment_validator.rb

@@ -0,0 +1,9 @@
+class SaleInquiryCommentValidator < ActiveModel::Validator
+  def validate(record)
+    record.errors.add(:sale_inquiry, :blank)                               and return false if record.sale_inquiry.nil?
+    record.errors.add(:author,       :blank)                               and return false if record.author.nil?
+    record.errors.add(:text,         :blank)                               and return false unless record.text.present?
+    record.errors.add(:text,         :less_than_or_equal_to, count: 1024)  and return false if record.text.size > 1024
+    true
+  end
+end

data/app/validators/user_permission_validator.rb

@@ -0,0 +1,7 @@
+class UserPermissionValidator < ActiveModel::Validator
+  def validate(record)
+    record.errors.add(:can, :blank) and return false    if record.can.nil?
+    record.errors.add(:action, :blank) and return false if record.action.nil?
+    true
+  end
+end

data/lib/c80_shared/version.rb

@@ -1,3 +1,3 @@
 module C80Shared
-  VERSION = "0.1.88"
+  VERSION = "0.1.93"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.88
+  version: 0.1.93
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,6 +120,13 @@ files:
 - app/services/sale/inquiry_asked_prices_save_service.rb
 - app/services/users/find_or_generate_email_token_service.rb
 - app/services/users/generate_email_token_service.rb
+- app/validators/boats/is_for_rent.rb
+- app/validators/boats/is_for_sell.rb
+- app/validators/currency_presence_validator.rb
+- app/validators/dimension_presence_validator.rb
+- app/validators/sale_inquiry_assign_validator.rb
+- app/validators/sale_inquiry_comment_validator.rb
+- app/validators/user_permission_validator.rb
 - bin/console
 - bin/rails
 - bin/setup
@@ -206,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Write a short summary, because RubyGems requires one.