Merge branch 'main' into feat/purchase-order-number-graphql-mutations

tiagolupepic · tiagolupepic · commit 9c8e804582ec · 2026-07-07T14:58:47.000+02:00
diff --git a/app/jobs/payment_providers/stripe/customers/fetch_default_payment_method_job.rb b/app/jobs/payment_providers/stripe/customers/fetch_default_payment_method_job.rb
@@ -6,6 +6,8 @@ module Customers
       class FetchDefaultPaymentMethodJob < ApplicationJob
         queue_as :default
 
+        retry_on ::Stripe::RateLimitError, wait: :polynomially_longer, attempts: 5
+
         def perform(provider_customer)
           PaymentProviders::Stripe::Customers::FetchDefaultPaymentMethodService.call!(provider_customer:)
         end
diff --git a/app/models/event.rb b/app/models/event.rb
@@ -91,6 +91,7 @@ def subscription
 #  index_events_on_organization_id                     (organization_id)
 #  index_events_on_organization_id_and_code            (organization_id,code)
 #  index_events_on_organization_id_and_created_at      (organization_id,created_at DESC) WHERE (deleted_at IS NULL)
+#  index_events_on_organization_id_and_timestamp       (organization_id,timestamp DESC) WHERE (deleted_at IS NULL)
 #  index_events_on_organization_id_and_transaction_id  (organization_id,transaction_id) WHERE (deleted_at IS NULL)
 #  index_unique_transaction_id                         (organization_id,external_subscription_id,transaction_id) UNIQUE
 #
diff --git a/app/models/invoice.rb b/app/models/invoice.rb
@@ -499,7 +499,7 @@ def document_invoice_name
     return I18n.t("invoice.self_billed.document_name") if self_billed?
     return I18n.t("invoice.prepaid_credit_invoice") if credit?
 
-    if TAX_INVOICE_LABEL_COUNTRIES.include?(organization.country)
+    if TAX_INVOICE_LABEL_COUNTRIES.include?(billing_entity.country)
       return I18n.t("invoice.paid_tax_invoice") if advance_charges?
       return I18n.t("invoice.document_tax_name")
     end
diff --git a/app/services/integrations/aggregator/invoices/payloads/base_payload.rb b/app/services/integrations/aggregator/invoices/payloads/base_payload.rb
@@ -149,6 +149,12 @@ def discounts
 
             output
           end
+
+          def invoice_url
+            url = ENV["LAGO_FRONT_URL"].presence || "https://app.getlago.com"
+
+            URI.join(url, "/#{invoice.customer.organization.slug}/customer/#{invoice.customer.id}/", "invoice/#{invoice.id}/overview").to_s
+          end
         end
       end
     end
diff --git a/app/services/integrations/aggregator/invoices/payloads/hubspot.rb b/app/services/integrations/aggregator/invoices/payloads/hubspot.rb
@@ -17,6 +17,7 @@ def create_body
                 "properties" => {
                   "lago_invoice_id" => invoice.id,
                   "lago_invoice_number" => invoice.number,
+                  "lago_invoice_purchase_order_number" => invoice.purchase_order_number,
                   "lago_invoice_issuing_date" => formatted_date(invoice.issuing_date),
                   "lago_invoice_payment_due_date" => formatted_date(invoice.payment_due_date),
                   "lago_invoice_payment_overdue" => invoice.payment_overdue,
@@ -27,7 +28,8 @@ def create_body
                   "lago_invoice_total_amount" => total_amount,
                   "lago_invoice_total_due_amount" => total_due_amount,
                   "lago_invoice_subtotal_excluding_taxes" => subtotal_excluding_taxes,
-                  "lago_invoice_file_url" => invoice.file_url
+                  "lago_invoice_file_url" => invoice.file_url,
+                  "lago_invoice_url" => invoice_url
                 }
               }
             }
@@ -45,6 +47,7 @@ def update_body
                 "properties" => {
                   "lago_invoice_id" => invoice.id,
                   "lago_invoice_number" => invoice.number,
+                  "lago_invoice_purchase_order_number" => invoice.purchase_order_number,
                   "lago_invoice_issuing_date" => formatted_date(invoice.issuing_date),
                   "lago_invoice_payment_due_date" => formatted_date(invoice.payment_due_date),
                   "lago_invoice_payment_overdue" => invoice.payment_overdue,
@@ -55,7 +58,8 @@ def update_body
                   "lago_invoice_total_amount" => total_amount,
                   "lago_invoice_total_due_amount" => total_due_amount,
                   "lago_invoice_subtotal_excluding_taxes" => subtotal_excluding_taxes,
-                  "lago_invoice_file_url" => invoice.file_url
+                  "lago_invoice_file_url" => invoice.file_url,
+                  "lago_invoice_url" => invoice_url
                 }
               }
             }
diff --git a/app/services/integrations/aggregator/invoices/payloads/netsuite.rb b/app/services/integrations/aggregator/invoices/payloads/netsuite.rb
@@ -87,12 +87,6 @@ def tax_line_item(fee)
             }
           end
 
-          def invoice_url
-            url = ENV["LAGO_FRONT_URL"].presence || "https://app.getlago.com"
-
-            URI.join(url, "/#{invoice.customer.organization.slug}/customer/#{invoice.customer.id}/", "invoice/#{invoice.id}/overview").to_s
-          end
-
           def due_date
             invoice.payment_due_date&.strftime("%-m/%-d/%Y")
           end
diff --git a/app/services/integrations/aggregator/invoices/payloads/xero.rb b/app/services/integrations/aggregator/invoices/payloads/xero.rb
@@ -9,6 +9,12 @@ def initialize(integration_customer:, invoice:)
             super
           end
 
+          def body
+            super.map do |invoice_payload|
+              invoice_payload.merge("reference" => invoice.purchase_order_number)
+            end
+          end
+
           def item(fee)
             base_item = super
             base_item["item_code"] = base_item.delete("external_id")
diff --git a/app/services/integrations/hubspot/invoices/deploy_object_service.rb b/app/services/integrations/hubspot/invoices/deploy_object_service.rb
@@ -4,7 +4,7 @@ module Integrations
   module Hubspot
     module Invoices
       class DeployObjectService < Integrations::Aggregator::BaseService
-        VERSION = 1
+        VERSION = 3
 
         def action_path
           "v1/hubspot/object"
@@ -83,6 +83,13 @@ def payload
                 fieldType: "text",
                 searchableInGlobalSearch: true
               },
+              {
+                name: "lago_invoice_purchase_order_number",
+                label: "Lago Purchase Order Number",
+                type: "string",
+                fieldType: "text",
+                searchableInGlobalSearch: true
+              },
               {
                 name: "lago_invoice_issuing_date",
                 label: "Lago Invoice Issuing Date",
@@ -153,6 +160,12 @@ def payload
                 label: "Lago Invoice File URL",
                 type: "string",
                 fieldType: "file"
+              },
+              {
+                name: "lago_invoice_url",
+                label: "Lago Invoice URL",
+                type: "string",
+                fieldType: "text"
               }
             ],
             associatedObjects: %w[COMPANY CONTACT]
diff --git a/db/migrate/20260706173746_add_events_organization_timestamp_index.rb b/db/migrate/20260706173746_add_events_organization_timestamp_index.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddEventsOrganizationTimestampIndex < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction!
+
+  def change
+    add_index :events,
+      [:organization_id, :timestamp],
+      order: {timestamp: :desc},
+      where: "deleted_at IS NULL",
+      name: "index_events_on_organization_id_and_timestamp",
+      algorithm: :concurrently,
+      if_not_exists: true
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
@@ -643,6 +643,7 @@ DROP INDEX IF EXISTS public.index_fees_on_billing_entity_id;
 DROP INDEX IF EXISTS public.index_fees_on_applied_add_on_id;
 DROP INDEX IF EXISTS public.index_fees_on_add_on_id;
 DROP INDEX IF EXISTS public.index_events_on_organization_id_and_transaction_id;
+DROP INDEX IF EXISTS public.index_events_on_organization_id_and_timestamp;
 DROP INDEX IF EXISTS public.index_events_on_organization_id_and_created_at;
 DROP INDEX IF EXISTS public.index_events_on_organization_id_and_code;
 DROP INDEX IF EXISTS public.index_events_on_organization_id;
@@ -8191,6 +8192,13 @@ CREATE INDEX index_events_on_organization_id_and_code ON public.events USING btr
 CREATE INDEX index_events_on_organization_id_and_created_at ON public.events USING btree (organization_id, created_at DESC) WHERE (deleted_at IS NULL);
 
 
+--
+-- Name: index_events_on_organization_id_and_timestamp; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_events_on_organization_id_and_timestamp ON public.events USING btree (organization_id, "timestamp" DESC) WHERE (deleted_at IS NULL);
+
+
 --
 -- Name: index_events_on_organization_id_and_transaction_id; Type: INDEX; Schema: public; Owner: -
 --
@@ -12847,6 +12855,7 @@ ALTER TABLE ONLY public.membership_roles
 SET search_path TO "$user", public;
 
 INSERT INTO "schema_migrations" (version) VALUES
+('20260706173746'),
 ('20260706131152'),
 ('20260703164249'),
 ('20260702074504'),
diff --git a/spec/models/invoice_spec.rb b/spec/models/invoice_spec.rb
@@ -1111,40 +1111,50 @@
 
   describe "#document_invoice_name" do
     let(:organization) { create(:organization, name: "LAGO", country: "FR") }
+    let(:billing_entity) { create(:billing_entity, organization:, country: "FR") }
     let(:customer) { create(:customer, organization:) }
-    let(:invoice) { create(:invoice, customer:, organization:) }
+    let(:invoice) { create(:invoice, customer:, organization:, billing_entity:) }
 
     it "returns the correct name for EU country" do
       expect(invoice.document_invoice_name).to eq("Invoice")
     end
 
     context "when invoice is self billed" do
-      let(:invoice) { create(:invoice, :self_billed, customer:, organization:) }
+      let(:invoice) { create(:invoice, :self_billed, customer:, organization:, billing_entity:) }
 
       it "returns the correct name for EU country" do
         expect(invoice.document_invoice_name).to eq("Self-billing invoice")
       end
     end
 
-    context "when organization country is Australia" do
-      let(:organization) { create(:organization, name: "LAGO", country: "AU") }
+    context "when billing entity country is Australia" do
+      let(:billing_entity) { create(:billing_entity, organization:, country: "AU") }
 
       it "returns the correct name that includes keyword tax" do
         expect(invoice.document_invoice_name).to eq("Tax invoice")
       end
     end
 
-    context "when the organization country is in TAX_INVOICE_LABEL_COUNTRIES" do
+    context "when the billing entity country is in TAX_INVOICE_LABEL_COUNTRIES" do
       let(:country) { Invoice::TAX_INVOICE_LABEL_COUNTRIES.sample }
-      let(:organization) { create(:organization, name: "LAGO", country:) }
+      let(:billing_entity) { create(:billing_entity, organization:, country:) }
 
       it "returns the correct tax invoice name" do
         expect(invoice.document_invoice_name).to eq(I18n.t("invoice.document_tax_name"))
       end
     end
 
+    context "when the billing entity country differs from the organization country" do
+      let(:organization) { create(:organization, name: "LAGO", country: "FR") }
+      let(:billing_entity) { create(:billing_entity, organization:, country: "SG") }
+
+      it "uses the billing entity country to determine the tax invoice name" do
+        expect(invoice.document_invoice_name).to eq("Tax invoice")
+      end
+    end
+
     context "when it is credit invoice" do
-      let(:invoice) { create(:invoice, customer:, organization:, invoice_type: :credit) }
+      let(:invoice) { create(:invoice, customer:, organization:, billing_entity:, invoice_type: :credit) }
 
       it "returns the correct name for EU country" do
         expect(invoice.document_invoice_name).to eq("Advance invoice")
diff --git a/spec/services/integrations/aggregator/invoices/hubspot/create_service_spec.rb b/spec/services/integrations/aggregator/invoices/hubspot/create_service_spec.rb
@@ -15,6 +15,8 @@
   let(:invoice_file_url) { invoice.file_url }
   let(:file_url) { Faker::Internet.url }
   let(:due_date) { invoice.payment_due_date.strftime("%Y-%m-%d") }
+  let(:purchase_order_number) { "PO-123" }
+  let(:invoice_url_path) { "/#{organization.slug}/customer/#{customer.id}/invoice/#{invoice.id}/overview" }
 
   let(:invoice) do
     create(
@@ -25,7 +27,8 @@
       coupons_amount_cents: 2000,
       prepaid_credit_amount_cents: 4000,
       credit_notes_amount_cents: 6000,
-      taxes_amount_cents: 8000
+      taxes_amount_cents: 8000,
+      purchase_order_number:
     )
   end
 
@@ -157,6 +160,22 @@
               expect(integration_resource.resource_type).to eq("invoice")
             end
 
+            it "sends the invoice properties" do
+              service_call
+
+              expect(lago_client).to have_received(:post_with_response).with(
+                hash_including(
+                  "input" => hash_including(
+                    "properties" => hash_including(
+                      "lago_invoice_purchase_order_number" => purchase_order_number,
+                      "lago_invoice_url" => a_string_ending_with(invoice_url_path)
+                    )
+                  )
+                ),
+                headers
+              )
+            end
+
             it_behaves_like "throttles!", :hubspot
           end
 
diff --git a/spec/services/integrations/aggregator/invoices/hubspot/update_service_spec.rb b/spec/services/integrations/aggregator/invoices/hubspot/update_service_spec.rb
@@ -16,6 +16,8 @@
   let(:invoice_file_url) { invoice.file_url }
   let(:file_url) { Faker::Internet.url }
   let(:due_date) { invoice.payment_due_date.strftime("%Y-%m-%d") }
+  let(:purchase_order_number) { "PO-123" }
+  let(:invoice_url_path) { "/#{organization.slug}/customer/#{customer.id}/invoice/#{invoice.id}/overview" }
 
   let(:invoice) do
     create(
@@ -25,7 +27,8 @@
       coupons_amount_cents: 2000,
       prepaid_credit_amount_cents: 4000,
       credit_notes_amount_cents: 6000,
-      taxes_amount_cents: 8000
+      taxes_amount_cents: 8000,
+      purchase_order_number:
     )
   end
 
@@ -113,6 +116,22 @@
             expect(result.external_id).to eq("123456789")
           end
 
+          it "sends the invoice properties" do
+            service_call
+
+            expect(lago_client).to have_received(:put_with_response).with(
+              hash_including(
+                "input" => hash_including(
+                  "properties" => hash_including(
+                    "lago_invoice_purchase_order_number" => purchase_order_number,
+                    "lago_invoice_url" => a_string_ending_with(invoice_url_path)
+                  )
+                )
+              ),
+              headers
+            )
+          end
+
           it_behaves_like "throttles!", :hubspot
         end
 
diff --git a/spec/services/integrations/aggregator/invoices/payloads/hubspot_spec.rb b/spec/services/integrations/aggregator/invoices/payloads/hubspot_spec.rb
@@ -9,6 +9,11 @@
   let(:customer) { create(:customer, organization:) }
   let(:organization) { create(:organization) }
   let(:file_url) { Faker::Internet.url }
+  let(:invoice_url) do
+    url = ENV["LAGO_FRONT_URL"].presence || "https://app.getlago.com"
+
+    URI.join(url, "/#{customer.organization.slug}/customer/#{customer.id}/", "invoice/#{invoice.id}/overview").to_s
+  end
 
   let(:invoice) do
     create(
@@ -43,6 +48,7 @@
           "properties" => {
             "lago_invoice_id" => invoice.id,
             "lago_invoice_number" => invoice.number,
+            "lago_invoice_purchase_order_number" => invoice.purchase_order_number,
             "lago_invoice_issuing_date" => invoice.issuing_date.strftime("%Y-%m-%d"),
             "lago_invoice_payment_due_date" => invoice.payment_due_date.strftime("%Y-%m-%d"),
             "lago_invoice_payment_overdue" => invoice.payment_overdue,
@@ -53,7 +59,8 @@
             "lago_invoice_total_amount" => invoice.total_amount_cents / 100.0,
             "lago_invoice_total_due_amount" => invoice.total_due_amount_cents / 100.0,
             "lago_invoice_subtotal_excluding_taxes" => invoice.sub_total_including_taxes_amount_cents / 100.0,
-            "lago_invoice_file_url" => invoice.file_url
+            "lago_invoice_file_url" => invoice.file_url,
+            "lago_invoice_url" => invoice_url
           }
         }
       }
@@ -83,6 +90,7 @@
           "properties" => {
             "lago_invoice_id" => invoice.id,
             "lago_invoice_number" => invoice.number,
+            "lago_invoice_purchase_order_number" => invoice.purchase_order_number,
             "lago_invoice_issuing_date" => invoice.issuing_date.strftime("%Y-%m-%d"),
             "lago_invoice_payment_due_date" => invoice.payment_due_date.strftime("%Y-%m-%d"),
             "lago_invoice_payment_overdue" => invoice.payment_overdue,
@@ -93,7 +101,8 @@
             "lago_invoice_total_amount" => invoice.total_amount_cents / 100.0,
             "lago_invoice_total_due_amount" => invoice.total_due_amount_cents / 100.0,
             "lago_invoice_subtotal_excluding_taxes" => invoice.sub_total_including_taxes_amount_cents / 100.0,
-            "lago_invoice_file_url" => invoice.file_url
+            "lago_invoice_file_url" => invoice.file_url,
+            "lago_invoice_url" => invoice_url
           }
         }
       }
diff --git a/spec/services/integrations/aggregator/invoices/payloads/xero_spec.rb b/spec/services/integrations/aggregator/invoices/payloads/xero_spec.rb
diff --git a/spec/services/integrations/hubspot/invoices/deploy_object_service_spec.rb b/spec/services/integrations/hubspot/invoices/deploy_object_service_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ def subscription`
`91`	`91`	`# index_events_on_organization_id (organization_id)`
`92`	`92`	`# index_events_on_organization_id_and_code (organization_id,code)`
`93`	`93`	`# index_events_on_organization_id_and_created_at (organization_id,created_at DESC) WHERE (deleted_at IS NULL)`
	`94`	`+# index_events_on_organization_id_and_timestamp (organization_id,timestamp DESC) WHERE (deleted_at IS NULL)`
`94`	`95`	`# index_events_on_organization_id_and_transaction_id (organization_id,transaction_id) WHERE (deleted_at IS NULL)`
`95`	`96`	`# index_unique_transaction_id (organization_id,external_subscription_id,transaction_id) UNIQUE`
`96`	`97`	`#`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ def create_body`
`17`	`17`	`"properties" => {`
`18`	`18`	`"lago_invoice_id" => invoice.id,`
`19`	`19`	`"lago_invoice_number" => invoice.number,`
	`20`	`+ "lago_invoice_purchase_order_number" => invoice.purchase_order_number,`
`20`	`21`	`"lago_invoice_issuing_date" => formatted_date(invoice.issuing_date),`
`21`	`22`	`"lago_invoice_payment_due_date" => formatted_date(invoice.payment_due_date),`
`22`	`23`	`"lago_invoice_payment_overdue" => invoice.payment_overdue,`
`@@ -27,7 +28,8 @@ def create_body`
`27`	`28`	`"lago_invoice_total_amount" => total_amount,`
`28`	`29`	`"lago_invoice_total_due_amount" => total_due_amount,`
`29`	`30`	`"lago_invoice_subtotal_excluding_taxes" => subtotal_excluding_taxes,`
`30`		`- "lago_invoice_file_url" => invoice.file_url`
	`31`	`+ "lago_invoice_file_url" => invoice.file_url,`
	`32`	`+ "lago_invoice_url" => invoice_url`
`31`	`33`	`}`
`32`	`34`	`}`
`33`	`35`	`}`
`@@ -45,6 +47,7 @@ def update_body`
`45`	`47`	`"properties" => {`
`46`	`48`	`"lago_invoice_id" => invoice.id,`
`47`	`49`	`"lago_invoice_number" => invoice.number,`
	`50`	`+ "lago_invoice_purchase_order_number" => invoice.purchase_order_number,`
`48`	`51`	`"lago_invoice_issuing_date" => formatted_date(invoice.issuing_date),`
`49`	`52`	`"lago_invoice_payment_due_date" => formatted_date(invoice.payment_due_date),`
`50`	`53`	`"lago_invoice_payment_overdue" => invoice.payment_overdue,`
`@@ -55,7 +58,8 @@ def update_body`
`55`	`58`	`"lago_invoice_total_amount" => total_amount,`
`56`	`59`	`"lago_invoice_total_due_amount" => total_due_amount,`
`57`	`60`	`"lago_invoice_subtotal_excluding_taxes" => subtotal_excluding_taxes,`
`58`		`- "lago_invoice_file_url" => invoice.file_url`
	`61`	`+ "lago_invoice_file_url" => invoice.file_url,`
	`62`	`+ "lago_invoice_url" => invoice_url`
`59`	`63`	`}`
`60`	`64`	`}`
`61`	`65`	`}`