instant_quote 1.1.8 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c7f021aa42714cc517f85e9828e2c34a20ba4044c4f024570338117218e68c3
-  data.tar.gz: ba11fe1ed79bd940c613587f85481583885dd8311dd021a5cb83e3c7d9178281
+  metadata.gz: cfe1f8cd80aa58f3cf222f4e1c98dab3e6a50b2b846a95eadf13585c5c5e1760
+  data.tar.gz: 0defb7c7587d624e0a83ca0ee879ab455aa0520b4c6111f10f7b6f3156d9f70e
 SHA512:
-  metadata.gz: 78426747755312c4618ebc70b42b51f19435b04bbc26d2385881b82a3b9113d26d6fa13af7ad97dcdb83540a20bc0a6113d854a469c501029edbd34a5c4d9c33
-  data.tar.gz: 76448f87df25db208b0d5c25d7e68df33f0c6c78ff7fcf58fa5cd041b50d21ae378ba5b328023155c5c95609412d4bfec98b352be79576f735f393b101626b20
+  metadata.gz: 2d152de9006e7c94ab6ebb1ae3d5b818fe79f42118c63b12890d659472d718bde2c8e5e86d4f08ed0d16379acd603398ff4f4d22327aaab3621d0fde78a0a8f8
+  data.tar.gz: 46162c30f56ebceabe2ffc035a837ea46f7a169816249024abd2f38e29d228a51c63af70b280b43909aad7f874375a3d8c7a237c9216c858fab716646f6c916e

data/Gemfile

@@ -6,6 +6,7 @@ source 'https://rubygems.org'
 #
 # gem 'capital_on_tap', path: '../capital-on-tap'
 # gem 'iwoca', path: '../iwoca'
+# gem 'optimum', path: '../optimum'
 
 # Specify your gem's dependencies in instant-quotes.gemspec
 gemspec

data/Gemfile.lock

@@ -1,17 +1,18 @@
 PATH
   remote: .
   specs:
-    instant_quote (1.1.8)
+    instant_quote (1.5.1)
       activesupport
       capital_on_tap
       iwoca
       money
+      optimum
       phonelib
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.2)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -28,14 +29,15 @@ GEM
       multi_json
       rainbow
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     docile (1.3.2)
     dotenv (2.7.5)
-    faraday (1.0.1)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     hashdiff (1.0.1)
@@ -49,15 +51,21 @@ GEM
       rainbow
     jaro_winkler (1.5.4)
     method_source (1.0.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     money (6.13.8)
       i18n (>= 0.6.4, <= 2)
     multi_json (1.15.0)
     multipart-post (2.1.1)
+    optimum (1.1.0)
+      addressable
+      faraday
+      faraday_middleware
+      multi_json
+      rainbow
     parallel (1.19.1)
     parser (2.7.0.5)
       ast (~> 2.4.0)
-    phonelib (0.6.44)
+    phonelib (0.6.46)
     pry (0.13.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -90,6 +98,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     safe_yaml (1.0.5)
     simplecov (0.18.5)
       docile (~> 1.1)

data/instant_quote.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport'
   spec.add_dependency 'capital_on_tap'
   spec.add_dependency 'iwoca'
+  spec.add_dependency 'optimum'
   spec.add_dependency 'money'
   spec.add_dependency 'phonelib'
 end

data/lib/instant_quote/adapters/capital_on_tap.rb

@@ -13,11 +13,6 @@ module InstantQuote
           type: 'date',
           required: true
         },
-        {
-          name: 'business_landline',
-          label: 'Business landline',
-          required: true
-        },
         {
           name: 'applicant_phone_number',
           label: 'Applicant mobile phone',
@@ -25,7 +20,7 @@ module InstantQuote
         },
         {
           name: 'monthly_income',
-          label: 'Applicat monthly income',
+          label: 'Applicant monthly income',
           type: 'number',
           required: true,
           if: ->(app) { app.borrower_organisation.sole_trader? }
@@ -37,6 +32,28 @@ module InstantQuote
           required: true,
           if: ->(app) { app.borrower_organisation.sole_trader? }
         },
+        {
+          name: 'turnover_percentage_after_feb_2020',
+          label: 'What is your current turnover as a percentage of your turnover prior to February 2020?',
+          required: true,
+          choices: [
+            'My turnover had increased since covid',
+            'My turnover is about the same as it was pre-covid (within 20%)',
+            'My turnover has fallen materially as a result of covid (20%-60% reduction in turnover)',
+            'My turnover has fallen significantly as a result of covid (more than a 60% reduction in turnover)'
+          ],
+          type: 'select'
+        },
+        {
+          name: 'preferred_monthly_repayment_option',
+          label: 'How do you want to set up your direct debit for monthly repayment?',
+          required: true,
+          choices: [
+            'Minimum Amount (10% of balance)',
+            'Full Balance'
+          ],
+          type: 'select'
+        },
         {
           name: 'applicant_consent',
           label: 'Yes, I give my consent for my data to be shared',
@@ -57,17 +74,17 @@ module InstantQuote
 
       # Get the status for a given application ID
       # {:applicationStatus=>
-      #   {:locatorId=>"B247T62",
-      #    :applicationStage=>"AppSubmitted",
+      #   {:locatorId=>'B247T62',
+      #    :applicationStage=>'AppSubmitted',
       #    :creditDecision=>
-      #     {:status=>"Pending",
+      #     {:status=>'Pending',
       #      :starRating=>0.0,
       #      :approvalAmount=>0.0,
       #      :monthlyInterestRate=>0.0,
       #      :monthlyCardInterestRate=>0.0,
-      #      :decisionDate=>"2020-01-28T01:44:29.241",
-      #      :creditDecisionReason=>"None"}},
-      #  :links=>{:self=>"/api/v1/Applications/B247T62", :parent=>nil},
+      #      :decisionDate=>'2020-01-28T01:44:29.241',
+      #      :creditDecisionReason=>'None'}},
+      #  :links=>{:self=>'/api/v1/Applications/B247T62', :parent=>nil},
       #  :metaData=>{}
       # }
       def get_status(application_id)

data/lib/instant_quote/adapters/optimum.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+require 'optimum'
+require 'instant_quote/decision_parsers/optimum'
+
+module InstantQuote
+  module Adapters
+    class Optimum < Adapter
+      additional_fields [
+        {
+          name: 'applicant_phone_number',
+          label: 'Applicant mobile phone',
+          required: true
+        },
+        {
+          name: 'expected_turnover_next_12_months',
+          label: 'Expected turnover next 12 months',
+          required: true,
+          type: 'money'
+        },
+        {
+          name: 'expected_customers',
+          label: 'Number of expected customers with a balance in 6 months',
+          required: true,
+          type: 'number'
+        },
+        {
+          name: 'industry_sector',
+          label: 'Industry sector',
+          required: true,
+          type: 'select',
+          choices: [
+            'Advertising / Marketing',
+            'Beer / Wine Merchant',
+            'Builders Merchant',
+            'Clothing & Fashion',
+            'Computer Hardware',
+            'Computer Software',
+            'Construction',
+            'Consultancy',
+            'Contract Cleaning',
+            'Courier',
+            'Distribution',
+            'Driving Agency',
+            'Electrical Contracting',
+            'Electrical Wholesaler',
+            'Engineering - Heavy',
+            'Engineering - Light',
+            'Engineering - Precision',
+            'Fabrication',
+            'Flooring Contractor',
+            'Food Manufacture',
+            'Franchise',
+            'Free Newspaper',
+            'Freight Forwarding',
+            'Fruit Importer',
+            'Furniture Manufacture',
+            'Garden Equipment',
+            'Haulage',
+            'IT Contracting',
+            'Jewellery',
+            'Maintenance',
+            'Manufacturing',
+            'Meat Trade',
+            'Other Services',
+            'Permanent Recruitment',
+            'Plant Hire',
+            'Plastic Injection Moulding',
+            'Plumbers Merchant',
+            'Printing',
+            'Publishing',
+            'Recycling',
+            'Security Guards',
+            'Shopfitting',
+            'Stationery',
+            'Steel Stockholding',
+            'Telecoms',
+            'Temporary Recruitment',
+            'Timber Merchant',
+            'Tooling Manufacture',
+            'Toys & Fancy Goods',
+            'Warehousing & Storage',
+            'Wholesale'
+          ]
+        },
+        {
+          name: 'credit_control',
+          label: 'Do you require credit control?',
+          required: false,
+          choices: {
+            'Yes' => '1',
+            'No' => '0'
+          },
+          type: 'radio'
+        },
+        {
+          name: 'applicant_consent',
+          label: 'Yes, I give my consent for my data to be shared',
+          required: true,
+          type: 'checkbox'
+        }
+      ]
+
+      def get_quote(params)
+        response = ::Optimum::Decision.create(params)
+
+        return response.data[:opportunityId] if response.success?
+
+        raise_error(response)
+      end
+
+      def get_status(application_id)
+        response = ::Optimum::Decision.update(application_id)
+
+        raise_error(response) unless response.success?
+
+        decision_parser.new(response.body)
+      end
+
+      # Gets the URL for the given state key.
+      def get_link(_)
+        ''
+      end
+
+      def get_approval(_)
+        true
+      end
+
+      private
+
+      def decision_parser
+        DecisionParsers::Optimum
+      end
+
+      def raise_error(response)
+        raise ApiError.new(
+          adapter: 'optimum',
+          data: response.body,
+          error: response.error || 'Unknown API error'
+        )
+      end
+    end
+  end
+end

data/lib/instant_quote/api_error.rb

@@ -14,7 +14,7 @@ module InstantQuote
       @code = params[:code]
 
       # Delete the metaData key, because it's irrelevant and has long strings
-      @data.delete(:metaData) if @data.key?(:metaData)
+      @data.delete(:metaData) if @data.respond_to?(:key?) && @data.key?(:metaData)
     end
   end
 end

data/lib/instant_quote/connection_translators/capital_on_tap.rb

@@ -19,12 +19,13 @@ module InstantQuote
           PersonalAddress: translate_address,
           TradingName: app_org.name,
           BusinessLegalName: app_org.name,
-          BusinessLandline: format_phone(extra_info['business_landline']),
+          BusinessLandline: format_phone(extra_info['applicant_phone_number']),
           YearsTrading: app_org.years_in_business,
           MonthlyTurnOver: translate_turnover,
           BusinessType: translate_business_type,
           BusinessAddress: translate_address,
-          RegistrationNumber: app_org.company_number
+          RegistrationNumber: app_org.company_number,
+          additionalQuestions: additional_questions
         }
 
         # If the borrower organisation is Sole Trader we need to merge two additional fields.
@@ -71,7 +72,7 @@ module InstantQuote
         }
       end
 
-      # Since in Finpoint the user selects an intervel (i.e. "500,000 - 999,999"). We get the avg
+      # Since in Finpoint the user selects an intervel (i.e. '500,000 - 999,999'). We get the avg
       # on this interval and use that number as the monthly turnover.
       def translate_turnover
         turnover = app_org.turnover_range
@@ -93,6 +94,29 @@ module InstantQuote
           'Partnership'
         end
       end
+
+      def additional_questions
+        [
+          preferred_monthly_repayment_option_question,
+          turnover_percentage_question
+        ]
+      end
+
+      def preferred_monthly_repayment_option_question
+        question_from_extra_info('preferred_monthly_repayment_option', '17')
+      end
+
+      def turnover_percentage_question
+        question_from_extra_info('turnover_percentage_after_feb_2020', '20')
+      end
+
+      def question_from_extra_info(name, question_type)
+        field = Adapters::CapitalOnTap.additional_fields.find do |f|
+          f[:name] == name
+        end
+
+        { question: field[:label], answer: extra_info[field[:name]], questionType: question_type }
+      end
     end
   end
 end

data/lib/instant_quote/connection_translators/optimum.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module InstantQuote
+  module ConnectionTranslators
+    class Optimum < ConnectionTranslator
+      def translate
+        {
+          companyNumber: company&.company_number.to_s,
+          sector: extra_info['industry_sector'],
+          turnover: extra_info['expected_turnover_next_12_months'].to_f,
+          homeowners: homeowners?,
+          yearsTrading: company&.years_in_business,
+          expectedCustomers: extra_info['expected_customers'].to_i,
+          contactName: application&.primary_user&.name,
+          contactNumber: extra_info['applicant_phone_number'],
+          contactEmail: application&.primary_user&.email,
+          creditControl: extra_info['credit_control'] == '1',
+          phoenix: false,
+          quotationOnly: false
+        }
+      end
+
+      private
+
+      def company
+        application.borrower_organisation
+      end
+
+      def homeowners?
+        case company&.directors_home_owning&.name
+        when 'Home owner without mortgage', 'Home owner with mortgage'
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/lib/instant_quote/decision_parsers/optimum.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module InstantQuote
+  module DecisionParsers
+    # Example response:
+    #
+    # {
+    # decision: {
+    #     decision: "approved",
+    #     trialPeriodMonths: 4, # trial period length
+    #     fundingLimit: 745000,
+    #     annualRenewalFee: 0,
+    #     badDebtProtection: 0.85,
+    #     cashAvailableWithinHours: 48,
+    #     discountFee: 3.35,
+    #     facility: "Factoring", # Factoring or Invoice Discounting or Confidential Invoice Discounting
+    #     prepayment: 80,
+    #     serviceFee: 1.14
+    # },
+    # opportunityId: "01234567ABCDEFGH", # the Optimum Finance opportunity ID (only supplied for successful applications that are not 'quotation only')
+    # companyName: "COMPANY NAME LTD" # company name from the given company number - use this to verify correct company
+    # }
+
+    class Optimum < DecisionParser
+      STATUSES = {
+        approved: 'approved',
+        declined: 'declined',
+        referred: 'referred',
+      }.freeze
+
+      LOAN_STATES = {
+        started: 'Closed Won'
+      }.freeze
+
+      def initialize(data = {})
+        super
+      end
+
+      def pending?
+        !STATUSES.value?(status)
+      end
+
+      def approved?
+        status == STATUSES[:approved]
+      end
+
+      def declined?
+        status == STATUSES[:declined]
+      end
+
+      def manual_review?
+        status == STATUSES[:referred]
+      end
+
+      def loan_started?
+        data[:status] == LOAN_STATES[:started]
+      end
+
+      def amount
+        amount_approved = decision[:fundingLimit] || 0
+
+        Money.new(amount_approved * 100).format
+      end
+
+      def credit_duration
+        0
+      end
+
+      def credit_interval
+        decision[:trialPeriodMonths]
+      end
+
+      def monthly_interest_rate
+        0
+      end
+
+      def status
+        decision[:decision]
+      end
+
+      private
+
+      def decision
+        data[:decision] || data[:originalDecision] || {}
+      end
+    end
+  end
+end

data/lib/instant_quote/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InstantQuote
-  VERSION = '1.1.8'
+  VERSION = '1.5.1'
 end

data/lib/instant_quote/webhooks/iwoca.rb

@@ -16,31 +16,15 @@ module InstantQuote
       class SignatureVerifyError < StandardError
       end
 
-      def iwoca_event
-        # Dynamically calls the following methods:
-        # * handle_approval_status_changed
-        # * handle_instruct_payments
-        # * handle_customer_funded
-        if iwoca_verify_signature
-          return send("handle_#{iwoca_event_type}") if respond_to?("handle_#{iwoca_event_type}")
-
-          render json: iwoca_payload, status: 200
-        else
-          iwoca_verify_signature_error
-        end
-      rescue SignatureVerifyError => e
-        iwoca_verify_signature_error(e.message)
-      end
-
       private
 
       def iwoca_verify_signature
-        unless webhook_signature && iwoca_payload && iwoca_signature
+        unless webhook_signature && payload && iwoca_signature
           raise SignatureVerifyError, "#{SIGNATURE_HEADER} header missing"
         end
 
         digest = OpenSSL::Digest.new('sha1')
-        hmac_digest = OpenSSL::HMAC.digest(digest, webhook_signature, iwoca_payload)
+        hmac_digest = OpenSSL::HMAC.digest(digest, webhook_signature, payload)
         signature = "sha1=#{Base64.strict_encode64(hmac_digest)}"
 
         Rack::Utils.secure_compare(signature, iwoca_signature)
@@ -50,8 +34,8 @@ module InstantQuote
         @webhook_signature ||= ::Iwoca.configuration.webhook_signature
       end
 
-      def iwoca_payload
-        @iwoca_payload ||= request.body.read
+      def payload
+        @payload ||= request.body.read
       end
 
       def iwoca_signature

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instant_quote
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.5.1
 platform: ruby
 authors:
 - rikas
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: optimum
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -217,22 +231,25 @@ files:
 - lib/instant_quote/adapters/capital_on_tap.rb
 - lib/instant_quote/adapters/iwoca.rb
 - lib/instant_quote/adapters/iwoca_cbils.rb
+- lib/instant_quote/adapters/optimum.rb
 - lib/instant_quote/api_error.rb
 - lib/instant_quote/connection_translator.rb
 - lib/instant_quote/connection_translators/capital_on_tap.rb
 - lib/instant_quote/connection_translators/iwoca.rb
 - lib/instant_quote/connection_translators/iwoca_cbils.rb
+- lib/instant_quote/connection_translators/optimum.rb
 - lib/instant_quote/decision_parser.rb
 - lib/instant_quote/decision_parsers/capital_on_tap.rb
 - lib/instant_quote/decision_parsers/iwoca.rb
 - lib/instant_quote/decision_parsers/iwoca_cbils.rb
+- lib/instant_quote/decision_parsers/optimum.rb
 - lib/instant_quote/version.rb
 - lib/instant_quote/webhooks/iwoca.rb
 homepage: https://finpoint.co.uk
 licenses: []
 metadata:
   homepage_uri: https://finpoint.co.uk
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -248,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Instant quote providers gem.
 test_files: []