npm - @chevre/domain - Versions diffs - 21.18.0-alpha.7 → 21.18.0-alpha.8 - Mend

@chevre/domain 21.18.0-alpha.7 → 21.18.0-alpha.8

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.

Files changed (28) hide show

package/example/src/chevre/searchAcceptedOfferIds.ts CHANGED Viewed

@@ -32,6 +32,24 @@ async function main() {
         'acceptedOffers.itemOffered.issuedThrough.id'
     );
     console.log(productIds);
+    const locationBranchCodes = await acceptedOfferRepo.distinctValues(
+        { orderNumber: { $in: ['CIN1-3743286-2441943', 'CIN4-3943511-3323473'] } },
+        'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode'
+    );
+    console.log(locationBranchCodes);
+    const offeredThroughIdentifiers = await acceptedOfferRepo.distinctValues(
+        { orderNumber: { $in: ['CIN1-3743286-2441943', 'CIN4-3943511-3323473'] } },
+        'acceptedOffers.offeredThrough.identifier'
+    );
+    console.log(offeredThroughIdentifiers);
+    const invalidValues = await acceptedOfferRepo.distinctValues(
+        { orderNumber: { $in: ['CIN1-3743286-2441943', 'CIN4-3943511-3323473'] } },
+        <any>'invalidValues'
+    );
+    console.log(invalidValues);
 }
 main()

package/lib/chevre/repo/acceptedOffer.d.ts CHANGED Viewed

@@ -5,7 +5,7 @@ type IProjection4searchWithUnwoundAcceptedOffers = {
 } & {
     _id?: 0 | 1;
 };
-type IDistinctField = 'acceptedOffers.id' | 'acceptedOffers.itemOffered.reservationNumber' | 'acceptedOffers.itemOffered.reservationFor.id' | 'acceptedOffers.itemOffered.issuedThrough.id';
+type IDistinctField = 'acceptedOffers.id' | 'acceptedOffers.itemOffered.reservationNumber' | 'acceptedOffers.itemOffered.reservationFor.id' | 'acceptedOffers.itemOffered.issuedThrough.id' | 'acceptedOffers.offeredThrough.identifier' | 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode';
 /**
  * 注文オファーリポジトリ
  */

package/lib/chevre/service/assetTransaction/pay/potentialActions.d.ts CHANGED Viewed

@@ -6,5 +6,7 @@ export type IUnitPriceSpecification = factory.unitPriceOffer.IUnitPriceOfferPric
 export declare function createPotentialActions(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>;
     potentialActions?: factory.assetTransaction.pay.IPotentialActionsParams;
-    order: factory.order.IOrder;
+    order: factory.order.IOrder & {
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    };
 }): factory.assetTransaction.IPotentialActions<factory.assetTransactionType.Pay>;

package/lib/chevre/service/assetTransaction/pay/potentialActions.js CHANGED Viewed

@@ -219,7 +219,7 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
     let reservationNumber = '';
     let priceComponents4invoice = [];
     // Orderから対象予約を取得
-    const reservationOffer = (_a = order === null || order === void 0 ? void 0 : order.acceptedOffers) === null || _a === void 0 ? void 0 : _a.find((o) => {
+    const reservationOffer = (_a = order.acceptedOffers) === null || _a === void 0 ? void 0 : _a.find((o) => {
         var _a, _b, _c, _d;
         let mvtkUnitPriceSpec;
         // MovieTicket適用単価オファーからidentifierを取り出す

package/lib/chevre/service/assetTransaction/pay.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@
  */
 import * as GMO from '@motionpicture/gmo-service';
 import * as factory from '../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -38,6 +39,7 @@ export interface ICancelRepos {
 }
 export type ICancelOperation<T> = (repos: ICancelRepos) => Promise<T>;
 export interface IConfirmRepos {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/assetTransaction/pay.js CHANGED Viewed

@@ -365,25 +365,28 @@ exports.confirm = confirm;
 function fixOrderAsPurpose(params, transaction) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
-        let order;
         const payPurposeConfirmationNumber = (_c = (_b = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.pay) === null || _b === void 0 ? void 0 : _b.purpose) === null || _c === void 0 ? void 0 : _c.confirmationNumber;
         const payPurposeOrderNumber = (_f = (_e = (_d = params.potentialActions) === null || _d === void 0 ? void 0 : _d.pay) === null || _e === void 0 ? void 0 : _e.purpose) === null || _f === void 0 ? void 0 : _f.orderNumber;
         if (typeof payPurposeConfirmationNumber !== 'string' || payPurposeConfirmationNumber.length === 0
             || typeof payPurposeOrderNumber !== 'string' || payPurposeOrderNumber.length === 0) {
             throw new factory.errors.ArgumentNull('potentialActions.pay.purpose');
         }
-        const orders = yield repos.order.search({
+        const ordersWithoutAcceptedOffers = yield repos.order.search({
             limit: 1,
             page: 1,
             project: { id: { $eq: transaction.project.id } },
             confirmationNumbers: [payPurposeConfirmationNumber],
             orderNumbers: [payPurposeOrderNumber]
         });
-        order = orders.shift();
-        if (order === undefined) {
+        const orderWithoutAcceptedOffers = ordersWithoutAcceptedOffers.shift();
+        if (orderWithoutAcceptedOffers === undefined) {
             throw new factory.errors.NotFound('Order as purpose');
         }
-        return order;
+        // 全acceptedOffersを検索(2023-12-06~)
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffers({
+            orderNumbers: [orderWithoutAcceptedOffers.orderNumber]
+        });
+        return Object.assign(Object.assign({}, orderWithoutAcceptedOffers), { acceptedOffers });
     });
 }
 /**

package/lib/chevre/service/order/confirmPayTransaction.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import * as factory from '../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -9,6 +10,7 @@ import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction>): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;

package/lib/chevre/service/order/confirmPayTransaction.js CHANGED Viewed

@@ -30,6 +30,7 @@ function confirmPayTransaction(data) {
                     } }, (typeof ((_b = (_a = confirmingTransaction.object) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
                     ? { object: { paymentMethod: { identifier: confirmingTransaction.object.paymentMethod.identifier } } }
                     : undefined))({
+                    acceptedOffer: repos.acceptedOffer,
                     action: repos.action,
                     accountingReport: repos.accountingReport,
                     assetTransaction: repos.assetTransaction,

package/lib/chevre/service/order/onAssetTransactionStatusChanged.js CHANGED Viewed

@@ -212,12 +212,11 @@ function cancelOrderIfExist(params) {
                 throw error;
             }
             if (params.useOnOrderStatusChanged) {
-                yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({
+                yield (0, onOrderStatusChanged_1.onOrderCancelled)({
                     order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderCancelled // 強制的にOrderCancelledとして処理する
                      }),
                     placeOrderTransaction
                 })({
-                    registerActionInProgress: repos.registerActionInProgress,
                     task: repos.task
                 });
             }

package/lib/chevre/service/order/onOrderStatusChanged/factory.d.ts CHANGED Viewed

@@ -27,16 +27,4 @@ export type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | '
 export declare function createOnOrderSentTasksByTransaction(params: {
     potentialActions?: factory.action.transfer.send.order.IPotentialActions;
 }): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
-/**
- * 注文返品後のアクション
- */
-export declare function createOnOrderReturnedTasksByTransaction(params: {
-    potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
-/**
- * 注文中止時のアクション
- */
-export declare function createOnOrderCancelledTasksByTransaction(params: {
-    transaction?: factory.transaction.placeOrder.ITransaction;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export {};

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

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createOnOrderCancelledTasksByTransaction = exports.createOnOrderReturnedTasksByTransaction = exports.createOnOrderSentTasksByTransaction = exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = exports.getOrderWithToken = void 0;
+exports.createOnOrderSentTasksByTransaction = exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = exports.getOrderWithToken = void 0;
 const google_libphonenumber_1 = require("google-libphonenumber");
 const jwt = require("jsonwebtoken");
 const util_1 = require("util");
@@ -358,110 +358,3 @@ function createOnOrderSentTasksByTransaction(params) {
     return taskAttributes;
 }
 exports.createOnOrderSentTasksByTransaction = createOnOrderSentTasksByTransaction;
-/**
- * 注文返品後のアクション
- */
-function createOnOrderReturnedTasksByTransaction(params) {
-    const now = new Date();
-    const taskAttributes = [];
-    const potentialActions = params.potentialActions;
-    // 入金返却タスク
-    const returnMoneyTransferAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.returnMoneyTransfer;
-    if (Array.isArray(returnMoneyTransferAttributes)) {
-        taskAttributes.push(...returnMoneyTransferAttributes.map((a) => {
-            return {
-                project: a.project,
-                name: factory.taskName.ReturnMoneyTransfer,
-                status: factory.taskStatus.Ready,
-                runsAt: now,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: a
-            };
-        }));
-    }
-    // ポイント特典返却タスク
-    const returnPointAwardAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.returnPointAward;
-    if (Array.isArray(returnPointAwardAttributes)) {
-        taskAttributes.push(...returnPointAwardAttributes.map((a) => {
-            return {
-                project: a.project,
-                name: factory.taskName.ReturnPointAward,
-                status: factory.taskStatus.Ready,
-                runsAt: now,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: a
-            };
-        }));
-    }
-    const sendEmailMessageAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.sendEmailMessage;
-    if (Array.isArray(sendEmailMessageAttributes)) {
-        sendEmailMessageAttributes.forEach((s) => {
-            const sendEmailMessageTask = {
-                project: s.project,
-                name: factory.taskName.SendEmailMessage,
-                status: factory.taskStatus.Ready,
-                runsAt: now,
-                remainingNumberOfTries: 3,
-                numberOfTried: 0,
-                executionResults: [],
-                data: {
-                    actionAttributes: s
-                }
-            };
-            taskAttributes.push(sendEmailMessageTask);
-        });
-    }
-    return taskAttributes;
-}
-exports.createOnOrderReturnedTasksByTransaction = createOnOrderReturnedTasksByTransaction;
-/**
- * 注文中止時のアクション
- */
-function createOnOrderCancelledTasksByTransaction(params) {
-    var _a;
-    const now = new Date();
-    const taskAttributes = [];
-    if (typeof ((_a = params.transaction) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-        const voidPaymentTaskAttributes = {
-            project: params.transaction.project,
-            name: factory.taskName.VoidPayTransaction,
-            status: factory.taskStatus.Ready,
-            runsAt: now,
-            remainingNumberOfTries: 10,
-            numberOfTried: 0,
-            executionResults: [],
-            data: {
-                project: params.transaction.project,
-                purpose: {
-                    typeOf: params.transaction.typeOf,
-                    id: params.transaction.id,
-                    result: { order: { orderStatus: factory.orderStatus.OrderCancelled } }
-                }
-            }
-        };
-        const voidReserveTaskAttributes = {
-            project: params.transaction.project,
-            name: factory.taskName.VoidReserveTransaction,
-            status: factory.taskStatus.Ready,
-            runsAt: now,
-            remainingNumberOfTries: 10,
-            numberOfTried: 0,
-            executionResults: [],
-            data: {
-                project: params.transaction.project,
-                purpose: {
-                    typeOf: params.transaction.typeOf,
-                    id: params.transaction.id,
-                    result: { order: { orderStatus: factory.orderStatus.OrderCancelled } }
-                }
-            }
-        };
-        taskAttributes.push(voidPaymentTaskAttributes, voidReserveTaskAttributes);
-    }
-    return taskAttributes;
-}
-exports.createOnOrderCancelledTasksByTransaction = createOnOrderCancelledTasksByTransaction;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderCancelled/factory.d.ts ADDED Viewed

@@ -0,0 +1,11 @@
+/**
+ * 注文ステータス変更時処理
+ */
+import * as factory from '../../../../factory';
+/**
+ * 注文中止時のアクション
+ */
+declare function createOnOrderCancelledTasksByTransaction(params: {
+    transaction?: factory.transaction.placeOrder.ITransaction;
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+export { createOnOrderCancelledTasksByTransaction };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderCancelled/factory.js ADDED Viewed

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createOnOrderCancelledTasksByTransaction = void 0;
+/**
+ * 注文ステータス変更時処理
+ */
+const factory = require("../../../../factory");
+/**
+ * 注文中止時のアクション
+ */
+function createOnOrderCancelledTasksByTransaction(params) {
+    var _a;
+    const now = new Date();
+    const taskAttributes = [];
+    if (typeof ((_a = params.transaction) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+        const voidPaymentTaskAttributes = {
+            project: params.transaction.project,
+            name: factory.taskName.VoidPayTransaction,
+            status: factory.taskStatus.Ready,
+            runsAt: now,
+            remainingNumberOfTries: 10,
+            numberOfTried: 0,
+            executionResults: [],
+            data: {
+                project: params.transaction.project,
+                purpose: {
+                    typeOf: params.transaction.typeOf,
+                    id: params.transaction.id,
+                    result: { order: { orderStatus: factory.orderStatus.OrderCancelled } }
+                }
+            }
+        };
+        const voidReserveTaskAttributes = {
+            project: params.transaction.project,
+            name: factory.taskName.VoidReserveTransaction,
+            status: factory.taskStatus.Ready,
+            runsAt: now,
+            remainingNumberOfTries: 10,
+            numberOfTried: 0,
+            executionResults: [],
+            data: {
+                project: params.transaction.project,
+                purpose: {
+                    typeOf: params.transaction.typeOf,
+                    id: params.transaction.id,
+                    result: { order: { orderStatus: factory.orderStatus.OrderCancelled } }
+                }
+            }
+        };
+        taskAttributes.push(voidPaymentTaskAttributes, voidReserveTaskAttributes);
+    }
+    return taskAttributes;
+}
+exports.createOnOrderCancelledTasksByTransaction = createOnOrderCancelledTasksByTransaction;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderCancelled.d.ts ADDED Viewed

@@ -0,0 +1,12 @@
+import type { MongoRepository as TaskRepo } from '../../../repo/task';
+import * as factory from '../../../factory';
+type IPlaceOrderTransaction = factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
+type IReturnOrderTransaction = factory.transaction.ITransaction<factory.transactionType.ReturnOrder>;
+declare function onOrderCancelled(params: {
+    order: factory.order.IOrder;
+    placeOrderTransaction?: IPlaceOrderTransaction;
+    returnOrderTransaction?: IReturnOrderTransaction;
+}): (repos: {
+    task: TaskRepo;
+}) => Promise<void>;
+export { onOrderCancelled };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderCancelled.js ADDED Viewed

@@ -0,0 +1,39 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onOrderCancelled = void 0;
+/**
+ * 注文中止時処理
+ */
+const createDebug = require("debug");
+const factory = require("../../../factory");
+const factory_1 = require("./onOrderCancelled/factory");
+const debug = createDebug('chevre-domain:service:order');
+function onOrderCancelled(params) {
+    // tslint:disable-next-line:max-func-body-length
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
+        let tasks = [];
+        switch (params.order.orderStatus) {
+            // OrderCancelled追加(2023-08-30~)
+            case factory.orderStatus.OrderCancelled:
+                // 注文取引中止時と同様の処理か
+                tasks = [
+                    ...(0, factory_1.createOnOrderCancelledTasksByTransaction)({ transaction: params.placeOrderTransaction })
+                ];
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
+        }
+        yield repos.task.saveMany(tasks, { emitImmediately: true });
+    });
+}
+exports.onOrderCancelled = onOrderCancelled;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned/factory.d.ts ADDED Viewed

@@ -0,0 +1,9 @@
+import * as factory from '../../../../factory';
+declare function createInformTasks(order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner'>): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+/**
+ * 注文返品後のアクション
+ */
+declare function createOnOrderReturnedTasksByTransaction(params: {
+    potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+export { createInformTasks, createOnOrderReturnedTasksByTransaction };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned/factory.js ADDED Viewed

@@ -0,0 +1,110 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createOnOrderReturnedTasksByTransaction = exports.createInformTasks = void 0;
+const factory = require("../../../../factory");
+const settings_1 = require("../../../../settings");
+const informOrder = (_a = settings_1.settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
+function createInformTasks(order) {
+    var _a;
+    const taskRunsAt = new Date();
+    let informTasks = [];
+    if (Array.isArray(informOrder) && informOrder.length > 0) {
+        const order4inform = creteOrder4inform(order);
+        let recipientId = '';
+        recipientId = order.customer.id;
+        if (typeof ((_a = order.returner) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+            recipientId = order.returner.id;
+        }
+        informTasks = informOrder.map((informOrderParams) => {
+            var _a, _b;
+            const informActionAttributes = {
+                agent: order.project,
+                object: order4inform,
+                project: order.project,
+                recipient: {
+                    url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
+                    id: recipientId,
+                    name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
+                    typeOf: factory.creativeWorkType.WebApplication
+                },
+                typeOf: factory.actionType.InformAction
+            };
+            return {
+                project: order.project,
+                name: factory.taskName.TriggerWebhook,
+                status: factory.taskStatus.Ready,
+                runsAt: taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: informActionAttributes
+            };
+        });
+    }
+    return informTasks;
+}
+exports.createInformTasks = createInformTasks;
+function creteOrder4inform(order) {
+    return Object.assign(Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, orderStatus: factory.orderStatus.OrderReturned }, (order.dateReturned !== undefined) ? { dateReturned: order.dateReturned } : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
+}
+/**
+ * 注文返品後のアクション
+ */
+function createOnOrderReturnedTasksByTransaction(params) {
+    const now = new Date();
+    const taskAttributes = [];
+    const potentialActions = params.potentialActions;
+    // 入金返却タスク
+    const returnMoneyTransferAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.returnMoneyTransfer;
+    if (Array.isArray(returnMoneyTransferAttributes)) {
+        taskAttributes.push(...returnMoneyTransferAttributes.map((a) => {
+            return {
+                project: a.project,
+                name: factory.taskName.ReturnMoneyTransfer,
+                status: factory.taskStatus.Ready,
+                runsAt: now,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: a
+            };
+        }));
+    }
+    // ポイント特典返却タスク
+    const returnPointAwardAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.returnPointAward;
+    if (Array.isArray(returnPointAwardAttributes)) {
+        taskAttributes.push(...returnPointAwardAttributes.map((a) => {
+            return {
+                project: a.project,
+                name: factory.taskName.ReturnPointAward,
+                status: factory.taskStatus.Ready,
+                runsAt: now,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: a
+            };
+        }));
+    }
+    const sendEmailMessageAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.sendEmailMessage;
+    if (Array.isArray(sendEmailMessageAttributes)) {
+        sendEmailMessageAttributes.forEach((s) => {
+            const sendEmailMessageTask = {
+                project: s.project,
+                name: factory.taskName.SendEmailMessage,
+                status: factory.taskStatus.Ready,
+                runsAt: now,
+                remainingNumberOfTries: 3,
+                numberOfTried: 0,
+                executionResults: [],
+                data: {
+                    actionAttributes: s
+                }
+            };
+            taskAttributes.push(sendEmailMessageTask);
+        });
+    }
+    return taskAttributes;
+}
+exports.createOnOrderReturnedTasksByTransaction = createOnOrderReturnedTasksByTransaction;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.d.ts ADDED Viewed

@@ -0,0 +1,12 @@
+import type { MongoRepository as AcceptedOfferRepo } from '../../../repo/acceptedOffer';
+import type { MongoRepository as TaskRepo } from '../../../repo/task';
+import * as factory from '../../../factory';
+type IReturnOrderTransaction = factory.transaction.ITransaction<factory.transactionType.ReturnOrder>;
+declare function onOrderReturned(params: {
+    order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner' | 'seller' | 'price' | 'priceCurrency' | 'orderDate' | 'orderStatus'>;
+    returnOrderTransaction?: IReturnOrderTransaction;
+}): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
+    task: TaskRepo;
+}) => Promise<void>;
+export { onOrderReturned };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js ADDED Viewed

@@ -0,0 +1,164 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onOrderReturned = void 0;
+/**
+ * 注文返品時処理
+ */
+const createDebug = require("debug");
+const google_libphonenumber_1 = require("google-libphonenumber");
+const factory = require("../../../factory");
+const order_1 = require("../../../factory/order");
+const factory_1 = require("./onOrderReturned/factory");
+const debug = createDebug('chevre-domain:service:order');
+function onOrderReturned(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
+        let tasks = [];
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
+        const simpleOrder = {
+            typeOf: params.order.typeOf,
+            seller: {
+                id: params.order.seller.id,
+                typeOf: params.order.seller.typeOf,
+                name: params.order.seller.name
+            },
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
+            orderNumber: params.order.orderNumber,
+            price: params.order.price,
+            priceCurrency: params.order.priceCurrency,
+            orderDate: params.order.orderDate
+        };
+        switch (params.order.orderStatus) {
+            case factory.orderStatus.OrderReturned:
+                const potentialActionsByTransaction = (_d = (_c = (_b = (_a = params.returnOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.returnOrder) === null || _c === void 0 ? void 0 : _c.find((returnOrderActionByTransaction) => {
+                    return returnOrderActionByTransaction.object.orderNumber === params.order.orderNumber;
+                })) === null || _d === void 0 ? void 0 : _d.potentialActions;
+                const reservationNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
+                const offeredThroughIdentifier = (yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber'))[0];
+                const reservationForSuperEventLocationBranchCodes = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
+                tasks = [
+                    ...(0, factory_1.createInformTasks)(params.order),
+                    ...createReturnReserveTransactionTasks(Object.assign(Object.assign({}, params.order), { reservationNumbers,
+                        offeredThroughIdentifier,
+                        reservationForSuperEventLocationBranchCodes }), simpleOrder),
+                    // 決済取引返却タスクを作成(2022-06-09~)
+                    ...createReturnPayTransactionTasks({ orderNumber: params.order.orderNumber }, params.returnOrderTransaction),
+                    // 取引のpotentialActionsを適用(2023-08-19~)
+                    ...(0, factory_1.createOnOrderReturnedTasksByTransaction)({ potentialActions: potentialActionsByTransaction })
+                ];
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
+        }
+        yield repos.task.saveMany(tasks, { emitImmediately: true });
+    });
+}
+exports.onOrderReturned = onOrderReturned;
+function createReturnReserveTransactionTasks(order, simpleOrder) {
+    const taskRunsAt = new Date();
+    const taskRunsAt4coa = new Date();
+    const tasks = [];
+    const returnActionRecipient = {
+        typeOf: order.seller.typeOf,
+        id: order.seller.id,
+        name: order.seller.name
+    };
+    // 注文アイテムから返却アクションを作成する
+    // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+    for (const reservationNumber of order.reservationNumbers) {
+        // const reservation = acceptedOffer.itemOffered;
+        // 予約番号ごとに返却アクションを作成する
+        let returnReserveTransactionAction;
+        switch (order.offeredThroughIdentifier) {
+            case factory.service.webAPI.Identifier.COA:
+                // const superEventLocationBranchCode =
+                //     (<factory.order.IEventReservation>reservation).reservationFor?.superEvent.location.branchCode;
+                // ↓1注文に複数施設はない想定なので、これで問題ない
+                const superEventLocationBranchCode = order.reservationForSuperEventLocationBranchCodes[0];
+                if (typeof superEventLocationBranchCode !== 'string') {
+                    throw new factory.errors.ArgumentNull('order.reservationForSuperEventLocationBranchCodes');
+                }
+                const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
+                const phoneNumber = phoneUtil.parse(order.customer.telephone, 'JP');
+                let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
+                // COAでは数字のみ受け付けるので数字以外を除去
+                telNum = telNum.replace(/[^\d]/g, '');
+                returnReserveTransactionAction = {
+                    project: order.project,
+                    typeOf: factory.actionType.ReturnAction,
+                    object: {
+                        theaterCode: superEventLocationBranchCode,
+                        reserveNum: reservationNumber,
+                        telNum: telNum,
+                        typeOf: 'COAReserveTransaction'
+                    },
+                    agent: order.project,
+                    purpose: simpleOrder,
+                    instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.COA },
+                    recipient: returnActionRecipient
+                };
+                break;
+            default:
+                returnReserveTransactionAction = {
+                    project: order.project,
+                    typeOf: factory.actionType.ReturnAction,
+                    object: {
+                        typeOf: factory.assetTransactionType.Reserve,
+                        transactionNumber: reservationNumber
+                    },
+                    agent: order.project,
+                    purpose: simpleOrder,
+                    instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre },
+                    recipient: returnActionRecipient
+                };
+        }
+        tasks.push({
+            project: order.project,
+            name: factory.taskName.ReturnReserveTransaction,
+            status: factory.taskStatus.Ready,
+            runsAt: (returnReserveTransactionAction.object.typeOf === 'COAReserveTransaction')
+                ? taskRunsAt4coa
+                : taskRunsAt,
+            remainingNumberOfTries: 10,
+            numberOfTried: 0,
+            executionResults: [],
+            data: returnReserveTransactionAction
+        });
+    }
+    return tasks;
+}
+function createReturnPayTransactionTasks(order, returnOrderTransaction) {
+    var _a, _b;
+    const taskRunsAt = new Date();
+    // const taskRunsAt = moment(order.dateReturned)
+    //     .add(RETURN_PAY_TASK_DELAY_IN_SECONDS, 'seconds')
+    //     .toDate();
+    const tasks = [];
+    const returnOrderPotentialActions = (_b = (_a = returnOrderTransaction === null || returnOrderTransaction === void 0 ? void 0 : returnOrderTransaction.potentialActions) === null || _a === void 0 ? void 0 : _a.returnOrder.find((action) => action.object.orderNumber === order.orderNumber)) === null || _b === void 0 ? void 0 : _b.potentialActions;
+    const returnPayActionsByReturnOrderTransaction = returnOrderPotentialActions === null || returnOrderPotentialActions === void 0 ? void 0 : returnOrderPotentialActions.returnPaymentMethod;
+    if (Array.isArray(returnPayActionsByReturnOrderTransaction)) {
+        tasks.push(...returnPayActionsByReturnOrderTransaction.map((a) => {
+            return {
+                project: a.project,
+                name: factory.taskName.ReturnPayTransaction,
+                status: factory.taskStatus.Ready,
+                runsAt: taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: a
+            };
+        }));
+    }
+    return tasks;
+}

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

@@ -2,14 +2,16 @@ import type { RedisRepository as RegisterServiceInProgressRepo } from '../../rep
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import * as factory from '../../factory';
 import { IExternalOrder } from './onOrderStatusChanged/factory';
+import { onOrderCancelled } from './onOrderStatusChanged/onOrderCancelled';
+import { onOrderReturned } from './onOrderStatusChanged/onOrderReturned';
 type IPlaceOrderTransaction = factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
-type IReturnOrderTransaction = factory.transaction.ITransaction<factory.transactionType.ReturnOrder>;
-export declare function onOrderStatusChanged(params: {
-    order: factory.order.IOrder;
+declare function onOrderStatusChanged(params: {
+    order: Omit<factory.order.IOrder, 'orderStatus'> & {
+        orderStatus: factory.orderStatus.OrderDelivered | factory.orderStatus.OrderPaymentDue | factory.orderStatus.OrderPaymentDue | factory.orderStatus.OrderProcessing;
+    };
     placeOrderTransaction?: IPlaceOrderTransaction;
-    returnOrderTransaction?: IReturnOrderTransaction;
 }): (repos: {
     registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;
 }) => Promise<void>;
-export { IExternalOrder };
+export { IExternalOrder, onOrderCancelled, onOrderReturned, onOrderStatusChanged };

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

@@ -9,23 +9,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onOrderStatusChanged = void 0;
+exports.onOrderStatusChanged = exports.onOrderReturned = exports.onOrderCancelled = void 0;
 /**
  * 注文ステータス変更時処理
  */
 const createDebug = require("debug");
-const google_libphonenumber_1 = require("google-libphonenumber");
 const factory = require("../../factory");
 const order_1 = require("../../factory/order");
 const product_1 = require("../offer/product");
 const factory_1 = require("./onOrderStatusChanged/factory");
+const onOrderCancelled_1 = require("./onOrderStatusChanged/onOrderCancelled");
+Object.defineProperty(exports, "onOrderCancelled", { enumerable: true, get: function () { return onOrderCancelled_1.onOrderCancelled; } });
+const onOrderReturned_1 = require("./onOrderStatusChanged/onOrderReturned");
+Object.defineProperty(exports, "onOrderReturned", { enumerable: true, get: function () { return onOrderReturned_1.onOrderReturned; } });
 const debug = createDebug('chevre-domain:service:order');
 const USE_CONFIRM_REGISTER_SERVICE_TRANSACTION = process.env.USE_CONFIRM_REGISTER_SERVICE_TRANSACTION === '1';
 const TOKEN_EXPIRES_IN = 604800;
 function onOrderStatusChanged(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
@@ -103,26 +106,6 @@ function onOrderStatusChanged(params) {
                     // })
                 ];
                 break;
-            case factory.orderStatus.OrderReturned:
-                const potentialActionsByTransaction = (_j = (_h = (_g = (_f = params.returnOrderTransaction) === null || _f === void 0 ? void 0 : _f.potentialActions) === null || _g === void 0 ? void 0 : _g.returnOrder) === null || _h === void 0 ? void 0 : _h.find((returnOrderActionByTransaction) => {
-                    return returnOrderActionByTransaction.object.orderNumber === params.order.orderNumber;
-                })) === null || _j === void 0 ? void 0 : _j.potentialActions;
-                tasks = [
-                    ...(0, factory_1.createInformTasks)(params.order),
-                    ...createReturnReserveTransactionTasks(params.order, simpleOrder),
-                    // 決済取引返却タスクを作成(2022-06-09~)
-                    ...createReturnPayTransactionTasks(params.order, simpleOrder, params.returnOrderTransaction),
-                    // 取引のpotentialActionsを適用(2023-08-19~)
-                    ...(0, factory_1.createOnOrderReturnedTasksByTransaction)({ potentialActions: potentialActionsByTransaction })
-                ];
-                break;
-            // OrderCancelled追加(2023-08-30~)
-            case factory.orderStatus.OrderCancelled:
-                // 注文取引中止時と同様の処理か
-                tasks = [
-                    ...(0, factory_1.createOnOrderCancelledTasksByTransaction)({ transaction: params.placeOrderTransaction })
-                ];
-                break;
             default:
         }
         yield repos.task.saveMany(tasks, { emitImmediately: true });
@@ -133,10 +116,10 @@ function onOrderStatusChanged(params) {
                 // 冗長なsendOrderタスク作成を回避(2023-08-25~)
                 yield createSendOrderTransactionTaskIfNotExist({
                     object: params.order,
-                    potentialActions: (_m = (_l = (_k = params.placeOrderTransaction) === null || _k === void 0 ? void 0 : _k.potentialActions) === null || _l === void 0 ? void 0 : _l.order) === null || _m === void 0 ? void 0 : _m.potentialActions
+                    potentialActions: (_h = (_g = (_f = params.placeOrderTransaction) === null || _f === void 0 ? void 0 : _f.potentialActions) === null || _g === void 0 ? void 0 : _g.order) === null || _h === void 0 ? void 0 : _h.potentialActions
                 })(repos);
                 yield createGivePointAwardTaskIfNotExist({
-                    potentialActions: (_q = (_p = (_o = params.placeOrderTransaction) === null || _o === void 0 ? void 0 : _o.potentialActions) === null || _p === void 0 ? void 0 : _p.order) === null || _q === void 0 ? void 0 : _q.potentialActions
+                    potentialActions: (_l = (_k = (_j = params.placeOrderTransaction) === null || _j === void 0 ? void 0 : _j.potentialActions) === null || _k === void 0 ? void 0 : _k.order) === null || _l === void 0 ? void 0 : _l.potentialActions
                 })(repos);
                 break;
             default:
@@ -341,111 +324,3 @@ function createGivePointAwardTaskIfNotExist(params) {
         }
     });
 }
-// const RETURN_COA_TASK_DELAY_IN_SECONDS = 0;
-function createReturnReserveTransactionTasks(order, simpleOrder) {
-    var _a, _b;
-    const taskRunsAt = new Date();
-    const taskRunsAt4coa = new Date();
-    // const taskRunsAt4coa = moment(order.dateReturned)
-    //     .add(RETURN_COA_TASK_DELAY_IN_SECONDS, 'seconds')
-    //     .toDate();
-    const tasks = [];
-    const returnActionRecipient = {
-        typeOf: order.seller.typeOf,
-        id: order.seller.id,
-        name: order.seller.name
-    };
-    const reservationNumbers = [];
-    // 注文アイテムから返却アクションを作成する
-    const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-    for (const acceptedOffer of acceptedOffers) {
-        if (acceptedOffer.itemOffered.typeOf === factory.reservationType.EventReservation
-            || acceptedOffer.itemOffered.typeOf === factory.reservationType.BusReservation) {
-            const reservation = acceptedOffer.itemOffered;
-            const reservationNumber = reservation.reservationNumber;
-            // 予約番号ごとに返却アクションを作成する
-            if (!reservationNumbers.includes(reservationNumber)) {
-                let returnReserveTransactionAction;
-                switch ((_a = acceptedOffer.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) {
-                    case factory.service.webAPI.Identifier.COA:
-                        const superEventLocationBranchCode = (_b = reservation.reservationFor) === null || _b === void 0 ? void 0 : _b.superEvent.location.branchCode;
-                        const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-                        const phoneNumber = phoneUtil.parse(order.customer.telephone, 'JP');
-                        let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
-                        // COAでは数字のみ受け付けるので数字以外を除去
-                        telNum = telNum.replace(/[^\d]/g, '');
-                        returnReserveTransactionAction = {
-                            project: order.project,
-                            typeOf: factory.actionType.ReturnAction,
-                            object: {
-                                theaterCode: superEventLocationBranchCode,
-                                reserveNum: reservationNumber,
-                                telNum: telNum,
-                                typeOf: 'COAReserveTransaction'
-                            },
-                            agent: order.project,
-                            // potentialActions: {},
-                            purpose: simpleOrder,
-                            instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.COA },
-                            recipient: returnActionRecipient
-                        };
-                        break;
-                    default:
-                        returnReserveTransactionAction = {
-                            project: order.project,
-                            typeOf: factory.actionType.ReturnAction,
-                            object: {
-                                typeOf: factory.assetTransactionType.Reserve,
-                                transactionNumber: reservationNumber
-                            },
-                            agent: order.project,
-                            // potentialActions: {},
-                            purpose: simpleOrder,
-                            instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre },
-                            recipient: returnActionRecipient
-                        };
-                }
-                tasks.push({
-                    project: order.project,
-                    name: factory.taskName.ReturnReserveTransaction,
-                    status: factory.taskStatus.Ready,
-                    runsAt: (returnReserveTransactionAction.object.typeOf === 'COAReserveTransaction')
-                        ? taskRunsAt4coa
-                        : taskRunsAt,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: returnReserveTransactionAction
-                });
-                reservationNumbers.push(reservationNumber);
-            }
-        }
-    }
-    return tasks;
-}
-// const RETURN_PAY_TASK_DELAY_IN_SECONDS = 0;
-function createReturnPayTransactionTasks(order, __, returnOrderTransaction) {
-    var _a, _b;
-    const taskRunsAt = new Date();
-    // const taskRunsAt = moment(order.dateReturned)
-    //     .add(RETURN_PAY_TASK_DELAY_IN_SECONDS, 'seconds')
-    //     .toDate();
-    const tasks = [];
-    const returnOrderPotentialActions = (_b = (_a = returnOrderTransaction === null || returnOrderTransaction === void 0 ? void 0 : returnOrderTransaction.potentialActions) === null || _a === void 0 ? void 0 : _a.returnOrder.find((action) => action.object.orderNumber === order.orderNumber)) === null || _b === void 0 ? void 0 : _b.potentialActions;
-    const returnPayActionsByReturnOrderTransaction = returnOrderPotentialActions === null || returnOrderPotentialActions === void 0 ? void 0 : returnOrderPotentialActions.returnPaymentMethod;
-    if (Array.isArray(returnPayActionsByReturnOrderTransaction)) {
-        tasks.push(...returnPayActionsByReturnOrderTransaction.map((a) => {
-            return {
-                project: a.project,
-                name: factory.taskName.ReturnPayTransaction,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: a
-            };
-        }));
-    }
-    return tasks;
-}

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

@@ -226,7 +226,9 @@ function placeOrder(params) {
             yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });
             // PaymentDueであればonOrderStatusChangedを実行(2023-08-23~)
             if (order.orderStatus === factory.orderStatus.OrderPaymentDue) {
-                yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, placeOrderTransaction })({
+                yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({
+                    order: Object.assign(Object.assign({}, order), { orderStatus: order.orderStatus }), placeOrderTransaction
+                })({
                     registerActionInProgress: repos.registerActionInProgress,
                     task: repos.task
                 });

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

@@ -1,5 +1,5 @@
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
-import type { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
@@ -16,11 +16,11 @@ declare function returnOrder(params: {
     };
     useOnOrderStatusChanged: boolean;
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-    registerServiceInProgress: RegisterServiceInProgressRepo;
 }) => Promise<void>;
 export { returnOrder };

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

@@ -28,7 +28,10 @@ function returnOrder(params) {
         let order = yield repos.order.findByOrderNumber({
             orderNumber,
             project: { id: params.project.id },
-            inclusion: [],
+            inclusion: [
+            // 'project', 'typeOf', 'orderNumber', 'dateReturned', 'id', 'customer',
+            // 'returner', 'seller', 'price', 'priceCurrency', 'orderDate', 'orderStatus'
+            ],
             exclusion: []
         });
         // 返品取引検索
@@ -95,14 +98,11 @@ function returnOrder(params) {
         const result = returnedOwnershipInfos;
         yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
         if (params.useOnOrderStatusChanged) {
-            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, returnOrderTransaction })({
-                registerActionInProgress: repos.registerServiceInProgress,
+            yield (0, onOrderStatusChanged_1.onOrderReturned)({ order, returnOrderTransaction })({
+                acceptedOffer: repos.acceptedOffer,
                 task: repos.task
             });
         }
-        // 潜在アクション
-        // onOrderStatusChangedへ移行(2023-08-19~)
-        // await onReturn(returnOrderActionAttributes)({ task: repos.task });
     });
 }
 exports.returnOrder = returnOrder;

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

@@ -100,7 +100,10 @@ function sendOrder(params) {
             const result = ownershipInfos;
             yield repos.action.complete({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
             if (params.useOnOrderStatusChanged) {
-                yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, placeOrderTransaction })({
+                yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({
+                    order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderDelivered }),
+                    placeOrderTransaction
+                })({
                     registerActionInProgress: repos.registerActionInProgress,
                     task: repos.task
                 });
@@ -122,8 +125,6 @@ function sendOrder(params) {
                 throw error;
             }
         }
-        // onOrderStatusChangedへ移行(2023-08-17~)
-        // await onSend(params)({ task: repos.task });
     });
 }
 exports.sendOrder = sendOrder;

package/lib/chevre/service/task/confirmPayTransaction.js CHANGED Viewed

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -30,6 +31,7 @@ function call(data) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
         yield (0, confirmPayTransaction_1.confirmPayTransaction)(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
@@ -37,7 +39,6 @@ function call(data) {
             event: new event_1.MongoRepository(settings.connection),
             product: new product_1.MongoRepository(settings.connection),
             project: new project_1.MongoRepository(settings.connection),
-            // seller: new SellerRepo(settings.connection),
             task: new task_1.MongoRepository(settings.connection),
             transaction: new transaction_1.MongoRepository(settings.connection)
         });

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

@@ -10,9 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const task_1 = require("../../repo/task");
@@ -23,22 +22,16 @@ const returnOrder_1 = require("../order/returnOrder");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const orderRepo = new order_1.MongoRepository(settings.connection);
-        const ownershipInfoRepo = new ownershipInfo_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
-        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
-        const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         yield (0, returnOrder_1.returnOrder)(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
-            action: actionRepo,
-            order: orderRepo,
-            ownershipInfo: ownershipInfoRepo,
-            registerServiceInProgress: registerServiceInProgressRepo,
-            task: taskRepo,
-            transaction: transactionRepo
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

package/package.json CHANGED Viewed

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.18.0-alpha.7"
+  "version": "21.18.0-alpha.8"
 }