c80_shared 0.1.33 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2018a901c7704054ba4433b0891ce3d3bb0a19644d85344d52c2b9dfd4d90489
-  data.tar.gz: 10325288d0fdc13b1e8e97867f1fcbd3f06da589d001148c59c4941856ea0150
+  metadata.gz: bd089f176cd766486dbe048062a8633eb2c3d72de2e67b04fc22d9f6cb1bd3aa
+  data.tar.gz: abe64d6e72fd85fafcf638b4cf193b6f87060a207136b0b25526223046e12a2e
 SHA512:
-  metadata.gz: abc853aff0959634e0e95629be2b276980602eaf842c624c623e413094d862acc8fedf3783ffc94fe51b0a3f76f80c1720e3774f29c3df4ddab38ac2cece94da
-  data.tar.gz: b3043462144edb23b4b37b567d92e3f777c1183d19c5226e6d75c91945714b9fa3465caa4e5d698f077674f73038be91bbc5f21832dfc756399646771198d6e2
+  metadata.gz: f5173095f3e5574251e85c8c6593df607ac0c0d7360ed71aa02903280d4a88591a182dba7ec45c7a54a3435c2750fee194f653b2acdb5cf0af43dd5263db1935
+  data.tar.gz: ded4cdd6e25b6ee23bac73fc98180db32c494cb255c1431b358edf32d77cbdd0f73f28e3289f24466411eb439fe4d3b7079efc3a93c23c32a07a7830f00f3e78

data/app/serializers/boat_serializer.rb

@@ -35,12 +35,15 @@ class BoatSerializer < AbstractSerializer
         longitude
         main_boat_photo_id
         motor
+        motor_id
         name
         naval_architect
         picture_medium_url
         prices
         refit_year
+        rent_prices
         rental_type
+        sale_price
         short_description
         state
         visits_today
@@ -95,8 +98,8 @@ class BoatSerializer < AbstractSerializer
       m = ::Dicts::Motor.find boat.motor
       {
           motor: {
-              id:     (m.id    rescue -1),
-              index:  (m.index rescue 'null')
+              id:     (m.id    rescue nil),
+              index:  (m.index rescue 'null')                                                                           # 'null' - индекс в локалях
           }
       }
     end
@@ -123,8 +126,8 @@ class BoatSerializer < AbstractSerializer
       color = ::Dicts::ExteriorColor.find boat.exterior_color
       {
           exterior_color: {
-              id:     (color.id    rescue -1),
-              index:  (color.index rescue 'null')
+              id:     (color.id    rescue nil),
+              index:  (color.index rescue 'null')                                                                       # 'null' - индекс в локалях
           }
       }
     end
@@ -172,8 +175,8 @@ class BoatSerializer < AbstractSerializer
       hm = ::Dicts::HullMaterial.find boat.hull_material
       {
           hull_material: {
-              id:     (hm.id rescue -1),
-              index:  (hm.index rescue 'null')
+              id:     (hm.id rescue nil),
+              index:  (hm.index rescue 'null')                                                                          # 'null' - индекс в локалях
           }
       }
     end
@@ -182,8 +185,8 @@ class BoatSerializer < AbstractSerializer
       hm = ::Dicts::RentSkipType.find boat.rental_type
       {
           rental_type: {
-              id:     (hm.id rescue -1),
-              index:  (hm.index rescue 'null')
+              id:     (hm.id rescue nil),
+              index:  (hm.index rescue 'null')                                                                          # 'null' - индекс в локалях
           }
       }
     end
@@ -314,6 +317,19 @@ class BoatSerializer < AbstractSerializer
       }
     end
 
+    def rent_prices(boat)
+      currency_id = ::Dicts::Currency.find_by_index(@opts[:currency]).id
+      {
+          rent_prices: boat.boat_prices
+                           .select { |bp| bp.currency_id == currency_id }
+                           .map.each_with_index { |bp, index| ::BoatPriceSerializer.serialize(bp).merge(id:index) }
+      }
+    end
+
+    def sale_price(boat)
+
+    end
+
     # --[low]-----------------------------------------------------------------------------------------------------------
 
     # def charter_1_hour_low_usd(boat)

data/lib/c80_shared/version.rb

@@ -1,3 +1,3 @@
 module C80Shared
-  VERSION = "0.1.33"
+  VERSION = "0.1.34"
 end

metadata

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