From ac3244466e2191d102f9da2053ba7b85da063ab7 Mon Sep 17 00:00:00 2001
From: olegphenomenon <oleg.hasjanov@eestiinternet.ee>
Date: Mon, 24 Jan 2022 13:32:06 +0200
Subject: [PATCH] remove uneccessary code, adapted to eis billing response, fix
 logging error

---
 .../eis_billing/payment_status_controller.rb  |  4 +--
 .../registrar/deposits_controller.rb          |  5 ++-
 .../registrar/invoices_controller.rb          |  5 ---
 app/services/eis_billing/add_deposits.rb      | 25 ---------------
 app/services/eis_billing/get_invoice_link.rb  | 32 -------------------
 .../invoices/partials/_banklinks.haml         |  4 +--
 6 files changed, 6 insertions(+), 69 deletions(-)
 delete mode 100644 app/services/eis_billing/get_invoice_link.rb

diff --git a/app/controllers/eis_billing/payment_status_controller.rb b/app/controllers/eis_billing/payment_status_controller.rb
index 713f59255..5e9003199 100644
--- a/app/controllers/eis_billing/payment_status_controller.rb
+++ b/app/controllers/eis_billing/payment_status_controller.rb
@@ -18,7 +18,7 @@ module EisBilling
       bank = create_bank_transfer(invoice: invoice, sum: sum, paid_at: paid_at)
       create_payment_order(invoice: invoice, everypay_response: everypay_response, payment_status: payment_status)
 
-      registrar = Registrar.find_by(reference_no: params[:reference_number])
+      registrar = invoice.buyer
       bank.create_activity(registrar, invoice)
 
       render status: 200, json: { status: 'ok' }
@@ -58,7 +58,7 @@ module EisBilling
       bank.save
 
       logger.info '++++ BANK TRANSACTION ERRORS ? ++++'
-      looger.info bank.errors
+      logger.info bank.errors
 
       bank
     end
diff --git a/app/controllers/registrar/deposits_controller.rb b/app/controllers/registrar/deposits_controller.rb
index 0464dd9f1..324a150b0 100644
--- a/app/controllers/registrar/deposits_controller.rb
+++ b/app/controllers/registrar/deposits_controller.rb
@@ -25,10 +25,9 @@ class Registrar
     def send_invoice_data_to_billing_system
       add_invoice_instance = EisBilling::AddDeposits.new(@invoice)
       result = add_invoice_instance.send_invoice
+      link = JSON.parse(result.body)['everypay_link']
 
-      p "+++++++++++++ result"
-      p JSON.parse(result.body)['everypay_link']
-      p "+++++++++++++"
+      @invoice.update(payment_link: link)
     end
 
     def deposit_params
diff --git a/app/controllers/registrar/invoices_controller.rb b/app/controllers/registrar/invoices_controller.rb
index f1f31354e..933e98a2f 100644
--- a/app/controllers/registrar/invoices_controller.rb
+++ b/app/controllers/registrar/invoices_controller.rb
@@ -14,11 +14,6 @@ class Registrar
     end
 
     def show
-      invoice = Invoice.find(params[:id])
-      link_handler = EisBilling::GetInvoiceLink.new(invoice.number)
-      response = link_handler.send_request
-
-      @everypay_link = JSON.parse(response.body)['payment_link']
     end
 
     def cancel
diff --git a/app/services/eis_billing/add_deposits.rb b/app/services/eis_billing/add_deposits.rb
index bf334d326..91100c266 100644
--- a/app/services/eis_billing/add_deposits.rb
+++ b/app/services/eis_billing/add_deposits.rb
@@ -23,33 +23,8 @@ module EisBilling
       data[:invoice_number] = invoice.number
 
       data
-
-      # invoice = @invoice.to_json(except: [ :order_reference,
-      #                                      :created_at,
-      #                                      :updated_at,
-      #                                      :e_invoice_sent_at,
-      #                                      :items_attributes])
-
-      # parsed_data = JSON.parse(invoice)
-      # parsed_data['role'] = 'registrar'
-      # parsed_data['source'] = 'registry'
-      # parsed_data['description'] = 'some' if parsed_data['description'] == ''
-
-      # parsed_data = replace_key(json_obj: parsed_data, old_key: 'total', new_key: 'transaction_amount')
-      # parsed_data = replace_key(json_obj: parsed_data, old_key: 'reference_no', new_key: 'reference_number')
-
-      # invoice_items_json = @invoice.items.to_json(except: [ :created_at, :updated_at ])
-      # parsed_data['items'] = JSON.parse(invoice_items_json)
-      # parsed_data
     end
 
-    # def replace_key(json_obj:, old_key:, new_key:)
-    #   json_obj[new_key] = json_obj[old_key]
-    #   json_obj.delete(old_key)
-
-    #   json_obj
-    # end
-
     def base_request(json_obj:)
       uri = URI(invoice_generator_url)
       http = Net::HTTP.new(uri.host, uri.port)
diff --git a/app/services/eis_billing/get_invoice_link.rb b/app/services/eis_billing/get_invoice_link.rb
deleted file mode 100644
index e5a493cb9..000000000
--- a/app/services/eis_billing/get_invoice_link.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-module EisBilling
-  class GetInvoiceLink < EisBilling::Base
-    attr_reader :invoice_number
-
-    def initialize(invoice_number)
-      @invoice_number = invoice_number
-    end
-
-    def send_request
-      base_request
-    end
-
-    private
-
-    def base_request
-      uri = URI(invoice_generator_url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      headers = {
-        'Authorization'=>'Bearer foobar',
-        'Content-Type' =>'application/json',
-        'Accept'=> TOKEN
-      }
-
-      res = http.get(invoice_generator_url + "?invoice_number=#{@invoice_number}", headers)
-      res
-    end
-
-    def invoice_generator_url
-      "#{BASE_URL}/api/v1/get_invoice_payment_link/show"
-    end
-  end
-end
diff --git a/app/views/registrar/invoices/partials/_banklinks.haml b/app/views/registrar/invoices/partials/_banklinks.haml
index a5321031a..0994a7517 100644
--- a/app/views/registrar/invoices/partials/_banklinks.haml
+++ b/app/views/registrar/invoices/partials/_banklinks.haml
@@ -7,7 +7,7 @@
     = image_tag("#{meth}.png")
 %hr
 
-  - if @everypay_link.present?
-    = link_to 'Everypay link', @everypay_link, target: :_blank
+  - if @invoice.payment_link.present?
+    = link_to 'Everypay link', @invoice.payment_link, target: :_blank
   - else
     = "No everypay link"