comi-logic/cfw-autumn
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit da2693567c
Author: John Yeo <johnyeocx@gmail.com>
Date:   Mon Sep 22 14:45:25 2025 +0100

    chore: ran biome format

commit db19928cea
Merge: 3005d452 d5d285a2
Author: John Yeo <johnyeocx@gmail.com>
Date:   Mon Sep 22 13:25:11 2025 +0100

    Merge branch 'staging' of https://github.com/useautumn/autumn into staging

commit 3005d45252
Merge: 5cb89756 784f7f92
Author: John Yeo <johnyeocx@gmail.com>
Date:   Mon Sep 22 13:25:01 2025 +0100

    Merge branch 'main' into staging

commit d5d285a25b
Merge: 894f943f b3952a27
Author: John Yeo <51376134+johnyeocx@users.noreply.github.com>
Date:   Mon Sep 22 13:19:48 2025 +0100

    Merge pull request #224 from muhammadusmandev/fix/create-product-prevent-empty-name-submission

    Fix: Create product prevent API call if product name field is empty and invalid characters

commit 894f943f31
Merge: 5cb89756 59aaf3c4
Author: John Yeo <51376134+johnyeocx@users.noreply.github.com>
Date:   Mon Sep 22 13:19:15 2025 +0100

    Merge pull request #223 from sidgaikwad/Fixes/Update-logic-reward-program

    Fixes/update logic reward program

commit 59aaf3c430
Author: John Yeo <johnyeocx@gmail.com>
Date:   Mon Sep 22 13:17:56 2025 +0100

    Fixes/Update-logic-reward-program

commit 5f9eb4f02d
Merge: 7b1b2cd2 5cb89756
Author: John Yeo <johnyeocx@gmail.com>
Date:   Mon Sep 22 13:17:46 2025 +0100

    Merge branch 'staging' into Fixes/Update-logic-reward-program

commit 7b1b2cd278
Author: John Yeo <johnyeocx@gmail.com>
Date:   Mon Sep 22 13:12:39 2025 +0100

    fix: show error message for update reward program

commit 5cb897560d
Merge: 79cf0f58 94dd5ba5
Author: John Yeo <johnyeocx@gmail.com>
Date:   Mon Sep 22 13:06:11 2025 +0100

    Merge branch 'staging' of https://github.com/useautumn/autumn into staging

commit 79cf0f5839
Author: John Yeo <johnyeocx@gmail.com>
Date:   Mon Sep 22 13:06:09 2025 +0100

    fix: update feature modal scrolls

commit 94dd5ba5b1
Merge: 9715e04e 609bd24b
Author: John Yeo <51376134+johnyeocx@users.noreply.github.com>
Date:   Mon Sep 22 12:58:51 2025 +0100

    Merge pull request #215 from shreyash1231/fix/Disabled-Create-Customer-Button-Until-Id-Or-Email-is-Filled-To-Prevent-API-CALL

    Fix/disabled create customer button until id or email is filled to prevent api call

commit 9715e04edd
Merge: 97190711 fe96c87a
Author: John Yeo <51376134+johnyeocx@users.noreply.github.com>
Date:   Mon Sep 22 12:44:40 2025 +0100

    Merge pull request #213 from SirTenzin/fix/event-timezone

    fix: 🐛 timezones not localised

commit 9719071149
Merge: 9c1862b4 7e201dae
Author: John Yeo <51376134+johnyeocx@users.noreply.github.com>
Date:   Mon Sep 22 12:44:28 2025 +0100

    Merge pull request #217 from SirTenzin/fix/trmnl-values

    fix: 🐛 only counted row instead of value

commit 9c1862b405
Merge: 6040c103 4fd25cc1
Author: John Yeo <51376134+johnyeocx@users.noreply.github.com>
Date:   Mon Sep 22 12:43:36 2025 +0100

    Merge pull request #216 from SirTenzin/feat/reward-migrations

    fix: 🐛 reward price_ids migrations

commit 4fd25cc161
Author: John Yeo <johnyeocx@gmail.com>
Date:   Mon Sep 22 12:43:06 2025 +0100

    fix: ent rollover null / undefined difference

commit 784f7f9290
Merge: dd0e9f1f 6040c103
Author: John Yeo <johnyeocx@gmail.com>
Date:   Mon Sep 22 10:40:49 2025 +0100

    fix: referral program coupon reward, apply to redeemer

commit dd0e9f1fd7
Author: John Yeo <johnyeocx@gmail.com>
Date:   Mon Sep 22 10:06:27 2025 +0100

    fix: referral utils apply to both coupon

commit e40e5a06f9
Author: John Yeo <johnyeocx@gmail.com>
Date:   Mon Sep 22 09:53:38 2025 +0100

    chore: fixing reward migrations

commit e161cbec83
Merge: e8ff791a 6040c103
Author: John Yeo <johnyeocx@gmail.com>
Date:   Sun Sep 21 18:24:24 2025 +0100

    Merge branch 'staging' into feat/reward-migrations

commit b3952a2702
Author: Muhammad Usman <muhammadusmandev@yahoo.com>
Date:   Sat Sep 20 08:28:35 2025 -0700

    Fix: Create product prevent API call if product name field is empty and not valid

commit 1f609eb592
Author: sidgaikwad <gaikwadsiddharth039@gmail.com>
Date:   Sat Sep 20 00:53:46 2025 +0530

    changes for the update logic for passing proper id

commit 86222adfa9
Author: sidgaikwad <gaikwadsiddharth039@gmail.com>
Date:   Sat Sep 20 00:20:44 2025 +0530

    `feat(rewardPrograms): Update RewardProgramService to support idOrInternalId and add update endpoint`

commit ab655107fc
Author: sidgaikwad <gaikwadsiddharth039@gmail.com>
Date:   Fri Sep 19 23:21:05 2025 +0530

    changes to have view for the updaterewardprogram and also the service for it

commit e8ff791ace
Author: amianthus <49116958+SirTenzin@users.noreply.github.com>
Date:   Fri Sep 19 12:58:48 2025 +0100

    fix: 🐛 dont use unmatched prices

commit e2528194fd
Author: amianthus <49116958+SirTenzin@users.noreply.github.com>
Date:   Fri Sep 19 12:53:06 2025 +0100

    feat: 🎸 toast to alert of any unmigrated prices

commit 7e201dae41
Author: amianthus <49116958+SirTenzin@users.noreply.github.com>
Date:   Tue Sep 16 14:47:04 2025 +0100

    fix: 🐛 only counted row instead of value

commit 590a2ae86f
Author: amianthus <49116958+SirTenzin@users.noreply.github.com>
Date:   Tue Sep 16 14:23:26 2025 +0100

    refactor: 💡 clean up

commit d529d6adb7
Author: amianthus <49116958+SirTenzin@users.noreply.github.com>
Date:   Tue Sep 16 13:52:35 2025 +0100

    refactor: 💡 types

commit d6e9802cdc
Author: amianthus <49116958+SirTenzin@users.noreply.github.com>
Date:   Tue Sep 16 13:52:28 2025 +0100

    feat: 🎸 reward migrations

commit 609bd24b60
Author: shreyash1231 <chandwadkarshreyash@gmail.com>
Date:   Tue Sep 16 17:08:33 2025 +0530

    fix/Disabled-Create-Customer-Button-Until-Id-Or-Email-is-Filled-To-Prevent-API-CALL

commit d13505621c
Author: shreyash1231 <chandwadkarshreyash@gmail.com>
Date:   Tue Sep 16 16:41:45 2025 +0530

    Disabled-Create-Customer-Button-Until-Name-Id-Or-Email-isfilled-to-Prevent-API-CALL

commit c26bd73627
Author: amianthus <49116958+SirTenzin@users.noreply.github.com>
Date:   Mon Sep 15 15:25:47 2025 +0100

    refactor: 💡 type sugar :)

commit 77790cb176
Author: amianthus <49116958+SirTenzin@users.noreply.github.com>
Date:   Mon Sep 15 15:11:05 2025 +0100

    fix: 🐛 applying to all

commit fe96c87a7a
Author: amianthus <49116958+SirTenzin@users.noreply.github.com>
Date:   Mon Sep 15 14:47:16 2025 +0100

    fix: 🐛 timezones not localised
This commit is contained in:
amianthus
2025-09-22 13:49:19 +00:00
parent 5b7d58813e
commit 5cb46bba96
1356 changed files with 112510 additions and 111609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
shared/utils/rewardUtils/rewardMigrationUtils.ts Normal file
View File

@@ -0,0 +1,177 @@
import type {
FixedPriceConfig,
Price,
Reward,
RewardType,
UsagePriceConfig,
} from "../../index.js";
import type { UsageTier } from "../../models/productModels/priceModels/priceConfig/usagePriceConfig.js";
import { isFixedPrice, isUsagePrice } from "../productUtils/priceUtils.js";
// Helper function to check if tier structures match
const tiersMatch = (oldTiers: UsageTier[], newTiers: UsageTier[]): boolean => {
if (oldTiers.length !== newTiers.length) return false;
return oldTiers.every((oldTier, index) => {
const newTier = newTiers[index];
return oldTier.to === newTier.to && oldTier.amount === newTier.amount;
});
};
// Match fixed prices by amount
const findMatchingFixedPrice = (
oldPrice: Price,
candidates: Price[],
): Price | null => {
const oldConfig = oldPrice.config as FixedPriceConfig;
return (
candidates.find((candidate) => {
const newConfig = candidate.config as FixedPriceConfig;
return newConfig.amount === oldConfig.amount;
}) || null
);
};
// Match usage prices by feature and billing characteristics
const findMatchingUsagePrice = (
oldPrice: Price,
candidates: Price[],
): Price | null => {
const oldConfig = oldPrice.config as UsagePriceConfig;
return (
candidates.find((candidate) => {
const newConfig = candidate.config as UsagePriceConfig;
// Match by feature
if (newConfig.feature_id !== oldConfig.feature_id) return false;
if (newConfig.internal_feature_id !== oldConfig.internal_feature_id)
return false;
// Match by billing behavior
if (newConfig.bill_when !== oldConfig.bill_when) return false;
if (newConfig.should_prorate !== oldConfig.should_prorate) return false;
// Optionally match by tier structure
if (!tiersMatch(oldConfig.usage_tiers, newConfig.usage_tiers))
return false;
return true;
}) || null
);
};
// Main matching function with type-specific logic
const findBestMatch = (oldPrice: Price, newPrices: Price[]): Price | null => {
// First, filter by basic characteristics
const candidates = newPrices.filter(
(newPrice) =>
newPrice.config.type === oldPrice.config.type &&
newPrice.config.interval === oldPrice.config.interval &&
newPrice.config.interval_count === oldPrice.config.interval_count,
);
if (candidates.length === 0) return null;
if (candidates.length === 1) return candidates[0];
// If multiple candidates, use type-specific matching
if (isFixedPrice({ price: oldPrice })) {
return findMatchingFixedPrice(oldPrice, candidates);
} else if (isUsagePrice({ price: oldPrice })) {
return findMatchingUsagePrice(oldPrice, candidates);
}
// Fallback to first candidate
return candidates[0];
};
export interface RewardMigrationResult {
willMigrateCount: number;
willNotMigrateCount: number;
}
export interface RewardPriceAnalysisResult {
validPriceCount: number;
invalidPriceCount: number;
}
export function analyzeRewardMigration({
rewards,
oldPrices,
newPrices,
rewardTypesToCheck,
}: {
rewards: Reward[];
oldPrices: Price[];
newPrices: Price[];
rewardTypesToCheck: RewardType[];
}): RewardMigrationResult {
let willMigrateCount = 0;
let willNotMigrateCount = 0;
// Filter rewards to only those we care about and that have discount configs with price_ids
const relevantRewards = rewards.filter(
(reward) =>
rewardTypesToCheck.includes(reward.type) &&
reward.discount_config?.price_ids &&
reward.discount_config.price_ids.length > 0,
);
for (const reward of relevantRewards) {
if (!reward.discount_config?.price_ids) continue;
for (const priceId of reward.discount_config.price_ids) {
const oldPrice = oldPrices.find((p) => p.id === priceId);
if (!oldPrice) {
// Price not in old prices list, skip
continue;
}
const matchingNewPrice = findBestMatch(oldPrice, newPrices);
if (matchingNewPrice) {
willMigrateCount++;
} else {
willNotMigrateCount++;
}
}
}
return {
willMigrateCount,
willNotMigrateCount,
};
}
export function analyzeRewardPrices({
reward,
availablePriceIds,
}: {
reward: Reward;
availablePriceIds: string[];
}): RewardPriceAnalysisResult {
let validPriceCount = 0;
let invalidPriceCount = 0;
// Skip rewards that apply to all products
if (reward.discount_config?.apply_to_all) {
return { validPriceCount: 0, invalidPriceCount: 0 };
}
// Check each price ID in the reward
if (reward.discount_config?.price_ids) {
for (const priceId of reward.discount_config.price_ids) {
if (availablePriceIds.includes(priceId)) {
validPriceCount++;
} else {
invalidPriceCount++;
}
}
}
return {
validPriceCount,
invalidPriceCount,
};
}