@chevre/domain 21.7.0-alpha.10 → 21.7.0-alpha.11

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -14,12 +14,14 @@ async function main() {
     let updateResult: any;
     updateResult = await transactionRepo.unsetUnnecessaryFields({
         filter: {
-            'project.id': { $eq: PROJECT_ID },
+            // 'project.id': { $eq: PROJECT_ID },
             typeOf: { $eq: chevre.factory.transactionType.PlaceOrder },
             status: { $eq: chevre.factory.transactionStatusType.Confirmed },
             startDate: {
-                $lte: moment('2023-08-16T07:26:00Z')
+                $lte: moment('2023-04-01T00:00:00Z')
                     .toDate()
+                // $lte: moment('2023-08-16T07:26:00Z')
+                //     .toDate()
             },
             'object.authorizeActions': { $exists: true }
         },

package/lib/chevre/service/order/onOrderStatusChanged.d.ts

@@ -11,4 +11,5 @@ export declare function onOrderStatusChanged(params: {
     registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;
 }) => Promise<void>;
+export type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
 export {};

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

@@ -23,6 +23,7 @@ const USE_CONFIRM_REGISTER_SERVICE_TRANSACTION = process.env.USE_CONFIRM_REGISTE
 const TOKEN_EXPIRES_IN = 604800;
 function onOrderStatusChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
         let tasks = [];
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
@@ -76,7 +77,13 @@ function onOrderStatusChanged(params) {
                     ...(0, factory_1.createInformTasks)(orderWithToken),
                     ...yield createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
                     ...yield createConfirmReserveTransactionTasks(params.order, simpleOrder)(repos),
-                    ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos)
+                    ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos),
+                    // 取引のpotentialActionsを適用(2023-08-17~)
+                    ...createOnPlaceOrderTasksByTransaction({
+                        object: params.order,
+                        // potentialActions: params.potentialActions
+                        potentialActions: (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions
+                    })
                 ];
                 break;
             case factory.orderStatus.OrderReturned:
@@ -363,3 +370,113 @@ function createReturnPayTransactionTasks(order, __, returnOrderTransaction) {
         return tasks;
     });
 }
+/**
+ * 注文作成後のアクション
+ */
+// export function onPlaceOrder(params: {
+//     object: factory.order.IOrder | IExternalOrder;
+//     potentialActions?: factory.action.trade.order.IPotentialActions;
+// }) {
+//     return async (repos: {
+//         task: TaskRepo;
+//     }) => {
+//         const potentialActions = params.potentialActions;
+//         const now = new Date();
+//         // potentialActionsのためのタスクを生成
+//         const taskAttributes: factory.task.IAttributes<factory.taskName>[] = [];
+//         // tslint:disable-next-line:no-single-line-block-comment
+//         /* istanbul ignore else */
+//         if (potentialActions !== undefined) {
+//             // tslint:disable-next-line:no-single-line-block-comment
+//             /* istanbul ignore else */
+//             if (potentialActions.sendOrder !== undefined) {
+//                 const sendOrderTask: factory.task.IAttributes<factory.taskName.SendOrder> = {
+//                     project: potentialActions.sendOrder.project,
+//                     name: factory.taskName.SendOrder,
+//                     status: factory.taskStatus.Ready,
+//                     runsAt: now, // なるはやで実行
+//                     remainingNumberOfTries: 10,
+//                     numberOfTried: 0,
+//                     executionResults: [],
+//                     // data: potentialActions.sendOrder
+//                     data: {
+//                         project: potentialActions.sendOrder.project,
+//                         object: {
+//                             ...potentialActions.sendOrder.object,
+//                             confirmationNumber: params.object.confirmationNumber
+//                         },
+//                         ...(potentialActions.sendOrder.potentialActions !== undefined)
+//                             ? { potentialActions: potentialActions.sendOrder.potentialActions }
+//                             : undefined
+//                     }
+//                 };
+//                 taskAttributes.push(sendOrderTask);
+//             }
+//             // ポイント付与
+//             // tslint:disable-next-line:no-single-line-block-comment
+//             /* istanbul ignore else */
+//             if (Array.isArray(potentialActions.givePointAward)) {
+//                 taskAttributes.push(...potentialActions.givePointAward.map(
+//                     (a): factory.task.IAttributes<factory.taskName.GivePointAward> => {
+//                         return {
+//                             project: a.project,
+//                             name: factory.taskName.GivePointAward,
+//                             status: factory.taskStatus.Ready,
+//                             runsAt: now, // なるはやで実行
+//                             remainingNumberOfTries: 10,
+//                             numberOfTried: 0,
+//                             executionResults: [],
+//                             data: a
+//                         };
+//                     }));
+//             }
+//         }
+//         // タスク保管
+//         await repos.task.saveMany(taskAttributes, { emitImmediately: true });
+//     };
+// }
+function createOnPlaceOrderTasksByTransaction(params) {
+    const potentialActions = params.potentialActions;
+    const now = new Date();
+    // potentialActionsのためのタスクを生成
+    const taskAttributes = [];
+    // tslint:disable-next-line:no-single-line-block-comment
+    /* istanbul ignore else */
+    if (potentialActions !== undefined) {
+        // tslint:disable-next-line:no-single-line-block-comment
+        /* istanbul ignore else */
+        if (potentialActions.sendOrder !== undefined) {
+            const sendOrderTask = {
+                project: potentialActions.sendOrder.project,
+                name: factory.taskName.SendOrder,
+                status: factory.taskStatus.Ready,
+                runsAt: now,
+                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)
+            };
+            taskAttributes.push(sendOrderTask);
+        }
+        // ポイント付与
+        // tslint:disable-next-line:no-single-line-block-comment
+        /* istanbul ignore else */
+        if (Array.isArray(potentialActions.givePointAward)) {
+            taskAttributes.push(...potentialActions.givePointAward.map((a) => {
+                return {
+                    project: a.project,
+                    name: factory.taskName.GivePointAward,
+                    status: factory.taskStatus.Ready,
+                    runsAt: now,
+                    remainingNumberOfTries: 10,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: a
+                };
+            }));
+        }
+    }
+    return taskAttributes;
+}

package/lib/chevre/service/order/placeOrder.d.ts

@@ -4,8 +4,8 @@ import { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/act
 import { MongoRepository as OrderRepo } from '../../repo/order';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+import { IExternalOrder } from './onOrderStatusChanged';
 import * as factory from '../../factory';
-type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
 /**
  * 注文取引なしに注文を作成する
  */
@@ -15,7 +15,6 @@ declare function placeOrderWithoutTransaction(params: {
         id: string;
     };
     object: IExternalOrder;
-    potentialActions?: factory.action.trade.order.IPotentialActions;
 }): (repos: {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;

package/lib/chevre/service/order/placeOrder.js

@@ -98,12 +98,6 @@ function placeOrderWithoutTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const order = params.object;
-        // 注文番号から取引と注文をfixする
-        // const { order, placeOrderTransaction } = await createOrderFromBody({
-        //     project: { id: params.project.id },
-        //     confirmationNumber: params.object.confirmationNumber,
-        //     orderNumber: params.object.orderNumber
-        // })({ transaction: repos.transaction });
         // アクションを作成する(2022-04-11~)
         const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const simpleOrder = {
@@ -145,21 +139,17 @@ function placeOrderWithoutTransaction(params) {
         yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         // 経理レポートを保管
         yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });
-        yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order: order })({
-            registerActionInProgress: repos.registerActionInProgress,
-            task: repos.task
-        });
-        // 潜在アクション
-        yield onPlaceOrder({
-            object: order,
-            potentialActions: params.potentialActions
-        })(repos);
+        // await onOrderStatusChanged({ order: <factory.order.IOrder>order })({
+        //     registerActionInProgress: repos.registerActionInProgress,
+        //     task: repos.task
+        // });
     });
 }
 exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
 /**
  * 注文を作成する
  */
+// tslint:disable-next-line:max-func-body-length
 function placeOrder(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -226,71 +216,22 @@ function placeOrder(params) {
             }
             yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         }
-        if (params.useOnOrderStatusChanged || params.useOnOrderStatusChanged === undefined) {
+        if (typeof params.useOnOrderStatusChanged !== 'boolean') {
+            throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
+        }
+        if (params.useOnOrderStatusChanged) {
             // 経理レポートを保管
             yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });
-            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order })({
+            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, placeOrderTransaction })({
                 registerActionInProgress: repos.registerActionInProgress,
                 task: repos.task
             });
         }
-        // 潜在アクション
-        yield onPlaceOrder({
-            object: order,
-            potentialActions: params.potentialActions
-        })(repos);
+        // onOrderStatusChangedへ移行(2023-08-17~)
+        // await onPlaceOrder({
+        //     object: order,
+        //     potentialActions: params.potentialActions
+        // })(repos);
     });
 }
 exports.placeOrder = placeOrder;
-/**
- * 注文作成後のアクション
- */
-function onPlaceOrder(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const potentialActions = params.potentialActions;
-        const now = new Date();
-        // potentialActionsのためのタスクを生成
-        const taskAttributes = [];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (potentialActions !== undefined) {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (potentialActions.sendOrder !== undefined) {
-                const sendOrderTask = {
-                    project: potentialActions.sendOrder.project,
-                    name: factory.taskName.SendOrder,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    // data: potentialActions.sendOrder
-                    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)
-                };
-                taskAttributes.push(sendOrderTask);
-            }
-            // ポイント付与
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (Array.isArray(potentialActions.givePointAward)) {
-                taskAttributes.push(...potentialActions.givePointAward.map((a) => {
-                    return {
-                        project: a.project,
-                        name: factory.taskName.GivePointAward,
-                        status: factory.taskStatus.Ready,
-                        runsAt: now,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: a
-                    };
-                }));
-            }
-        }
-        // タスク保管
-        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
-}

package/package.json

@@ -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.10"
+  "version": "21.7.0-alpha.11"
 }