fix(netsuite): Fix netsuite payment payload

app/jobs/integrations/aggregator/payments/create_job.rb

@@ -7,6 +7,7 @@ class CreateJob < ApplicationJob
         queue_as 'integrations'
 
         retry_on LagoHttpClient::HttpError, wait: :polynomially_longer, attempts: 5
+        retry_on Integrations::Aggregator::BasePayload::Failure, wait: :polynomially_longer, attempts: 10
         retry_on RequestLimitError, wait: :polynomially_longer, attempts: 100
 
         def perform(payment:)

app/services/integrations/aggregator/invoices/create_service.rb

@@ -46,6 +46,7 @@ def call
           raise e
         rescue Integrations::Aggregator::BasePayload::Failure => e
           deliver_error_webhook(customer:, code: e.code, message: e.code.humanize)
+          result
         end
 
         def call_async

app/services/integrations/aggregator/payments/payloads/base_payload.rb

@@ -14,7 +14,7 @@ def initialize(integration:, payment:)
           def body
             [
               {
-                'invoice_id' => integration_invoice&.external_id,
+                'invoice_id' => integration_invoice.external_id,
                 'account_code' => account_item&.external_account_code,
                 'date' => payment.created_at.utc.iso8601,
                 'amount_cents' => payment.amount_cents
@@ -31,7 +31,12 @@ def invoice
           end
 
           def integration_invoice
-            invoice.integration_resources.where(resource_type: 'invoice', syncable_type: 'Invoice').first
+            integration_resource =
+              invoice.integration_resources.where(resource_type: 'invoice', syncable_type: 'Invoice').first
+
+            raise Integrations::Aggregator::BasePayload::Failure.new(nil, code: 'invoice_missing') unless integration_resource
+
+            integration_resource
           end
 
           def integration_customer

app/services/integrations/aggregator/payments/payloads/netsuite.rb

@@ -7,27 +7,27 @@ module Payloads
         class Netsuite < BasePayload
           def body
             {
-              'type' => 'customerpayment',
               'isDynamic' => true,
               'columns' => {
-                'customer' => integration_customer.external_customer_id
+                'customer' => integration_customer.external_customer_id,
+                'payment' => amount(payment.amount_cents, resource: invoice)
+              },
+              'options' => {
+                'ignoreMandatoryFields' => false
               },
+              'type' => 'customerpayment',
               'lines' => [
                 {
-                  'sublistId' => 'apply',
                   'lineItems' => [
                     {
-                      # If the invoice is not synced yet, lets raise an error and retry. (doc: nil is an invalid request)
-                      'doc' => integration_invoice&.external_id,
+                      'amount' => amount(payment.amount_cents, resource: invoice),
                       'apply' => true,
-                      'amount' => amount(payment.amount_cents, resource: invoice)
+                      'doc' => integration_invoice.external_id
                     }
-                  ]
+                  ],
+                  'sublistId' => 'apply'
                 }
-              ],
-              'options' => {
-                'ignoreMandatoryFields' => false
-              }
+              ]
             }
           end
         end

spec/services/integrations/aggregator/invoices/create_service_spec.rb

@@ -410,6 +410,10 @@
       it 'sends error webhook' do
         expect { service_call }.to have_enqueued_job(SendWebhookJob)
       end
+
+      it 'returns result' do
+        expect(service_call).to be_a(BaseService::Result)
+      end
     end
   end
 end

spec/services/integrations/aggregator/payments/create_service_spec.rb

@@ -25,26 +25,27 @@
 
   let(:params) do
     {
-      'type' => 'customerpayment',
       'isDynamic' => true,
       'columns' => {
-        'customer' => integration_customer.external_customer_id
+        'customer' => integration_customer.external_customer_id,
+        'payment' => payment.amount_cents.div(100).to_f
+      },
+      'options' => {
+        'ignoreMandatoryFields' => false
       },
+      'type' => 'customerpayment',
       'lines' => [
         {
-          'sublistId' => 'apply',
           'lineItems' => [
             {
-              'doc' => integration_invoice.external_id,
+              'amount' => payment.amount_cents.div(100).to_f,
               'apply' => true,
-              'amount' => payment.amount_cents.div(100).to_f
+              'doc' => integration_invoice.external_id
             }
-          ]
+          ],
+          'sublistId' => 'apply'
         }
-      ],
-      'options' => {
-        'ignoreMandatoryFields' => false
-      }
+      ]
     }
   end
 

spec/services/integrations/aggregator/payments/payloads/base_payload_spec.rb

@@ -36,11 +36,15 @@
   end
 
   describe '#body' do
+    let(:integration_invoice) { create(:integration_resource, syncable: invoice, integration:) }
+
+    before { integration_invoice }
+
     it 'returns correct body' do
       expect(payload.body).to eq(
         [
           {
-            'invoice_id' => nil,
+            'invoice_id' => integration_invoice.external_id,
             'account_code' => nil,
             'date' => payment.created_at.utc.iso8601,
             'amount_cents' => payment.amount_cents

spec/services/integrations/aggregator/payments/payloads/netsuite_spec.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Integrations::Aggregator::Payments::Payloads::Netsuite do
+  let(:payload) { described_class.new(integration:, payment:) }
+  let(:integration_customer) { create(:netsuite_customer, integration:, customer:) }
+  let(:integration) { create(:netsuite_integration, organization:) }
+  let(:customer) { create(:customer, organization:) }
+  let(:organization) { create(:organization) }
+  let(:payment) { create(:payment, payable: invoice, amount_cents: 100) }
+  let(:integration_invoice) { create(:integration_resource, syncable: invoice) }
+
+  let(:invoice) do
+    create(
+      :invoice,
+      customer:,
+      organization:,
+      coupons_amount_cents: 2000,
+      prepaid_credit_amount_cents: 4000,
+      credit_notes_amount_cents: 6000,
+      taxes_amount_cents: 200,
+      issuing_date: DateTime.new(2024, 7, 8)
+    )
+  end
+
+  let(:body) do
+    {
+      'isDynamic' => true,
+      'columns' => {
+        'customer' => integration_customer.external_customer_id,
+        'payment' => payment.amount_cents.div(100).to_f
+      },
+      'options' => {
+        'ignoreMandatoryFields' => false
+      },
+      'type' => 'customerpayment',
+      'lines' => [
+        {
+          'lineItems' => [
+            {
+              'amount' => payment.amount_cents.div(100).to_f,
+              'apply' => true,
+              'doc' => integration_invoice.external_id
+            }
+          ],
+          'sublistId' => 'apply'
+        }
+      ]
+    }
+  end
+
+  before do
+    integration_customer
+    integration_invoice
+  end
+
+  describe '#body' do
+    subject(:body_call) { payload.body }
+
+    it 'returns payload body' do
+      expect(subject).to eq(body)
+    end
+  end
+end