@driveflux/api-functions 1.0.43 → 1.0.44
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth/confirm.js +29 -24
- package/dist/auth/emails.js +13 -12
- package/dist/auth/formatter.js +5 -5
- package/dist/auth/otp.js +50 -66
- package/dist/auth/register.js +34 -42
- package/dist/auth/tokens.js +55 -58
- package/dist/auth/verifications.js +52 -53
- package/dist/constants.js +1 -0
- package/dist/create-logger.js +2 -1
- package/dist/mailjet/calls/manage-contacts-in-list.js +6 -5
- package/dist/mailjet/calls/manage-subscription-status.js +5 -4
- package/dist/mailjet/calls/request-service.js +6 -7
- package/dist/mailjet/refresh-email-preferences.js +12 -11
- package/dist/mailjet/set-contact.js +12 -11
- package/dist/mailjet/types.js +2 -1
- package/dist/mailjet/utils/convert-to-array.js +6 -8
- package/dist/mailjet/utils/extract-email-preferences.js +15 -14
- package/dist/mailjet/utils/lists.js +8 -7
- package/dist/mailjet/utils/update-email-references.js +15 -16
- package/dist/notion/client.js +19 -22
- package/dist/notion/helpful.js +9 -6
- package/dist/notion/schemas/block.js +48 -42
- package/dist/notion/schemas/common.js +14 -9
- package/dist/notion/schemas/database.js +60 -62
- package/dist/notion/schemas/emoji.js +2 -1
- package/dist/notion/schemas/file.js +9 -9
- package/dist/notion/schemas/kb.js +6 -5
- package/dist/notion/schemas/page.js +61 -72
- package/dist/notion/schemas/parent.js +5 -4
- package/dist/notion/schemas/user.js +19 -18
- package/dist/reservation/agree.js +7 -6
- package/dist/reservation/checks.js +4 -3
- package/dist/reservation/display-vehicle.js +71 -65
- package/dist/reservation/ensure-user-billing-address.js +11 -9
- package/dist/reservation/fetch-or-create.js +54 -48
- package/dist/reservation/invoice.js +78 -70
- package/dist/reservation/payer.js +6 -5
- package/dist/reservation/payment-intent-sync.js +6 -4
- package/dist/reservation/reserve.js +4 -3
- package/dist/reservation/types.js +2 -1
- package/dist/reservation/vehicle.js +16 -13
- package/dist/slack.js +29 -24
- package/dist/validation.js +79 -77
- package/dist/vehicle/vehicle-pricing/constants.js +19 -22
- package/dist/vehicle/vehicle-pricing/index.js +42 -28
- package/dist/vehicle/vehicle-pricing/types.js +2 -1
- package/package.json +2 -2
|
@@ -1,75 +1,73 @@
|
|
|
1
1
|
import { config } from '@driveflux/config/backend';
|
|
2
|
-
import { prisma } from '@driveflux/db';
|
|
2
|
+
import { prisma, } from '@driveflux/db';
|
|
3
3
|
import { generateId } from '@driveflux/db/id';
|
|
4
4
|
import { createPricingController } from '@driveflux/db/models/vehicle';
|
|
5
|
-
import { getFluxExcessMileage, getFluxPiceMatrix, getHostExcessMileage, getHostsMatrix, getRecommendedMotorcycleDeposit, getStartFeeMatrix } from '../vehicle/vehicle-pricing/index.js';
|
|
6
|
-
export const fetchDisplayVehicle = async (displayVehicle)=>{
|
|
7
|
-
return typeof displayVehicle === 'string'
|
|
8
|
-
where: {
|
|
9
|
-
|
|
10
|
-
}
|
|
11
|
-
}) : displayVehicle;
|
|
5
|
+
import { getFluxExcessMileage, getFluxPiceMatrix, getHostExcessMileage, getHostsMatrix, getRecommendedMotorcycleDeposit, getStartFeeMatrix, } from '../vehicle/vehicle-pricing/index.js';
|
|
6
|
+
export const fetchDisplayVehicle = async (displayVehicle) => {
|
|
7
|
+
return typeof displayVehicle === 'string'
|
|
8
|
+
? await prisma.displayVehicle.findFirst({ where: { id: displayVehicle } })
|
|
9
|
+
: displayVehicle;
|
|
12
10
|
};
|
|
13
|
-
export const createVehicleFromDisplayVehicle = async (displayVehicle, selectedColor)=>{
|
|
11
|
+
export const createVehicleFromDisplayVehicle = async (displayVehicle, selectedColor) => {
|
|
14
12
|
const dv = await fetchDisplayVehicle(displayVehicle);
|
|
15
|
-
if (!dv || typeof dv !== 'object')
|
|
16
|
-
|
|
17
|
-
|
|
13
|
+
if (!dv || typeof dv !== 'object')
|
|
14
|
+
return;
|
|
15
|
+
if (!dv.details)
|
|
16
|
+
return;
|
|
17
|
+
const mainImage = dv.images.main.find((m) => m.variant === selectedColor)?.url;
|
|
18
18
|
const vehicleData = {
|
|
19
19
|
id: generateId('Vehicle'),
|
|
20
20
|
...transformBasicVehicleData(dv),
|
|
21
21
|
images: [
|
|
22
|
-
...mainImage ? [
|
|
23
|
-
|
|
24
|
-
] : [],
|
|
25
|
-
...transformImages(dv.images)
|
|
22
|
+
...(mainImage ? [transfromSingleImage(mainImage)] : []),
|
|
23
|
+
...transformImages(dv.images),
|
|
26
24
|
],
|
|
27
25
|
...transformBasePrices(dv.pricing),
|
|
28
26
|
pricing: transformPriceMatrix(dv.type, dv.pricing),
|
|
29
27
|
details: transformDetails(dv.details, selectedColor),
|
|
30
28
|
host: {
|
|
31
29
|
connect: {
|
|
32
|
-
id: dv.defaultHostId
|
|
33
|
-
}
|
|
30
|
+
id: dv.defaultHostId,
|
|
31
|
+
},
|
|
34
32
|
},
|
|
35
33
|
displayVehicle: {
|
|
36
34
|
connect: {
|
|
37
|
-
id: dv.id
|
|
38
|
-
}
|
|
39
|
-
}
|
|
35
|
+
id: dv.id,
|
|
36
|
+
},
|
|
37
|
+
},
|
|
40
38
|
};
|
|
41
39
|
return await prisma.vehicle.create({
|
|
42
40
|
data: vehicleData,
|
|
43
41
|
include: {
|
|
44
|
-
host: true
|
|
45
|
-
}
|
|
42
|
+
host: true,
|
|
43
|
+
},
|
|
46
44
|
});
|
|
47
45
|
};
|
|
48
|
-
export const transfromVehicleDisplayToVehicle = async (displayVehicle, selectedColor)=>{
|
|
46
|
+
export const transfromVehicleDisplayToVehicle = async (displayVehicle, selectedColor) => {
|
|
49
47
|
const dv = await fetchDisplayVehicle(displayVehicle);
|
|
50
|
-
if (!dv || typeof dv !== 'object')
|
|
51
|
-
|
|
52
|
-
|
|
48
|
+
if (!dv || typeof dv !== 'object')
|
|
49
|
+
return;
|
|
50
|
+
if (!dv.details)
|
|
51
|
+
return;
|
|
52
|
+
const mainImage = dv.images.main.find((m) => m.variant === selectedColor)?.url;
|
|
53
53
|
return {
|
|
54
54
|
id: dv.id,
|
|
55
55
|
...transformBasicVehicleData(dv),
|
|
56
56
|
images: [
|
|
57
|
-
...mainImage ? [
|
|
58
|
-
|
|
59
|
-
] : [],
|
|
60
|
-
...transformImages(dv.images)
|
|
57
|
+
...(mainImage ? [transfromSingleImage(mainImage)] : []),
|
|
58
|
+
...transformImages(dv.images),
|
|
61
59
|
],
|
|
62
60
|
...transformBasePrices(dv.pricing),
|
|
63
61
|
pricing: transformPriceMatrix(dv.type, dv.pricing),
|
|
64
62
|
details: transformDetails(dv.details, selectedColor),
|
|
65
63
|
host: {
|
|
66
64
|
address: {
|
|
67
|
-
state: 'Kuala Lumpur'
|
|
68
|
-
}
|
|
69
|
-
}
|
|
65
|
+
state: 'Kuala Lumpur',
|
|
66
|
+
},
|
|
67
|
+
},
|
|
70
68
|
};
|
|
71
69
|
};
|
|
72
|
-
export const transformBasicVehicleData = (dv)=>{
|
|
70
|
+
export const transformBasicVehicleData = (dv) => {
|
|
73
71
|
return {
|
|
74
72
|
registrationNumber: null,
|
|
75
73
|
featured: false,
|
|
@@ -87,17 +85,17 @@ export const transformBasicVehicleData = (dv)=>{
|
|
|
87
85
|
type: dv.type,
|
|
88
86
|
niceName: `${dv.make} ${dv.vehicleModel} ${dv.variant} ${dv.year}`,
|
|
89
87
|
niceNameShort: `${dv.make} ${dv.vehicleModel}`,
|
|
90
|
-
appliedCoupon: dv.appliedCoupon
|
|
88
|
+
appliedCoupon: dv.appliedCoupon,
|
|
91
89
|
};
|
|
92
90
|
};
|
|
93
|
-
export const transformImages = (images)=>{
|
|
91
|
+
export const transformImages = (images) => {
|
|
94
92
|
return [
|
|
95
93
|
transfromSingleImage(images.exterior[0].url, 'exterior'),
|
|
96
94
|
transfromSingleImage(images.interior[0].url, 'interior'),
|
|
97
|
-
...images.gallery.map((i)=>transfromSingleImage(i.url))
|
|
95
|
+
...images.gallery.map((i) => transfromSingleImage(i.url)),
|
|
98
96
|
];
|
|
99
97
|
};
|
|
100
|
-
const transfromSingleImage = (imageUrl, inspectionType)=>{
|
|
98
|
+
const transfromSingleImage = (imageUrl, inspectionType) => {
|
|
101
99
|
return {
|
|
102
100
|
default: imageUrl,
|
|
103
101
|
blurBase64: null,
|
|
@@ -108,20 +106,20 @@ const transfromSingleImage = (imageUrl, inspectionType)=>{
|
|
|
108
106
|
description: null,
|
|
109
107
|
inspection: !!inspectionType,
|
|
110
108
|
inspectionType: inspectionType || null,
|
|
111
|
-
notActualPhoto: true
|
|
109
|
+
notActualPhoto: true,
|
|
112
110
|
};
|
|
113
111
|
};
|
|
114
|
-
const transformBasePrices = (pricing)=>{
|
|
112
|
+
const transformBasePrices = (pricing) => {
|
|
115
113
|
return {
|
|
116
114
|
basePrice: pricing.matrix.plan36.lite,
|
|
117
115
|
basePricePlan1: pricing.matrix.plan1.lite,
|
|
118
116
|
basePricePlan12: pricing.matrix.plan12.lite,
|
|
119
117
|
basePricePlan24: pricing.matrix.plan24.lite,
|
|
120
118
|
basePricePlan36: pricing.matrix.plan36.lite,
|
|
121
|
-
basePricePlan60: pricing.matrix.plan60.lite
|
|
119
|
+
basePricePlan60: pricing.matrix.plan60.lite,
|
|
122
120
|
};
|
|
123
121
|
};
|
|
124
|
-
const transformPriceMatrix = (vehicleType, pricing)=>{
|
|
122
|
+
const transformPriceMatrix = (vehicleType, pricing) => {
|
|
125
123
|
const baseline = pricing?.matrix.plan36.lite;
|
|
126
124
|
const ultraTier = 'tier1';
|
|
127
125
|
const fluxPriceCoefficient = 25;
|
|
@@ -134,14 +132,16 @@ const transformPriceMatrix = (vehicleType, pricing)=>{
|
|
|
134
132
|
const { availablePlans, availableMileagePackages } = getNonZeroKeys(priceMatrix);
|
|
135
133
|
const pricingController = createPricingController({
|
|
136
134
|
coefficient: fluxPriceCoefficient,
|
|
137
|
-
vehicleType
|
|
135
|
+
vehicleType,
|
|
138
136
|
});
|
|
139
137
|
const startFeeMatrix = excludeServiceFeesFrom(getStartFeeMatrix(pricingController, baseline, flatPricing));
|
|
140
138
|
const hostMatrix = excludeServiceFeesFrom(getHostsMatrix(pricingController, baseline, ultraTier, flatPricing));
|
|
141
139
|
const hostExcessMileage = getHostExcessMileage(pricingController, baseline);
|
|
142
140
|
const fluxPriceMatrix = excludeServiceFeesFrom(getFluxPiceMatrix(pricingController, vehicleType, baseline, hostMatrix, ultraTier, flatPricing));
|
|
143
141
|
const fluxExcessMileage = getFluxExcessMileage(pricingController, baseline);
|
|
144
|
-
const recommendedDeposit = pricing.refundableDeposit || vehicleType === 'motorcycle'
|
|
142
|
+
const recommendedDeposit = pricing.refundableDeposit || vehicleType === 'motorcycle'
|
|
143
|
+
? getRecommendedMotorcycleDeposit(baseline)
|
|
144
|
+
: null;
|
|
145
145
|
return {
|
|
146
146
|
tmv,
|
|
147
147
|
gfv,
|
|
@@ -160,31 +160,31 @@ const transformPriceMatrix = (vehicleType, pricing)=>{
|
|
|
160
160
|
excessMileage: fluxExcessMileage,
|
|
161
161
|
originalExcessMileage: fluxExcessMileage,
|
|
162
162
|
matrixComments: null,
|
|
163
|
-
add: null
|
|
163
|
+
add: null,
|
|
164
164
|
},
|
|
165
165
|
hostTake: {
|
|
166
166
|
matrix: hostMatrix,
|
|
167
167
|
originalMatrix: hostMatrix,
|
|
168
168
|
excessMileage: hostExcessMileage,
|
|
169
169
|
originalExcessMileage: hostExcessMileage,
|
|
170
|
-
matrixComments: null
|
|
170
|
+
matrixComments: null,
|
|
171
171
|
},
|
|
172
172
|
startFee: {
|
|
173
173
|
matrix: startFeeMatrix,
|
|
174
174
|
originalMatrix: startFeeMatrix,
|
|
175
|
-
matrixComments: null
|
|
176
|
-
}
|
|
175
|
+
matrixComments: null,
|
|
176
|
+
},
|
|
177
177
|
};
|
|
178
178
|
};
|
|
179
|
-
const getNonZeroKeys = (matrix)=>{
|
|
179
|
+
const getNonZeroKeys = (matrix) => {
|
|
180
180
|
const planKeys = new Set();
|
|
181
181
|
const mileageKeys = new Set();
|
|
182
|
-
for (const [plan, mileageMap] of Object.entries(matrix)){
|
|
182
|
+
for (const [plan, mileageMap] of Object.entries(matrix)) {
|
|
183
183
|
const entries = Object.entries(mileageMap ?? {});
|
|
184
|
-
const hasNonZero = entries.some(([_, value])=>(value ?? 0) > 0);
|
|
184
|
+
const hasNonZero = entries.some(([_, value]) => (value ?? 0) > 0);
|
|
185
185
|
if (hasNonZero) {
|
|
186
186
|
planKeys.add(plan);
|
|
187
|
-
for (const [mileage, value] of entries){
|
|
187
|
+
for (const [mileage, value] of entries) {
|
|
188
188
|
if ((value ?? 0) > 0) {
|
|
189
189
|
mileageKeys.add(mileage);
|
|
190
190
|
}
|
|
@@ -193,20 +193,20 @@ const getNonZeroKeys = (matrix)=>{
|
|
|
193
193
|
}
|
|
194
194
|
return {
|
|
195
195
|
availablePlans: Array.from(planKeys),
|
|
196
|
-
availableMileagePackages: Array.from(mileageKeys)
|
|
196
|
+
availableMileagePackages: Array.from(mileageKeys),
|
|
197
197
|
};
|
|
198
198
|
};
|
|
199
|
-
const _getInspection = ()=>{
|
|
199
|
+
const _getInspection = () => {
|
|
200
200
|
return {
|
|
201
201
|
exterior: 5,
|
|
202
202
|
interior: 5,
|
|
203
203
|
engine: 5,
|
|
204
204
|
frame: 5,
|
|
205
205
|
total: 5,
|
|
206
|
-
comment: 'COMMENT HERE'
|
|
206
|
+
comment: 'COMMENT HERE',
|
|
207
207
|
};
|
|
208
208
|
};
|
|
209
|
-
const transformDetails = (details, selectColor)=>{
|
|
209
|
+
const transformDetails = (details, selectColor) => {
|
|
210
210
|
const color = selectColor || details.colors[0].name || '';
|
|
211
211
|
return {
|
|
212
212
|
numberOfSeats: details.numberOfSeats,
|
|
@@ -214,25 +214,31 @@ const transformDetails = (details, selectColor)=>{
|
|
|
214
214
|
bodyType: details.bodyType,
|
|
215
215
|
transmission: details.transmission,
|
|
216
216
|
engineType: details.fuelType,
|
|
217
|
-
engineCapacity: details.fuelType === 'electric'
|
|
217
|
+
engineCapacity: details.fuelType === 'electric'
|
|
218
|
+
? details.batteryCapacity
|
|
219
|
+
: details.engineCapacity,
|
|
218
220
|
drivetrain: details.drivetrain,
|
|
219
221
|
accelerationTo100km: details.accelerationTo100km,
|
|
220
222
|
fuelConsumptionLitersPer100Km: details.fuelConsumptionLitersPer100Km,
|
|
221
223
|
color,
|
|
222
224
|
features: details.features,
|
|
223
|
-
condition: 'new'
|
|
225
|
+
condition: 'new',
|
|
224
226
|
};
|
|
225
227
|
};
|
|
226
|
-
const excludeServiceFeesFrom = (originalMatrix)=>{
|
|
228
|
+
const excludeServiceFeesFrom = (originalMatrix) => {
|
|
227
229
|
const matrix = {};
|
|
228
|
-
for (const [planKey, planValue] of Object.entries(originalMatrix)){
|
|
229
|
-
if (!planValue)
|
|
230
|
-
|
|
231
|
-
|
|
230
|
+
for (const [planKey, planValue] of Object.entries(originalMatrix)) {
|
|
231
|
+
if (!planValue)
|
|
232
|
+
continue;
|
|
233
|
+
if (!matrix[planKey])
|
|
234
|
+
matrix[planKey] = {};
|
|
235
|
+
for (const [mileageKey, price] of Object.entries(planValue)) {
|
|
232
236
|
if (typeof price === 'number') {
|
|
233
|
-
matrix[planKey][mileageKey] =
|
|
237
|
+
matrix[planKey][mileageKey] =
|
|
238
|
+
price / (1 + config.serviceRate);
|
|
234
239
|
}
|
|
235
240
|
}
|
|
236
241
|
}
|
|
237
242
|
return matrix;
|
|
238
243
|
};
|
|
244
|
+
//# sourceMappingURL=display-vehicle.js.map
|
|
@@ -3,27 +3,29 @@ import { makeProblem, PROBLEM_INTERNAL } from '@driveflux/problem';
|
|
|
3
3
|
import { Err, Ok } from '@driveflux/result';
|
|
4
4
|
import { createScopedLogger } from '../create-logger.js';
|
|
5
5
|
const log = createScopedLogger('reservation:ensure-user-billing-address');
|
|
6
|
-
export const ensureUserBillingAddress = async (userOrBusiness, deliveryAddresses)=>{
|
|
6
|
+
export const ensureUserBillingAddress = async (userOrBusiness, deliveryAddresses) => {
|
|
7
7
|
if (userOrBusiness.addresses?.billing) {
|
|
8
8
|
return new Ok(userOrBusiness);
|
|
9
9
|
}
|
|
10
10
|
try {
|
|
11
11
|
const fullQuery = {
|
|
12
|
-
where: {
|
|
13
|
-
id: userOrBusiness.id
|
|
14
|
-
},
|
|
12
|
+
where: { id: userOrBusiness.id },
|
|
15
13
|
data: {
|
|
16
14
|
addresses: {
|
|
17
15
|
home: deliveryAddresses.home,
|
|
18
|
-
billing: deliveryAddresses.billing
|
|
19
|
-
}
|
|
20
|
-
}
|
|
16
|
+
billing: deliveryAddresses.billing,
|
|
17
|
+
},
|
|
18
|
+
},
|
|
21
19
|
};
|
|
22
20
|
// Use the delivery addresses
|
|
23
|
-
const updatedUserOrBusiness = userOrBusiness.object === 'user'
|
|
21
|
+
const updatedUserOrBusiness = userOrBusiness.object === 'user'
|
|
22
|
+
? await prisma.user.update(fullQuery)
|
|
23
|
+
: await prisma.business.update(fullQuery);
|
|
24
24
|
return new Ok(updatedUserOrBusiness);
|
|
25
|
-
}
|
|
25
|
+
}
|
|
26
|
+
catch (error) {
|
|
26
27
|
log.error(error, 'Failed to ensure user billing address');
|
|
27
28
|
return new Err(makeProblem(PROBLEM_INTERNAL, 'Failed to ensure user billing address'));
|
|
28
29
|
}
|
|
29
30
|
};
|
|
31
|
+
//# sourceMappingURL=ensure-user-billing-address.js.map
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { prisma } from '@driveflux/db';
|
|
1
|
+
import { prisma, } from '@driveflux/db';
|
|
2
2
|
import { generateId } from '@driveflux/db/id';
|
|
3
3
|
import { reportError } from '@driveflux/reporter';
|
|
4
4
|
import { Ok } from '@driveflux/result';
|
|
5
5
|
import { slackLater } from '../slack.js';
|
|
6
|
-
import { createReservationInvoice, updateReservationInvoiceIfNeeded } from './invoice.js';
|
|
7
|
-
export const fetchOrCreateReservation = async ({ vehicle, payer, body })=>{
|
|
8
|
-
const { subscribingUser, plan, mileagePackage, couponCode, referralCode, asBusiness, source, deliveryAddresses, deliveryDate, analytics, paymentIntentId, freeReservation, freeReservationReason } = body;
|
|
6
|
+
import { createReservationInvoice, updateReservationInvoiceIfNeeded, } from './invoice.js';
|
|
7
|
+
export const fetchOrCreateReservation = async ({ vehicle, payer, body, }) => {
|
|
8
|
+
const { subscribingUser, plan, mileagePackage, couponCode, referralCode, asBusiness, source, deliveryAddresses, deliveryDate, analytics, paymentIntentId, freeReservation, freeReservationReason, } = body;
|
|
9
9
|
try {
|
|
10
10
|
const previousReservation = await prisma.subscriptionReservation.findFirst({
|
|
11
11
|
where: {
|
|
@@ -19,14 +19,14 @@ export const fetchOrCreateReservation = async ({ vehicle, payer, body })=>{
|
|
|
19
19
|
source,
|
|
20
20
|
// If the subscription ID was populated, this means that this reservation was consumed into a subsription,
|
|
21
21
|
// so we shouldn't re-use it
|
|
22
|
-
subscription: null
|
|
22
|
+
subscription: null,
|
|
23
23
|
},
|
|
24
24
|
orderBy: {
|
|
25
|
-
updatedAt: 'desc'
|
|
25
|
+
updatedAt: 'desc',
|
|
26
26
|
},
|
|
27
27
|
include: {
|
|
28
|
-
invoice: true
|
|
29
|
-
}
|
|
28
|
+
invoice: true,
|
|
29
|
+
},
|
|
30
30
|
});
|
|
31
31
|
if (previousReservation) {
|
|
32
32
|
if (previousReservation.invoice.voided) {
|
|
@@ -39,7 +39,7 @@ export const fetchOrCreateReservation = async ({ vehicle, payer, body })=>{
|
|
|
39
39
|
'partiallyPaid',
|
|
40
40
|
'partiallyRefunded',
|
|
41
41
|
'refunded',
|
|
42
|
-
'pendingRefund'
|
|
42
|
+
'pendingRefund',
|
|
43
43
|
];
|
|
44
44
|
if (wrongStatuses.includes(previousReservation.invoice.status)) {
|
|
45
45
|
const updatedReservation = await recreateReservationInvoiceAndUpdateReservation(previousReservation, body, vehicle, payer);
|
|
@@ -52,16 +52,16 @@ export const fetchOrCreateReservation = async ({ vehicle, payer, body })=>{
|
|
|
52
52
|
text: {
|
|
53
53
|
type: 'plain_text',
|
|
54
54
|
text: '‼️ Reservation invoice in wrong status',
|
|
55
|
-
emoji: true
|
|
56
|
-
}
|
|
55
|
+
emoji: true,
|
|
56
|
+
},
|
|
57
57
|
},
|
|
58
58
|
{
|
|
59
59
|
type: 'section',
|
|
60
60
|
text: {
|
|
61
61
|
type: 'plain_text',
|
|
62
|
-
text: `The reservation invoice ${previousReservation.invoice.id} was in a wrong status (${previousReservation.invoice.status}), it was discarded and a new invoice (${updatedReservation.val.id}) was created, however, investigate the issue
|
|
63
|
-
}
|
|
64
|
-
}
|
|
62
|
+
text: `The reservation invoice ${previousReservation.invoice.id} was in a wrong status (${previousReservation.invoice.status}), it was discarded and a new invoice (${updatedReservation.val.id}) was created, however, investigate the issue.`,
|
|
63
|
+
},
|
|
64
|
+
},
|
|
65
65
|
]);
|
|
66
66
|
return updatedReservation;
|
|
67
67
|
}
|
|
@@ -73,7 +73,8 @@ export const fetchOrCreateReservation = async ({ vehicle, payer, body })=>{
|
|
|
73
73
|
// Otherwise, we need to create a new reservation
|
|
74
74
|
return new Ok(previousReservation);
|
|
75
75
|
}
|
|
76
|
-
}
|
|
76
|
+
}
|
|
77
|
+
catch (error) {
|
|
77
78
|
// We couldn't fetch the reservation, so we create a new one and just log this
|
|
78
79
|
await reportError(error);
|
|
79
80
|
}
|
|
@@ -92,7 +93,7 @@ export const fetchOrCreateReservation = async ({ vehicle, payer, body })=>{
|
|
|
92
93
|
analytics,
|
|
93
94
|
vehicle,
|
|
94
95
|
payer,
|
|
95
|
-
subscribingUser
|
|
96
|
+
subscribingUser,
|
|
96
97
|
});
|
|
97
98
|
if (invoiceResult.err) {
|
|
98
99
|
return invoiceResult;
|
|
@@ -111,66 +112,70 @@ export const fetchOrCreateReservation = async ({ vehicle, payer, body })=>{
|
|
|
111
112
|
deliveryAddresses,
|
|
112
113
|
deliveryDate,
|
|
113
114
|
asBusiness,
|
|
114
|
-
source
|
|
115
|
+
source,
|
|
115
116
|
});
|
|
116
117
|
return new Ok(reservation);
|
|
117
118
|
};
|
|
118
|
-
const createReservation = async ({ reservationId, invoiceId, subscribingUserId, vehicleId, businessId, plan, mileagePackage, couponCode, referralCode, analytics, deliveryAddresses, deliveryDate, asBusiness, source })=>{
|
|
119
|
+
const createReservation = async ({ reservationId, invoiceId, subscribingUserId, vehicleId, businessId, plan, mileagePackage, couponCode, referralCode, analytics, deliveryAddresses, deliveryDate, asBusiness, source, }) => {
|
|
119
120
|
return await prisma.subscriptionReservation.create({
|
|
120
121
|
data: {
|
|
121
122
|
id: reservationId,
|
|
122
123
|
invoice: {
|
|
123
124
|
connect: {
|
|
124
|
-
id: invoiceId
|
|
125
|
-
}
|
|
125
|
+
id: invoiceId,
|
|
126
|
+
},
|
|
126
127
|
},
|
|
127
128
|
user: {
|
|
128
129
|
connect: {
|
|
129
|
-
id: subscribingUserId
|
|
130
|
-
}
|
|
130
|
+
id: subscribingUserId,
|
|
131
|
+
},
|
|
131
132
|
},
|
|
132
133
|
vehicle: {
|
|
133
134
|
connect: {
|
|
134
|
-
id: vehicleId
|
|
135
|
-
}
|
|
135
|
+
id: vehicleId,
|
|
136
|
+
},
|
|
136
137
|
},
|
|
137
|
-
...businessId
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
138
|
+
...(businessId
|
|
139
|
+
? {
|
|
140
|
+
business: {
|
|
141
|
+
connect: {
|
|
142
|
+
id: businessId,
|
|
143
|
+
},
|
|
144
|
+
},
|
|
142
145
|
}
|
|
143
|
-
|
|
146
|
+
: undefined),
|
|
144
147
|
plan,
|
|
145
148
|
mileagePackage,
|
|
146
149
|
couponCode: couponCode,
|
|
147
150
|
deliveryAddresses: deliveryAddresses,
|
|
148
151
|
deliveryDate: deliveryDate,
|
|
149
|
-
...referralCode
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
152
|
+
...(referralCode
|
|
153
|
+
? {
|
|
154
|
+
referral: {
|
|
155
|
+
connect: {
|
|
156
|
+
id: referralCode,
|
|
157
|
+
},
|
|
158
|
+
},
|
|
154
159
|
}
|
|
155
|
-
|
|
160
|
+
: undefined),
|
|
156
161
|
asBusiness: !!asBusiness,
|
|
157
162
|
source,
|
|
158
163
|
metadata: {
|
|
159
|
-
analytics
|
|
160
|
-
}
|
|
164
|
+
analytics,
|
|
165
|
+
},
|
|
161
166
|
},
|
|
162
167
|
include: {
|
|
163
|
-
invoice: true
|
|
164
|
-
}
|
|
168
|
+
invoice: true,
|
|
169
|
+
},
|
|
165
170
|
});
|
|
166
171
|
};
|
|
167
|
-
const recreateReservationInvoiceAndUpdateReservation = async (previousReservation, body, vehicle, payer)=>{
|
|
172
|
+
const recreateReservationInvoiceAndUpdateReservation = async (previousReservation, body, vehicle, payer) => {
|
|
168
173
|
const invoiceResult = await createReservationInvoice({
|
|
169
174
|
...body,
|
|
170
175
|
invoiceId: generateId('Invoice'),
|
|
171
176
|
reservationId: previousReservation.id,
|
|
172
177
|
vehicle,
|
|
173
|
-
payer
|
|
178
|
+
payer,
|
|
174
179
|
});
|
|
175
180
|
if (!invoiceResult.ok) {
|
|
176
181
|
return invoiceResult;
|
|
@@ -178,18 +183,19 @@ const recreateReservationInvoiceAndUpdateReservation = async (previousReservatio
|
|
|
178
183
|
const invoice = invoiceResult.val;
|
|
179
184
|
const updatedReservation = await prisma.subscriptionReservation.update({
|
|
180
185
|
where: {
|
|
181
|
-
id: previousReservation.id
|
|
186
|
+
id: previousReservation.id,
|
|
182
187
|
},
|
|
183
188
|
data: {
|
|
184
189
|
invoice: {
|
|
185
190
|
connect: {
|
|
186
|
-
id: invoice.id
|
|
187
|
-
}
|
|
188
|
-
}
|
|
191
|
+
id: invoice.id,
|
|
192
|
+
},
|
|
193
|
+
},
|
|
189
194
|
},
|
|
190
195
|
include: {
|
|
191
|
-
invoice: true
|
|
192
|
-
}
|
|
196
|
+
invoice: true,
|
|
197
|
+
},
|
|
193
198
|
});
|
|
194
199
|
return new Ok(updatedReservation);
|
|
195
200
|
};
|
|
201
|
+
//# sourceMappingURL=fetch-or-create.js.map
|