fixing combined interval stuff

2025-08-16 07:17:52 -07:00
parent f3ef6e1596
commit 42c3e73334
136 changed files with 3170 additions and 2043 deletions
--- a/server/tests/advanced/customInterval/customInterval1.ts
+++ b/server/tests/advanced/customInterval/customInterval1.ts
@@ -11,12 +11,13 @@ import { createProducts } from "tests/utils/productUtils.js";
 import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
 import { TestFeature } from "tests/setup/v2Features.js";
 import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
-import { addPrefixToProducts, runAttachTest } from "tests/attach/utils.js";
+import { addPrefixToProducts } from "tests/attach/utils.js";
 import { advanceTestClock } from "tests/utils/stripeUtils.js";
 import { addHours, addMonths } from "date-fns";
 import { expect } from "chai";
 import { hoursToFinalizeInvoice } from "tests/utils/constants.js";
 import { getBasePrice } from "tests/utils/testProductUtils/testProductUtils.js";
+import { attachAndExpectCorrect } from "tests/utils/expectUtils/expectAttach.js";

 const testCase = "customInterval1";

@@ -90,7 +91,7 @@ describe(`${chalk.yellowBright(`${testCase}: Testing custom interval and interva
  });

  it("should attach pro product", async function () {
-    await runAttachTest({
+    await attachAndExpectCorrect({
      autumn,
      customerId,
      product: pro,
@@ -110,7 +111,7 @@ describe(`${chalk.yellowBright(`${testCase}: Testing custom interval and interva
      waitForSeconds: 15,
    });

-    await runAttachTest({
+    await attachAndExpectCorrect({
      autumn,
      customerId,
      product: premium,
--- a/server/tests/advanced/customInterval/customInterval2.ts
+++ b/server/tests/advanced/customInterval/customInterval2.ts
@@ -11,13 +11,14 @@ import { constructArrearItem } from "@/utils/scriptUtils/constructItem.js";
 import { TestFeature } from "tests/setup/v2Features.js";
 import { constructRawProduct } from "@/utils/scriptUtils/createTestProducts.js";

-import { addPrefixToProducts, runAttachTest } from "tests/attach/utils.js";
+import { addPrefixToProducts } from "tests/attach/utils.js";
 import { advanceTestClock } from "tests/utils/stripeUtils.js";
 import { addHours, addMonths } from "date-fns";
 import { expect } from "chai";
 import { hoursToFinalizeInvoice } from "tests/utils/constants.js";
 import { getBasePrice } from "tests/utils/testProductUtils/testProductUtils.js";
 import { getExpectedInvoiceTotal } from "tests/utils/expectUtils/expectInvoiceUtils.js";
+import { attachAndExpectCorrect } from "tests/utils/expectUtils/expectAttach.js";

 const testCase = "customInterval2";

@@ -74,7 +75,7 @@ describe(`${chalk.yellowBright(`${testCase}: Testing custom interval on arrear p
  });

  it("should attach pro product", async function () {
-    await runAttachTest({
+    await attachAndExpectCorrect({
      autumn,
      customerId,
      product: pro,
--- a/server/tests/advanced/customInterval/customInterval3.ts
+++ b/server/tests/advanced/customInterval/customInterval3.ts
@@ -25,7 +25,7 @@ import {
  constructRawProduct,
 } from "@/utils/scriptUtils/createTestProducts.js";

-import { addPrefixToProducts, runAttachTest } from "tests/attach/utils.js";
+import { addPrefixToProducts } from "tests/attach/utils.js";
 import { advanceTestClock } from "tests/utils/stripeUtils.js";
 import { addDays, addHours, addMonths } from "date-fns";
 import { expect } from "chai";
@@ -35,6 +35,7 @@ import { getExpectedInvoiceTotal } from "tests/utils/expectUtils/expectInvoiceUt
 import { expectProductAttached } from "tests/utils/expectUtils/expectProductAttached.js";
 import { calculateProrationAmount } from "@/internal/invoices/prorationUtils.js";
 import { getProration } from "@/internal/invoices/previewItemUtils/getItemsForNewProduct.js";
+import { attachAndExpectCorrect } from "tests/utils/expectUtils/expectAttach.js";

 const testCase = "customInterval3";

@@ -105,7 +106,7 @@ describe(`${chalk.yellowBright(`${testCase}: Testing custom interval on add on m
  });

  it("should attach pro product", async function () {
-    await runAttachTest({
+    await attachAndExpectCorrect({
      autumn,
      customerId,
      product: pro,
--- a/server/tests/advanced/customInterval/customInterval4.ts
+++ b/server/tests/advanced/customInterval/customInterval4.ts
@@ -11,7 +11,8 @@ import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
 import { TestFeature } from "tests/setup/v2Features.js";
 import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";

-import { addPrefixToProducts, runAttachTest } from "tests/attach/utils.js";
+import { addPrefixToProducts } from "tests/attach/utils.js";
+
 import { addMonths } from "date-fns";
 import { expect } from "chai";
 import {
@@ -19,6 +20,7 @@ import {
  expectNextCycleCorrect,
 } from "tests/utils/expectUtils/expectScheduleUtils.js";
 import { getBasePrice } from "tests/utils/testProductUtils/testProductUtils.js";
+import { attachAndExpectCorrect } from "tests/utils/expectUtils/expectAttach.js";

 const testCase = "customInterval4";

@@ -87,7 +89,7 @@ describe(`${chalk.yellowBright(`${testCase}: Testing downgrades for custom inter
  });

  it("should attach premium product", async function () {
-    await runAttachTest({
+    await attachAndExpectCorrect({
      autumn,
      customerId,
      product: premium,
--- a/server/tests/advanced/customInterval/customInterval5.ts
+++ b/server/tests/advanced/customInterval/customInterval5.ts
@@ -11,10 +11,11 @@ import { createProducts } from "tests/utils/productUtils.js";
 import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
 import { TestFeature } from "tests/setup/v2Features.js";
 import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
-import { addPrefixToProducts, runAttachTest } from "tests/attach/utils.js";
+import { addPrefixToProducts } from "tests/attach/utils.js";
 import { expect } from "chai";
 import { Customer } from "autumn-js";
 import { timeout } from "@/utils/genUtils.js";
+import { attachAndExpectCorrect } from "tests/utils/expectUtils/expectAttach.js";

 const testCase = "customInterval5";

@@ -92,7 +93,7 @@ describe(`${chalk.yellowBright(`${testCase}: Testing multi interval features wit
  });

  it("should attach pro product", async function () {
-    await runAttachTest({
+    await attachAndExpectCorrect({
      autumn,
      customerId,
      product: pro,
--- a/server/tests/advanced/customInterval/customInterval6.ts
+++ b/server/tests/advanced/customInterval/customInterval6.ts
@@ -1,165 +0,0 @@
-import chalk from "chalk";
-import Stripe from "stripe";
-
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-import { APIVersion, AppEnv, FullCustomer, Organization } from "@autumn/shared";
-
-import { DrizzleCli } from "@/db/initDrizzle.js";
-import { setupBefore } from "tests/before.js";
-import { createProducts } from "tests/utils/productUtils.js";
-import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
-import { TestFeature } from "tests/setup/v2Features.js";
-import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
-import { addPrefixToProducts, runAttachTest } from "tests/attach/utils.js";
-import { expect } from "chai";
-import { Customer } from "autumn-js";
-import { timeout } from "@/utils/genUtils.js";
-
-const testCase = "customInterval6";
-
-// Update balances!
-
-// const includedUsage = 500;
-// const monthlyWords = constructFeatureItem({
-//   featureId: TestFeature.Words,
-//   includedUsage,
-// });
-
-// const biMonthlyWords = constructFeatureItem({
-//   featureId: TestFeature.Words,
-//   intervalCount: 2,
-//   includedUsage,
-// });
-
-// export let pro = constructProduct({
-//   items: [monthlyWords, biMonthlyWords],
-//   intervalCount: 2,
-//   type: "pro",
-// });
-
-// const getBreakdown = ({
-//   customer,
-//   intervalCount,
-// }: {
-//   customer: Customer;
-//   intervalCount: number;
-// }) => {
-//   const wordsFeature = customer.features[TestFeature.Words];
-//   // @ts-ignore
-//   return wordsFeature.breakdown?.find(
-//     (b: any) => b.interval_count == intervalCount
-//   );
-// };
-
-// describe(`${chalk.yellowBright(`${testCase}: Testing multi interval features with custom intervals`)}`, () => {
-//   let customerId = testCase;
-//   let autumn: AutumnInt = new AutumnInt({ version: APIVersion.v1_4 });
-//   let testClockId: string;
-//   let db: DrizzleCli, org: Organization, env: AppEnv;
-//   let stripeCli: Stripe;
-
-//   before(async function () {
-//     await setupBefore(this);
-//     const { autumnJs } = this;
-//     db = this.db;
-//     org = this.org;
-//     env = this.env;
-
-//     stripeCli = this.stripeCli;
-
-//     const { testClockId: testClockId1 } = await initCustomer({
-//       autumn: autumnJs,
-//       customerId,
-//       db,
-//       org,
-//       env,
-//       attachPm: "success",
-//     });
-
-//     addPrefixToProducts({
-//       products: [pro],
-//       prefix: testCase,
-//     });
-
-//     await createProducts({
-//       autumn,
-//       products: [pro],
-//       db,
-//       orgId: org.id,
-//       env,
-//     });
-
-//     testClockId = testClockId1!;
-//   });
-
-//   it("should attach pro product", async function () {
-//     await runAttachTest({
-//       autumn,
-//       customerId,
-//       product: pro,
-//       stripeCli,
-//       db,
-//       org,
-//       env,
-//     });
-
-//     const customer = await autumn.customers.get(customerId);
-//     const wordsFeature = customer.features[TestFeature.Words];
-//     // @ts-ignore
-//     expect(wordsFeature.interval_count).to.equal(null);
-//     expect(wordsFeature.breakdown?.length).to.equal(2);
-
-//     expect(
-//       wordsFeature.breakdown?.some(
-//         (b: any) => b.interval_count == 1 && b.interval == "month"
-//       )
-//     ).to.equal(true);
-//     expect(
-//       wordsFeature.breakdown?.some(
-//         (b: any) => b.interval_count == 2 && b.interval == "month"
-//       )
-//     ).to.equal(true);
-//   });
-
-//   const trackVal = 300;
-//   it("should have correct breakdown after usage", async function () {
-//     await autumn.track({
-//       customer_id: customerId,
-//       feature_id: TestFeature.Words,
-//       value: trackVal,
-//     });
-
-//     await timeout(3000);
-
-//     const customer = await autumn.customers.get(customerId);
-
-//     // Should deduct
-//     const monthlyBreakdown = getBreakdown({ customer, intervalCount: 1 });
-//     const biMonthlyBreakdown = getBreakdown({ customer, intervalCount: 2 });
-
-//     expect(monthlyBreakdown?.balance).to.equal(includedUsage - trackVal);
-//     expect(biMonthlyBreakdown?.balance).to.equal(includedUsage);
-
-//     await autumn.track({
-//       customer_id: customerId,
-//       feature_id: TestFeature.Words,
-//       value: trackVal,
-//     });
-
-//     await timeout(3000);
-
-//     const customer2 = await autumn.customers.get(customerId);
-//     const monthlyBreakdown2 = getBreakdown({
-//       customer: customer2,
-//       intervalCount: 1,
-//     });
-//     const biMonthlyBreakdown2 = getBreakdown({
-//       customer: customer2,
-//       intervalCount: 2,
-//     });
-
-//     expect(monthlyBreakdown2?.balance).to.equal(0);
-//     expect(biMonthlyBreakdown2?.balance).to.equal(includedUsage - 100);
-//   });
-// });