c80_shared 0.1.71 → 0.1.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a006efb8239eb50f526ddb5a12433c90b748bc4dc0007a1f8c943f1ca9d89f1b
-  data.tar.gz: 6a388b745d84cbb287bb712347ed82111a1de0f80fc92cdefa44359ed562baaa
+  metadata.gz: ca59ad4b66c8f4441cbec7cd25df5ff69918db89ac7039b37e3b3961f4cfc990
+  data.tar.gz: f16c5ffdb1909856589dfcf688546b0079a53fc2bfe37eeacc56f3568e92faa0
 SHA512:
-  metadata.gz: '081300781c670a18cec9b1c74c6c1632236a8d1a20182b744894c7394d47e5b514180bd7d06fc48cee456972bfb902dbe7febef0381b92e39046a5a9c1e410ad'
-  data.tar.gz: 1b4bf672050386efb7485920b49ca34b1076f686aa2546a0c0d25124138e68106922b51dc9965271c24ab3da4b0df220f17cdf116c6c9bddae6b6350822505f7
+  metadata.gz: 49af6a2b4873f1b0b29a7e65db051687207e7273bf923dab6a4e1cb8e351b718b494fcd4bdaea507867d00f136359408f8ec9869e92e7eabaf0cb4ad5b5f7d3f
+  data.tar.gz: e61d4c46321f3de8749d1f1013548bacbc400123795b8d7da3d408cea5ce5bc5f983f9395a53bf295d6e8f9840886812ad52207122246358844120b11b346609

data/app/serializers/boat_serializer.rb

@@ -63,6 +63,7 @@ class BoatSerializer < AbstractSerializer
         refit_year
         rent_prices
         rental_type
+        reviews
         safety
         sale_price
         short_description
@@ -535,6 +536,11 @@ class BoatSerializer < AbstractSerializer
       { boat_thumbups: boat.boat_thumbups.max_by(&:created_at)&.value }
     end
 
+    # TODO:: impelement it
+    def reviews(boat)
+      { reviews: [] }
+    end
+
     def serialize_opts
       locale   = ::Dicts::Locale.find_by_index   @opts[:locale].to_s
       uol      = ::Dicts::Length.find_by_index   @opts[:uol]

data/app/services/lease/find_suits_service.rb

@@ -11,6 +11,9 @@ module Lease
       _reset_ivars
     end
 
+    # вернёт false, если:
+    #   * нет подходящих под заявку юзеров
+    #   * нет подходящих под заявку лодок
     def perform(inquiry, personal_boat_id = nil)
       _reset_ivars
       @inquiry  = inquiry
@@ -19,7 +22,7 @@ module Lease
       locs2      = locs1.select { |loc| loc.radius >= loc.distance }                                                     # потом выбираем только те лодки, которые охватывают эту точку заявки
 
       boats_ids = locs2.map(&:boat_id).uniq
-      boats     = Boat.where(id: boats_ids).where(boat_type_id: inquiry.boat_type_ids).where(for_rent: 1).where.not(state: ::Boat::STATE_REJECTED)
+      boats     = Boat.where(id: boats_ids).where(boat_type_id: inquiry.boat_type_ids).where(for_rent: 1).where(state: ::Boat::STATE_APPROVED)
       boats_ids = boats.map(&:id)
 
       _log 'inquiry_id = ',          inquiry.id

data/config/locales/dicts/business/ru.yml

@@ -1,4 +1,4 @@
-en:
+ru:
   dicts:
     business:
       rent:   Аренда

data/lib/c80_shared/version.rb

@@ -1,3 +1,3 @@
 module C80Shared
-  VERSION = "0.1.71"
+  VERSION = "0.1.72"
 end

metadata

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