@driveflux/api-functions 1.0.45 → 1.0.47

package/dist/reservation/invoice.js

@@ -1,6 +1,6 @@
 import { config } from '@driveflux/config/backend';
 import { loadCoupon, PROBLEM_APPLICABLE_NOT_FOUND } from '@driveflux/coupon';
-import { prisma, } from '@driveflux/db';
+import { prisma } from '@driveflux/db';
 import { generateId } from '@driveflux/db/id';
 import { EMPTY_BILLING_ADDRESS } from '@driveflux/db/models/other';
 import { PURPOSE_RESERVATION } from '@driveflux/db/models/subscription';
@@ -14,16 +14,15 @@ import { isAfter } from 'date-fns/isAfter';
 import { subMinutes } from 'date-fns/subMinutes';
 import { createScopedLogger } from '../create-logger.js';
 const log = createScopedLogger('reservation:invoice');
-export const updateReservationInvoiceIfNeeded = async (oldReservationInvoice, newParams) => {
+export const updateReservationInvoiceIfNeeded = async (oldReservationInvoice, newParams)=>{
     const couponIsDifferent = oldReservationInvoice.couponCode !== newParams.couponCode;
-    if (!couponIsDifferent &&
-        oldReservationInvoice.stripePaymentIntentId === newParams.paymentIntentId) {
+    if (!couponIsDifferent && oldReservationInvoice.stripePaymentIntentId === newParams.paymentIntentId) {
         return new Ok(oldReservationInvoice);
     }
     // If the coupon or payment intent are differnt we should update the invoice
     let update = {
         stripePaymentIntentId: newParams.paymentIntentId,
-        couponCode: newParams.couponCode,
+        couponCode: newParams.couponCode
     };
     // If the coupon is different, we need to apply the coupon to the invoice
     if (couponIsDifferent) {
@@ -31,63 +30,56 @@ export const updateReservationInvoiceIfNeeded = async (oldReservationInvoice, ne
             const result = await coupons.applyCouponToUnsavedInvoice(newParams.couponCode, oldReservationInvoice);
             if (result.ok) {
                 const { discounts, ...rest } = result.val;
-                const toDisconnect = discounts
-                    ? oldReservationInvoice.discountIds?.filter((id) => !discounts.connect?.some((d) => d.id === id))
-                    : undefined;
-                const disconnectClauses = toDisconnect?.length
-                    ? {
-                        disconnect: toDisconnect.map((id) => ({ id })),
-                    }
-                    : undefined;
+                const toDisconnect = discounts ? oldReservationInvoice.discountIds?.filter((id)=>!discounts.connect?.some((d)=>d.id === id)) : undefined;
+                const disconnectClauses = toDisconnect?.length ? {
+                    disconnect: toDisconnect.map((id)=>({
+                            id
+                        }))
+                } : undefined;
                 update = {
                     ...update,
                     ...rest,
-                    ...(discounts || disconnectClauses
-                        ? {
-                            discounts: {
-                                ...(discounts || {}),
-                                ...(disconnectClauses || {}),
-                            },
+                    ...discounts || disconnectClauses ? {
+                        discounts: {
+                            ...discounts || {},
+                            ...disconnectClauses || {}
                         }
-                        : {}),
+                    } : {},
                     metadata: {
                         ...update.metadata,
-                        couponCode: newParams.couponCode,
+                        couponCode: newParams.couponCode
                     },
                     providerMetadata: {
                         ...update.providerMetadata,
-                        couponCode: newParams.couponCode,
-                    },
+                        couponCode: newParams.couponCode
+                    }
                 };
             }
             if (result.err && result.val.code !== PROBLEM_APPLICABLE_NOT_FOUND) {
                 return result;
             }
-        }
-        else if (oldReservationInvoice.discountIds.length) {
+        } else if (oldReservationInvoice.discountIds.length) {
             // No discounts, so we disconnect all of them
             update = {
                 discounts: {
-                    disconnect: oldReservationInvoice.discountIds.map((id) => ({
-                        id,
-                    })),
-                },
+                    disconnect: oldReservationInvoice.discountIds.map((id)=>({
+                            id
+                        }))
+                }
             };
         }
     }
     let updated = await wrapInResult(biller.updateInvoice(oldReservationInvoice.id, update));
     // If the invoice was locked due to pending status and we're more than 1 minute old, we unlock it
     if (updated.err && updated.val.code === 'invoice_pending') {
-        if ((oldReservationInvoice.lockedAt &&
-            isAfter(oldReservationInvoice.lockedAt, subMinutes(new Date(), 1))) ||
-            !oldReservationInvoice.lockedAt) {
+        if (oldReservationInvoice.lockedAt && isAfter(oldReservationInvoice.lockedAt, subMinutes(new Date(), 1)) || !oldReservationInvoice.lockedAt) {
             updated = await wrapInResult(biller.updateInvoice(oldReservationInvoice.id, {
                 ...update,
                 locked: false,
                 lockedAt: null,
                 lockReason: null,
                 unlockAt: null,
-                status: 'draft',
+                status: 'draft'
             }));
         }
     }
@@ -96,7 +88,7 @@ export const updateReservationInvoiceIfNeeded = async (oldReservationInvoice, ne
     }
     return new Ok(updated.val);
 };
-export const createReservationInvoice = async ({ invoiceId, couponCode, plan, mileagePackage, referralCode, reservationId, paymentIntentId, freeReservation, freeReservationReason, analytics, vehicle, payer, subscribingUser, }) => {
+export const createReservationInvoice = async ({ invoiceId, couponCode, plan, mileagePackage, referralCode, reservationId, paymentIntentId, freeReservation, freeReservationReason, analytics, vehicle, payer, subscribingUser })=>{
     if (freeReservation) {
         // It's a free reservation, so we don't need to add a coupon code
         return await wrapInResult(biller.createInvoice(getInvoiceCreateDetails({
@@ -109,21 +101,17 @@ export const createReservationInvoice = async ({ invoiceId, couponCode, plan, mi
             freeReservation,
             freeReservationReason,
             analytics,
-            reservationId,
+            reservationId
         })));
     }
     let finalCouponCode = couponCode;
     // If we don't have a reservation coupon ID, we apply the referral discount if any
-    const referral = referralCode &&
-        (await prisma.referral.findUnique({
-            where: {
-                id: referralCode,
-            },
-        }));
-    if (!finalCouponCode &&
-        referral &&
-        referral.discountToReceiverCouponId &&
-        referral.discountToReceiverCouponApplicationName === 'reservationFee') {
+    const referral = referralCode && await prisma.referral.findUnique({
+        where: {
+            id: referralCode
+        }
+    });
+    if (!finalCouponCode && referral && referral.discountToReceiverCouponId && referral.discountToReceiverCouponApplicationName === 'reservationFee') {
         const referralCoupon = await loadCoupon(referral.discountToReceiverCouponId);
         if (referralCoupon) {
             finalCouponCode = referralCoupon.code;
@@ -142,18 +130,20 @@ export const createReservationInvoice = async ({ invoiceId, couponCode, plan, mi
             freeReservation,
             freeReservationReason,
             analytics,
-            reservationId,
+            reservationId
         }),
         lines: [
             {
                 amount: reservationAmount,
                 description: `Reservation fee for ${vehicleName(vehicle)}`,
-                chargingFor: 'reservationFee',
-            },
-        ],
+                chargingFor: 'reservationFee'
+            }
+        ]
     };
     if (finalCouponCode) {
-        log.debug({ finalCouponCode }, 'Applying coupon code to invoice');
+        log.debug({
+            finalCouponCode
+        }, 'Applying coupon code to invoice');
         const withCoupon = await coupons.applyCouponToUnsavedInvoice(finalCouponCode, invoiceCreateDetails, 'reservationFee', {
             subscriptionPlans: plan,
             subscriptionMileagePackages: mileagePackage,
@@ -161,24 +151,25 @@ export const createReservationInvoice = async ({ invoiceId, couponCode, plan, mi
             vehicleMake: vehicle.make,
             userId: subscribingUser.id,
             businessId: payer.object === 'business' ? payer.id : undefined,
-            vehicleType: vehicle.type,
+            vehicleType: vehicle.type
         });
-        if (withCoupon.err &&
-            withCoupon.val.code !== PROBLEM_APPLICABLE_NOT_FOUND) {
+        if (withCoupon.err && withCoupon.val.code !== PROBLEM_APPLICABLE_NOT_FOUND) {
             return withCoupon;
         }
-        log.debug({ couponUpdates: withCoupon.val }, 'Coupon applied to invoice');
+        log.debug({
+            couponUpdates: withCoupon.val
+        }, 'Coupon applied to invoice');
         if (withCoupon.ok) {
             invoiceCreateDetails = {
                 ...withCoupon.val,
                 metadata: {
                     ...withCoupon.val.metadata,
-                    couponCode: finalCouponCode,
+                    couponCode: finalCouponCode
                 },
                 providerMetadata: {
                     ...withCoupon.val.providerMetadata,
-                    couponCode: finalCouponCode,
-                },
+                    couponCode: finalCouponCode
+                }
             };
         }
     }
@@ -186,15 +177,15 @@ export const createReservationInvoice = async ({ invoiceId, couponCode, plan, mi
         ...invoiceCreateDetails,
         providerMetadata: {
             ...invoiceCreateDetails.providerMetadata,
-            invoiceId: invoiceCreateDetails.id,
-        },
+            invoiceId: invoiceCreateDetails.id
+        }
     }));
     if (result.err) {
         return result;
     }
     return new Ok(result.val);
 };
-const getInvoiceCreateDetails = ({ invoiceId, payer, date, reservationDiscountId, vehicle, plan, mileagePackage, couponCode, paymentIntentId, freeReservation, freeReservationReason, analytics, reservationId, }) => {
+const getInvoiceCreateDetails = ({ invoiceId, payer, date, reservationDiscountId, vehicle, plan, mileagePackage, couponCode, paymentIntentId, freeReservation, freeReservationReason, analytics, reservationId })=>{
     return {
         id: invoiceId || generateId('Invoice'),
         taxPercentage: 0,
@@ -210,15 +201,13 @@ const getInvoiceCreateDetails = ({ invoiceId, payer, date, reservationDiscountId
         description: 'Reservation fee for a FLUX subscription',
         footer: `Invoice for a FLUX subscription reservation. Due by ${format(date ?? new Date())}`,
         invoiceUrl: `${config.appUrl}/invoice-preview/${invoiceId}`,
-        ...(reservationDiscountId
-            ? {
-                discounts: {
-                    connect: {
-                        id: reservationDiscountId,
-                    },
-                },
+        ...reservationDiscountId ? {
+            discounts: {
+                connect: {
+                    id: reservationDiscountId
+                }
             }
-            : {}),
+        } : {},
         lines: [],
         subscriptionDetails: {
             vehicleId: vehicle.id,
@@ -227,7 +216,7 @@ const getInvoiceCreateDetails = ({ invoiceId, payer, date, reservationDiscountId
             variant: vehicle.variant,
             year: vehicle.year,
             plan: plan,
-            mileagePackage: mileagePackage,
+            mileagePackage: mileagePackage
         },
         // Legacy field:
         stripePaymentIntentId: paymentIntentId,
@@ -237,14 +226,18 @@ const getInvoiceCreateDetails = ({ invoiceId, payer, date, reservationDiscountId
             mileagePackage,
             vehicleId: vehicle.id,
             vehicleName: vehicleName(vehicle),
-            ...(reservationId ? { reservationId } : {}),
-            ...(couponCode ? { couponCode } : {}),
+            ...reservationId ? {
+                reservationId
+            } : {},
+            ...couponCode ? {
+                couponCode
+            } : {}
         },
         autoRetry: {
             enabled: false,
             interval: 0,
             maxAttempts: 0,
-            attempts: 0,
+            attempts: 0
         },
         metadata: {
             purpose: PURPOSE_RESERVATION,
@@ -253,11 +246,10 @@ const getInvoiceCreateDetails = ({ invoiceId, payer, date, reservationDiscountId
             plan,
             mileagePackage,
             couponCode,
-            ...(freeReservation && freeReservationReason
-                ? { freeReservationReason }
-                : {}),
-            analytics,
-        },
+            ...freeReservation && freeReservationReason ? {
+                freeReservationReason
+            } : {},
+            analytics
+        }
     };
 };
-//# sourceMappingURL=invoice.js.map

package/dist/reservation/payment-intent-sync.js

@@ -3,20 +3,18 @@ import { makeProblem, PROBLEM_EXTERNAL } from '@driveflux/problem';
 import { Err, Ok } from '@driveflux/result';
 import { createScopedLogger } from '../create-logger.js';
 const log = createScopedLogger('reservation:payment-intent-sync');
-export const ensurePaymentIntentIdIsSynced = async (invoice, paymentIntentId) => {
+export const ensurePaymentIntentIdIsSynced = async (invoice, paymentIntentId)=>{
     const stripe = biller.getPaymentProvider('stripe').getStripe();
     try {
         await stripe.paymentIntents.update(paymentIntentId, {
             metadata: {
                 ...invoice.providerMetadata,
-                invoiceId: invoice.id,
-            },
+                invoiceId: invoice.id
+            }
         });
         return new Ok(true);
-    }
-    catch (error) {
+    } catch (error) {
         log.error(error, 'Error updating payment intent metadata');
         return new Err(makeProblem(PROBLEM_EXTERNAL, 'Error updating payment intent metadata'));
     }
 };
-//# sourceMappingURL=payment-intent-sync.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@driveflux/api-functions",
-  "version": "1.0.45",
+  "version": "1.0.47",
   "type": "module",
   "exports": {
     "./notion": {
@@ -73,20 +73,20 @@
   ],
   "dependencies": {
     "@casl/ability": "^6.7.3",
-    "@driveflux/auth": "4.0.34",
+    "@driveflux/auth": "4.0.35",
     "@driveflux/billing": "8.0.3",
     "@driveflux/config": "3.0.3",
-    "@driveflux/coupon": "9.0.3",
-    "@driveflux/db": "4.0.3",
-    "@driveflux/email": "7.0.3",
-    "@driveflux/email-templates": "1.0.3",
-    "@driveflux/engine": "1.0.9",
+    "@driveflux/coupon": "9.0.4",
+    "@driveflux/db": "4.0.4",
+    "@driveflux/email": "7.0.4",
+    "@driveflux/email-templates": "1.0.4",
+    "@driveflux/engine": "1.0.10",
     "@driveflux/fetch": "8.0.0",
     "@driveflux/format-money": "7.0.0",
     "@driveflux/problem": "6.0.0",
     "@driveflux/reporter": "7.0.1",
     "@driveflux/result": "6.0.0",
-    "@driveflux/scheduler": "8.0.3",
+    "@driveflux/scheduler": "8.0.4",
     "@driveflux/singleton": "3.0.0",
     "@driveflux/subscription": "9.0.0",
     "@driveflux/logger": "1.0.0",