@driveflux/api-functions 0.0.7-next.32 → 0.0.7-next.34

package/dist/auth/tokens.d.ts

@@ -13,8 +13,8 @@ export declare const createToken: (userId: string | null, type: "email" | "phone
     metadata: PrismaJson.AnyMetadata | null;
     createdAt: Date;
     updatedAt: Date;
-    value: string | null;
     userId: string | null;
+    value: string | null;
     client: string | null;
     identifier: string | null;
     expiresAt: Date | null;
@@ -29,8 +29,8 @@ export declare const createEmailToken: (userId: string, email: string) => Promis
     metadata: PrismaJson.AnyMetadata | null;
     createdAt: Date;
     updatedAt: Date;
-    value: string | null;
     userId: string | null;
+    value: string | null;
     client: string | null;
     identifier: string | null;
     expiresAt: Date | null;
@@ -45,8 +45,8 @@ export declare const createSMSToken: (userId: string | null, phoneNumber: string
     metadata: PrismaJson.AnyMetadata | null;
     createdAt: Date;
     updatedAt: Date;
-    value: string | null;
     userId: string | null;
+    value: string | null;
     client: string | null;
     identifier: string | null;
     expiresAt: Date | null;

package/dist/notion/schemas/database.d.ts

@@ -190,8 +190,8 @@ export declare const notionDatabasePropertyRollupSchema: ZodObject<{
         type: z.ZodEnum<{
             number: "number";
             date: "date";
-            array: "array";
             incomplete: "incomplete";
+            array: "array";
             unsupported: "unsupported";
         }>;
     }, z.core.$strip>;

package/dist/notion/schemas/page.d.ts

@@ -231,8 +231,8 @@ export declare const notionPagePropertyRollupSchema: ZodObject<{
         type: z.ZodEnum<{
             number: "number";
             date: "date";
-            array: "array";
             incomplete: "incomplete";
+            array: "array";
             unsupported: "unsupported";
         }>;
     }, z.core.$strip>;

package/dist/reservation/display-vehicle.d.ts

@@ -1,7 +1,6 @@
 import { type DisplayVehicle, type MileagePackage, type PlanType, type UltraTier, type Vehicle, type VehicleType } from '@driveflux/db';
 export declare const fetchDisplayVehicle: (displayVehicle: DisplayVehicle | string) => Promise<{
     object: import("@driveflux/db").DisplayVehicleObject;
-    type: VehicleType;
     id: string;
     createdAt: Date;
     updatedAt: Date;
@@ -9,6 +8,7 @@ export declare const fetchDisplayVehicle: (displayVehicle: DisplayVehicle | stri
     vehicleModel: string;
     variant: string;
     year: number;
+    type: VehicleType;
     brandSlug: string;
     brandId: string;
     defaultHostId: string;
@@ -191,20 +191,20 @@ export declare const fetchDisplayVehicle: (displayVehicle: DisplayVehicle | stri
 export declare const createVehicleFromDisplayVehicle: (displayVehicle: DisplayVehicle | string, selectedColor?: string) => Promise<({
     host: {
         object: import("@driveflux/db").HostObject;
-        phoneNumber: string | null;
-        type: import("@driveflux/db").HostType | null;
+        name: string;
         id: string;
         metadata: PrismaJson.AnyMetadata | null;
-        name: string;
         createdAt: Date;
         updatedAt: Date;
+        registrationNumber: string | null;
+        type: import("@driveflux/db").HostType | null;
+        active: boolean;
         email: string | null;
+        phoneNumber: string | null;
         race: import("@driveflux/db").Race | null;
         emergencyContactName: string | null;
         emergencyPhoneNumber: string | null;
-        active: boolean;
         commencementDate: Date | null;
-        registrationNumber: string | null;
         stripeAccountId: string | null;
         isStripeConnected: boolean;
         serviceCenterIds: string[];
@@ -262,15 +262,11 @@ export declare const createVehicleFromDisplayVehicle: (displayVehicle: DisplayVe
     };
 } & {
     object: import("@driveflux/db").VehicleObject;
-    type: VehicleType;
     id: string;
+    status: import("@driveflux/db").VehicleStatus;
     metadata: PrismaJson.AnyMetadata | null;
     createdAt: Date;
     updatedAt: Date;
-    status: import("@driveflux/db").VehicleStatus;
-    temporary: boolean;
-    registrationNumber: string | null;
-    hostId: string;
     make: string;
     vehicleModel: string;
     variant: string;
@@ -280,6 +276,7 @@ export declare const createVehicleFromDisplayVehicle: (displayVehicle: DisplayVe
     compositeSearchScore: number;
     registrationDate: Date | null;
     mileage: number | null;
+    registrationNumber: string | null;
     vin: string | null;
     engineNumber: string | null;
     availability: import("@driveflux/db").VehicleAvailablity | null;
@@ -294,6 +291,8 @@ export declare const createVehicleFromDisplayVehicle: (displayVehicle: DisplayVe
     delistedAt: Date | null;
     imagesNotActual: boolean;
     imagesNotActualMessage: string | null;
+    hostId: string;
+    type: VehicleType;
     allowedServiceCenterIds: string[];
     displayVehicleId: string | null;
     isHostConfirmed: boolean | null;
@@ -306,6 +305,7 @@ export declare const createVehicleFromDisplayVehicle: (displayVehicle: DisplayVe
     featureOnLandingPage: boolean;
     lastMileageRecordedAt: Date | null;
     locationAvailability: string[];
+    temporary: boolean;
     hotDeal: boolean | null;
     activeSubscriptionId: string | null;
     addresses: {
@@ -689,15 +689,11 @@ export declare const createVehicleFromDisplayVehicle: (displayVehicle: DisplayVe
 }) | undefined>;
 export declare const transfromVehicleDisplayToVehicle: (displayVehicle: DisplayVehicle | string, selectedColor: string) => Promise<({
     object: import("@driveflux/db").VehicleObject;
-    type: VehicleType;
     id: string;
+    status: import("@driveflux/db").VehicleStatus;
     metadata: PrismaJson.AnyMetadata | null;
     createdAt: Date;
     updatedAt: Date;
-    status: import("@driveflux/db").VehicleStatus;
-    temporary: boolean;
-    registrationNumber: string | null;
-    hostId: string;
     make: string;
     vehicleModel: string;
     variant: string;
@@ -707,6 +703,7 @@ export declare const transfromVehicleDisplayToVehicle: (displayVehicle: DisplayV
     compositeSearchScore: number;
     registrationDate: Date | null;
     mileage: number | null;
+    registrationNumber: string | null;
     vin: string | null;
     engineNumber: string | null;
     availability: import("@driveflux/db").VehicleAvailablity | null;
@@ -721,6 +718,8 @@ export declare const transfromVehicleDisplayToVehicle: (displayVehicle: DisplayV
     delistedAt: Date | null;
     imagesNotActual: boolean;
     imagesNotActualMessage: string | null;
+    hostId: string;
+    type: VehicleType;
     allowedServiceCenterIds: string[];
     displayVehicleId: string | null;
     isHostConfirmed: boolean | null;
@@ -733,6 +732,7 @@ export declare const transfromVehicleDisplayToVehicle: (displayVehicle: DisplayV
     featureOnLandingPage: boolean;
     lastMileageRecordedAt: Date | null;
     locationAvailability: string[];
+    temporary: boolean;
     hotDeal: boolean | null;
     activeSubscriptionId: string | null;
     addresses: {

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';
@@ -12,15 +12,16 @@ import { Ok } from '@driveflux/result';
 import { format } from '@driveflux/time';
 import { isAfter } from 'date-fns/isAfter';
 import { subMinutes } from 'date-fns/subMinutes';
-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) {
@@ -28,56 +29,63 @@ 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',
             }));
         }
     }
@@ -86,7 +94,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({
@@ -99,17 +107,21 @@ 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;
@@ -128,15 +140,15 @@ 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) {
         const withCoupon = await coupons.applyCouponToUnsavedInvoice(finalCouponCode, invoiceCreateDetails, 'reservationFee', {
@@ -146,9 +158,10 @@ 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;
         }
         if (withCoupon.ok) {
@@ -156,18 +169,18 @@ export const createReservationInvoice = async ({ invoiceId, couponCode, plan, mi
                 ...withCoupon.val,
                 metadata: {
                     ...withCoupon.val.metadata,
-                    couponCode: finalCouponCode
+                    couponCode: finalCouponCode,
                 },
                 providerMetadata: {
                     ...withCoupon.val.providerMetadata,
-                    couponCode: finalCouponCode
-                }
+                    couponCode: finalCouponCode,
+                },
             };
         }
     }
     return await wrapInResult(biller.createInvoice(invoiceCreateDetails));
 };
-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,
@@ -183,13 +196,15 @@ 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,
@@ -198,7 +213,7 @@ const getInvoiceCreateDetails = ({ invoiceId, payer, date, reservationDiscountId
             variant: vehicle.variant,
             year: vehicle.year,
             plan: plan,
-            mileagePackage: mileagePackage
+            mileagePackage: mileagePackage,
         },
         stripePaymentIntentId: paymentIntentId,
         providerMetadata: {
@@ -206,18 +221,14 @@ 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,
@@ -226,10 +237,11 @@ const getInvoiceCreateDetails = ({ invoiceId, payer, date, reservationDiscountId
             plan,
             mileagePackage,
             couponCode,
-            ...freeReservation && freeReservationReason ? {
-                freeReservationReason
-            } : {},
-            analytics
-        }
+            ...(freeReservation && freeReservationReason
+                ? { freeReservationReason }
+                : {}),
+            analytics,
+        },
     };
 };
+//# sourceMappingURL=invoice.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@driveflux/api-functions",
-  "version": "0.0.7-next.32",
+  "version": "0.0.7-next.34",
   "type": "module",
   "exports": {
     "./notion": {
@@ -73,9 +73,9 @@
   ],
   "dependencies": {
     "@casl/ability": "^6.7.3",
-    "@driveflux/auth": "3.0.0-next.18",
+    "@driveflux/auth": "3.0.0-next.19",
     "@driveflux/billing": "7.0.0-develop.42",
-    "@driveflux/config": "2.1.0-next.4",
+    "@driveflux/config": "2.1.0-next.5",
     "@driveflux/coupon": "8.0.0-develop.61",
     "@driveflux/db": "3.0.0-develop.74",
     "@driveflux/email": "6.0.0-develop.55",