From 8ca041cc701617ba6a52b7dcfed1e29eda8b55cd Mon Sep 17 00:00:00 2001
From: John Yeo
Date: Fri, 25 Jul 2025 20:01:15 +0100
Subject: [PATCH 44/45] fix: update product_id in rollover test to use free
product
---
server/tests/advanced/rollovers/rollover6.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/tests/advanced/rollovers/rollover6.ts b/server/tests/advanced/rollovers/rollover6.ts
index e06038b2c..7b054f623 100644
--- a/server/tests/advanced/rollovers/rollover6.ts
+++ b/server/tests/advanced/rollovers/rollover6.ts
@@ -120,7 +120,7 @@ describe(`${chalk.yellowBright(`${testCase}: Testing rollovers for upgrade`)}`,
// Attach pro
await autumn.attach({
customer_id: customerId,
- product_id: pro.id,
+ product_id: free.id,
});
let cus = await autumn.customers.get(customerId);
From 7f430c531c6fd75de091d372d3b443713674af02 Mon Sep 17 00:00:00 2001
From: John Yeo
Date: Fri, 25 Jul 2025 20:23:15 +0100
Subject: [PATCH 45/45] testing rollovers
---
server/shell/g4.sh | 3 ++-
server/src/cron/cronUtils.ts | 16 +++++++++++++
.../cusEnts/cusRollovers/RolloverService.ts | 17 -------------
server/tests/advanced/rollovers/rollover6.ts | 24 +++++++++++++++----
4 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/server/shell/g4.sh b/server/shell/g4.sh
index b5a362206..647b4702e 100755
--- a/server/shell/g4.sh
+++ b/server/shell/g4.sh
@@ -11,7 +11,8 @@ fi
$MOCHA_CMD 'tests/advanced/multiFeature/*.ts' \
'tests/advanced/coupons/*.ts' \
'tests/attach/updateQuantity/*.ts' \
- 'tests/advanced/referrals/*.ts'
+ 'tests/advanced/referrals/*.ts' \
+ 'tests/advanced/rollovers/*.ts'
$MOCHA_CMD 'tests/attach/multiProduct/*.ts' \
'tests/advanced/usageLimit/*.ts'
diff --git a/server/src/cron/cronUtils.ts b/server/src/cron/cronUtils.ts
index b8a6a2962..b2e00dcc1 100644
--- a/server/src/cron/cronUtils.ts
+++ b/server/src/cron/cronUtils.ts
@@ -27,6 +27,8 @@ import { notNullish } from "../utils/genUtils.js";
import { CusPriceService } from "../internal/customers/cusProducts/cusPrices/CusPriceService.js";
import { RolloverService } from "../internal/customers/cusProducts/cusEnts/cusRollovers/RolloverService.js";
+import { CusService } from "@/internal/customers/CusService.js";
+import { refreshCusCache } from "@/internal/customers/cusCache/updateCachedCus.js";
const checkSubAnchor = async ({
db,
@@ -236,6 +238,20 @@ export const resetCustomerEntitlement = async ({
format(new UTCDate(nextResetAt), "dd MMM yyyy HH:mm:ss")
)}`
);
+
+ let customer = await CusService.getByInternalId({
+ db,
+ internalId: cusEnt.internal_customer_id,
+ });
+
+ if (customer) {
+ await refreshCusCache({
+ db,
+ customerId: customer.id!,
+ orgId: customer.org_id,
+ env: customer.env,
+ });
+ }
} catch (error: any) {
console.log(
`Failed to reset ${cusEnt.id} | ${cusEnt.customer_id} | ${cusEnt.feature_id}, error: ${error}`
diff --git a/server/src/internal/customers/cusProducts/cusEnts/cusRollovers/RolloverService.ts b/server/src/internal/customers/cusProducts/cusEnts/cusRollovers/RolloverService.ts
index 704b4d15a..573dc1eb6 100644
--- a/server/src/internal/customers/cusProducts/cusEnts/cusRollovers/RolloverService.ts
+++ b/server/src/internal/customers/cusProducts/cusEnts/cusRollovers/RolloverService.ts
@@ -93,34 +93,17 @@ export class RolloverService {
}) {
if (rows.length === 0) return {};
- // console.log("inserting rollovers", rows);
-
await db
.insert(rollovers)
.values(rows as any)
.returning();
- // const currentRolloverRows = await db
- // .select()
- // .from(rollovers)
- // .where(
- // and(
- // eq(rollovers.cus_ent_id, cusEntID),
- // gte(rollovers.expires_at, new Date().getTime())
- // )
- // );
let curRollovers = [...fullCusEnt.rollovers, ...rows];
- console.log(`Cur rollovers:`, curRollovers);
let { toDelete, toUpdate } = performMaximumClearing({
rows: curRollovers as Rollover[],
- // rolloverConfig,
cusEnt: fullCusEnt,
- // cusEntID,
- // entityMode,
});
- // console.log(`To update:`, toUpdate);
- // console.log(`To delete:`, toDelete);
if (toDelete.length > 0) {
await RolloverService.delete({ db, ids: toDelete });
diff --git a/server/tests/advanced/rollovers/rollover6.ts b/server/tests/advanced/rollovers/rollover6.ts
index 7b054f623..c9dc16ffa 100644
--- a/server/tests/advanced/rollovers/rollover6.ts
+++ b/server/tests/advanced/rollovers/rollover6.ts
@@ -22,9 +22,12 @@ import { addPrefixToProducts } from "tests/attach/utils.js";
import { expect } from "chai";
import { resetAndGetCusEnt } from "./rolloverTestUtils.js";
+import { advanceTestClock } from "@/utils/scriptUtils/testClockUtils.js";
+import { addHours, addMonths } from "date-fns";
+import { hoursToFinalizeInvoice } from "tests/utils/constants.js";
-let freeRollover = { max: 1000, length: 1, duration: RolloverDuration.Month };
-let proRollover = { max: 600, length: 1, duration: RolloverDuration.Month };
+let freeRollover = { max: 600, length: 1, duration: RolloverDuration.Month };
+let proRollover = { max: 1000, length: 1, duration: RolloverDuration.Month };
const freeMsges = constructFeatureItem({
featureId: TestFeature.Messages,
@@ -123,15 +126,26 @@ describe(`${chalk.yellowBright(`${testCase}: Testing rollovers for upgrade`)}`,
product_id: free.id,
});
+ await advanceTestClock({
+ stripeCli,
+ testClockId,
+ advanceTo: addHours(
+ addMonths(curUnix, 1),
+ hoursToFinalizeInvoice
+ ).getTime(),
+ waitForSeconds: 20,
+ });
+
let cus = await autumn.customers.get(customerId);
let msgesFeature = cus.features[TestFeature.Messages];
- let freeRolloverBalance = freeMsges.included_usage * 2;
- let proRolloverBalance = Math.min(proRollover.max, freeRolloverBalance);
+ let proRolloverBalance = proMsges.included_usage * 2;
+ let freeRolloverBalance = Math.min(freeRollover.max, proRolloverBalance);
expect(msgesFeature).to.exist;
expect(msgesFeature?.balance).to.equal(
- proMsges.included_usage + proRolloverBalance
+ freeMsges.included_usage + freeRolloverBalance
);
+
// @ts-ignore
let rollovers = msgesFeature?.rollovers;
expect(rollovers[0].balance).to.equal(100);