c80_shared 0.1.47 → 0.1.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d6e0efe1ed0161e4bd85858be91010da3470089ba00bc1230443ed8698b11ea
-  data.tar.gz: 2c768f5ebc7709f32fab0748772ae044dda3d2c04989fdad3d07c4a108b8223f
+  metadata.gz: 9f2e77e7dbf7e8a1279e7b352b677027059cfadad92b286d3f89d02af8583ed9
+  data.tar.gz: 4c0501164cb9f5e47242c6a2d6a0f15f4c63cfe910ea1c2b4fa2256175d9ecca
 SHA512:
-  metadata.gz: a69d0eb917803c5dd9527b807de738580f6ae84535aa80757bb99112d5a62225825e7fd5314b88f1a157d6f4da1190aae17c8e4a47e06a10323c81e6062a5bf5
-  data.tar.gz: 588968c45cc3260d17447a62017509048fcfc4c3a06c5b2eebf621ee3d217c0bd2d00869088d6d8c0e9ea6ed203e73df444a40d38176b003ae238de023d9b16f
+  metadata.gz: 1b28f1132f4558b46d6ac1afeb5f56e710525d24fda8af17626debd201070590bca2d8a3ca85b6357927e8fda86601662e74dd2a32dfc3003aa8c29b0f5c6ba7
+  data.tar.gz: 3427cf33ce35082fa55ea7038895f12a0b23b5f87cd33518c274ef24dea387b14adc2fb16e9eb9d799e91fc03b485248c60e5f435c3757f011a48bd6bf4b833d

data/app/dicts/length.rb

@@ -1,6 +1,6 @@
 module Dicts
   class Length < ::Dict
     METRE = new(1, 'meters')
-    FOOT  = new(1, 'ft')
+    FOOT  = new(2, 'ft')
   end
 end

data/app/serializers/boat_location_serializer.rb

@@ -0,0 +1,39 @@
+class BoatLocationSerializer < AbstractSerializer
+
+  class << self
+    def available_attributes
+      %i[
+        id
+        latitude
+        longitude
+        address
+        is_main
+        radius
+      ]
+    end
+
+    def id(location)
+      { id: location.id }
+    end
+
+    def latitude(location)
+      { latitude: location.latitude }
+    end
+
+    def longitude(location)
+      { longitude: location.longitude }
+    end
+
+    def address(location)
+      { address: location.address }
+    end
+
+    def is_main(location)
+      { is_main: location.is_main }
+    end
+
+    def radius(location)
+      { radius: location.radius }
+    end
+  end
+end

data/app/serializers/boat_serializer.rb

@@ -13,8 +13,10 @@ class BoatSerializer < AbstractSerializer
         boat_length_metrics
         boat_length_metrics_ft
         boat_length_metrics_meters
+        boat_locations_attributes
         boat_model
         boat_photos
+        boat_photos_attributes
         boat_type
         boat_type_id
         builder
@@ -31,8 +33,10 @@ class BoatSerializer < AbstractSerializer
         hull_material
         id
         interior_designer
+        length
         latitude
         location_address
+        locations
         longitude
         maximum_guests_during_cruise
         main_boat_photo_id
@@ -71,7 +75,7 @@ class BoatSerializer < AbstractSerializer
     end
 
     # определяем "простые" методы
-    %i[id comments tender name description built_year boat_model location_address latitude longitude boat_type_id boat_hull_id refit_year
+    %i[id comments tender name description built_year boat_model 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|
@@ -281,6 +285,16 @@ class BoatSerializer < AbstractSerializer
       }
     end
 
+    # используется для валидации лодки при обновлении стейта
+    def length(boat)
+      {
+          length: {
+              value:     boat.send('boat_length_metrics_%s' % @opts[:uol]),
+              length_id: ::Dicts::Length.find_by_index(@opts[:uol]).id
+          }
+      }
+    end
+
     # для формы редактирования в кабинете агента
     def boat_length_metrics(boat)
       { boat_length_metrics: boat_length(boat)[:boat_length] }
@@ -352,6 +366,15 @@ class BoatSerializer < AbstractSerializer
       { boat_photos: boat_photos }
     end
 
+    # используется для валидации лодки при обновлении стейта
+    def boat_photos_attributes(boat)
+      {
+          boat_photos_attributes: boat.boat_photos.map do |boat_photo|
+            { id: boat_photo.id }
+          end
+      }
+    end
+
     # Контакты владельцев: то, что приходит в `boat_users_attributes` из админской формы
     def boat_contacts(boat)
       boat_contacts = boat.boat_users.map do |user|
@@ -362,6 +385,42 @@ class BoatSerializer < AbstractSerializer
       { boat_contacts: boat_contacts }
     end
 
+    # TODO
+    def latitude(boat)
+      { latitude: 1 }
+    end
+
+    # TODO
+    def longitude(boat)
+      { longitude: 1 }
+    end
+
+    # под видом этого атрибута будет приходить текст - название главной локации
+    def location_address(boat)
+      loc   = boat.boat_locations.select { |bl| bl.is_main }.first                                                      # если не применяется поиск по адресу
+      loc ||= boat.boat_locations.first                                                                                 # если поиск по адресу применён -- в результат поиска может не попасть главная локация
+      {
+          location_address: loc&.address || ''
+      }
+    end
+
+    def locations(boat)
+      {
+          locations: boat.boat_locations.map do |location|
+            ::BoatLocationSerializer.serialize location
+          end
+      }
+    end
+
+    # используется для валидации лодки при обновлении стейта
+    def boat_locations_attributes(boat)
+      {
+          boat_locations_attributes: boat.boat_locations.map do |location|
+            ::BoatLocationSerializer.serialize location
+          end
+      }
+    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.47"
+  VERSION = "0.1.48"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.47
+  version: 0.1.48
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - app/helpers/custom/select_helper.rb
 - app/helpers/site/time_helper.rb
 - app/serializers/account_serializer.rb
+- app/serializers/boat_location_serializer.rb
 - app/serializers/boat_price_serializer.rb
 - app/serializers/boat_sale_price_serializer.rb
 - app/serializers/boat_serializer.rb