c80_shared 0.1.69 → 0.1.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a51c1503139e06e27c0a6734a20c44bff15f5ba150c776ff4ad5be6739206004
-  data.tar.gz: 39343ca14d3ccb8817c2be53812529b7e00041e89f19d435bf2df6cd002139b8
+  metadata.gz: 2c3214907b93916e8e43bf0d80847168d6e8ae568bc62e22fff7e34637221b35
+  data.tar.gz: 2bc2128ec79443d16fe8f7b67c0cd0c1131067b6c1807bc3e96041ce5af0d493
 SHA512:
-  metadata.gz: 8a9eaf0707a2282394a2511fb25676b3c06708e0c0b4ae27039c7e7ae03ef486ade82b403647c42a7e5d22bf2a165f294cd650d5a403bbd867e99203f49cd858
-  data.tar.gz: 42287fcb2ab7e5d759951199508cd8ab564cecb1697dd19a482ae02d3c7aa4ddc04f056f80bc14b0e48c2606a439428c2400a0c8af8f7e6150ac9b482996d257
+  metadata.gz: 824d6dae5f5b4619d94a7408276e62afacae379e5100268d5af691531e805a99464c523b5f98004127741e70009c50937350b05df6c4ac3a30c483f919e3bacd
+  data.tar.gz: 9a2cae54b524a337834a98f2a3b78194d9eb9b11b4d3db0db19dfec6b2f3c9a5481e54dc2260914be63877169ba90476a1f3d6ba6ae767a113c5a68275639a62

data/app/dicts/event_type.rb

@@ -2,5 +2,6 @@ module Dicts
   class EventType < ::Dict
     MANAGER_LEASE_BID_MAKE = new 1, 'manager_lease_bid_make'
     AGENT_LEASE_BID_MAKE   = new 2, 'agent_lease_bid_make'
+    REJECT                 = new 3, 'reject'
   end
 end

data/app/dicts/reject_type.rb

@@ -0,0 +1,17 @@
+module Dicts
+  class RejectType < ::Dict
+
+    attr_reader :type
+
+    def initialize(id, index, type)
+      @type = type
+      super id, index
+    end
+
+    LEASE_INQUIRY = new 1, 'user_lease_inquiry',  '::Lease::Inquiry'    # какой-то юзер оставляет заявку на аренду
+    LIST_YOR_BOAT = new 2, 'user_list_your_boat', '::Boat'              # какой-то юзер пытается добавить лодку с помощью фичи LIST YOUR BOAT
+    CREATE_BOAT   = new 3, 'agent_create_boat',   '::Boat'              # агент пытается добавить лодку
+    UPDATE_BOAT   = new 4, 'agent_update_boat',   '::Boat'              # агент пытается обновить лодку
+
+  end
+end

data/app/forms/application_form.rb

@@ -0,0 +1,41 @@
+class ApplicationForm
+  include ActiveModel::Model
+  include ActiveModel::Validations
+
+  def self.all_fields
+    @all_fields ||= {}
+  end
+
+  def self.fields(model, *names)
+    unless all_fields.key? model
+      attr_reader model
+
+      define_method :"validate_#{model}!" do
+        own = send model
+
+        unless own.valid?
+          errors.messages.merge!(own.errors.messages) { |_, ary1, ary2| ary1 + ary2 }
+          errors.details.merge!(own.errors.details)   { |_, ary1, ary2| ary1 + ary2 }
+        end
+      end
+
+      validate :"validate_#{model}!"
+
+      all_fields[model] = []
+    end
+
+    delegate *names, to: model
+
+    all_fields[model] = all_fields[model] + names
+    all_fields[model].uniq!
+    all_fields
+  end
+
+  def persisted?
+    false
+  end
+
+  def to_h
+    self.class.all_fields.map { |a| [a, self.send(a)] if self.respond_to?(a) }.compact.to_h
+  end
+end

data/app/forms/rent_form.rb

@@ -0,0 +1,111 @@
+class RentForm < ApplicationForm
+  include DatesNowValidator
+
+  FIELDS = %i[
+    address
+    latitude
+    longitude
+    location_address
+    name
+    from
+    to
+    guests
+    kids
+    boat_types
+    is_skippered
+    is_my_price
+    my_price_currency
+    my_price
+    watersports
+    need_transfer
+    comments
+    email
+    name
+    phone_number
+    password
+    sms_code
+    staying_overnight
+    uploaded_license_file
+    hours_per_day
+  ].freeze
+
+  attr_accessor *FIELDS
+
+  validates :address,
+            :latitude,
+            :longitude,
+            :from,
+            :to,
+            :email,
+            :name,
+            :phone_number, presence: true
+
+  validates :phone_number, phony_plausible: true
+  validates :email, email: { strict_mode: true }
+
+  validates :kids,   numericality: { greater_than_or_equal_to: 0 }, if: -> { kids.present? }
+  validates :guests, numericality: { greater_than_or_equal_to: 0 }
+
+  validates :my_price,          numericality: { greater_than_or_equal_to: 0 },                           if: -> { !my_price.to_i.zero? }
+  validates :my_price_currency, presence: true, length: { minimum: 3, maximum: 3 }, allow_blank: false, if: -> { !my_price.to_i.zero? }
+
+  # validates :uploaded_license_file, presence: true, allow_blank: false, if: -> { is_skippered == 'false' }
+  validate :validate_license
+
+  validate :validate_dates
+  validate :validate_boat_types
+  validate :validate_address
+
+  attr_reader :is_need_bareboat_license
+
+  def initialize(params = nil, is_need_bareboat_license = true)
+    self.send(:is_my_price=, !params[:my_price].to_i.zero?) unless params.nil?
+    @is_need_bareboat_license = is_need_bareboat_license
+
+    super params
+  end
+
+  def validate_license
+    return unless @is_need_bareboat_license
+    return unless is_skippered.eql?('false')
+
+    unless uploaded_license_file.present?
+      errors.add(:uploaded_license_file, :presence)
+    end
+  end
+
+  def button_name
+    I18n.t(:new_rent_order)
+  end
+
+  def validate_dates
+    check_dates errors, from, to
+  end
+
+  def validate_boat_types
+    if boat_types.nil? || boat_types.empty?
+      errors.add(:boat_types, :absent)
+    else
+      unless BoatType.where(id: boat_types.map(&:to_i)).exists?
+        errors.add(:boat_types, :absent)
+      end
+    end
+  end
+
+  def validate_address
+    conditions = [
+      address.empty?,
+      latitude.to_f.zero?,
+      longitude.to_f.zero?,
+      latitude.to_i < -90,
+      latitude.to_i > 90,
+      longitude.to_i < -180,
+      longitude.to_i > 180,
+    ]
+
+    if conditions.any?
+      errors.add(:address, :invalid_address)
+    end
+  end
+
+end

data/app/getboat/schemas/base_boat_schema.rb

@@ -79,7 +79,7 @@ module Schemas
       result[:properties][:rent_prices] = {
           type: [:null, :array],                                                                                      # это первая версия, где я пробую разобраться с массивом объектов (версия покруче тут - app/getboat/schemas/base_boat_schema.rb - с помощью :items)
           cast: ->(value) do
-            value.inject([]) do |res, el|
+            value&.inject([]) do |res, el|
               el[:_delete]  = to_bool el[:_delete]
               el[:currency] = normalize_integer el[:currency]
               el[:discount] = to_float el[:discount]

data/app/getboat/schemas/site/register_boat_schema.rb

@@ -0,0 +1,85 @@
+module Schemas
+  module Site
+    class RegisterBoatSchema < Schemas::BaseBoatSchema
+
+      def schema
+        super_schema = super
+
+        super_schema[:required] = %i[
+                name
+                boat_type_id
+                boat_model
+                builder
+                length
+                crew_total
+                guest_cabins
+                guests_total
+                maximum_guests_during_cruise
+                boat_price
+                boat_sale_price
+        ]
+
+        super_schema[:properties][:boat_price] = {
+            type: :hash,
+            required: %i[duration uom_id season_id currency_id value],
+            properties: {
+                duration: {
+                    type: :number,
+                    cast: ->(value) { normalize_integer(value) }
+                },
+                uom_id: {
+                    enum: Dicts::CharterUom.all.collect(&:id),
+                    cast: ->(value) { normalize_integer(value) }
+                },
+                season_id: {
+                    enum: Dicts::CharterSeason.all.collect(&:id),
+                    cast: ->(value) { normalize_integer(value) }
+                },
+                currency_id: {
+                    enum: Dicts::Currency.all.collect(&:id),
+                    cast: ->(value) { normalize_integer(value) }
+                },
+                value: {
+                    type: %i[number nil],
+                    cast: ->(value) { normalize_integer(value) }
+                }
+            }
+        }
+
+        super_schema[:properties][:boat_sale_price] = {
+            type: :hash,
+            required: %i[value currency_id],
+            properties: {
+                currency_id: {
+                    enum: Dicts::Currency.all.collect(&:id),
+                    cast: ->(value) { normalize_integer(value) }
+                },
+                value: {
+                    type: %i[number nil],
+                    cast: ->(value) { normalize_integer(value) }
+                }
+            }
+        }
+
+        super_schema
+      end
+
+      def validate_additional
+        validate_prices
+        validate_location
+        validate_length
+        # validate_crew_total
+        # validate_guest_cabins
+        validate_guests_total
+      end
+
+      # noinspection RubyResolve
+      def validate_prices
+        unless boat_price[:value]&.nonzero? || boat_sale_price[:value]&.nonzero?
+          errors.add :prices, I18n.t('errors.boat.prices.any')
+        end
+      end
+
+    end
+  end
+end

data/app/repositories/events/rejects_repository.rb

@@ -0,0 +1,40 @@
+module Events
+  class RejectsRepository
+
+    def self.create(reject_type_id, language_id, params, error_messages, current_user = nil)
+      raise ArgumentError, '`error_messages` must be String' unless error_messages.class.eql? String
+      raise ArgumentError, '`params` must be Hash' unless params.class.eql? Hash
+      raise ArgumentError, '`current_user` должен быть подан, когда создаётся лодка в кабинете' if current_user.nil? && reject_type_id == ::Dicts::RejectType::CREATE_BOAT.id
+      raise ArgumentError, '`current_user` должен быть подан, когда обновляется лодка в кабинете' if current_user.nil? && reject_type_id == ::Dicts::RejectType::UPDATE_BOAT.id
+
+      event    = ::Event.new type_id: ::Dicts::EventType::REJECT.id
+      r_event  = ::Events::Reject.new event: event
+
+      r_event.reject_type_id = reject_type_id
+      r_event.language_id    = language_id
+      r_event.params         = params.to_json
+      r_event.error_messages = error_messages
+
+      case reject_type_id
+        when ::Dicts::RejectType::LEASE_INQUIRY.id
+          r_event.email = params['email']
+        when ::Dicts::RejectType::LIST_YOR_BOAT.id
+          r_event.email = params['users_attributes']['0']['email']
+        when ::Dicts::RejectType::CREATE_BOAT.id
+          r_event.email = current_user.email
+        when ::Dicts::RejectType::UPDATE_BOAT.id
+          r_event.email = current_user.email
+        else
+          r_event.email = ''
+      end
+
+      event.transaction do
+        event.save
+        r_event.save
+      end
+
+      r_event
+    end
+
+  end
+end

data/app/services/boat_register_service.rb

@@ -0,0 +1,120 @@
+class BoatRegisterService
+
+  attr_reader :boat,
+              :errors,
+              :user
+
+  def initialize
+    _reset_instance_variables
+  end
+
+  # @param boat_params  - параметры лодки, пришедшие с формы регистрации лодки
+  # @param request      - нужен только для того, чтобы установить ip юзеру
+  # @param user         - это current_user (в номинальном режиме)
+  #
+  def perform(boat_params, request, user = nil)
+    _reset_instance_variables
+
+    schema = ::Schemas::Site::RegisterBoatSchema.new boat_params                                                        # проверяем параметры, пришедшие с формы
+    unless schema.valid?
+      @errors = schema.errors.messages
+      return false
+    end
+
+    _create_user(boat_params.dig(:users_attributes, '0'), user)                                                         # # затем создаём и проверяем юзера == NOTE: такой странный хэш приходит 100%, если в модели Boat есть accept_nested_attributes :users
+    return false if @user.new_record? && !@user.valid?
+    _new_boat boat_params                                                                                               # создаём лодку (но в базу пока не кладём)
+
+    ActiveRecord::Base.transaction do                                                                                   # если дошли до этого этапа - значит всё ровно и с юзером и с лодкой - связываем их и пишем в базу
+      @boat.users << @user
+      @user.save validate: false
+
+      @boat.send :set_slug
+      @boat.save validate: false
+
+      # Делаем первую фотку главной и пишем в базу IP
+      MediaService.new(@boat).set_main_picture(:boat_photo)
+      UserService.new(@user).set_ip(request.remote_ip.to_s)
+
+      # в конце концов рассчитываем цены во всех валютах
+      ::Boats::BoatPricesSaveService.perform(@boat, [schema.attributes[:boat_price]])            unless @boat.for_rent.zero?
+      ::Boats::BoatSalePricesSaveService.perform(@boat.id, schema.attributes[:boat_sale_price])  unless @boat.for_sale.zero?
+
+      # TODO:: во-первых, заменить условия в двух строках выше на анализ boat_params[:boat_price] и boat_params[:boat_sale_price] соответственно
+      # TODO:: во-вторых, только после успешной отработки ценовых сервисов определять for_sale и for_rent и обновлять атрибуты
+
+    end
+
+    true
+  end
+
+  private
+
+  # noinspection RubySimplifyBooleanInspection,RubyResolve
+  def _new_boat(boat_params)
+    boat_locs2          = boat_params[:boat_locations_attributes].compact.each_with_index.map { |attr, index| [index.to_s, attr] }.to_h
+    boat_new_params     = boat_params.except(:users_attributes, :prices, :boat_sale_price, :boat_price, :length, :boat_locations_attributes)    # это собираемся подать в Boat.new, но сначала допишем длину
+    lk                  = Dicts::Length.find(boat_params[:length][:length_id]).index                                                            # "meters", "ft"
+    lk                  = 'boat_length_metrics_%s' % lk
+    boat_new_params[lk] = boat_params[:length][:value]
+
+    boat_new_params[:boat_locations_attributes] = boat_locs2
+
+    # fuckin' active record
+    @boat = Boat.new
+    @boat.assign_attributes boat_new_params.permit(
+        :boat_type_id, :boat_model, :name,
+        :builder,      :crew_total, :guest_cabins, :guests_total,
+        :maximum_guests_during_cruise,
+        # :longitude,    :latitude,   :location_address,
+        lk.to_sym,
+        boat_photos_attributes:    %i[id boat_id name picture _destroy],
+        boat_locations_attributes: %i[latitude longitude address is_main radius _destroy id]
+    )
+    @boat.premoderate
+
+    length_index = ::Dicts::Length.find(boat_params[:length][:length_id]).index                                         # вместо cookies[:dimension]
+    DimensionService.new(@boat).calculate_boat_attributes length_index
+
+    @boat.for_sale = !!boat_params[:boat_sale_price][:value]&.to_i&.nonzero?
+    @boat.for_rent = !!boat_params[:boat_price][:value]&.to_i&.nonzero?
+
+    true
+  end
+
+  def _create_user(user_params, user = nil)
+    @user = user || User.new(user_params.permit(:email, :password))
+    return unless @user.new_record?                          # 2. если пользователь авторизован
+
+    email    = user_params[:email]
+    password = user_params[:password]
+
+    # 1. если пользователь не авторизован
+    if email.present? && password.present?                   # 1.1 если указаны email и password - поищем юзера в базе
+      may_be_user = User.find_by_email email
+      if may_be_user                                         # 1.1.1 если есть такой юзер в базе - проверим правильность пароля
+        if may_be_user.valid_password? password              # 1.1.1.1 если пароль правильный
+          @user = may_be_user
+          return
+        else                                                 # 1.1.1.2 если пароль неправильный -- сообщаем об этом
+          errors[:users_attributes_0_email] =                # note : такой странный ключ хэша обусловлен Boat.accept_nested_attributes :user
+            [I18n.t('devise.failure.invalid', authentication_keys: 'email')]
+          return
+        end
+      else                                                   # 1.1.2 если такого юзера нет в базе - СОЗДАЁМ
+        @user.role_id  = 11                                  # todo-my:: 2018-08-06: потом это будет заменено на создание аккаунта Central Agent (просто сейчас находимся в контексте разработки list your boat)
+        @user.name     = @user.email.split('@')[0]
+        return
+      end
+    else                                                     # 1.2 если не указан или пароль или емайл - сообщаем об этом
+      errors[:users_attributes_0_email] =                    # note : такой странный ключ хэша обусловлен Boat.accept_nested_attributes :user
+        [I18n.t('devise.failure.invalid', authentication_keys: 'email')]
+    end
+
+  end
+
+  def _reset_instance_variables
+    @errors = { }
+  end
+
+end

data/config/locales/dicts/business/en.yml

@@ -0,0 +1,5 @@
+en:
+  dicts:
+    business:
+      rent:   Rent
+      sale:   Sale

data/config/locales/dicts/business/ru.yml

@@ -0,0 +1,5 @@
+en:
+  dicts:
+    business:
+      rent:   Аренда
+      sale:   Продажа

data/lib/c80_shared/dates_now_validator.rb

@@ -0,0 +1,41 @@
+module DatesNowValidator
+
+  # Сверит даты между собой.
+  # Сверит даты с текущей датой.
+  #
+  # @param errors
+  # @param from   [nil || String || ::ActiveSupport::TimeWithZone || Time]
+  # @param to     [аналогично]
+  #
+  def check_dates(errors, from, to)
+    errors.add(:from, :invalid_date) unless is_date?(from)
+    errors.add(:to,   :invalid_date) unless is_date?(to)
+
+    # если введена хотя бы одна некорректная дата - дальше не проверяем
+    return if errors[:from].any? || errors[:to].any?
+
+    from = Time.parse(from) rescue from
+    to   = Time.parse(to)   rescue to
+    now  = Time.zone.now.beginning_of_day
+
+    conditions = [
+      from.beginning_of_day < now,
+      to.beginning_of_day   < now,
+      from > to
+    ]
+
+    if conditions.any?
+      errors.add(:from, :invalid_date)
+      errors.add(:to, :invalid_date)
+    end
+
+  end
+
+  private
+
+  def is_date?(date)
+    return true if date.is_a? ::ActiveSupport::TimeWithZone
+    !!Time.parse(date) rescue false
+  end
+
+end

data/lib/c80_shared/version.rb

@@ -1,3 +1,3 @@
 module C80Shared
-  VERSION = "0.1.69"
+  VERSION = "0.1.70"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.69
+  version: 0.1.70
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2019-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,12 +64,16 @@ files:
 - app/dicts/length.rb
 - app/dicts/locale.rb
 - app/dicts/motor.rb
+- app/dicts/reject_type.rb
 - app/dicts/rent_skip_type.rb
 - app/dicts/role.rb
+- app/forms/application_form.rb
+- app/forms/rent_form.rb
 - app/getboat/schemas/base.rb
 - app/getboat/schemas/base_boat_schema.rb
 - app/getboat/schemas/central_agent/save_boat_schema.rb
 - app/getboat/schemas/site/lease/create_personal_inquiry_schema.rb
+- app/getboat/schemas/site/register_boat_schema.rb
 - app/helpers/custom/currency_helper.rb
 - app/helpers/custom/dimension_helper.rb
 - app/helpers/custom/price_helper.rb
@@ -77,6 +81,7 @@ files:
 - app/helpers/site/time_helper.rb
 - app/repositories/accounts/central_agent_account_repository.rb
 - app/repositories/accounts/client_account_repository.rb
+- app/repositories/events/rejects_repository.rb
 - app/serializers/account_serializer.rb
 - app/serializers/boat_location_serializer.rb
 - app/serializers/boat_price_serializer.rb
@@ -95,6 +100,7 @@ files:
 - app/serializers/lib/boats/rent_price_per_season.rb
 - app/serializers/lib/boats/sale_price.rb
 - app/services/abstract_prices_service.rb
+- app/services/boat_register_service.rb
 - app/services/boats/boat_prices_save_service.rb
 - app/services/boats/boat_sale_prices_save_service.rb
 - app/services/central_agent/save_boat_service.rb
@@ -112,6 +118,8 @@ files:
 - config/locales/boat/ru.yml
 - config/locales/dicts/account_type/en.yml
 - config/locales/dicts/account_type/ru.yml
+- config/locales/dicts/business/en.yml
+- config/locales/dicts/business/ru.yml
 - config/locales/dicts/charter_category/en.yml
 - config/locales/dicts/charter_category/ru.yml
 - config/locales/dicts/exterior_color/en.yml
@@ -133,6 +141,7 @@ files:
 - lib/c80_shared.rb
 - lib/c80_shared/aasm/handle_event.rb
 - lib/c80_shared/abstract_serializer.rb
+- lib/c80_shared/dates_now_validator.rb
 - lib/c80_shared/dict.rb
 - lib/c80_shared/engine.rb
 - lib/c80_shared/geo/distance.rb