@chevre/domain 21.34.0-alpha.15 → 21.34.0-alpha.16
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.
|
@@ -17,10 +17,10 @@ async function main() {
|
|
|
17
17
|
startDate: {
|
|
18
18
|
$lte: moment()
|
|
19
19
|
// tslint:disable-next-line:no-magic-numbers
|
|
20
|
-
.add(-
|
|
20
|
+
.add(-178, 'days'),
|
|
21
21
|
$gte: moment()
|
|
22
22
|
// tslint:disable-next-line:no-magic-numbers
|
|
23
|
-
.add(-
|
|
23
|
+
.add(-365, 'days')
|
|
24
24
|
},
|
|
25
25
|
'object.typeOf': { $exists: true, $eq: chevre.factory.service.paymentService.PaymentServiceType.MovieTicket }
|
|
26
26
|
},
|
|
@@ -91,24 +91,24 @@ async function main() {
|
|
|
91
91
|
// optimize payTransaction.object
|
|
92
92
|
let unsetResult: any;
|
|
93
93
|
if (secureTran2Result !== undefined) {
|
|
94
|
-
unsetResult = await assetTransactionRepo.unsetUnnecessaryFields({
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
});
|
|
94
|
+
// unsetResult = await assetTransactionRepo.unsetUnnecessaryFields({
|
|
95
|
+
// filter: { _id: { $eq: payTransaction.id } },
|
|
96
|
+
// $unset: {
|
|
97
|
+
// 'object.secureTran2Result': 1
|
|
98
|
+
// }
|
|
99
|
+
// });
|
|
100
100
|
updateCount += 1;
|
|
101
101
|
} else if (entryTranArgs !== undefined && execTranResult !== undefined) {
|
|
102
102
|
if (typeof (<any>execTranResult).redirectUrl !== 'string') {
|
|
103
|
-
unsetResult = await assetTransactionRepo.unsetUnnecessaryFields({
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
});
|
|
103
|
+
// unsetResult = await assetTransactionRepo.unsetUnnecessaryFields({
|
|
104
|
+
// filter: { _id: { $eq: payTransaction.id } },
|
|
105
|
+
// $unset: {
|
|
106
|
+
// 'object.entryTranArgs': 1,
|
|
107
|
+
// 'object.entryTranResult': 1,
|
|
108
|
+
// 'object.execTranArgs': 1,
|
|
109
|
+
// 'object.execTranResult': 1
|
|
110
|
+
// }
|
|
111
|
+
// });
|
|
112
112
|
updateCount += 1;
|
|
113
113
|
}
|
|
114
114
|
}
|
|
@@ -101,9 +101,6 @@ export declare class MongoRepository {
|
|
|
101
101
|
* タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
|
|
102
102
|
*/
|
|
103
103
|
startExportTasks<T extends factory.assetTransactionType>(params: {
|
|
104
|
-
project?: {
|
|
105
|
-
id: string;
|
|
106
|
-
};
|
|
107
104
|
typeOf?: {
|
|
108
105
|
$in: T[];
|
|
109
106
|
};
|
|
@@ -115,13 +112,6 @@ export declare class MongoRepository {
|
|
|
115
112
|
};
|
|
116
113
|
};
|
|
117
114
|
}): Promise<Pick<factory.assetTransaction.ITransaction<T>, 'id' | 'typeOf'> | null>;
|
|
118
|
-
/**
|
|
119
|
-
* タスクエクスポートリトライ
|
|
120
|
-
* @deprecated use reexportTasksByExportAction
|
|
121
|
-
*/
|
|
122
|
-
reexportTasksByExportationStatus(params: {
|
|
123
|
-
intervalInMinutes: number;
|
|
124
|
-
}): Promise<void>;
|
|
125
115
|
reexportTasksByExportAction(params: {
|
|
126
116
|
intervalInMinutes: number;
|
|
127
117
|
}): Promise<void>;
|
|
@@ -409,7 +409,7 @@ class MongoRepository {
|
|
|
409
409
|
* タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
|
|
410
410
|
*/
|
|
411
411
|
startExportTasks(params) {
|
|
412
|
-
var _a
|
|
412
|
+
var _a;
|
|
413
413
|
return __awaiter(this, void 0, void 0, function* () {
|
|
414
414
|
switch (params.status) {
|
|
415
415
|
case factory.transactionStatusType.InProgress:
|
|
@@ -418,7 +418,13 @@ class MongoRepository {
|
|
|
418
418
|
// no op
|
|
419
419
|
}
|
|
420
420
|
const typeOfIn = (_a = params.typeOf) === null || _a === void 0 ? void 0 : _a.$in;
|
|
421
|
-
return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign(
|
|
421
|
+
return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign({}, (Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined), { status: { $eq: params.status },
|
|
422
|
+
// remove dependency on tasksExportationStatus(2024-06-13~)
|
|
423
|
+
// tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported },
|
|
424
|
+
'tasksExportAction.actionStatus': {
|
|
425
|
+
$exists: true,
|
|
426
|
+
$eq: factory.actionStatusType.PotentialActionStatus
|
|
427
|
+
} }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), {
|
|
422
428
|
'tasksExportAction.actionStatus': factory.actionStatusType.ActiveActionStatus,
|
|
423
429
|
'tasksExportAction.agent': { name: params.tasksExportAction.agent.name },
|
|
424
430
|
'tasksExportAction.startDate': new Date(),
|
|
@@ -433,48 +439,6 @@ class MongoRepository {
|
|
|
433
439
|
.then((doc) => (doc === null) ? null : doc.toObject());
|
|
434
440
|
});
|
|
435
441
|
}
|
|
436
|
-
/**
|
|
437
|
-
* タスクエクスポートリトライ
|
|
438
|
-
* @deprecated use reexportTasksByExportAction
|
|
439
|
-
*/
|
|
440
|
-
reexportTasksByExportationStatus(params) {
|
|
441
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
442
|
-
const reexportingTransactions = yield this.transactionModel.find({
|
|
443
|
-
tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting },
|
|
444
|
-
updatedAt: {
|
|
445
|
-
$lt: moment()
|
|
446
|
-
.add(-params.intervalInMinutes, 'minutes')
|
|
447
|
-
.toDate()
|
|
448
|
-
}
|
|
449
|
-
})
|
|
450
|
-
.select({
|
|
451
|
-
_id: 1,
|
|
452
|
-
typeOf: 1,
|
|
453
|
-
status: 1
|
|
454
|
-
})
|
|
455
|
-
.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
|
|
456
|
-
.exec();
|
|
457
|
-
if (reexportingTransactions.length > 0) {
|
|
458
|
-
for (const reexportingTransaction of reexportingTransactions) {
|
|
459
|
-
yield this.transactionModel.updateOne({
|
|
460
|
-
_id: { $eq: reexportingTransaction.id },
|
|
461
|
-
tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
|
|
462
|
-
}, {
|
|
463
|
-
tasksExportAction: {
|
|
464
|
-
actionStatus: factory.actionStatusType.PotentialActionStatus
|
|
465
|
-
},
|
|
466
|
-
tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
|
|
467
|
-
})
|
|
468
|
-
.exec();
|
|
469
|
-
assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({
|
|
470
|
-
id: reexportingTransaction.id,
|
|
471
|
-
typeOf: reexportingTransaction.typeOf,
|
|
472
|
-
status: reexportingTransaction.status
|
|
473
|
-
});
|
|
474
|
-
}
|
|
475
|
-
}
|
|
476
|
-
});
|
|
477
|
-
}
|
|
478
442
|
reexportTasksByExportAction(params) {
|
|
479
443
|
return __awaiter(this, void 0, void 0, function* () {
|
|
480
444
|
const reexportingTransactions = yield this.transactionModel.find({
|
|
@@ -522,7 +486,12 @@ class MongoRepository {
|
|
|
522
486
|
return __awaiter(this, void 0, void 0, function* () {
|
|
523
487
|
const delayedTransactions = yield this.transactionModel.find({
|
|
524
488
|
status: { $in: params.status.$in },
|
|
525
|
-
|
|
489
|
+
// remove dependency on tasksExportationStatus(2024-06-13~)
|
|
490
|
+
// tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported },
|
|
491
|
+
'tasksExportAction.actionStatus': {
|
|
492
|
+
$exists: true,
|
|
493
|
+
$eq: factory.actionStatusType.PotentialActionStatus
|
|
494
|
+
},
|
|
526
495
|
endDate: {
|
|
527
496
|
$exists: true,
|
|
528
497
|
$lt: moment(params.now)
|
|
@@ -558,7 +527,12 @@ class MongoRepository {
|
|
|
558
527
|
const endDate = new Date();
|
|
559
528
|
yield this.transactionModel.updateOne({
|
|
560
529
|
_id: { $eq: params.id },
|
|
561
|
-
|
|
530
|
+
// remove dependency on tasksExportationStatus(2024-06-13~)
|
|
531
|
+
// tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
|
|
532
|
+
'tasksExportAction.actionStatus': {
|
|
533
|
+
$exists: true,
|
|
534
|
+
$eq: factory.actionStatusType.ActiveActionStatus
|
|
535
|
+
}
|
|
562
536
|
}, {
|
|
563
537
|
tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
|
|
564
538
|
tasksExportedAt: endDate,
|
package/package.json
CHANGED