c80_shared 0.1.62 → 0.1.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8488b93daa009deb49d2f372f70f9c5105f4d942f18f27cf8b809028df268264
-  data.tar.gz: 1a6802b87d4e234c431e18c3d8f8160648d0632a90817e1c706521ca592b2410
+  metadata.gz: a839dc2411230b3fe6219bc77ea6ac3a3fee81e3b0901bf76f9c9a184b5ef037
+  data.tar.gz: 6f7b105a5ed6766399be2ae11a95cebdcff65b77d5b054390203ab2200b4a74c
 SHA512:
-  metadata.gz: 91c8311e24528634a089204e658b0f424df8d8f03fb10066fcc7d3bfbafdaed8b94fe3b10bb393dbb71fccd1a624be28c891bc17b60a3d4f7d22b0bb6184e34f
-  data.tar.gz: 40c6c74f5c007f6cfa2f8c8ad800038ab28db576a0304e50c9c111c07368a216e50bff13ae13661e29e5d96bd50847fb6ed85ab32b43a4a0b7292afdf4914c16
+  metadata.gz: c62d3f733e49b298fb449c5ec0d52e7b3d2a2d6107cd87182e162717857a98032c2156dd13b6e158a875a279760cc05c50a169321609ed93b4d94ee080fdbaa3
+  data.tar.gz: 2dfe9219c5b5d2a92bdfb124957cb00a66a4f402c16904448deffb3db5b267b9e3df7bd98b2194df03bc452d5dccae57e1b33bcf5bf71aa1fbf7cc96d3e5d651

data/app/serializers/boat_serializer.rb

@@ -28,6 +28,7 @@ class BoatSerializer < AbstractSerializer
         builder
         built_year
         charter_details
+        charter_deposit
         crew_total
         crew_cabins
         description
@@ -518,6 +519,10 @@ class BoatSerializer < AbstractSerializer
       { charter_details: boat.charter_details }
     end
 
+    def charter_deposit(boat)
+      { charter_deposit: boat.charter_deposit }
+    end
+
     def serialize_opts
       locale   = ::Dicts::Locale.find_by_index   @opts[:locale].to_s
       uol      = ::Dicts::Length.find_by_index   @opts[:uol]

data/lib/c80_shared/version.rb

@@ -1,3 +1,3 @@
 module C80Shared
-  VERSION = "0.1.62"
+  VERSION = "0.1.63"
 end

data/lib/c80_shared.rb

@@ -8,7 +8,7 @@ end.call
 # загружаем все классы из директории app
 lambda do
   lib_path  = File.expand_path('../../app', __FILE__)
-  dir_names = %w[dicts helpers serializers repositories schemas] # order matters!
+  dir_names = %w[dicts helpers serializers] # order matters!
 
   dir_names.each do |dir|
     dir_path = '%s/%s/**/*.rb' % [lib_path, dir]

data/scratch_105___02.txt

@@ -0,0 +1,13 @@
+ФУНКЦИЯ-1: показ блока с ценами аренды на странице просмотра лодки
+  На странице должна отобразиться минимальная цена аренды и кнопка 'request to book'
+
+  ПРЕДЫСТОРИЯ-2:
+    Допустим юзер входит на главную страницу
+    И кликает по лодке из блока FEATURES BOATS FOR RENT (http://localhost:3000/en/boat/carpe_diem?for=rent)
+    И лодка на продажу
+
+  @correct
+  СЦЕНАРИЙ:
+    На странице должна отобразиться минимальная цена аренды и кнопка 'request to book'
+    На странице не должно быть блока `contact seller`
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.62
+  version: 0.1.63
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-13 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,15 +71,6 @@ files:
 - app/helpers/custom/price_helper.rb
 - app/helpers/custom/select_helper.rb
 - app/helpers/site/time_helper.rb
-- app/repositories/accounts/admin_account_repository.rb
-- app/repositories/accounts/central_agent_account_repository.rb
-- app/repositories/accounts/client_account_repository.rb
-- app/repositories/accounts/manager_account_repository.rb
-- app/repositories/accounts/manager_guest_account_repository.rb
-- app/repositories/accounts/moderator_account_repository.rb
-- app/schemas/base.rb
-- app/schemas/base_boat_schema.rb
-- app/schemas/central_agent/save_boat_schema.rb
 - app/serializers/account_serializer.rb
 - app/serializers/boat_location_serializer.rb
 - app/serializers/boat_price_serializer.rb
@@ -97,21 +88,12 @@ files:
 - app/serializers/lib/boats/dimensions.rb
 - app/serializers/lib/boats/rent_price_per_season.rb
 - app/serializers/lib/boats/sale_price.rb
-- app/services/abstract_prices_service.rb
-- app/services/boats/boat_prices_save_service.rb
-- app/services/boats/boat_sale_prices_save_service.rb
-- app/services/boats/dimension_service.rb
-- app/services/central_agent/save_boat_service.rb
-- app/services/lease/create_broadcast_inquiry_service.rb
-- app/services/lease/destroy_inquiry_service.rb
 - app/services/users/find_or_generate_email_token_service.rb
 - app/services/users/generate_email_token_service.rb
 - bin/console
 - bin/rails
 - bin/setup
 - c80_shared.gemspec
-- config/initializers/core_ext/active_record_log_subscriber.rb
-- config/initializers/core_ext/string.rb
 - config/locales/boat/en.yml
 - config/locales/boat/ru.yml
 - config/locales/dicts/account_type/en.yml
@@ -141,30 +123,7 @@ files:
 - lib/c80_shared/middleware/images_proxy.rb
 - lib/c80_shared/token_generator.rb
 - lib/c80_shared/version.rb
-- lib/dry/errors.rb
-- lib/dry/rule.rb
-- lib/dry/rules/and.rb
-- lib/dry/rules/between.rb
-- lib/dry/rules/binary.rb
-- lib/dry/rules/collection.rb
-- lib/dry/rules/composite.rb
-- lib/dry/rules/equal.rb
-- lib/dry/rules/format.rb
-- lib/dry/rules/greater_than.rb
-- lib/dry/rules/greater_than_or_equal.rb
-- lib/dry/rules/included.rb
-- lib/dry/rules/length_between.rb
-- lib/dry/rules/length_equal.rb
-- lib/dry/rules/less_than.rb
-- lib/dry/rules/less_than_or_equal.rb
-- lib/dry/rules/max_length.rb
-- lib/dry/rules/min_length.rb
-- lib/dry/rules/not_equal.rb
-- lib/dry/rules/or.rb
-- lib/dry/rules/present.rb
-- lib/dry/rules/then.rb
-- lib/dry/rules_factory.rb
-- lib/dry/schema.rb
+- scratch_105___02.txt
 homepage: http://google.com
 licenses:
 - MIT

data/app/repositories/accounts/admin_account_repository.rb

@@ -1,35 +0,0 @@
-module Accounts
-  class AdminAccountRepository
-
-    def create_account(user)
-      return unless user
-      return if user.accounts.admins.any?
-
-      account = ::Account.new(type_id: ::Dictionaries::AccountType::ADMIN)
-      admin   = ::Accounts::Admin.new(account: account)
-
-      account.user   = user
-      account.name   = user.name.to_s
-      account.active = true
-
-      account.transaction do
-        account.save validate: false
-        admin.save validate: false
-      end
-    end
-
-    def destroy_account(user)
-      return unless user
-      return unless user.accounts.admins.any?
-
-      account = user.accounts.admins.first
-      admin   = account.admin
-
-      ActiveRecord::Base.transaction do
-        admin.destroy
-        account.destroy
-      end
-    end
-
-  end
-end

data/app/repositories/accounts/central_agent_account_repository.rb

@@ -1,46 +0,0 @@
-module Accounts
-  class CentralAgentAccountRepository
-
-    # todo-my: перевести в self.
-    def create_account(user)
-      return unless user
-      return if user.accounts.central_agents.any?
-
-      account = ::Account.new(type_id: ::Dictionaries::AccountType::CENTRAL_AGENT)
-      central = ::Accounts::CentralAgent.new(account: account)
-
-      account.user   = user
-      account.name   = user.name.to_s
-      account.active = true
-      user.is_notify = true
-
-      ActiveRecord::Base.transaction do
-        account.save
-        central.save
-        user.save
-      end
-
-      central
-    end
-
-    # todo-my: перевести в self.
-    def destroy_account(user)
-      return unless user
-      return unless user.accounts.central_agents.any?
-
-      account = user.accounts.central_agents.first
-      central = account.central_agent
-
-      ActiveRecord::Base.transaction do
-        central.destroy
-        account.destroy
-      end
-    end
-
-    def self.fetch_or_create(user)
-      return unless user
-      return user.accounts.central_agents.first.central_agent if user.accounts.central_agents.any?
-      new.create_account(user)
-    end
-  end
-end

data/app/repositories/accounts/client_account_repository.rb

@@ -1,43 +0,0 @@
-module Accounts
-  class ClientAccountRepository
-
-    def fetch_or_create(user)
-      return unless user
-      return user.accounts.clients.first.client if user.accounts.clients.any?
-      create_account(user)
-    end
-
-    def create_account(user)
-      return unless user
-      return if user.accounts.clients.any?
-
-      account = ::Account.new(type_id: ::Dictionaries::AccountType::CLIENT)
-      client  = ::Accounts::Client.new(account: account)
-
-      account.user   = user
-      account.name   = user.name.to_s
-      account.active = true
-
-      account.transaction do
-        account.save validate: false
-        client.save validate: false
-      end
-
-      client
-    end
-
-    def destroy_account(user)
-      return unless user
-      return unless user.accounts.clients.any?
-
-      account = user.accounts.clients.first
-      client  = account.client
-
-      ActiveRecord::Base.transaction do
-        client.destroy
-        account.destroy
-      end
-    end
-
-  end
-end

data/app/repositories/accounts/manager_account_repository.rb

@@ -1,35 +0,0 @@
-module Accounts
-  class ManagerAccountRepository
-
-    def create_account(user)
-      return unless user
-      return if user.accounts.managers.any?
-
-      account = ::Account.new(type_id: ::Dictionaries::AccountType::MANAGER)
-      manager = ::Accounts::Manager.new(account: account)
-
-      account.user   = user
-      account.name   = user.name.to_s
-      account.active = true
-
-      account.transaction do
-        account.save validate: false
-        manager.save validate: false
-      end
-    end
-
-    def destroy_account(user)
-      return unless user
-      return unless user.accounts.managers.any?
-
-      account = user.accounts.managers.first
-      manager = account.manager
-
-      ActiveRecord::Base.transaction do
-        manager.destroy
-        account.destroy
-      end
-    end
-
-  end
-end

data/app/repositories/accounts/manager_guest_account_repository.rb

@@ -1,35 +0,0 @@
-module Accounts
-  class ManagerGuestAccountRepository
-
-    def create_account(user)
-      return unless user
-      return if user.accounts.managers_guests.any?
-
-      account = ::Account.new(type_id: ::Dictionaries::AccountType::MANAGER_GUEST)
-      manager = ::Accounts::ManagerGuest.new(account: account)
-
-      account.user   = user
-      account.name   = user.name.to_s
-      account.active = true
-
-      account.transaction do
-        account.save validate: false
-        manager.save validate: false
-      end
-    end
-
-    def destroy_account(user)
-      return unless user
-      return unless user.accounts.managers_guests.any?
-
-      account = user.accounts.managers_guests.first
-      manager = account.manager_guest
-
-      ActiveRecord::Base.transaction do
-        manager.destroy
-        account.destroy
-      end
-    end
-
-  end
-end

data/app/repositories/accounts/moderator_account_repository.rb

@@ -1,35 +0,0 @@
-module Accounts
-  class ModeratorAccountRepository
-
-    def create_account(user)
-      return unless user
-      return if user.accounts.moderators.any?
-
-      account   = ::Account.new(type_id: ::Dictionaries::AccountType::MODERATOR)
-      moderator = ::Accounts::Moderator.new(account: account)
-
-      account.user   = user
-      account.name   = user.name.to_s
-      account.active = true
-
-      account.transaction do
-        account.save validate: false
-        moderator.save validate: false
-      end
-    end
-
-    def destroy_account(user)
-      return unless user
-      return unless user.accounts.moderators.any?
-
-      account   = user.accounts.moderators.first
-      moderator = account.moderator
-
-      ActiveRecord::Base.transaction do
-        moderator.destroy
-        account.destroy
-      end
-    end
-
-  end
-end

data/app/schemas/base.rb

@@ -1,69 +0,0 @@
-require_relative '../../lib/dry/schema'
-
-module Schemas
-  class Base
-
-    include Dry::Schema
-
-    def normalize_integer(value)
-      return nil if value.blank?
-      Integer(value.to_s.gsub(/\s/, '')) rescue value
-    end
-
-
-    def strip_string(value, empty_to_nil = true)
-      value = value.to_s.strip
-      value = nil if empty_to_nil && value.blank?
-      value
-    end
-
-
-    def to_date(value)
-      value.to_date rescue value
-    end
-
-
-    def clear_html(value)
-      Rails::Html::WhiteListSanitizer.new.sanitize(value)
-    end
-
-
-    def normalize_url(value)
-      return if value.blank?
-      value.to_s.strip.scan(/^https?:\/\//).present? ? value : sprintf('https://%s', value.to_s.strip)
-    end
-
-
-    def to_bool(value)
-      value.to_s.to_bool
-    end
-
-
-    def to_float(value)
-      return unless value.present?
-      BigDecimal.new(value.to_s.gsub(/\s/, '')) rescue value
-    end
-
-
-    def to_big_decimal(value)
-      return unless value.present?
-      BigDecimal.new(value.to_s.gsub(/\s/, '')) rescue value
-    end
-
-
-    def forced_array(value)
-      [value.present? ? value : nil].flatten.compact
-    end
-
-
-    def forced_hash(value)
-      value.blank? ? {} : value
-    end
-
-
-    def nullify_empty(value)
-      value.present? ? value : nil
-    end
-
-  end
-end

data/app/schemas/base_boat_schema.rb

@@ -1,235 +0,0 @@
-require_relative 'base'
-
-module Schemas
-  class BaseBoatSchema < ::Schemas::Base
-    def schema
-      result = {
-          properties: {
-              id: {
-                  type: %i[null number],
-                  cast: ->(value) { normalize_integer(value) }
-              },
-              name: {
-                  type: [:null, :string],
-                  cast: ->(value) { clear_html(strip_string(value)) },
-                  rule: ->(parents) { rule_name(parents) }
-              },
-              boat_type_id: {
-                  enum: [nil, -1] + Dicts::BoatType::ALL.collect(&:id),
-                  cast: ->(value) { normalize_integer(value) },
-                  rule: ->(parents) { rule_boat_type_id(parents) }
-              },
-              boat_model: {
-                  type: %i[null string],
-                  cast: ->(value) { clear_html(strip_string(value)) }
-              },
-              builder: {
-                  type: %i[null string],
-                  cast: ->(value) { clear_html(strip_string(value)) }
-              },
-              length: {
-                  type: :hash,
-                  required: %i[value length_id],
-                  properties: {
-                      value: {
-                          type: %i[null number string],
-                          cast: ->(value) { to_float(value) }
-                      },
-                      length_id: {
-                          enum: Dicts::Length.all.collect(&:id),
-                          cast: ->(value) { normalize_integer(value) }
-                      }
-                  }
-              },
-              crew_total: {
-                  type: %i[null number],
-                  cast: ->(value) { normalize_integer(value) }
-              },
-              guest_cabins: {
-                  type: %i[null number],
-                  cast: ->(value) { normalize_integer(value) }
-              },
-              guests_total: {
-                  type: %i[null number],
-                  cast: ->(value) { normalize_integer(value) }
-              },
-              maximum_guests_during_cruise: {
-                  type: %i[null number],
-                  cast: ->(value) { normalize_integer(value) },
-                  rule: ->(parents) { rule_maximum_guests_during_cruise(parents) }
-              },
-              boat_locations_attributes: {
-                  type: %i[null array],
-                  items: {
-                      type: :hash,
-                      required: %i[latitude longitude address is_main _destroy],
-                      cast: ->(value) do
-                        value[:latitude]  = to_big_decimal value[:latitude]
-                        value[:longitude] = to_big_decimal value[:longitude]
-                        value[:address]   = strip_string   value[:address]
-                        value[:is_main]   = to_bool        value[:is_main]
-                        value[:_destroy]  = to_bool        value[:_destroy]
-
-                        value[:latitude].nil? || value[:longitude].nil? || !value[:address].present? ? nil : value
-                      end
-                  },
-                  cast: ->(value) { forced_array(value) }
-              }
-          }
-      }
-
-      result[:properties][:rent_prices] = {
-          type: [:null, :array],                                                                                      # это первая версия, где я пробую разобраться с массивом объектов (версия покруче тут - app/getboat/schemas/base_boat_schema.rb - с помощью :items)
-          cast: ->(value) do
-            value.inject([]) do |res, el|
-              el[:_delete]  = to_bool el[:_delete]
-              el[:currency] = normalize_integer el[:currency]
-              el[:discount] = to_float el[:discount]
-              el[:duration] = to_float el[:duration]
-              el[:season]   = normalize_integer el[:season]
-              el[:uom]      = normalize_integer el[:uom]
-              el[:value]    = normalize_integer(el[:value].is_a?(String) ? el[:value].split(/[, ]/).join : el[:value])
-              res << el
-              res
-            end
-          end
-      }
-
-      result[:properties][:sale_price] = {
-          type: [:null, :hash],
-          properties: {
-              currency_id: {
-                  enum: Dicts::Currency.all.collect(&:id),
-                  cast: ->(value) { normalize_integer(value) }
-              },
-              value: {
-                  type: %i[number null string],
-                  cast: ->(value) do
-                    val = value.is_a?(String) ? value.split(/[, ]/).join : value
-                    normalize_integer val
-                  end
-              },
-              discount: {
-                  type: %i[number null string],
-                  cast: ->(value) { to_float(value) }
-              },
-          }
-      }
-
-      result[:properties][:boat_photos_attributes] = {
-          type: [:null, :hash],
-          cast: ->(value) { nullify_empty(value) },
-          rule: ->(parents) { rule_boat_photos_attributes(parents)}
-      }
-
-      result
-    end
-
-
-    def rule_name(parents)
-      messages = {
-          present:        I18n.t('errors.boat.name.blank'),
-          length_between: I18n.t('errors.boat.name.length_invalid', min: 2, max: 255)
-      }
-      rule(:name, parents, messages) { present? & length_between?(2..255) }
-    end
-
-
-    def rule_boat_type_id(parents)
-      messages = {
-          present: I18n.t('errors.boat.boat_type_id.blank'),
-          gt:      I18n.t('errors.boat.boat_type_id.blank')
-      }
-      rule(:boat_type_id, parents, messages) { present? & gt?(0) }
-    end
-
-
-    def rule_maximum_guests_during_cruise(parents)
-      messages = {
-          present: I18n.t('errors.boat.maximum_guests_during_cruise.blank'),
-          gt:      I18n.t('errors.boat.maximum_guests_during_cruise.blank')
-      }
-      rule(:maximum_guests_during_cruise, parents, messages) { present? & gt?(0) }
-    end
-
-
-    def rule_boat_photos_attributes(parents)
-      messages = { present: I18n.t('errors.boat.boat_photos_attributes.blank') }
-      rule(:boat_photos_attributes, parents, messages) { present? }
-    end
-
-
-    def validate_location
-      unless boat_locations_attributes
-        errors.add :boat_locations, I18n.t('errors.boat.boat_locations.blank')
-        return
-      end
-
-      bls  = boat_locations_attributes.compact.select { |loc| !loc[:_destroy] }
-      mbls = bls.select { |loc| loc[:is_main] }
-
-      if bls.size.zero?
-        errors.add :boat_locations, I18n.t('errors.boat.boat_locations.blank')
-        return
-      end
-
-      if bls.size > 5
-        errors.add :boat_locations, I18n.t('errors.boat.boat_locations.limit', max: 5)
-        return
-      end
-
-      if mbls.size == 0
-        errors.add :boat_locations, I18n.t('errors.boat.boat_locations.is_main')
-        return
-      end
-    end
-
-
-    def validate_length
-      errors.add(:length_value, I18n.t('errors.boat.length.blank')) unless length[:value]&.nonzero?
-    end
-
-
-    def validate_crew_total
-      errors.add(:crew_total, I18n.t('errors.boat.crew_total.blank')) unless crew_total.present?
-    end
-
-
-    def validate_guests_total
-      errors.add(:guests_total, I18n.t('errors.boat.guests_total.blank')) unless guests_total.present?
-    end
-
-
-    def validate_guest_cabins
-      errors.add(:guest_cabins, I18n.t('errors.boat.guest_cabins.blank')) unless guest_cabins.present?
-    end
-
-
-    def validate_prices_and_rent_prices
-      rent_prices_present = rent_prices.present? && rent_prices.count { |price| price[:_delete] } < rent_prices.count
-      sale_price_present  = sale_price.present? && sale_price[:value]&.>(0)
-      return if rent_prices_present && sale_price_present
-
-      if !(rent_prices_present || sale_price_present)
-        errors.add :rent_prices, I18n.t('errors.boat.prices.any')
-        errors.add :sale_price, I18n.t('errors.boat.prices.any')
-      end
-    end
-
-
-    def validate_rent_prices
-      return unless rent_prices.present?
-
-      rent_prices.each do |price|
-        if price[:value].nil? || price[:value].zero?
-          errors.add :rent_prices, I18n.t('errors.boat.rent_prices.invalid')
-          break
-        end
-        if price[:duration].nil? || price[:duration].zero?
-          errors.add :rent_prices, I18n.t('errors.boat.rent_prices.invalid_duration')
-          break
-        end
-      end
-    end
-  end
-end