diff --git a/server/src/internal/api/rewards/referralRouter.ts b/server/src/internal/api/rewards/referralRouter.ts index 391d92b46..2e2d04b22 100644 --- a/server/src/internal/api/rewards/referralRouter.ts +++ b/server/src/internal/api/rewards/referralRouter.ts @@ -212,8 +212,8 @@ referralRouter.post("/redeem", (req, res) => res.status(200).json({ id: redemption.id, customer_id: customer.id, - triggered: redemption?.applied, - applied: redemption?.applied, + // triggered: redemption?.applied, + // applied: redemption?.applied, reward_id: reward_program.reward.id, }); }, diff --git a/server/src/internal/customers/products/CusProductService.ts b/server/src/internal/customers/products/CusProductService.ts index 0e3c32eef..1a860e1c7 100644 --- a/server/src/internal/customers/products/CusProductService.ts +++ b/server/src/internal/customers/products/CusProductService.ts @@ -267,7 +267,7 @@ export class CusProductService { .select( `*, product:products(*), customer:customers!inner(*)${ withCusEnts - ? ", customer_entitlements:customer_entitlements!inner(*, entitlement:entitlements!inner(*, feature:features!inner(*)))" + ? ", customer_entitlements:customer_entitlements(*, entitlement:entitlements!inner(*, feature:features!inner(*)))" : "" }` as "*" ) diff --git a/server/test.sh b/server/test.sh index d6a0d20ca..f364b2093 100755 --- a/server/test.sh +++ b/server/test.sh @@ -5,11 +5,11 @@ MOCHA_CMD="npx mocha --parallel --timeout 10000000 --ignore tests/00_setup.ts" # TEST PARALLEL if [ "$1" == "basic-parallel" ]; then MOCHA_PARALLEL=true $MOCHA_SETUP && $MOCHA_CMD \ - tests/basic/*.ts \ - tests/basic/multi-feature/*.ts \ - tests/basic/entities/*.ts \ - # tests/basic/referrals/*.ts \ - # tests/attach/**/*.ts \ + tests/basic/referrals/*.ts \ + tests/attach/**/*.ts \ + # tests/basic/*.ts \ + # tests/basic/multi-feature/*.ts \ + # tests/basic/entities/*.ts \ elif [ "$1" == "advanced-parallel" ]; then MOCHA_PARALLEL=true \ diff --git a/server/tests/basic/referrals/referrals1.ts b/server/tests/basic/referrals/referrals1.ts index 00e446d99..862a9620e 100644 --- a/server/tests/basic/referrals/referrals1.ts +++ b/server/tests/basic/referrals/referrals1.ts @@ -133,8 +133,8 @@ describe(`${chalk.yellowBright( redemptions.push(redemption); - assert.equal(redemption.triggered, false); - assert.equal(redemption.applied, false); + // assert.equal(redemption.triggered, false); + // assert.equal(redemption.applied, false); } // Try redeem for redeemer1 again diff --git a/server/tests/basic/referrals/referrals3.ts b/server/tests/basic/referrals/referrals3.ts index 56869602c..90ed3b18b 100644 --- a/server/tests/basic/referrals/referrals3.ts +++ b/server/tests/basic/referrals/referrals3.ts @@ -11,15 +11,9 @@ import { } from "@autumn/shared"; import { timeout } from "tests/utils/genUtils.js"; import { initCustomerWithTestClock } from "tests/utils/testInitUtils.js"; -import { advanceTestClock } from "tests/utils/stripeUtils.js"; -import { addDays, addHours, addMonths } from "date-fns"; import { Stripe } from "stripe"; import { initCustomer } from "tests/utils/init.js"; -import { - checkFeatureHasCorrectBalance, - compareMainProduct, - compareProductEntitlements, -} from "tests/utils/compare.js"; +import { compareProductEntitlements } from "tests/utils/compare.js"; // UNCOMMENT FROM HERE describe(`${chalk.yellowBright( @@ -90,8 +84,8 @@ describe(`${chalk.yellowBright( redemptions.push(redemption); - assert.equal(redemption.triggered, false); - assert.equal(redemption.applied, false); + // assert.equal(redemption.triggered, false); + // assert.equal(redemption.applied, false); } // Try redeem for redeemer1 again