c80_shared 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 6e1a4cc1d29e3b41b2621edc36f7a825e59841fcddfaeded7e0df55de344ba1e
-  data.tar.gz: 869851dc848c047670df269abc659c1afdf864f98c3840be090d2c002844fb80
+SHA1:
+  metadata.gz: fa7f6666b59ba7a52fb884bf341eaf24a17cfb92
+  data.tar.gz: e407fe01bcddfe7dea7292707e49fcd0bc4c50bc
 SHA512:
-  metadata.gz: 99d6501d5c909d45d6a77687fb545151a2a101872ca7c4a356ec9f08f68e2d3e846e5858ff7e5f92ce21c59021f510fdcd630096387c5dec1fc7cdcb93fb58cb
-  data.tar.gz: 8cd35b9389b28c00af2d4887df16c087b312307bb79bb55f59351a3f5230db9ebdb7728c1b83306903fbcd76c74f7ae43d4f924c62399ea706f420a7bffb4a00
+  metadata.gz: 5b8d0f09a04894e441b09c38ed23296a8aca88016e6794e59fa26e4c368a9ae92cabd8766f2d5e722695fded593d28c879f94cb2caf1d65705222f3715648a3f
+  data.tar.gz: eadff5f8150ef5ca6d497189ed21caf1b80a32ab0317469518c778aa1d35c3e23a391768b0d05a08a840655a8c0e8e09fb1397250d2a20c489e0509fa118e1c3

data/app/serializers/lease/rebate_serializer.rb

@@ -11,7 +11,10 @@ module Lease
           :id,
           :amount,
           :currency,
-          :human_price
+          :human_price,
+          :old_amount,
+          :old_currency,
+          :old_human_price
         ].freeze
       end
 
@@ -34,6 +37,22 @@ module Lease
         end
         { human_price: val }
       end
+
+      def old_amount(rebate)
+        { old_amount: rebate.old_amount }
+      end
+
+      def old_currency(rebate)
+        { old_currency: rebate.old_currency }
+      end
+
+      def old_human_price(rebate)
+        val = nil
+        if rebate.old_amount.present? && rebate.old_currency.present?
+          val = num_to_cur(rebate.old_amount, rebate.old_currency, @opts[:locale])
+        end
+        { old_human_price: val }
+      end
     end
   end
 end

data/app/services/users/find_or_generate_email_token_service.rb

@@ -0,0 +1,48 @@
+module Users
+  class FindOrGenerateEmailTokenService
+
+    attr_reader :token, :generated
+
+    def perform(user_id, bid_id)
+      _reset_ivars
+
+      new_token   = _find_token user_id, bid_id
+      new_token ||= _generate_token user_id, bid_id
+      @token      = new_token
+
+      true
+    end
+
+    private
+
+    # @return [Nil]
+    # @return [String]
+    #
+    def _find_token(user_id, bid_id)
+      return unless user_id.present? && bid_id.present?
+
+      sql = 'SELECT user_email_tokens.token FROM user_email_tokens
+      INNER JOIN user_email_tokens_bids ON user_email_tokens.id = user_email_tokens_bids.token_id
+      WHERE user_email_tokens_bids.bid_id = %s
+      AND   user_email_tokens.user_id = %s
+      AND   user_email_tokens.subj_id IN (%s)
+      LIMIT 1 ' % [bid_id, user_id, Users::GenerateEmailTokenService.db_types.join(',')]
+
+      res = ::ActiveRecord::Base.connection.exec_query(sql)
+      res.as_json.dig(0, 'token')
+    end
+
+    # @return [String]
+    #
+    def _generate_token(user_id, bid_id)
+      @generated = true
+      user       = ::User.find user_id
+      ::Users::GenerateEmailTokenService.call user, ::Dicts::EmailTokenSubj::TO_CLIENT_NEW_BID.id, bid_id
+    end
+
+    def _reset_ivars
+      @token     = nil
+      @generated = false
+    end
+  end
+end

data/app/services/users/generate_email_token_service.rb

@@ -0,0 +1,37 @@
+module Users
+  class GenerateEmailTokenService
+    def self.call(user, email_token_subj_id, bid_id = nil)
+      user_email_token            = ::UserEmailToken.new user: user
+      user_email_token.token      = ::TokenGenerator.generate_token
+      user_email_token.expires_at = Time.now + 1.week
+      user_email_token.subj_id    = email_token_subj_id
+      user_email_token.save!
+
+      create_bid_link(user_email_token.id, bid_id) if needed_types.include? email_token_subj_id
+
+      user_email_token.token
+    end
+
+    # создадим связку с Предложением, если токен генерится для ссылки на лодку в письме о новом Предложении, отправляемого Клиенту
+    def self.create_bid_link(user_email_token_id, bid_id)
+      return unless bid_id
+
+      opts = {
+        token_id: user_email_token_id,
+        bid_id:   bid_id
+      }
+      sql  = 'INSERT IGNORE INTO user_email_tokens_bids(token_id, bid_id) VALUES(%{token_id}, %{bid_id})' % opts
+      ActiveRecord::Base.connection.execute(sql)
+    end
+
+    # для таких типов генерим связку
+    def self.needed_types
+      [::Dicts::EmailTokenSubj::TO_CLIENT_NEW_BID.id]
+    end
+
+    # в базе могут лежать такие связки
+    def self.db_types
+      [::Dicts::EmailTokenSubj::TO_CLIENT_NEW_BID.id, ::Dicts::EmailTokenSubj::TO_CLIENT_NEW_BID_BOAT.id]
+    end
+  end
+end

data/lib/c80_shared/token_generator.rb

@@ -0,0 +1,7 @@
+module TokenGenerator
+  module_function
+
+  def generate_token
+    Digest::SHA2.hexdigest(Time.now.to_f.to_s + SecureRandom.urlsafe_base64(32))
+  end
+end

data/lib/c80_shared/version.rb

@@ -1,3 +1,3 @@
 module C80Shared
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,8 @@ files:
 - app/serializers/lib/boats/dimensions.rb
 - app/serializers/lib/boats/rent_price_per_season.rb
 - app/serializers/lib/boats/sale_price.rb
+- app/services/users/find_or_generate_email_token_service.rb
+- app/services/users/generate_email_token_service.rb
 - bin/console
 - bin/rails
 - bin/setup
@@ -79,6 +81,7 @@ files:
 - lib/c80_shared/engine.rb
 - lib/c80_shared/geo/distance.rb
 - lib/c80_shared/middleware/images_proxy.rb
+- lib/c80_shared/token_generator.rb
 - lib/c80_shared/version.rb
 homepage: http://google.com
 licenses:
@@ -100,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Write a short summary, because RubyGems requires one.