c80_shared 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ea5ee1185bdae0322323c6ce97c444cd3e5b72f2553ebb2759a39833f698964
-  data.tar.gz: bfc619cf91108d53e7b2adc0e4b3eccf6415b5f628d3ef9efd692a00c3e9c460
+  metadata.gz: 67ee8d9c2b4f04abc4ed5421e832edcdc9a03db966d6f43d70cea4305ced4ae6
+  data.tar.gz: b773639ed62b3d0c23c5c3ba0117c5b58ac32e12a9e86dac749205bf968549d6
 SHA512:
-  metadata.gz: d3a51fcbd6d52a7b86070cd55a6b744d9877af0628cc1c0910c1d652e5d535648eb407451935ea91e2f751880d9027bc1d62fb3f78c50d499b5b16087f22e526
-  data.tar.gz: 1f62ae502e89032fb59df3f40991082589fa5a0f74d5d1f7ea3c416f643624a103705b0583cca5d9337ce12bfafc79d2991fe2228ee00a51468ee5602e3aabcf
+  metadata.gz: 1fdd80cf449a1ccbd7ba17e346032f28d392bdbdfa0bcdb919b49902963c9481d2a34c6f5f54f99bc4f1a35d44963b8152e3b80eddbee6c61273bfd5cc0f5e22
+  data.tar.gz: 13b08b0e82d619f40aafac1ffd536ae183903ae0ce007218673301591a10c5eeaa17d2f042e27d5a5b39aac47baa2132e6c7c3711cb7a8a7318fe9043ced3086

data/app/serializers/boat_serializer.rb

@@ -57,7 +57,9 @@ class BoatSerializer < AbstractSerializer
     end
 
     def serialize(model, attributes: available_attributes, opts: {})
-      super(model, attributes: attributes, opts: default_opts.merge(opts))
+      result = super(model, attributes: attributes, opts: default_opts.merge(opts))
+      result[:opts] = serialize_opts
+      result
     end
 
     def id(boat)
@@ -259,17 +261,21 @@ class BoatSerializer < AbstractSerializer
 
     def prices(boat)
       currency_id  = ::Dicts::Currency.find_by_index(@opts[:currency]).id
-      prices       = if @opts[:business] == ::Dicts::Business::RENT.index
+      business     = ::Dicts::Business.find_by_index @opts[:business]
+
+      prices       = if business.index == ::Dicts::Business::RENT.index
                        boat.boat_prices.select { |bp| bp.currency_id == currency_id }.map { |bp| ::BoatPriceSerializer.serialize bp }
                      else
                        # noinspection RubyResolve
                        boat.boat_sale_prices.select { |bp| bp.currency_id == currency_id }.map { |bps| ::BoatSalePriceSerializer.serialize bps }
                      end
-
       {
           prices:   {
               list:     prices,
-              business: @opts[:business]
+              business: {
+                  index: business.index,
+                  id:    business.id
+              }
           }
       }
     end
@@ -460,5 +466,32 @@ class BoatSerializer < AbstractSerializer
     def visits_total(boat)
       { visits_total: boat.visits_total }
     end
+
+    def serialize_opts
+      locale   = ::Dicts::Locale.find_by_index   @opts[:locale]
+      uol      = ::Dicts::Length.find_by_index   @opts[:uol]
+      business = ::Dicts::Business.find_by_index @opts[:business]
+      currency = ::Dicts::Currency.find_by_index @opts[:currency]
+
+      {
+          locale: {
+              index: locale.index,
+              id:    locale.id
+          },
+          uol: {
+              index: uol.index,
+              id:    uol.id
+          },
+          business: {
+              index: business.index,
+              id:    business.id
+          },
+          currency: {
+              index:  currency.index,
+              id:     currency.id,
+              symbol: currency.symbol
+          }
+      }
+    end
   end
 end

data/lib/c80_shared/version.rb

@@ -1,3 +1,3 @@
 module C80Shared
-  VERSION = "0.1.30"
+  VERSION = "0.1.31"
 end

metadata

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