@chevre/domain 21.20.0-alpha.8 → 21.20.0

package/lib/chevre/service/payment.js

@@ -11,29 +11,64 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refund = exports.voidPayment = exports.pay = void 0;
 const factory = require("../factory");
+const pay_1 = require("./assetTransaction/pay");
+const potentialActions_1 = require("./assetTransaction/pay/potentialActions");
 const CreditCardPaymentService = require("./payment/creditCard");
 const FaceToFacePaymentService = require("./payment/faceToFace");
 const MovieTicketPaymentService = require("./payment/movieTicket");
 const PaymentCardPaymentService = require("./payment/paymentCard");
+function payTask2payActionAttributes(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let transaction;
+        if (typeof params.object.paymentMethod.paymentMethodId === 'string') {
+            transaction = yield repos.assetTransaction.findByTransactionNumber({
+                typeOf: factory.assetTransactionType.Pay,
+                transactionNumber: params.object.paymentMethod.paymentMethodId
+            });
+            if (transaction.status !== factory.transactionStatusType.Confirmed) {
+                throw new factory.errors.Argument('object.paymentMethod.paymentMethodId', `invalid transaction status: ${transaction.transactionNumber} ${transaction.status}`);
+            }
+        }
+        else {
+            throw new factory.errors.ArgumentNull('object.paymentMethod.paymentMethodId');
+        }
+        const order = yield (0, pay_1.fixOrderAsPurpose)({ potentialActions: { pay: { purpose: params.purpose } } }, transaction)(repos);
+        const payActions = (0, potentialActions_1.createPayActions)({
+            transaction: transaction,
+            potentialActions: { pay: { purpose: params.purpose } },
+            order
+        });
+        return payActions[0];
+    });
+}
 /**
  * 決済確定
  */
 function pay(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const paymentServiceType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
+        let payActionAttributes;
+        if (params.typeOf === factory.actionType.PayAction) {
+            // タスクにPayActionそのものが指定されていればそのまま処理
+            payActionAttributes = params;
+        }
+        else {
+            // 最適化されたタスクに対応(2024-01-19~)
+            payActionAttributes = yield payTask2payActionAttributes(params)(repos);
+        }
+        const paymentServiceType = (_a = payActionAttributes.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                yield FaceToFacePaymentService.payFaceToFace(params)(repos);
+                yield FaceToFacePaymentService.payFaceToFace(payActionAttributes)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                yield PaymentCardPaymentService.payPaymentCard(params)(repos);
+                yield PaymentCardPaymentService.payPaymentCard(payActionAttributes)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                yield CreditCardPaymentService.payCreditCard(params)(repos);
+                yield CreditCardPaymentService.payCreditCard(payActionAttributes)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                yield MovieTicketPaymentService.payMovieTicket(params)(repos);
+                yield MovieTicketPaymentService.payMovieTicket(payActionAttributes)(repos);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);

package/lib/chevre/service/product.js

@@ -42,7 +42,7 @@ function registerService(params) {
             }
             // アクション完了
             const actionResult = {};
-            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+            yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
             yield onRegistered(actionAttributes, serviceOutput)(repos);
         })));
     });

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

@@ -148,7 +148,7 @@ function cancelPengindIfNotYet(params, __) {
             // } : undefined
             // canceledReservationId: canceledReservation?.id
             };
-            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+            yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
         return { reserveTransaction };
     });
@@ -288,7 +288,7 @@ function cancelReservation(actionAttributesList) {
                 } : undefined
                 // canceledReservationId: canceledReservation?.id
                 );
-                yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+                yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
                 let canceledReservations = [];
                 if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
                     const reservationNumber = actionAttributes.object.reservationNumber;

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

@@ -30,9 +30,7 @@ interface ICheckInReservationParams {
         code: string;
     };
 }
-export declare function checkInReservation(params: ICheckInReservationParams & {
-    reserveIfNotYet: boolean;
-}): (repos: {
+export declare function checkInReservation(params: ICheckInReservationParams): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     event: EventRepo;

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

@@ -19,10 +19,7 @@ function checkInReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
-        debug('reserveIfNotYet?', params.reserveIfNotYet, 'ids:', params.object.ids, 'reservationNumbers:', params.object.reservationNumbers);
-        if (params.reserveIfNotYet === true) {
-            yield reserveIfNotYet(params)(repos);
-        }
+        yield reserveIfNotYet(params)(repos);
         // 発券処理(Array対応)
         let checkedInReservationIds;
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
@@ -100,7 +97,11 @@ function reserveIfNotYet(params) {
                                 reservationStatus: (typeof reserveTransaction.object.reservationStatus === 'string')
                                     ? reserveTransaction.object.reservationStatus
                                     : factory.reservationStatusType.ReservationPending,
-                                reservationFor: reserveTransaction.object.reservationFor
+                                reservationFor: {
+                                    id: String(reserveTransaction.object.reservationFor.id),
+                                    typeOf: reserveTransaction.object.reservationFor.typeOf,
+                                    optimized: true
+                                } // optimize(2024-01-24~)
                             },
                             agent: reserveTransaction.project,
                             purpose: { typeOf: reserveTransaction.typeOf, id: reserveTransaction.id }

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

@@ -138,7 +138,7 @@ function reserveIfNotYet(params, options) {
             }
             // アクション完了
             const actionResult = {};
-            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+            yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
     });
 }

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

@@ -3,17 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NUM_TRY_INFORM_RESERVATION = exports.maskUnderName = void 0;
 const MASKED_PROFILE = '****';
 function maskUnderName(reservation) {
-    // 予約後を隠蔽(2022-12-24~)
-    // const underNameIdentifiers: factory.propertyValue.IPropertyValue<string>[] | undefined =
-    //     (Array.isArray(reservation.underName?.identifier))
-    //         ? reservation.underName?.identifier.filter((p) => {
-    //             return !RESERVED_AGENT_IDENTIFIER_NAMES.includes(p.name);
-    //         })
-    //         : undefined;
     var _a;
     const underName = (typeof ((_a = reservation.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
         ? Object.assign(Object.assign({}, reservation.underName), { email: MASKED_PROFILE, telephone: MASKED_PROFILE, name: MASKED_PROFILE, familyName: MASKED_PROFILE, givenName: MASKED_PROFILE, 
-            // ... (Array.isArray(underNameIdentifiers)) ? { identifier: underNameIdentifiers } : undefined,
             // identifierも隠蔽(2022-12-27~)
             identifier: [] }) : undefined;
     return Object.assign(Object.assign({}, reservation), (underName !== undefined) ? { underName } : undefined);

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.d.ts

@@ -8,7 +8,7 @@ export type IUseReservationAction = factory.action.consume.use.reservation.IActi
 /**
  * 予約使用
  */
-export declare function onReservationUsed(action: IUseReservationAction, attendedReservation: IEventReservation): (repos: {
+export declare function onReservationUsed(attendedReservation: IEventReservation): (repos: {
     task: TaskRepo;
 }) => Promise<void>;
 export {};

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.js

@@ -21,7 +21,7 @@ const informReservations = settings_1.settings.onReservationStatusChanged.inform
 /**
  * 予約使用
  */
-function onReservationUsed(action, attendedReservation) {
+function onReservationUsed(attendedReservation) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const tasks = [];
@@ -54,7 +54,7 @@ function onReservationUsed(action, attendedReservation) {
                     typeOf: factory.actionType.InformAction
                 };
                 return {
-                    project: action.project,
+                    project: attendedReservation.project,
                     name: factory.taskName.TriggerWebhook,
                     status: factory.taskStatus.Ready,
                     runsAt: informTaskRunsAt,
@@ -67,9 +67,9 @@ function onReservationUsed(action, attendedReservation) {
         }
         // projectを限定する(2023-02-21~)
         // 使用アクション集計タスクを作成する(冗長な作成を避ける)
-        if (settings_1.settings.useAggregateEntranceGateProjects.includes(action.project.id)) {
+        if (settings_1.settings.useAggregateEntranceGateProjects.includes(attendedReservation.project.id)) {
             const readyAggregateUseActionsTaskDoc = yield repos.task.taskModel.findOne({
-                'project.id': { $eq: action.project.id },
+                'project.id': { $eq: attendedReservation.project.id },
                 name: { $eq: factory.taskName.AggregateUseActionsOnEvent },
                 status: { $eq: factory.taskStatus.Ready },
                 'data.id': { $exists: true, $eq: attendedReservation.reservationFor.id }

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

@@ -16,7 +16,8 @@ const factory = require("../../factory");
 const credentials_1 = require("../../credentials");
 const coaAuthClient = new COA.auth.RefreshToken({
     endpoint: credentials_1.credentials.coa.endpoint,
-    refreshToken: credentials_1.credentials.coa.refreshToken
+    refreshToken: credentials_1.credentials.coa.refreshToken,
+    useFetch: credentials_1.credentials.coa.useFetch
 });
 function searchByOrder(params) {
     // tslint:disable-next-line:max-func-body-length

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

@@ -4,7 +4,6 @@ import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTr
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
-import { IUseReservationAction } from './potentialActions/onReservationUsed';
 /**
  * 予約使用
  */
@@ -26,11 +25,10 @@ export declare function useReservation(params: {
         identifier?: string;
     };
     verifyToken: boolean;
-    reserveIfNotYet: boolean;
 }): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
-}) => Promise<IUseReservationAction>;
+}) => Promise<void>;

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

@@ -38,10 +38,7 @@ function useReservation(params) {
             }
         }
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
-        debug('reserveIfNotYet?', params.reserveIfNotYet, 'id:', params.object.id);
-        if (params.reserveIfNotYet === true) {
-            yield reserveIfNotYet({ object: params.object })(repos);
-        }
+        yield reserveIfNotYet({ object: params.object })(repos);
         // 予約検索
         // 取得属性最適化(2023-01-30~)
         const reservation = yield repos.reservation.findById({
@@ -68,7 +65,7 @@ function useReservation(params) {
                 }
             }
             : undefined);
-        let action = yield repos.action.start(actionAttributes);
+        const action = yield repos.action.start(actionAttributes);
         // ひとまず予約数:1に限定する
         if (actionAttributes.object.length !== 1) {
             throw new factory.errors.Argument('object', 'number of using reservations must be 1');
@@ -88,9 +85,9 @@ function useReservation(params) {
             throw error;
         }
         // アクション完了
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: {} }));
-        yield (0, onReservationUsed_1.onReservationUsed)(action, attendedReservation)({ task: repos.task });
-        return action;
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
+        yield (0, onReservationUsed_1.onReservationUsed)(attendedReservation)({ task: repos.task });
+        // return action;
     });
 }
 exports.useReservation = useReservation;
@@ -120,7 +117,11 @@ function reserveIfNotYet(params) {
                                 reservationStatus: (typeof reserveTransaction.object.reservationStatus === 'string')
                                     ? reserveTransaction.object.reservationStatus
                                     : factory.reservationStatusType.ReservationPending,
-                                reservationFor: reserveTransaction.object.reservationFor
+                                reservationFor: {
+                                    id: String(reserveTransaction.object.reservationFor.id),
+                                    typeOf: reserveTransaction.object.reservationFor.typeOf,
+                                    optimized: true
+                                } // optimize(2024-01-24~)
                             },
                             agent: reserveTransaction.project,
                             purpose: { typeOf: reserveTransaction.typeOf, id: reserveTransaction.id }

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

@@ -33,6 +33,8 @@ function verifyToken4reservation(params) {
                 });
                 // ステータス検証
                 switch (order.orderStatus) {
+                    case factory.orderStatus.OrderProcessing: // OrderProcessingも許可(2024-01-10~)
+                    case factory.orderStatus.OrderInTransit: // OrderInTransitも許可(2024-01-12~)
                     case factory.orderStatus.OrderDelivered:
                         break;
                     default:

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

@@ -12,17 +12,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const task_1 = require("../../repo/task");
 const MoneyTransferOfferService = require("../offer/moneyTransfer");
 /**
  * タスク実行関数
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
         yield MoneyTransferOfferService.settleTransaction(data)({
-            action: actionRepo,
-            assetTransaction: assetTransactionRepo
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -20,6 +20,7 @@ const order_1 = require("../../repo/order");
 const project_1 = require("../../repo/project");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
+const settings_1 = require("../../settings");
 const confirmPayTransaction_1 = require("../order/confirmPayTransaction");
 /**
  * タスク実行関数
@@ -29,7 +30,7 @@ function call(data) {
         if (settings.redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        yield (0, confirmPayTransaction_1.confirmPayTransaction)(data)({
+        yield (0, confirmPayTransaction_1.confirmPayTransaction)(data, { minimizePotentialActions: settings_1.USE_MINIMIZED_PAY_TASK })({
             acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),

package/lib/chevre/service/task/confirmRegisterServiceTransaction.d.ts

@@ -12,6 +12,6 @@ export declare function confirmRegisterServiceTransaction(params: factory.action
     assetTransaction: AssetTransactionRepo;
     task: TaskRepo;
 }) => Promise<void>;
-export declare function onRegistered(__: factory.action.interact.confirm.registerService.IAttributes): (repos: {
+export declare function onRegistered(params: factory.action.interact.confirm.registerService.IAttributes): (repos: {
     task: TaskRepo;
 }) => Promise<void>;

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

@@ -78,22 +78,44 @@ function confirmRegisterServiceTransaction(params) {
         }
         // アクション完了
         const result = {};
-        yield repos.action.complete({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
         yield onRegistered(confirmActionAttributes)(repos);
     });
 }
 exports.confirmRegisterServiceTransaction = confirmRegisterServiceTransaction;
-function onRegistered(__) {
+function onRegistered(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const taskAttributes = [];
-        // 次のメンバーシップ注文タスクを作成
-        // 廃止(2023-08-18~)
-        // const orderProgramMembershipTasks = actionAttributes.potentialActions?.orderProgramMembership;
-        // if (Array.isArray(orderProgramMembershipTasks)) {
-        //     taskAttributes.push(...orderProgramMembershipTasks);
-        // }
         // タスク保管
         yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
+        if (params.purpose.typeOf === factory.order.OrderType.Order) {
+            // タスク冪等作成
+            const onAssetTransactionStatusChangedTaskData = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: {
+                    typeOf: params.object.typeOf,
+                    transactionNumber: params.object.transactionNumber,
+                    status: factory.transactionStatusType.Confirmed
+                },
+                purpose: {
+                    confirmationNumber: '',
+                    orderNumber: params.purpose.orderNumber,
+                    typeOf: factory.order.OrderType.Order
+                },
+                useOnOrderStatusChanged: true
+            };
+            const onAssetTransactionStatusChangedTask = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                name: factory.taskName.OnAssetTransactionStatusChanged,
+                status: factory.taskStatus.Ready,
+                runsAt: new Date(),
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: onAssetTransactionStatusChangedTaskData
+            };
+            yield repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
+        }
     });
 }
 exports.onRegistered = onRegistered;

package/lib/chevre/service/task/confirmReserveTransaction.d.ts

@@ -1,5 +1,6 @@
 import { IOperation } from '../task';
 import * as factory from '../../factory';
+import { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import { MongoRepository as OrderRepo } from '../../repo/order';
@@ -12,7 +13,11 @@ export declare function call(data: factory.task.IData<factory.taskName.ConfirmRe
 /**
  * 予約を確定する
  */
-export declare function confirmReserveTransaction(params: factory.action.interact.confirm.reservation.IAttributes<factory.service.webAPI.Identifier>): (repos: {
+export declare function confirmReserveTransaction(params: factory.task.IData<factory.taskName.ConfirmReserveTransaction>, options: {
+    sendOrder: boolean;
+    useOnOrderStatusChanged: boolean;
+}): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;