@chevre/domain 21.2.0-alpha.81 → 21.2.0-alpha.83

package/lib/chevre/service/assetTransaction/reserve.js

@@ -727,7 +727,10 @@ function confirm(params) {
             : undefined));
         if (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
             // sync対応(2023-01-13~)
-            yield (0, confirmReservation_1.confirmReservation)(potentialActions.reserve)(repos);
+            yield (0, confirmReservation_1.confirmReservation)({
+                actionAttributesList: potentialActions.reserve,
+                useOnReservationConfirmed: true
+            })(repos);
         }
     });
 }

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

@@ -36,6 +36,7 @@ declare function placeOrder(params: {
         orderNumber: string;
     };
     potentialActions?: factory.action.trade.order.IPotentialActions;
+    useOnOrderStatusChanged: boolean;
 }): (repos: {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;

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

@@ -206,12 +206,14 @@ function placeOrder(params) {
             throw error;
         }
         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 })({
-            registerActionInProgress: repos.registerActionInProgress,
-            task: repos.task
-        });
+        if (params.useOnOrderStatusChanged || params.useOnOrderStatusChanged === undefined) {
+            // 経理レポートを保管
+            yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });
+            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order })({
+                registerActionInProgress: repos.registerActionInProgress,
+                task: repos.task
+            });
+        }
         // 潜在アクション
         yield onPlaceOrder({
             object: order,

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

@@ -15,6 +15,7 @@ declare function returnOrder(params: {
         id: string;
     };
     potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
+    useOnOrderStatusChanged: boolean;
 }): (repos: {
     action: ActionRepo;
     order: OrderRepo;

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

@@ -80,10 +80,12 @@ function returnOrder(params) {
         }
         const result = returnedOwnershipInfos;
         yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
-        yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, returnOrderTransaction })({
-            registerActionInProgress: repos.registerServiceInProgress,
-            task: repos.task
-        });
+        if (params.useOnOrderStatusChanged || params.useOnOrderStatusChanged === undefined) {
+            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, returnOrderTransaction })({
+                registerActionInProgress: repos.registerServiceInProgress,
+                task: repos.task
+            });
+        }
         // 潜在アクション
         yield onReturn(returnOrderActionAttributes)({ task: repos.task });
     });

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

@@ -26,5 +26,6 @@ declare function sendOrder(params: {
         orderNumber: string;
     };
     potentialActions?: factory.action.transfer.send.order.IPotentialActions;
+    useOnOrderStatusChanged: boolean;
 }): ISendOperation<void>;
 export { sendOrder };

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

@@ -91,10 +91,12 @@ function sendOrder(params) {
             }
             const result = ownershipInfos;
             yield repos.action.complete({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
-            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, placeOrderTransaction })({
-                registerActionInProgress: repos.registerActionInProgress,
-                task: repos.task
-            });
+            if (params.useOnOrderStatusChanged || params.useOnOrderStatusChanged === undefined) {
+                yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, placeOrderTransaction })({
+                    registerActionInProgress: repos.registerActionInProgress,
+                    task: repos.task
+                });
+            }
         }
         catch (error) {
             let throwsError = true;

package/lib/chevre/service/reserve/confirmReservation.d.ts

@@ -9,7 +9,10 @@ import { MongoRepository as TaskRepo } from '../../repo/task';
 /**
  * 予約を確定する
  */
-export declare function confirmReservation(actionAttributesList: factory.action.reserve.IAttributes[]): (repos: {
+export declare function confirmReservation(params: {
+    actionAttributesList: factory.action.reserve.IAttributes[];
+    useOnReservationConfirmed: boolean;
+}): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTrasactionRepo;
     reservation: ReservationRepo;

package/lib/chevre/service/reserve/confirmReservation.js

@@ -18,106 +18,131 @@ const onReservationConfirmed_1 = require("./potentialActions/onReservationConfir
 /**
  * 予約を確定する
  */
-function confirmReservation(actionAttributesList) {
-    // tslint:disable-next-line:max-func-body-length
+function confirmReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let confirmedReservations = [];
-        if (actionAttributesList.length > 0) {
-            yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                const reservationPackage = actionAttributes.object;
-                const action = yield repos.action.start(actionAttributes);
-                try {
-                    const reserveTransactions = yield repos.assetTransaction.search({
-                        limit: 1,
-                        page: 1,
-                        typeOf: factory.assetTransactionType.Reserve,
-                        transactionNumber: { $eq: reservationPackage.reservationNumber }
+        if (params.actionAttributesList.length > 0) {
+            yield Promise.all(params.actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
+                yield reserveIfNotYet(actionAttributes)(repos);
+                if (params.useOnReservationConfirmed) {
+                    yield (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
+                }
+            })));
+            if (params.useOnReservationConfirmed) {
+                let confirmedReservations = [];
+                // 確定予約通知タスクを予約番号単位で作成する(2022-12-21~)
+                const reservationNumber = params.actionAttributesList[0].object.reservationNumber;
+                if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
+                    // 最新のconfirmedReservationsを検索
+                    confirmedReservations = yield repos.reservation.search({
+                        reservationNumber: { $eq: reservationNumber },
+                        typeOf: factory.reservationType.EventReservation
                     });
-                    const reserveTransaction = reserveTransactions.shift();
-                    if (reserveTransaction === undefined) {
-                        throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
-                    }
-                    let underName;
-                    // 予約取引に保管されたunderNameを使用する(2023-05-30~)
-                    if (typeof ((_a = reserveTransaction.object.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
-                        underName = reserveTransaction.object.underName;
-                        // 廃止(2023-05-31~)→予約取引から取得に変更
-                        // } else if (typeof reservationPackage.underName?.typeOf === 'string') {
-                        //     underName = reservationPackage.underName;
-                    }
-                    // ReservationPackageに対応(2022-12-22~)
-                    if (reservationPackage.typeOf === factory.reservationType.ReservationPackage) {
-                        // Pendingの予約が存在しないバージョンに対応する(2023-05-29~)
-                        if (reserveTransaction.object.disablePendingReservations === true) {
-                            const reservationFor = reserveTransaction.object.reservationFor;
-                            const subReservations = reserveTransaction.object.subReservation;
-                            if (Array.isArray(subReservations)
-                                && typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) === 'string') {
-                                yield Promise.all(subReservations.map((subReservation) => __awaiter(this, void 0, void 0, function* () {
-                                    yield repos.reservation.confirmByIdIfNotExist({
-                                        reservation: subReservation,
-                                        reservationFor,
-                                        underName
-                                    });
-                                })));
-                            }
-                        }
-                        else {
-                            // 予約を確定状態に変更する
-                            yield repos.reservation.confirmByReservationNumber({
-                                reservationNumber: reservationPackage.reservationNumber,
-                                previousReservationStatus: reservationPackage.reservationStatus,
-                                underName
-                            });
+                    confirmedReservations = confirmedReservations.map((r) => {
+                        // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                        delete r._id;
+                        return r;
+                    });
+                }
+                yield (0, onReservationConfirmed_1.onReservationConfirmed)(confirmedReservations)({ task: repos.task });
+            }
+        }
+    });
+}
+exports.confirmReservation = confirmReservation;
+// tslint:disable-next-line:max-func-body-length
+function reserveIfNotYet(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const reservationPackage = params.object;
+        // 冪等性を担保(2023-05-31~)
+        const completedActions = yield repos.action.search({
+            limit: 1,
+            page: 1,
+            typeOf: { $eq: params.typeOf },
+            object: {
+                typeOf: { $eq: params.object.typeOf }
+                // reservationNumber: { $eq: params.object.reservationNumber }
+            },
+            purpose: {
+                id: { $in: [params.purpose.id] },
+                typeOf: { $in: [params.purpose.typeOf] }
+            }
+        }, ['_id'], []);
+        if (completedActions.length === 0) {
+            const action = yield repos.action.start(params);
+            try {
+                const reserveTransactions = yield repos.assetTransaction.search({
+                    limit: 1,
+                    page: 1,
+                    typeOf: factory.assetTransactionType.Reserve,
+                    transactionNumber: { $eq: reservationPackage.reservationNumber }
+                });
+                const reserveTransaction = reserveTransactions.shift();
+                if (reserveTransaction === undefined) {
+                    throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
+                }
+                let underName;
+                // 予約取引に保管されたunderNameを使用する(2023-05-30~)
+                if (typeof ((_a = reserveTransaction.object.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+                    underName = reserveTransaction.object.underName;
+                    // 廃止(2023-05-31~)→予約取引から取得に変更
+                    // } else if (typeof reservationPackage.underName?.typeOf === 'string') {
+                    //     underName = reservationPackage.underName;
+                }
+                // ReservationPackageに対応(2022-12-22~)
+                if (reservationPackage.typeOf === factory.reservationType.ReservationPackage) {
+                    // Pendingの予約が存在しないバージョンに対応する(2023-05-29~)
+                    if (reserveTransaction.object.disablePendingReservations === true) {
+                        const reservationFor = reserveTransaction.object.reservationFor;
+                        const subReservations = reserveTransaction.object.subReservation;
+                        if (Array.isArray(subReservations)
+                            && typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) === 'string') {
+                            yield Promise.all(subReservations.map((subReservation) => __awaiter(this, void 0, void 0, function* () {
+                                yield repos.reservation.confirmByIdIfNotExist({
+                                    reservation: subReservation,
+                                    reservationFor,
+                                    underName
+                                });
+                            })));
                         }
                     }
                     else {
-                        // 廃止(2023-01-18)
-                        throw new factory.errors.Forbidden(`${reservationPackage.typeOf} not acceptable`);
                         // 予約を確定状態に変更する
-                        // await repos.reservation.confirm<factory.reservationType.EventReservation>({
-                        //     id: reservation.id,
-                        //     previousReservationStatus: reservation.reservationStatus,
-                        //     underName: reservation.underName
-                        // });
-                        // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                        // delete (<any>reservation)._id;
-                        // confirmedReservations.push(reservation);
+                        yield repos.reservation.confirmByReservationNumber({
+                            reservationNumber: reservationPackage.reservationNumber,
+                            previousReservationStatus: reservationPackage.reservationStatus,
+                            underName
+                        });
                     }
                 }
-                catch (error) {
-                    // actionにエラー結果を追加
-                    try {
-                        const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
-                        yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
-                    }
-                    catch (__) {
-                        // 失敗したら仕方ない
-                    }
-                    throw error;
-                }
-                // アクション完了
-                const actionResult = {};
-                yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-                yield (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
-            })));
-            // 確定予約通知タスクを予約番号単位で作成する(2022-12-21~)
-            const reservationNumber = actionAttributesList[0].object.reservationNumber;
-            if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
-                // 最新のconfirmedReservationsを検索
-                confirmedReservations = yield repos.reservation.search({
-                    reservationNumber: { $eq: reservationNumber },
-                    typeOf: factory.reservationType.EventReservation
-                });
-                confirmedReservations = confirmedReservations.map((r) => {
+                else {
+                    // 廃止(2023-01-18)
+                    throw new factory.errors.Forbidden(`${reservationPackage.typeOf} not acceptable`);
+                    // 予約を確定状態に変更する
+                    // await repos.reservation.confirm<factory.reservationType.EventReservation>({
+                    //     id: reservation.id,
+                    //     previousReservationStatus: reservation.reservationStatus,
+                    //     underName: reservation.underName
+                    // });
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                    delete r._id;
-                    return r;
-                });
+                    // delete (<any>reservation)._id;
+                    // confirmedReservations.push(reservation);
+                }
+            }
+            catch (error) {
+                // actionにエラー結果を追加
+                try {
+                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+                }
+                catch (__) {
+                    // 失敗したら仕方ない
+                }
+                throw error;
             }
-            yield (0, onReservationConfirmed_1.onReservationConfirmed)(confirmedReservations)({ task: repos.task });
+            // アクション完了
+            const actionResult = {};
+            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
     });
 }
-exports.confirmReservation = confirmReservation;

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

@@ -32,7 +32,7 @@ function call(data) {
         const taskRepo = new task_1.MongoRepository(settings.connection);
         const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
-        yield OrderService.placeOrder(data)({
+        yield OrderService.placeOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
             accountingReport: accountingReportRepo,
             action: actionRepo,
             order: orderRepo,

package/lib/chevre/service/task/reserve.js

@@ -20,7 +20,10 @@ const ReserveService = require("../reserve");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        yield ReserveService.confirmReservation(data.actionAttributes)({
+        yield ReserveService.confirmReservation({
+            actionAttributesList: data.actionAttributes,
+            useOnReservationConfirmed: true
+        })({
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             reservation: new reservation_1.MongoRepository(settings.connection),

package/lib/chevre/service/task/returnOrder.js

@@ -32,7 +32,7 @@ function call(data) {
         const taskRepo = new task_1.MongoRepository(settings.connection);
         const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
-        yield OrderService.returnOrder(data)({
+        yield OrderService.returnOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
             action: actionRepo,
             order: orderRepo,
             ownershipInfo: ownershipInfoRepo,

package/lib/chevre/service/task/sendOrder.js

@@ -32,7 +32,7 @@ function call(data) {
         const taskRepo = new task_1.MongoRepository(settings.connection);
         const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
-        yield OrderService.sendOrder(data)({
+        yield OrderService.sendOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
             action: actionRepo,
             order: orderRepo,
             ownershipInfo: ownershipInfoRepo,

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.2.0-alpha.81"
+  "version": "21.2.0-alpha.83"
 }