@chevre/domain 21.7.0-alpha.14 → 21.7.0-alpha.16

package/example/src/chevre/createDeleteTransactionTasksIfNotExist.ts

@@ -0,0 +1,98 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const ONE_YEAR_IN_DAYS = 365;
+type IDeletingTransaction = Pick<
+    chevre.factory.transaction.placeOrder.ITransaction,
+    'id' | 'project' | 'typeOf' | 'startDate' | 'endDate' | 'object'
+>;
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const now = new Date();
+    const endDateLt: Date = moment(now)
+        // tslint:disable-next-line:no-magic-numbers
+        .add(-ONE_YEAR_IN_DAYS, 'days')
+        .toDate();
+
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+    const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
+
+    const deletingTransactions = <IDeletingTransaction[]>await transactionRepo.search<chevre.factory.transactionType.PlaceOrder>(
+        {
+            limit: 100,
+            page: 1,
+            sort: { startDate: chevre.factory.sortType.Ascending },
+            typeOf: chevre.factory.transactionType.PlaceOrder,
+            statuses: [
+                chevre.factory.transactionStatusType.Canceled,
+                chevre.factory.transactionStatusType.Confirmed,
+                chevre.factory.transactionStatusType.Expired
+            ],
+            endThrough: endDateLt,
+            inclusion: ['_id', 'project', 'typeOf', 'startDate', 'endDate', 'object'],
+            exclusion: []
+        }
+    );
+
+    let i = 0;
+    let updateCount = 0;
+    for (const deletingTransaction of deletingTransactions) {
+        i += 1;
+        const transaction: IDeletingTransaction = deletingTransaction;
+        console.log('checking...', transaction.project.id, transaction.id, transaction.startDate, transaction.endDate, i);
+
+        const isEndDateBefore = transaction.endDate !== undefined && moment(transaction.endDate)
+            .isBefore(endDateLt);
+        if (isEndDateBefore) {
+            const runsAt: Date = moment(transaction.endDate)
+                .add(ONE_YEAR_IN_DAYS, 'days')
+                .toDate();
+
+            updateCount += 1;
+            const deleteTransactionTask: chevre.factory.task.deleteTransaction.IAttributes = {
+                project: transaction.project,
+                name: chevre.factory.taskName.DeleteTransaction,
+                status: chevre.factory.taskStatus.Ready,
+                runsAt,
+                remainingNumberOfTries: 3,
+                numberOfTried: 0,
+                executionResults: [],
+                data: {
+                    object: {
+                        specifyingMethod: chevre.factory.task.deleteTransaction.SpecifyingMethod.Id,
+                        endDate: transaction.endDate,
+                        id: transaction.id,
+                        object: {
+                            ...(typeof transaction.object.confirmationNumber === 'string')
+                                ? { confirmationNumber: transaction.object.confirmationNumber }
+                                : undefined,
+                            ...(typeof transaction.object.orderNumber === 'string')
+                                ? { orderNumber: transaction.object.orderNumber }
+                                : undefined
+                        },
+                        project: transaction.project,
+                        startDate: transaction.startDate,
+                        typeOf: transaction.typeOf
+                    }
+                }
+            };
+            console.log(
+                'saving task...',
+                deleteTransactionTask.runsAt, transaction.project.id, transaction.id, transaction.startDate, transaction.endDate, i);
+            await taskRepo.createDeleteTransactionTaskIfNotExist(deleteTransactionTask, { emitImmediately: false });
+            console.log('task saved', transaction.project.id, transaction.id, transaction.startDate, transaction.endDate, i);
+        }
+    }
+
+    console.log(i, 'transactions checked');
+    console.log(updateCount, 'transactions updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/task.d.ts

@@ -31,6 +31,10 @@ export declare class MongoRepository {
         id: string;
     }[]>;
     createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>, options: IOptionOnCreate): Promise<void>;
+    /**
+     * 取引削除タスク冪等作成
+     */
+    createDeleteTransactionTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.DeleteTransaction>, options: IOptionOnCreate): Promise<void>;
     executeById(params: {
         id: string;
         executor: {

package/lib/chevre/repo/task.js

@@ -206,6 +206,30 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * 取引削除タスク冪等作成
+     */
+    createDeleteTransactionTaskIfNotExist(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (params.data.object.specifyingMethod !== factory.task.deleteTransaction.SpecifyingMethod.Id) {
+                throw new factory.errors.NotImplemented(`only ${factory.task.deleteTransaction.SpecifyingMethod.Id} implemented`);
+            }
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                'data.object.id': { $exists: true, $eq: params.data.object.id }
+            }, { $setOnInsert: params }, { new: true, upsert: true })
+                .select({ _id: 1 })
+                .exec();
+            if (options.emitImmediately) {
+                task_2.taskEventEmitter.emitTaskStatusChanged({
+                    id: createdTask.id,
+                    name: params.name,
+                    status: factory.taskStatus.Ready
+                });
+            }
+        });
+    }
     executeById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.taskModel.findOneAndUpdate({

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -338,6 +338,14 @@ function createOnPlaceOrderTasksByTransaction(params) {
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (potentialActions.sendOrder !== undefined) {
+            const sendOrderTaskData = {
+                project: potentialActions.sendOrder.project,
+                object: Object.assign(Object.assign({}, potentialActions.sendOrder.object), { confirmationNumber: params.object.confirmationNumber })
+                // 廃止(2023-08-21~)
+                // ...(potentialActions.sendOrder.potentialActions !== undefined)
+                //     ? { potentialActions: potentialActions.sendOrder.potentialActions }
+                //     : undefined
+            };
             const sendOrderTask = {
                 project: potentialActions.sendOrder.project,
                 name: factory.taskName.SendOrder,
@@ -346,9 +354,7 @@ function createOnPlaceOrderTasksByTransaction(params) {
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,
                 executionResults: [],
-                data: Object.assign({ project: potentialActions.sendOrder.project, object: Object.assign(Object.assign({}, potentialActions.sendOrder.object), { confirmationNumber: params.object.confirmationNumber }) }, (potentialActions.sendOrder.potentialActions !== undefined)
-                    ? { potentialActions: potentialActions.sendOrder.potentialActions }
-                    : undefined)
+                data: sendOrderTaskData
             };
             taskAttributes.push(sendOrderTask);
         }

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -130,6 +130,17 @@ function createTasks(params) {
                 throw new factory.errors.NotFound('Transaction Result');
             }
             const orderActionAttributes = potentialActions.order;
+            const placeOrderTaskData = {
+                project: orderActionAttributes.project,
+                object: {
+                    confirmationNumber: orderFromTransaction.confirmationNumber,
+                    orderNumber: orderActionAttributes.object.orderNumber
+                }
+                // 廃止(2023-08-21~)
+                // ...(orderActionAttributes.potentialActions !== undefined)
+                //     ? { potentialActions: orderActionAttributes.potentialActions }
+                //     : undefined
+            };
             const placeOrderTaskAttributes = {
                 project: transaction.project,
                 name: factory.taskName.PlaceOrder,
@@ -138,12 +149,7 @@ function createTasks(params) {
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,
                 executionResults: [],
-                data: Object.assign({ project: orderActionAttributes.project, object: {
-                        confirmationNumber: orderFromTransaction.confirmationNumber,
-                        orderNumber: orderActionAttributes.object.orderNumber
-                    } }, (orderActionAttributes.potentialActions !== undefined)
-                    ? { potentialActions: orderActionAttributes.potentialActions }
-                    : undefined)
+                data: placeOrderTaskData
             };
             taskAttributes.push(placeOrderTaskAttributes);
             break;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.326.0-alpha.0",
+    "@chevre/factory": "4.326.0-alpha.1",
     "@cinerino/sdk": "3.165.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.7.0-alpha.14"
+  "version": "21.7.0-alpha.16"
 }