c80_shared 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b236e08513a15d9ca9dd41382641ee82d24158b0a0850c8c907ebb7528330a2f
-  data.tar.gz: e80c6d7d2c3f12a153aac7c82abac231374f29ac616b11166803c52c6397c1c9
+  metadata.gz: beb69360e62a37e82a25e04c0f1c58b758f1b08ba9ba1e61f0c37afad5d7514d
+  data.tar.gz: b60b0b9fe9c872a0166d69599f11c0e0820e71e091d1daebeed7a77e8f66c042
 SHA512:
-  metadata.gz: bbc0039d84644da11ff2aecd5cfbaf101e33b6bb1bb6e11c376d0290866bbe8d9ef21f8d737c59830539ec3fee54532f489fa2e8abbf75446dbf04d7ca2bdc15
-  data.tar.gz: ee4753dda77eac6ed36e1cd30c16c8d50dcfab8885fc07b0895e162ea04a2425e6ce0c21555d23437306dda72020338cf718898108e05c15bdfdc10f035afe3b
+  metadata.gz: 20f3e67dd585908ff384bcddb985db8407f0b085a030afb19af6ba291659843ce213229d0880d97178db59cadaddb42c33b9d0f38796449e684926779145a9bf
+  data.tar.gz: a36075b8c1aad10b245e4cf3fd53ad435ae4c18cd0488afcabd3a592986f8bf6db9a51da5e44167a8ff11f9ac15f5d4609d3cdd4b0edc06b3d36369bbf106d0f

data/app/helpers/custom/currency_helper.rb

@@ -1,16 +1,20 @@
 module Custom
   module CurrencyHelper
-    def currency_symbol
-      collection_name_by_id(t('static.currencies', default: ''), cookies[:currency]) || ''
+    def currency_symbol(currency = nil)
+      currency ||= cookies[:currency]
+      collection_name_by_id(I18n.t('static.currencies', default: ''), currency) || ''
     end
 
     def currency_for_label(options = {})
       options[:prefix] ||= ', '
       "#{options[:prefix]}#{currency_symbol}"
     end
-
-    def currency_attribute_name(name)
-      Currency.attribute_name(cookies[:currency], name)
+    
+    # @param name [Symbol, String] Например: `charter_1_day_high`
+    #
+    def currency_attribute_name name, currency = nil
+      currency ||= cookies[:currency]
+      Currency.attribute_name(currency, name)
     end
 
     # 12 USD -> $ 12.00, EUR -> €,...

data/app/helpers/custom/dimension_helper.rb

@@ -0,0 +1,18 @@
+module Custom
+  module DimensionHelper
+    def dimension_symbol(uom = nil)
+      uom ||= cookies[:dimension]
+      collection_name_by_id(I18n.t('static.dimensions', default: ''), uom) || ''
+    end
+
+    def dimension_for_label options = {}
+      options[:prefix] ||= ', '
+      "#{options[:prefix]}#{dimension_symbol}"
+    end
+
+    def dimension_attribute_name(name, uom = nil)
+      uom ||= cookies[:dimension]
+      Dimension.attribute_name(uom, name)
+    end
+  end
+end

data/app/helpers/custom/price_helper.rb

@@ -0,0 +1,29 @@
+module Custom
+  module PriceHelper
+
+    # @param [Boat] object
+    #
+    def price_discount(object, attr)
+      price    = object.attributes[currency_attribute_name(attr)]
+      discount = object.attributes["#{attr}_discount"]
+      return ''    if price.nil?
+
+      return price if discount.nil?
+
+      price - (price / 100 * discount)
+    end
+
+    # @param [Boat] object
+    #
+    def price_format(object, attr, options = {})
+      price = options[:discounted] ? price_discount(object, attr) : object.attributes[currency_attribute_name(attr, options[:currency])]
+      return '' if price.blank?
+
+      unit  = currency_symbol options[:currency]
+      price = number_to_currency(price, unit: unit).to_s
+      price = price            + options[:postfix] if options[:postfix]
+      price = options[:prefix] + price             if options[:prefix]
+      price
+    end
+  end
+end

data/app/serializers/boat_serializer.rb

@@ -0,0 +1,331 @@
+class BoatSerializer < AbstractSerializer
+
+  class << self
+    def available_attributes
+      %i[
+        charter_1_hour_low_usd
+        charter_1_hour_low_rub
+        charter_1_hour_low_eur
+        charter_1_day_low_usd
+        charter_1_day_low_rub
+        charter_1_day_low_eur
+        charter_1_week_low_usd
+        charter_1_week_low_rub
+        charter_1_week_low_eur
+        charter_1_month_low_usd
+        charter_1_month_low_rub
+        charter_1_month_low_eur
+        charter_1_hour_high_usd
+        charter_1_hour_high_rub
+        charter_1_hour_high_eur
+        charter_1_day_high_usd
+        charter_1_day_high_rub
+        charter_1_day_high_eur
+        charter_1_week_high_usd
+        charter_1_week_high_rub
+        charter_1_week_high_eur
+        charter_1_month_high_usd
+        charter_1_month_high_rub
+        charter_1_month_high_eur
+        sale_price_usd
+        sale_price_rub
+        sale_price_eur
+        id
+        picture_medium_url
+        name
+        builder
+        short_description
+        per_season
+        price
+        price_discount
+        guests_total
+        guest_cabins
+        crew_total
+        built_year
+        refit_year
+        boat_model
+        location_address
+        latitude
+        boat_type_id
+        boat_length_metrics
+        boat_length_metrics_meters
+        boat_length_metrics_ft
+        boat_beam_metrics
+        boat_beam_metrics_ft
+        boat_beam_metrics_meters
+        boat_draft_metrics
+        boat_draft_metrics_ft
+        boat_draft_metrics_meters
+      ].freeze
+    end
+
+    def default_opts
+      {
+        uom:         'ft',
+        currency:    'USD',
+        locale:      'en',
+        is_for_rent: true
+      }
+    end
+
+    def serialize(model, attributes: available_attributes, opts: {})
+      super(model, attributes: attributes, opts: default_opts.merge(opts))
+    end
+
+    def id(boat)
+      { id: boat.id }
+    end
+
+    # noinspection RubyResolve
+    def picture_medium_url(boat)
+      url = if boat.boat_photo.present?
+              boat.boat_photo.picture.url(:medium).gsub('\'', '&#39;')
+            else
+              ''
+            end
+
+      { picture_medium_url: url }
+    end
+
+    def name(boat)
+      { name: boat.name }
+    end
+
+    def builder(boat)
+      { builder: boat.builder }
+    end
+
+    def short_description(boat)
+      attr  = 'short_description_%s' % @opts[:locale]
+      value = boat.send(attr.to_sym) || ''
+      { short_description: value }
+    end
+
+    # per day, per week; в день, в час, за месяц;
+    def per_season(boat)
+      season_key = ::Lib::Boats::RentPricePerSeason.spot_rentprice_id(boat, @opts[:currency], @opts[:rent_price_id]).gsub(/_low|_high/, '')
+      #=> charter_1_week_low, charter_1_day_high
+      translate  = I18n.t("boat.rent_price.per_#{season_key}")
+      value      = @opts[:is_for_rent] ? translate : ''
+
+      { per_season: value }
+    end
+
+    # ₽ 293,885
+    def price(boat)
+      value = if @opts[:is_for_rent]
+                ::Lib::Boats::RentPricePerSeason.price(boat, @opts[:currency], @opts[:rent_price_id])
+              else
+                ::Lib::Boats::SalePrice.price(boat, @opts[:currency])
+              end
+
+      { price: value }
+    end
+
+    # 12%
+    def price_discount(boat)
+      value = if @opts[:is_for_rent]
+                ::Lib::Boats::RentPricePerSeason.price_discount(boat, @opts[:currency])
+              else
+                ::Lib::Boats::SalePrice.price_discount(boat)
+              end
+      { price_discount: value }
+    end
+
+    def guests_total(boat)
+      { guests_total: boat.guests_total || '' }
+    end
+
+    def guest_cabins(boat)
+      { guest_cabins: boat.guest_cabins || '' }
+    end
+
+    def crew_total(boat)
+      { crew_total: boat.crew_total || '' }
+    end
+
+    def built_year(boat)
+      { built_year: boat.built_year || '' }
+    end
+
+    def refit_year(boat)
+      value = boat.refit_year || ''
+      { refit_year: value }
+    end
+
+    def boat_model(boat)
+      { boat_model: boat.boat_model }
+    end
+
+    def location_address(boat)
+      { location_address: boat.location_address }
+    end
+
+    def latitude(boat)
+      { latitude: boat.latitude }
+    end
+
+    def longitude(boat)
+      { longitude: boat.longitude }
+    end
+
+    def boat_type_id(boat)
+      { boat_type_id: boat.boat_type_id }
+    end
+
+    def boat_length_metrics(boat)
+      value = ::Lib::Boats::Dimensions.boatlength(boat, @opts[:uom])
+      { boat_length_metrics: value }
+    end
+
+    def boat_length_metrics_meters(boat)
+      { boat_length_metrics_meters: boat.boat_length_metrics_meters }
+    end
+
+    def boat_length_metrics_ft(boat)
+      { boat_length_metrics_ft: boat.boat_length_metrics_ft }
+    end
+
+    def boat_beam_metrics(boat)
+      value = ::Lib::Boats::Dimensions.boatbeam(boat, @opts[:uom])
+      { boat_beam_metrics: value }
+    end
+
+    def boat_beam_metrics_ft(boat)
+      { boat_beam_metrics_ft: boat.boat_beam_metrics_ft }
+    end
+
+    def boat_beam_metrics_meters(boat)
+      { boat_beam_metrics_meters: boat.boat_beam_metrics_meters }
+    end
+
+    def boat_draft_metrics(boat)
+      value = ::Lib::Boats::Dimensions.boatdraft(boat, @opts[:uom])
+      { boat_draft_metrics: value }
+    end
+
+    def boat_draft_metrics_ft(boat)
+      { boat_draft_metrics_ft: boat.boat_draft_metrics_ft }
+    end
+
+    def boat_draft_metrics_meters(boat)
+      { boat_draft_metrics_meters: boat.boat_draft_metrics_meters }
+    end
+
+
+    # --[low]-----------------------------------------------------------------------------------------------------------
+
+    def charter_1_hour_low_usd(boat)
+      { charter_1_hour_low_usd: boat.charter_1_hour_low_usd || '' }
+    end
+
+    def charter_1_hour_low_rub(boat)
+      { charter_1_hour_low_rub: boat.charter_1_hour_low_rub || '' }
+    end
+
+    def charter_1_hour_low_eur(boat)
+      { charter_1_hour_low_eur: boat.charter_1_hour_low_eur || '' }
+    end
+
+    def charter_1_day_low_usd(boat)
+      { charter_1_day_low_usd: boat.charter_1_day_low_usd || '' }
+    end
+
+    def charter_1_day_low_rub(boat)
+      { charter_1_day_low_rub: boat.charter_1_day_low_rub || '' }
+    end
+
+    def charter_1_day_low_eur(boat)
+      { charter_1_day_low_eur: boat.charter_1_day_low_eur || '' }
+    end
+
+    def charter_1_week_low_usd(boat)
+      { charter_1_week_low_usd: boat.charter_1_week_low_usd || '' }
+    end
+
+    def charter_1_week_low_rub(boat)
+      { charter_1_week_low_rub: boat.charter_1_week_low_rub || '' }
+    end
+
+    def charter_1_week_low_eur(boat)
+      { charter_1_week_low_eur: boat.charter_1_week_low_eur || '' }
+    end
+
+    def charter_1_month_low_usd(boat)
+      { charter_1_month_low_usd: boat.charter_1_month_low_usd || '' }
+    end
+
+    def charter_1_month_low_rub(boat)
+      { charter_1_month_low_rub: boat.charter_1_month_low_rub || '' }
+    end
+
+    def charter_1_month_low_eur(boat)
+      { charter_1_month_low_eur: boat.charter_1_month_low_eur || '' }
+    end
+
+    # --[high]-----------------------------------------------------------------------------------------------------------
+
+    def charter_1_hour_high_usd(boat)
+      { charter_1_hour_high_usd: boat.charter_1_hour_high_usd || '' }
+    end
+
+    def charter_1_hour_high_rub(boat)
+      { charter_1_hour_high_rub: boat.charter_1_hour_high_rub || '' }
+    end
+
+    def charter_1_hour_high_eur(boat)
+      { charter_1_hour_high_eur: boat.charter_1_hour_high_eur || '' }
+    end
+
+    def charter_1_day_high_usd(boat)
+      { charter_1_day_high_usd: boat.charter_1_day_high_usd || '' }
+    end
+
+    def charter_1_day_high_rub(boat)
+      { charter_1_day_high_rub: boat.charter_1_day_high_rub || '' }
+    end
+
+    def charter_1_day_high_eur(boat)
+      { charter_1_day_high_eur: boat.charter_1_day_high_eur || '' }
+    end
+
+    def charter_1_week_high_usd(boat)
+      { charter_1_week_high_usd: boat.charter_1_week_high_usd || '' }
+    end
+
+    def charter_1_week_high_rub(boat)
+      { charter_1_week_high_rub: boat.charter_1_week_high_rub || '' }
+    end
+
+    def charter_1_week_high_eur(boat)
+      { charter_1_week_high_eur: boat.charter_1_week_high_eur || '' }
+    end
+
+    def charter_1_month_high_usd(boat)
+      { charter_1_month_high_usd: boat.charter_1_month_high_usd || '' }
+    end
+
+    def charter_1_month_high_rub(boat)
+      { charter_1_month_high_rub: boat.charter_1_month_high_rub || '' }
+    end
+
+    def charter_1_month_high_eur(boat)
+      { charter_1_month_high_eur: boat.charter_1_month_high_eur || '' }
+    end
+
+    # --[sale]----------------------------------------------------------------------------------------------------------
+
+    def sale_price_usd(boat)
+      { sale_price_usd: boat.sale_price_usd || '' }
+    end
+
+    def sale_price_rub(boat)
+      { sale_price_rub: boat.sale_price_rub || '' }
+    end
+
+    def sale_price_eur(boat)
+      { sale_price_eur: boat.sale_price_eur || '' }
+    end
+
+  end
+end

data/app/serializers/configs/boats/central_agent/boat_list.rb

@@ -0,0 +1,26 @@
+module Configs
+  module Boats
+    module CentralAgent
+      class BoatList
+        # список атрибутов Лодок, которые видны Агенту в списке Лодок
+        def self.attributes
+          %i[
+            id
+            picture_medium_url
+            name
+            builder
+            guests_total
+            guest_cabins
+            crew_total
+            boat_length_metrics
+            built_year
+            boat_model
+            location_address
+            price
+            per_season
+          ]
+        end
+      end
+    end
+  end
+end

data/app/serializers/configs/lease/central_agent/inquiry_list.rb

@@ -0,0 +1,29 @@
+module Configs
+  module Lease
+    module CentralAgent
+      class InquiryList
+        # список атрибутов Заявки, которые видны Агенту в списке заявок
+        def self.attributes
+          [
+            :id,
+            :token,
+            :is_skippered,
+            :is_my_price,
+            :my_price,
+            :my_price_currency,
+            :address,
+            :period,
+            :duration,
+            :guests,
+            :kids,
+            :watersports,
+            :need_transfer,
+            :comments,
+            :created_at,
+            :boat_types
+          ]
+        end
+      end
+    end
+  end
+end

data/app/serializers/lib/boats/dimensions.rb

@@ -0,0 +1,26 @@
+module Lib
+  module Boats
+    class Dimensions
+      extend ::Custom::DimensionHelper
+      extend ::Custom::SelectHelper
+
+      # @param [String]  uom: ft, meters
+      # @return [String] '78.7 ft', '20 m'
+      #
+      def self.boatlength(boat, uom = nil)
+        attr = dimension_attribute_name(:boat_length_metrics, uom)
+        '%s %s' % [boat.attributes[attr], dimension_symbol(uom)]
+      end
+
+      def self.boatbeam(boat, uom = nil)
+        attr = dimension_attribute_name(:boat_beam_metrics, uom)
+        '%s %s' % [boat.attributes[attr], dimension_symbol(uom)]
+      end
+
+      def self.boatdraft(boat, uom = nil)
+        attr = dimension_attribute_name(:boat_draft_metrics, uom)
+        '%s %s' % [boat.attributes[attr], dimension_symbol(uom)]
+      end
+    end
+  end
+end

data/app/serializers/lib/boats/rent_price_per_season.rb

@@ -0,0 +1,51 @@
+module Lib
+  module Boats
+    class RentPricePerSeason
+      extend ::Custom::CurrencyHelper
+      extend ::Custom::PriceHelper
+      extend ::ActionView::Helpers::NumberHelper
+
+      # Вернёт отформатированное минимальное число среди цен на аренду вместе с подписью.
+      # Если у лодки не заполнены цены - вернёт дефлотное значение.
+      # value возвращается, но не используется.
+      #
+      # @return [Hash] { value: String, perseason: String }
+      #
+      def self.min_rentprice(boat, currency)
+        ::Dictionaries::BoatCharterAttribute::ALL.map do |attr|
+          {
+            attr:  attr.to_s,
+            value: boat.send(currency_attribute_name(attr, currency))
+          }
+        end.delete_if { |el| !el[:value].present? }.sort_by { |el| el[:value] }.first || { attr: 'charter_1_day_high', value: 0 }
+      end
+
+      # Определить столбец, из которого надо взять цену аренды.
+      # Может зависеть от контекста - от того, какой параметр выставлен в поисковой форме.
+      # Если с поисковой формы приходит nil или пустая строка - вернёт дефолтное значение.
+      # Если у лодки не заполнено искомое поле - вернёт дефолтное значение.
+      # Дефолтное значение - вычисляется с помощью min_rent_price
+      #
+      # @param  [Symbol, String] rent_price_id Например: charter_1_day_low
+      # @return [String]
+      #
+      def self.spot_rentprice_id(boat, currency = 'USD', rent_price_id = nil)
+        default_id =  min_rentprice(boat, currency)[:attr]
+        return default_id unless rent_price_id
+
+        return default_id unless boat.attributes[currency_attribute_name(rent_price_id, currency)].present?
+
+        rent_price_id.to_s
+      end
+
+      def self.price(boat, currency = 'USD', rent_price_id = nil)
+        attr = spot_rentprice_id(boat, currency, rent_price_id)
+        price_format(boat, attr, currency: currency)
+      end
+
+      def self.price_discount(boat, currency = 'USD')
+        boat.send('%s_discount' % min_rentprice(boat, currency)[:attr])
+      end
+    end
+  end
+end

data/app/serializers/lib/boats/sale_price.rb

@@ -0,0 +1,17 @@
+module Lib
+  module Boats
+    class SalePrice
+      extend ::Custom::PriceHelper
+      extend ::Custom::CurrencyHelper
+      extend ::ActionView::Helpers::NumberHelper
+
+      def self.price(boat, currency)
+        price_format(boat, :sale_price, currency: currency)
+      end
+
+      def self.price_discount(boat)
+        boat.sale_price_discount
+      end
+    end
+  end
+end

data/lib/c80_shared/version.rb

@@ -1,3 +1,3 @@
 module C80Shared
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,10 +52,18 @@ files:
 - app/dicts/email_token_subj.rb
 - app/dicts/rent_skip_type.rb
 - app/helpers/custom/currency_helper.rb
+- app/helpers/custom/dimension_helper.rb
+- app/helpers/custom/price_helper.rb
 - app/helpers/custom/select_helper.rb
 - app/helpers/site/time_helper.rb
+- app/serializers/boat_serializer.rb
+- app/serializers/configs/boats/central_agent/boat_list.rb
+- app/serializers/configs/lease/central_agent/inquiry_list.rb
 - app/serializers/lease/bid_serializer.rb
 - app/serializers/lease/inquiry_serializer.rb
+- app/serializers/lib/boats/dimensions.rb
+- app/serializers/lib/boats/rent_price_per_season.rb
+- app/serializers/lib/boats/sale_price.rb
 - bin/console
 - bin/rails
 - bin/setup