@chevre/domain 25.2.0-alpha.24 → 25.2.0-alpha.25
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.
|
@@ -46,6 +46,7 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
|
|
|
46
46
|
const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
|
|
47
47
|
// const informReservations = settings.onReservationStatusChanged.informReservation;
|
|
48
48
|
const informReservations = setting?.onReservationStatusChanged?.informReservation;
|
|
49
|
+
const minimizeReservation = setting?.onReservationStatusChanged?.minimizeReservation === true;
|
|
49
50
|
let orderAsAbout;
|
|
50
51
|
if (Array.isArray(reserveAction.instrument)) {
|
|
51
52
|
for (const eachInstrument of reserveAction.instrument) {
|
|
@@ -98,16 +99,24 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
|
|
|
98
99
|
}
|
|
99
100
|
const subReservations4inform = confirmedReservations.map((r) => {
|
|
100
101
|
const { additionalProperty, additionalTicketText, id, modifiedTime, price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
|
|
102
|
+
let reservedTicket4inform;
|
|
103
|
+
if (minimizeReservation) {
|
|
104
|
+
const { ticketType: _ticketType, ...reservedTicketWithNoTicketType } = reservedTicket;
|
|
105
|
+
reservedTicket4inform = reservedTicketWithNoTicketType;
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
reservedTicket4inform = reservedTicket; // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
109
|
+
}
|
|
101
110
|
return {
|
|
102
111
|
id,
|
|
103
112
|
typeOf,
|
|
104
|
-
reservedTicket,
|
|
105
|
-
...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
|
|
113
|
+
reservedTicket: reservedTicket4inform,
|
|
106
114
|
...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
|
|
107
115
|
...(modifiedTime instanceof Date) ? { modifiedTime } : undefined,
|
|
108
|
-
...(
|
|
109
|
-
...(
|
|
110
|
-
...(
|
|
116
|
+
...(Array.isArray(subReservation)) ? { subReservation } : undefined,
|
|
117
|
+
...(!minimizeReservation && Array.isArray(additionalProperty)) ? { additionalProperty } : undefined, // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
118
|
+
...(!minimizeReservation && price !== undefined) ? { price } : undefined, // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
119
|
+
...(!minimizeReservation && programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined, // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
111
120
|
};
|
|
112
121
|
});
|
|
113
122
|
if (typeof issuedThrough.id !== 'string') {
|
|
@@ -116,7 +125,6 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
|
|
|
116
125
|
}
|
|
117
126
|
const informObject = {
|
|
118
127
|
bookingTime,
|
|
119
|
-
issuedThrough, // subReservationから移行(2024-03-20~)
|
|
120
128
|
project,
|
|
121
129
|
provider, // subReservationから移行(2024-03-20~)
|
|
122
130
|
reservationFor,
|
|
@@ -124,8 +132,9 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
|
|
|
124
132
|
reservationStatus: factory_1.factory.reservationStatusType.ReservationConfirmed,
|
|
125
133
|
subReservation: subReservations4inform,
|
|
126
134
|
typeOf: factory_1.factory.reservationType.ReservationPackage,
|
|
127
|
-
...(
|
|
128
|
-
|
|
135
|
+
...(!minimizeReservation) ? { issuedThrough } : undefined, // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
136
|
+
...(!minimizeReservation && typeof underName?.typeOf === 'string')
|
|
137
|
+
? { underName: (0, factory_2.optimizeUnderName4inform)({ underName }) } // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
129
138
|
: undefined
|
|
130
139
|
};
|
|
131
140
|
const informIdentifier = `${factory_1.factory.reservationType.ReservationPackage}:${informObject.reservationNumber}:${informObject.reservationStatus}`;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.deleteReservationsByPlaceOrder = deleteReservationsByPlaceOrder;
|
|
4
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
5
4
|
const factory_1 = require("../../../factory");
|
|
6
5
|
function deleteReservationsByPlaceOrder(params) {
|
|
7
6
|
return async (repos) => {
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@aws-sdk/client-cognito-identity-provider": "3.600.0",
|
|
13
13
|
"@aws-sdk/credential-providers": "3.600.0",
|
|
14
|
-
"@chevre/factory": "9.5.0-alpha.
|
|
14
|
+
"@chevre/factory": "9.5.0-alpha.8",
|
|
15
15
|
"@motionpicture/coa-service": "10.0.0",
|
|
16
16
|
"@motionpicture/gmo-service": "6.1.0-alpha.0",
|
|
17
17
|
"@sendgrid/client": "8.1.4",
|
|
@@ -91,5 +91,5 @@
|
|
|
91
91
|
"postversion": "git push origin --tags",
|
|
92
92
|
"prepublishOnly": "npm run clean && npm run build"
|
|
93
93
|
},
|
|
94
|
-
"version": "25.2.0-alpha.
|
|
94
|
+
"version": "25.2.0-alpha.25"
|
|
95
95
|
}
|