c80_shared 0.1.38 → 0.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe910329bcff3b21b0e4f5426362fee42c56a70cfe2dc0d253c65f3b96eb76c5
-  data.tar.gz: 4721fee3ab0be6dbf2a84e2acfca44400f96f0cc07e1dbfded0a7876b0181475
+  metadata.gz: d59448f06caa5565bd1789750343b0f14d15473d164ffbe47d8950e0927c75b8
+  data.tar.gz: 92ecb6ca525b561ea10b69c0bcde1e5b361e8a973b29bc6c237c9ee6bd443742
 SHA512:
-  metadata.gz: 1da074bf84e3f1297a73107c335ca9b5cc65a9ccdf8f22146c2bf26646332fd5971d2dbc6294be84bfd969d5ab1bae445e4dbcd4a9aa60c9899d3f7b5c0df5da
-  data.tar.gz: 17619064f8a7614206a951b5104a3236e553fee64de05685cdc1b302527bdc7b3bbd2ba72b3ef0fd1ea7c6d89653ee3ad88da9c3db05016faa84bd754b8b7abf
+  metadata.gz: a7dbbb0f5cf2c6ce18bf170cf305e9ef710ae04f8fcc55886bc3b33a1ea3db65e3272c5b8b725c39414a39ce8ccf1171a2acc202405a95a7f14ef3bd2ff671c6
+  data.tar.gz: c87b8bba8dd1a9de71d7809a412eb877e796427f0827d003fb116d21c68a011a4f35b7ec1358885048ffa73ebdc486097721c8c1cf350fbad4c139d212de5b68

data/app/dicts/boat_type.rb

@@ -7,5 +7,6 @@ module Dicts
     SAILING       = new(11, 'sailing')
     CATAMARAN     = new(12, 'catamaran')
     MEGA_YACHT    = new(13, 'mega_yacht')
+    EXPLORER      = new(17, 'explorer')
   end
 end

data/app/serializers/boat_serializer.rb

@@ -5,18 +5,12 @@ class BoatSerializer < AbstractSerializer
       %i[
         boat_beam
         boat_beam_metrics
-        boat_beam_metrics_ft
-        boat_beam_metrics_meters
         boat_contacts
         boat_draft
         boat_draft_metrics
-        boat_draft_metrics_ft
-        boat_draft_metrics_meters
         boat_hull_id
         boat_length
         boat_length_metrics
-        boat_length_metrics_ft
-        boat_length_metrics_meters
         boat_model
         boat_photos
         boat_type
@@ -24,9 +18,13 @@ class BoatSerializer < AbstractSerializer
         builder
         built_year
         crew_total
+        crew_cabins
         description
         exterior_color
+        equipment
         guest_cabins
+        guest_heads
+        guest_sleeps
         guests_total
         hull_material
         id
@@ -34,6 +32,7 @@ class BoatSerializer < AbstractSerializer
         latitude
         location_address
         longitude
+        maximum_guests_during_cruise
         main_boat_photo_id
         motor
         motor_id
@@ -47,6 +46,7 @@ class BoatSerializer < AbstractSerializer
         sale_price
         short_description
         state
+        toys
         visits_today
         visits_total
       ].freeze
@@ -68,16 +68,76 @@ class BoatSerializer < AbstractSerializer
       result
     end
 
-    def id(boat)
-      { id: boat.id }
+    # определяем "простые" методы
+    %i[id comments tender name description built_year boat_model location_address latitude longitude boat_type_id boat_hull_id refit_year
+       crew_cabins crew_total guest_heads guest_sleeps maximum_guests_during_cruise interior_designer
+       naval_architect guests_total guest_cabins state visits_today visits_total].each do |f|
+      define_method f do |boat|
+        { f => boat.send(f) }
+      end
+    end
+
+    def toys_attributes
+      %i[
+        banana
+        beach_kids_toys
+        donut
+        exercise_equipment
+        fishing_gear
+        flyboard
+        inflatable_sailboat
+        jet_ski
+        kayak
+        kneeboard
+        paddle_boards
+        sailing_boat
+        scuba_tanks
+        skiboard
+        snorkelling_gear
+        stand_up_jet_ski
+        underwater_gear
+        wakeboard
+        water_ski
+        windsurfing_board
+      ].freeze
     end
 
-    def interior_designer(boat)
-      { interior_designer: boat.interior_designer }
+    def toys(boat)
+      {
+        toys: toys_attributes.map do |f|
+          [f, boat.send(f)]
+        end.to_h
+      }
     end
 
-    def naval_architect(boat)
-      { naval_architect: boat.naval_architect }
+    def equipment_attributes
+      %i[
+        apple_tv
+        autopilot
+        cd_player
+        chartplotter
+        cockpit_loudspeakers
+        entertainment
+        excellent_sound_system
+        gps
+        internet
+        lcd_tv
+        navigation
+        radar
+        satellite_internet
+        satellite_phone
+        tv
+        vhf
+        wi_fi
+      ]
+    end
+
+    def equipment(boat)
+      {
+          equipment: equipment_attributes.map do |f|
+            [f, boat.send(f)]
+          end.to_h
+      }
     end
 
     # noinspection RubyResolve
@@ -91,10 +151,6 @@ class BoatSerializer < AbstractSerializer
       { picture_medium_url: url }
     end
 
-    def name(boat)
-      { name: boat.name }
-    end
-
     def motor(boat)
       m = ::Dicts::Motor.find boat.motor
       {
@@ -117,10 +173,6 @@ class BoatSerializer < AbstractSerializer
       { builder: boat.builder&.strip }
     end
 
-    def description(boat)
-      { description: boat.description }
-    end
-
     def short_description(boat)
       attr  = 'short_description_%s' % @opts[:locale]
       value = boat.send(attr.to_sym)
@@ -168,14 +220,6 @@ class BoatSerializer < AbstractSerializer
     #   { 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 hull_material(boat)
       hm = ::Dicts::HullMaterial.find boat.hull_material
       {
@@ -196,39 +240,6 @@ class BoatSerializer < AbstractSerializer
       }
     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_type(boat)
       {
           boat_type: {
@@ -238,6 +249,27 @@ class BoatSerializer < AbstractSerializer
       }
     end
 
+    # для формы редактирования в кабинете агента
+    def boat_beam_metrics(boat)
+      {
+          boat_beam_metrics: {
+              value: boat.send('boat_beam_metrics_%s' % @opts[:uol]),
+              uol:   @opts[:uol]
+          }
+      }
+    end
+
+    # для формы редактирования в кабинете агента
+    def boat_draft_metrics(boat)
+      {
+          boat_draft_metrics: {
+              value: boat.send('boat_draft_metrics_%s' % @opts[:uol]),
+              uol:   @opts[:uol]
+          }
+      }
+    end
+
+    # используется в списке лодок агента, в preview-блоке на сайте
     def boat_length(boat)
       {
           boat_length: {
@@ -247,13 +279,12 @@ class BoatSerializer < AbstractSerializer
       }
     end
 
-    # [bcff00da] : вся подобная логика переезжает во фронт, переделано должно быть по образу `def boat_length`
+    # для формы редактирования в кабинете агента
+    def boat_length_metrics(boat)
+      { boat_length_metrics: boat_length(boat)[:boat_length] }
+    end
 
-    # TODO:: [bcff00da] УДАЛИТЬ
-    # def boat_length_metrics(boat)
-    #   value = ::Lib::Boats::Dimensions.boatlength(boat, @opts[:uol])
-    #   { boat_length_metrics: value }
-    # end
+    # [bcff00da] : вся подобная логика переезжает во фронт, переделано должно быть по образу `def boat_length`
 
     # TODO:: [bcff00da] УДАЛИТЬ - пока используется при обновлении/создании лодки в админке
     def boat_length_metrics_meters(boat)
@@ -265,42 +296,6 @@ class BoatSerializer < AbstractSerializer
       { boat_length_metrics_ft: boat.boat_length_metrics_ft }
     end
 
-    # TODO:: [bcff00da] УДАЛИТЬ
-    # def boat_beam_metrics(boat)
-    #   value = ::Lib::Boats::Dimensions.boatbeam(boat, @opts[:uol])
-    #   { boat_beam_metrics: value }
-    # end
-
-    # TODO:: [bcff00da] УДАЛИТЬ
-    # def boat_beam_metrics_ft(boat)
-    #   { boat_beam_metrics_ft: boat.boat_beam_metrics_ft }
-    # end
-
-    # TODO:: [bcff00da] УДАЛИТЬ
-    # def boat_beam_metrics_meters(boat)
-    #   { boat_beam_metrics_meters: boat.boat_beam_metrics_meters }
-    # end
-
-    # TODO:: [bcff00da] УДАЛИТЬ
-    # def boat_draft_metrics(boat)
-    #   value = ::Lib::Boats::Dimensions.boatdraft(boat, @opts[:uol])
-    #   { boat_draft_metrics: value }
-    # end
-
-    # TODO:: [bcff00da] УДАЛИТЬ
-    # def boat_draft_metrics_ft(boat)
-    #   { boat_draft_metrics_ft: boat.boat_draft_metrics_ft }
-    # end
-
-    # TODO:: [bcff00da] УДАЛИТЬ
-    # def boat_draft_metrics_meters(boat)
-    #   { boat_draft_metrics_meters: boat.boat_draft_metrics_meters }
-    # end
-
-    def boat_hull_id(boat)
-      { boat_hull_id: boat.boat_hull_id }
-    end
-
     def prices(boat)
       currency_id  = ::Dicts::Currency.find_by_index(@opts[:currency]).id
       business     = ::Dicts::Business.find_by_index @opts[:business]
@@ -342,162 +337,6 @@ class BoatSerializer < AbstractSerializer
       }
     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
-
-    # --[discount]------------------------------------------------------------------------------------------------------
-
-    # def charter_1_day_high_discount(boat)
-    #   { charter_1_day_high_discount: boat.charter_1_day_high_discount }
-    # end
-    #
-    # def charter_1_day_low_discount(boat)
-    #   { charter_1_day_low_discount: boat.charter_1_day_low_discount }
-    # end
-    #
-    # def charter_1_hour_high_discount(boat)
-    #   { charter_1_hour_high_discount: boat.charter_1_hour_high_discount }
-    # end
-    #
-    # def charter_1_hour_low_discount(boat)
-    #   { charter_1_hour_low_discount: boat.charter_1_hour_low_discount }
-    # end
-    #
-    # def charter_1_month_high_discount(boat)
-    #   { charter_1_month_high_discount: boat.charter_1_month_high_discount }
-    # end
-    #
-    # def charter_1_month_low_discount(boat)
-    #   { charter_1_month_low_discount: boat.charter_1_month_low_discount }
-    # end
-    #
-    # def charter_1_week_high_discount(boat)
-    #   { charter_1_week_high_discount: boat.charter_1_week_high_discount }
-    # end
-    #
-    # def charter_1_week_low_discount(boat)
-    #   { charter_1_week_low_discount: boat.charter_1_week_low_discount }
-    # end
-
-    # def sale_price_discount(boat)
-    #   { sale_price_discount: boat.sale_price_discount }
-    # end
-
-    def state(boat)
-      { state: boat.state }
-    end
-
     def boat_photos(boat)
       # FIXME:: выяснить, нужно ли всётаки использовать .gsub('\'', '&#39;') для строк с путями к фоткам?
       boat_photos = boat.boat_photos.map do |boat_photo|
@@ -521,14 +360,6 @@ class BoatSerializer < AbstractSerializer
       { boat_contacts: boat_contacts }
     end
 
-    def visits_today(boat)
-      { visits_today: boat.visits_today }
-    end
-
-    def visits_total(boat)
-      { visits_total: boat.visits_total }
-    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.38"
+  VERSION = "0.1.39"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.39
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler