@chevre/domain 28.1.0-alpha.8 → 28.2.0-alpha.0
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/lib/chevre/repo/mongoose/schemas/setting.d.ts +5 -5
- package/lib/chevre/repo/mongoose/schemas/setting.js +14 -14
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.js +18 -13
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js +0 -10
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js +0 -10
- package/lib/chevre/service/order/sendOrder.js +0 -1
- package/package.json +2 -2
|
@@ -274,11 +274,6 @@ export interface ISetting {
|
|
|
274
274
|
userPoolIdOld?: string;
|
|
275
275
|
userPoolIdNew?: string;
|
|
276
276
|
waiter?: IWaiterSettings;
|
|
277
|
-
useMongoAsStockHolder?: boolean;
|
|
278
|
-
useMongoAsStockHolderProjects?: string[];
|
|
279
|
-
useMongo4confirmationNumberFrom?: Date;
|
|
280
|
-
useMongo4orderNumberFrom?: Date;
|
|
281
|
-
useMongo4transactionNumberFrom?: Date;
|
|
282
277
|
/**
|
|
283
278
|
* 外部連携設定
|
|
284
279
|
* 環境変数から移行(2026-05-23~)
|
|
@@ -286,6 +281,11 @@ export interface ISetting {
|
|
|
286
281
|
integration?: IIntegrationSettings;
|
|
287
282
|
rateLimit?: IRateLimitSetting;
|
|
288
283
|
member?: IMemberSetting;
|
|
284
|
+
useMongoAsStockHolder?: boolean;
|
|
285
|
+
useMongoAsStockHolderProjects?: string[];
|
|
286
|
+
useMongo4confirmationNumberFrom?: Date;
|
|
287
|
+
useMongo4orderNumberFrom?: Date;
|
|
288
|
+
useMongo4transactionNumberFrom?: Date;
|
|
289
289
|
}
|
|
290
290
|
type IDocType = ISetting;
|
|
291
291
|
type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
|
|
@@ -11,33 +11,33 @@ const schemaDefinition = {
|
|
|
11
11
|
defaultSenderEmail: String,
|
|
12
12
|
jwt: mongoose_1.SchemaTypes.Mixed,
|
|
13
13
|
project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
|
|
14
|
-
// discontinue(2026-11-02~)
|
|
15
|
-
...{
|
|
16
|
-
onEventChanged: mongoose_1.SchemaTypes.Mixed,
|
|
17
|
-
onOrderStatusChanged: mongoose_1.SchemaTypes.Mixed,
|
|
18
|
-
onReservationStatusChanged: mongoose_1.SchemaTypes.Mixed,
|
|
19
|
-
onTaskStatusChanged: mongoose_1.SchemaTypes.Mixed,
|
|
20
|
-
triggerWebhook: mongoose_1.SchemaTypes.Mixed,
|
|
21
|
-
},
|
|
22
|
-
// onResourceUpdated: SchemaTypes.Mixed, // discontinue(2026-11-02~)
|
|
23
|
-
// onTransactionStatusChanged: SchemaTypes.Mixed, // discontinue(2026-06-29~)
|
|
24
14
|
orderNumber: mongoose_1.SchemaTypes.Mixed,
|
|
25
15
|
quota: mongoose_1.SchemaTypes.Mixed,
|
|
26
|
-
// serviceOutputIdentifier: SchemaTypes.Mixed, // discontinue(2026-11-03~)
|
|
27
16
|
storage: mongoose_1.SchemaTypes.Mixed,
|
|
28
17
|
transactionNumber: mongoose_1.SchemaTypes.Mixed,
|
|
29
18
|
useInformResourceTypes: [String],
|
|
30
19
|
userPoolIdOld: String,
|
|
31
20
|
userPoolIdNew: String,
|
|
32
21
|
waiter: mongoose_1.SchemaTypes.Mixed,
|
|
22
|
+
integration: { type: mongoose_1.SchemaTypes.Mixed, required: false }, // 2026-05-23~
|
|
23
|
+
rateLimit: { type: mongoose_1.SchemaTypes.Mixed, required: false }, // 2026-06-30~
|
|
24
|
+
member: { type: mongoose_1.SchemaTypes.Mixed, required: false }, // 2026-07-01~
|
|
33
25
|
useMongoAsStockHolder: Boolean,
|
|
34
26
|
useMongoAsStockHolderProjects: [String],
|
|
35
27
|
useMongo4confirmationNumberFrom: { type: Date, required: false },
|
|
36
28
|
useMongo4orderNumberFrom: { type: Date, required: false },
|
|
37
29
|
useMongo4transactionNumberFrom: { type: Date, required: false },
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
30
|
+
// discontinue(2026-11-02~)
|
|
31
|
+
// ...{
|
|
32
|
+
// onEventChanged: SchemaTypes.Mixed,
|
|
33
|
+
// onOrderStatusChanged: SchemaTypes.Mixed,
|
|
34
|
+
// onReservationStatusChanged: SchemaTypes.Mixed,
|
|
35
|
+
// onTaskStatusChanged: SchemaTypes.Mixed,
|
|
36
|
+
// triggerWebhook: SchemaTypes.Mixed,
|
|
37
|
+
// },
|
|
38
|
+
// onResourceUpdated: SchemaTypes.Mixed, // discontinue(2026-11-02~)
|
|
39
|
+
// onTransactionStatusChanged: SchemaTypes.Mixed, // discontinue(2026-06-29~)
|
|
40
|
+
// serviceOutputIdentifier: SchemaTypes.Mixed, // discontinue(2026-11-03~)
|
|
41
41
|
};
|
|
42
42
|
const schemaOptions = {
|
|
43
43
|
autoIndex: settings_1.MONGO_AUTO_INDEX,
|
|
@@ -7,14 +7,29 @@ function creteOrder4inform(order) {
|
|
|
7
7
|
const { deliveredAcceptedOffers, project, typeOf, orderNumber } = order;
|
|
8
8
|
const acceptedOffers = deliveredAcceptedOffers.map((acceptedOffer) => {
|
|
9
9
|
if (acceptedOffer.offeredThrough?.identifier === factory_1.factory.service.webAPI.Identifier.COA) {
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
const { itemOffered, ...acceptedOfferWithtoutItemOffered } = acceptedOffer;
|
|
11
|
+
const { reservedTicket, ...itemOfferedWithoutReservedTicket } = itemOffered;
|
|
12
|
+
const { ticketType: _ticketType, ...reservedTicketwithoutTicketType } = reservedTicket;
|
|
13
|
+
const itemOffered4inform = {
|
|
14
|
+
...itemOfferedWithoutReservedTicket,
|
|
15
|
+
reservedTicket: reservedTicketwithoutTicketType, // discontinue ticketType(2026-11-10~)
|
|
16
|
+
};
|
|
17
|
+
// // COAでは最小化しない
|
|
18
|
+
// return acceptedOffer as factory.acceptedOffer.ICOAAcceptedOffer;
|
|
19
|
+
return {
|
|
20
|
+
...acceptedOfferWithtoutItemOffered,
|
|
21
|
+
itemOffered: itemOffered4inform
|
|
22
|
+
};
|
|
12
23
|
}
|
|
13
24
|
else {
|
|
14
25
|
const { itemOffered, ...acceptedOfferWithtoutItemOffered } = acceptedOffer;
|
|
15
26
|
const { reservationFor, issuedThrough: _issuedThrough, programMembershipUsed: _programMembershipUsed, ...itemOfferedWithoutReservationFor } = itemOffered;
|
|
27
|
+
const { reservedTicket, ...itemOfferedWithoutReservedTicket } = itemOfferedWithoutReservationFor;
|
|
28
|
+
const { ticketType: _ticketType, ...reservedTicketwithoutTicketType } = reservedTicket;
|
|
16
29
|
const itemOffered4inform = {
|
|
17
|
-
...itemOfferedWithoutReservationFor,
|
|
30
|
+
// ...itemOfferedWithoutReservationFor,
|
|
31
|
+
...itemOfferedWithoutReservedTicket,
|
|
32
|
+
reservedTicket: reservedTicketwithoutTicketType, // discontinue ticketType(2026-11-10~)
|
|
18
33
|
reservationFor: { id: reservationFor.id, typeOf: reservationFor.typeOf } // minimize reservationFor(2026-09-28~)
|
|
19
34
|
};
|
|
20
35
|
return {
|
|
@@ -81,19 +96,9 @@ setting) {
|
|
|
81
96
|
function createNextSendOrderTasks(params) {
|
|
82
97
|
const now = new Date();
|
|
83
98
|
const taskAttributes = [];
|
|
84
|
-
// const maskedCustomer = createMaskedCustomer({ customer: params.order.customer }, { noProfile: true });
|
|
85
99
|
const simpleOrder = {
|
|
86
100
|
typeOf: params.order.typeOf,
|
|
87
|
-
// seller: {
|
|
88
|
-
// id: params.order.seller.id,
|
|
89
|
-
// typeOf: params.order.seller.typeOf,
|
|
90
|
-
// name: params.order.seller.name
|
|
91
|
-
// }, // 廃止(2024-03-06~)
|
|
92
|
-
// mask
|
|
93
|
-
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
94
101
|
orderNumber: params.order.orderNumber,
|
|
95
|
-
// price: params.order.price,
|
|
96
|
-
// priceCurrency: params.order.priceCurrency,
|
|
97
102
|
orderDate: params.order.orderDate
|
|
98
103
|
};
|
|
99
104
|
const sendOrderObject = {
|
|
@@ -30,19 +30,9 @@ function onOrderInTransit(params) {
|
|
|
30
30
|
function createSendOrderTaskIfNotExist(params) {
|
|
31
31
|
return async (repos, settings) => {
|
|
32
32
|
const now = new Date();
|
|
33
|
-
// const maskedCustomer = createMaskedCustomer({ customer: params.order.customer }, { noProfile: true });
|
|
34
33
|
const simpleOrder = {
|
|
35
34
|
typeOf: params.order.typeOf,
|
|
36
|
-
// seller: {
|
|
37
|
-
// id: params.order.seller.id,
|
|
38
|
-
// typeOf: params.order.seller.typeOf,
|
|
39
|
-
// name: params.order.seller.name
|
|
40
|
-
// }, // 廃止(2024-03-06~)
|
|
41
|
-
// mask
|
|
42
|
-
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
43
35
|
orderNumber: params.order.orderNumber,
|
|
44
|
-
// price: params.order.price,
|
|
45
|
-
// priceCurrency: params.order.priceCurrency,
|
|
46
36
|
orderDate: params.order.orderDate
|
|
47
37
|
};
|
|
48
38
|
const sendOrderObject = {
|
|
@@ -10,7 +10,6 @@ exports.onOrderReturned = onOrderReturned;
|
|
|
10
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
11
|
const customerTelephone2COATelNum_1 = require("../../../factory/customerTelephone2COATelNum");
|
|
12
12
|
const factory_1 = require("../../../factory");
|
|
13
|
-
// import { createMaskedCustomer } from '../../../factory/order';
|
|
14
13
|
const factory_2 = require("./onOrderReturned/factory");
|
|
15
14
|
const debug = (0, debug_1.default)('chevre-domain:service:order');
|
|
16
15
|
function onOrderReturned(params) {
|
|
@@ -20,18 +19,9 @@ function onOrderReturned(params) {
|
|
|
20
19
|
const setting = await repos.integrationSetting.getByKey('agg');
|
|
21
20
|
debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
|
|
22
21
|
let tasks;
|
|
23
|
-
// const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
|
|
24
22
|
const simpleOrder = {
|
|
25
23
|
typeOf: params.order.typeOf,
|
|
26
|
-
// seller: {
|
|
27
|
-
// id: params.order.seller.id,
|
|
28
|
-
// typeOf: params.order.seller.typeOf,
|
|
29
|
-
// name: params.order.seller.name
|
|
30
|
-
// }, // 廃止(2024-03-06~)
|
|
31
|
-
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
32
24
|
orderNumber: params.order.orderNumber,
|
|
33
|
-
// price: params.order.price,
|
|
34
|
-
// priceCurrency: params.order.priceCurrency,
|
|
35
25
|
orderDate: params.order.orderDate
|
|
36
26
|
};
|
|
37
27
|
switch (params.order.orderStatus) {
|
|
@@ -40,7 +40,6 @@ function sendOrder(params) {
|
|
|
40
40
|
if (order.confirmationNumber !== confirmationNumber) {
|
|
41
41
|
throw new factory_1.factory.errors.NotFound('Order');
|
|
42
42
|
}
|
|
43
|
-
// const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
|
|
44
43
|
const simpleOrder = {
|
|
45
44
|
typeOf: order.typeOf,
|
|
46
45
|
orderNumber: order.orderNumber,
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@aws-sdk/client-cognito-identity-provider": "3.1090.0",
|
|
13
13
|
"@aws-sdk/credential-providers": "3.1090.0",
|
|
14
|
-
"@chevre/factory": "11.2.0-alpha.
|
|
14
|
+
"@chevre/factory": "11.2.0-alpha.2",
|
|
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",
|
|
@@ -89,5 +89,5 @@
|
|
|
89
89
|
"postversion": "git push origin --tags",
|
|
90
90
|
"prepublishOnly": "npm run clean && npm run build"
|
|
91
91
|
},
|
|
92
|
-
"version": "28.
|
|
92
|
+
"version": "28.2.0-alpha.0"
|
|
93
93
|
}
|