@chevre/domain 21.2.0-alpha.23 → 21.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.
- package/lib/chevre/repo/mongoose/schemas/transaction.d.ts +3 -0
- package/lib/chevre/repo/mongoose/schemas/transaction.js +1 -0
- package/lib/chevre/repo/transaction.d.ts +5 -0
- package/lib/chevre/repo/transaction.js +10 -2
- package/lib/chevre/service/transaction.d.ts +5 -0
- package/lib/chevre/service/transaction.js +9 -1
- package/package.json +1 -1
|
@@ -67,6 +67,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
|
|
|
67
67
|
tasksExportationStatus?: string | undefined;
|
|
68
68
|
tasksExportedAt?: Date | undefined;
|
|
69
69
|
seller?: any;
|
|
70
|
+
tasksExportAction?: any;
|
|
70
71
|
}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
|
|
71
72
|
object?: any;
|
|
72
73
|
typeOf?: string | undefined;
|
|
@@ -83,6 +84,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
|
|
|
83
84
|
tasksExportationStatus?: string | undefined;
|
|
84
85
|
tasksExportedAt?: Date | undefined;
|
|
85
86
|
seller?: any;
|
|
87
|
+
tasksExportAction?: any;
|
|
86
88
|
}>> & Omit<import("mongoose").FlatRecord<{
|
|
87
89
|
object?: any;
|
|
88
90
|
typeOf?: string | undefined;
|
|
@@ -99,6 +101,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
|
|
|
99
101
|
tasksExportationStatus?: string | undefined;
|
|
100
102
|
tasksExportedAt?: Date | undefined;
|
|
101
103
|
seller?: any;
|
|
104
|
+
tasksExportAction?: any;
|
|
102
105
|
}> & {
|
|
103
106
|
_id: import("mongoose").Types.ObjectId;
|
|
104
107
|
}, never>>;
|
|
@@ -112,6 +112,11 @@ export declare class MongoRepository {
|
|
|
112
112
|
};
|
|
113
113
|
status: factory.transactionStatusType;
|
|
114
114
|
id?: string;
|
|
115
|
+
tasksExportAction: {
|
|
116
|
+
agent: {
|
|
117
|
+
name: string;
|
|
118
|
+
};
|
|
119
|
+
};
|
|
115
120
|
}): Promise<Pick<factory.transaction.ITransaction<T>, 'id' | 'typeOf'> | null>;
|
|
116
121
|
/**
|
|
117
122
|
* タスクエクスポートリトライ
|
|
@@ -458,7 +458,13 @@ class MongoRepository {
|
|
|
458
458
|
// no op
|
|
459
459
|
}
|
|
460
460
|
const typeOfIn = (_a = params.typeOf) === null || _a === void 0 ? void 0 : _a.$in;
|
|
461
|
-
return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign(Object.assign({}, (params.project !== undefined) ? { 'project.id': { $eq: params.project.id } } : undefined), (Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined), { status: { $eq: params.status }, tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported } }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), {
|
|
461
|
+
return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign(Object.assign({}, (params.project !== undefined) ? { 'project.id': { $eq: params.project.id } } : undefined), (Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined), { status: { $eq: params.status }, tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported } }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), {
|
|
462
|
+
tasksExportAction: {
|
|
463
|
+
agent: { name: params.tasksExportAction.agent.name },
|
|
464
|
+
startDate: new Date()
|
|
465
|
+
},
|
|
466
|
+
tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting
|
|
467
|
+
}, { new: true })
|
|
462
468
|
.select({
|
|
463
469
|
_id: 1,
|
|
464
470
|
typeOf: 1
|
|
@@ -528,12 +534,14 @@ class MongoRepository {
|
|
|
528
534
|
*/
|
|
529
535
|
setTasksExportedById(params) {
|
|
530
536
|
return __awaiter(this, void 0, void 0, function* () {
|
|
537
|
+
const endDate = new Date();
|
|
531
538
|
yield this.transactionModel.updateOne({
|
|
532
539
|
_id: { $eq: params.id },
|
|
533
540
|
tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
|
|
534
541
|
}, {
|
|
535
542
|
tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
|
|
536
|
-
tasksExportedAt:
|
|
543
|
+
tasksExportedAt: endDate,
|
|
544
|
+
'tasksExportAction.endDate': endDate
|
|
537
545
|
})
|
|
538
546
|
.exec();
|
|
539
547
|
});
|
|
@@ -19,6 +19,7 @@ const MoneyTransferTransactionService = require("./transaction/moneyTransfer");
|
|
|
19
19
|
const PlaceOrderTransactionService = require("./transaction/placeOrder");
|
|
20
20
|
const PlaceOrderInProgressTransactionService = require("./transaction/placeOrderInProgress");
|
|
21
21
|
const ReturnOrderTransactionService = require("./transaction/returnOrder");
|
|
22
|
+
const DEFAULT_TASKS_EXPORT_AGENT_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_SERVICE}:jobs`;
|
|
22
23
|
exports.moneyTransfer = MoneyTransferTransactionService;
|
|
23
24
|
exports.placeOrder = PlaceOrderTransactionService;
|
|
24
25
|
exports.placeOrderInProgress = PlaceOrderInProgressTransactionService;
|
|
@@ -77,7 +78,14 @@ exports.updateAgent = updateAgent;
|
|
|
77
78
|
*/
|
|
78
79
|
function exportTasks(params) {
|
|
79
80
|
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
80
|
-
|
|
81
|
+
var _a;
|
|
82
|
+
const transaction = yield repos.transaction.startExportTasks(Object.assign({ project: params.project, typeOf: params.typeOf, status: params.status, tasksExportAction: {
|
|
83
|
+
agent: {
|
|
84
|
+
name: (typeof ((_a = params.tasksExportAction) === null || _a === void 0 ? void 0 : _a.agent.name) === 'string')
|
|
85
|
+
? params.tasksExportAction.agent.name
|
|
86
|
+
: DEFAULT_TASKS_EXPORT_AGENT_NAME
|
|
87
|
+
}
|
|
88
|
+
} }, (typeof params.id === 'string') ? { id: params.id } : undefined));
|
|
81
89
|
if (transaction === null) {
|
|
82
90
|
return;
|
|
83
91
|
}
|
package/package.json
CHANGED