@chevre/domain 22.9.0-alpha.44 → 22.9.0-alpha.46

package/example/src/chevre/migratePaymentServiceChannelIds.ts

@@ -83,11 +83,11 @@ async function main() {
         } else {
             if (paymentService.typeOf === chevre.factory.service.paymentService.PaymentServiceType.CreditCard
                 || paymentService.typeOf === chevre.factory.service.paymentService.PaymentServiceType.MovieTicket) {
-                await paymentServiceRepo.migrateChannelId({
-                    project: { id: paymentService.project.id },
-                    id: paymentService.id,
-                    typeOf: paymentService.typeOf
-                });
+                // await paymentServiceRepo.migrateChannelId({
+                //     project: { id: paymentService.project.id },
+                //     id: paymentService.id,
+                //     typeOf: paymentService.typeOf
+                // });
                 updateCount += 1;
                 console.log(
                     'updated.',

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

@@ -69,20 +69,6 @@ export declare class PaymentServiceRepo {
         id: string;
         credentials: factory.serviceChannel.ICredentialsMovieTicket;
     }>;
-    saveChannelByServiceUrl(params: Omit<factory.serviceChannel.IServiceChannel, 'id'>): Promise<void>;
-    /**
-     * for migrate(2025-02-20~)
-     */
-    migrateChannelId(params: {
-        project: {
-            id: string;
-        };
-        /**
-         * payment service ID
-         */
-        id: string;
-        typeOf: factory.service.paymentService.PaymentServiceType.CreditCard | factory.service.paymentService.PaymentServiceType.MovieTicket;
-    }): Promise<void>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

package/lib/chevre/repo/paymentService.js

@@ -317,12 +317,13 @@ class PaymentServiceRepo {
             if (availableChannel === undefined) {
                 throw new factory.errors.NotFound('paymentService.availableChannel');
             }
-            if (typeof availableChannel.serviceUrl !== 'string' || availableChannel.serviceUrl === '') {
-                throw new factory.errors.NotFound('paymentService.availableChannel.serviceUrl');
+            if (typeof availableChannel.id !== 'string' || availableChannel.id === '') {
+                throw new factory.errors.NotFound('paymentService.availableChannel.id');
             }
             const serviceChannel = yield this.paymentServiceChannelModel.findOne({
                 'project.id': { $eq: params.project.id },
-                serviceUrl: { $eq: availableChannel.serviceUrl },
+                _id: { $eq: availableChannel.id },
+                // serviceUrl: { $eq: availableChannel.serviceUrl },
                 'providesService.typeOf': { $eq: factory.service.paymentService.PaymentServiceType.CreditCard }
             }, {
                 credentials: 1,
@@ -356,12 +357,13 @@ class PaymentServiceRepo {
             if (availableChannel === undefined) {
                 throw new factory.errors.NotFound('paymentService.availableChannel');
             }
-            if (typeof availableChannel.serviceUrl !== 'string' || availableChannel.serviceUrl === '') {
-                throw new factory.errors.NotFound('paymentService.availableChannel.serviceUrl');
+            if (typeof availableChannel.id !== 'string' || availableChannel.id === '') {
+                throw new factory.errors.NotFound('paymentService.availableChannel.id');
             }
             const serviceChannel = yield this.paymentServiceChannelModel.findOne({
                 'project.id': { $eq: '*' },
-                serviceUrl: { $eq: availableChannel.serviceUrl },
+                _id: { $eq: availableChannel.id },
+                // serviceUrl: { $eq: availableChannel.serviceUrl },
                 'providesService.typeOf': { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket }
             }, {
                 credentials: 1,
@@ -377,49 +379,61 @@ class PaymentServiceRepo {
             return Object.assign(Object.assign({}, availableChannel), { id: serviceChannel.id, serviceUrl: serviceChannel.serviceUrl, credentials: serviceChannel.credentials });
         });
     }
-    saveChannelByServiceUrl(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.paymentServiceChannelModel.findOneAndUpdate({
-                'project.id': { $eq: params.project.id },
-                serviceUrl: { $eq: params.serviceUrl }
-            }, {
-                $setOnInsert: params
-            }, { upsert: true })
-                .exec();
-        });
-    }
-    /**
-     * for migrate(2025-02-20~)
-     */
-    migrateChannelId(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let existingChannel;
-            if (params.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
-                existingChannel = yield this.findAvailableChannelCreditCard(params);
-            }
-            else if (params.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket) {
-                existingChannel = yield this.findAvailableChannelMovieTicket(params);
-            }
-            else {
-                throw new factory.errors.Argument('typeOf', `not implemented`);
-            }
-            if (typeof existingChannel.id !== 'string' || existingChannel.id === '') {
-                throw new factory.errors.NotFound('existingChannel.id');
-            }
-            // tslint:disable-next-line:no-console
-            console.log('updating paymentService...', existingChannel.id, existingChannel.serviceUrl, params.project.id, params.id);
-            const doc = yield this.paymentServiceModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
-                $set: {
-                    'availableChannel.id': existingChannel.id
-                }
-            }, { upsert: false, new: true, projection: { _id: 1, id: { $toString: '$_id' } } })
-                .lean()
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.paymentServiceModel.modelName);
-            }
-        });
-    }
+    // public async saveChannelByServiceUrl(
+    //     params: Omit<factory.serviceChannel.IServiceChannel, 'id'>
+    // ): Promise<void> {
+    //     await this.paymentServiceChannelModel.findOneAndUpdate(
+    //         {
+    //             'project.id': { $eq: params.project.id },
+    //             serviceUrl: { $eq: params.serviceUrl }
+    //         },
+    //         {
+    //             $setOnInsert: params
+    //         },
+    //         { upsert: true }
+    //     )
+    //         .exec();
+    // }
+    // public async migrateChannelId(params: {
+    //     project: { id: string };
+    //     /**
+    //      * payment service ID
+    //      */
+    //     id: string;
+    //     typeOf: factory.service.paymentService.PaymentServiceType.CreditCard
+    //     | factory.service.paymentService.PaymentServiceType.MovieTicket;
+    // }): Promise<void> {
+    //     let existingChannel: Pick<
+    //         factory.service.paymentService.IAvailableChannel,
+    //         'serviceUrl' | 'typeOf' | 'id'
+    //     >;
+    //     if (params.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
+    //         existingChannel = await this.findAvailableChannelCreditCard(params);
+    //     } else if (params.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket) {
+    //         existingChannel = await this.findAvailableChannelMovieTicket(params);
+    //     } else {
+    //         throw new factory.errors.Argument('typeOf', `not implemented`);
+    //     }
+    //     if (typeof existingChannel.id !== 'string' || existingChannel.id === '') {
+    //         throw new factory.errors.NotFound('existingChannel.id');
+    //     }
+    //     // tslint:disable-next-line:no-console
+    //     console.log('updating paymentService...', existingChannel.id, existingChannel.serviceUrl, params.project.id, params.id);
+    //     const doc = await this.paymentServiceModel.findOneAndUpdate(
+    //         { _id: { $eq: params.id } },
+    //         {
+    //             $set: {
+    //                 'availableChannel.id': existingChannel.id
+    //             }
+    //         },
+    //         { upsert: false, new: true, projection: { _id: 1, id: { $toString: '$_id' } } }
+    //     )
+    //         .lean<{ id: string }>()
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.paymentServiceModel.modelName);
+    //     }
+    // }
     unsetUnnecessaryFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.paymentServiceModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })

package/lib/chevre/service/assetTransaction/reserveCOA/cancel.d.ts

@@ -2,6 +2,7 @@ import type * as COA from '@motionpicture/coa-service';
 import * as factory from '../../../factory';
 import { ActionRepo } from '../../../repo/action';
 type ICancelOperation<T> = (repos: {
+    action: ActionRepo;
     reserveService: COA.service.Reserve;
 }) => Promise<T>;
 declare function cancel(params: {
@@ -9,8 +10,5 @@ declare function cancel(params: {
 }): ICancelOperation<void>;
 declare function cancelByAcceptAction(params: {
     action: factory.action.accept.coaOffer.IAction;
-}): (repos: {
-    action: ActionRepo;
-    reserveService: COA.service.Reserve;
-}) => Promise<void>;
+}): ICancelOperation<void>;
 export { cancel, cancelByAcceptAction };

package/lib/chevre/service/assetTransaction/reserveCOA/cancel.js

@@ -14,7 +14,7 @@ exports.cancelByAcceptAction = cancelByAcceptAction;
 const cancelReservation_1 = require("../../reserveCOA/cancelReservation");
 function cancel(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield (0, cancelReservation_1.cancelPendingReservation)(params)(repos);
+        yield (0, cancelReservation_1.cancelPendingReservationByAuthorizeAction)(params)(repos);
     });
 }
 function cancelByAcceptAction(params) {

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4coa.d.ts

@@ -4,6 +4,7 @@ import { ActionRepo } from '../../../../repo/action';
 declare function processVoidTransaction4coa(params: {
     action: factory.action.authorize.offer.eventService.IAction;
 }): (repos: {
+    action: ActionRepo;
     reserveService: COA.service.Reserve;
 }) => Promise<void>;
 declare function processVoidTransactionByAcceptAction4coa(params: {

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -85,7 +85,10 @@ function voidTransaction(params) {
                     yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({
                         // action: <factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.COA>>action
                         action
-                    })({ reserveService });
+                    })({
+                        action: repos.action,
+                        reserveService
+                    });
                     break;
                 default:
                     yield (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({

package/lib/chevre/service/offer/event/voidTransactionByActionId.js

@@ -59,7 +59,10 @@ function voidTransactionByActionId(params) {
                 }
                 yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({
                     action
-                })({ reserveService });
+                })({
+                    action: repos.action,
+                    reserveService
+                });
                 break;
             default:
                 yield (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({

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

@@ -9,7 +9,7 @@ import type { TaskRepo } from '../../repo/task';
 /**
  * 保留予約取消
  */
-declare function cancelPendingReservation(actionAttributes: factory.task.cancelPendingReservation.IData): (repos: {
+declare function cancelPendingReservation(actionAttributes: factory.task.cancelPendingReservation.IPotentialCancelAction): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;

package/lib/chevre/service/reserveCOA/cancelReservation.d.ts

@@ -1,9 +1,18 @@
 import type * as COA from '@motionpicture/coa-service';
 import * as factory from '../../factory';
 import { ActionRepo } from '../../repo/action';
-declare function cancelPendingReservation(params: {
+declare function cancelPendingReservation(params: factory.task.cancelPendingReservation.IPotentialCancelCOAReserveAction & {
+    project: {
+        id: string;
+    };
+}): (repos: {
+    action: ActionRepo;
+    reserveService: COA.service.Reserve;
+}) => Promise<void>;
+declare function cancelPendingReservationByAuthorizeAction(params: {
     action: factory.action.authorize.offer.eventService.IAction;
 }): (repos: {
+    action: ActionRepo;
     reserveService: COA.service.Reserve;
 }) => Promise<void>;
 declare function cancelPendingReservationByAcceptAction(params: {
@@ -12,4 +21,4 @@ declare function cancelPendingReservationByAcceptAction(params: {
     action: ActionRepo;
     reserveService: COA.service.Reserve;
 }) => Promise<void>;
-export { cancelPendingReservation, cancelPendingReservationByAcceptAction };
+export { cancelPendingReservation, cancelPendingReservationByAuthorizeAction, cancelPendingReservationByAcceptAction };

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

@@ -10,28 +10,34 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cancelPendingReservation = cancelPendingReservation;
+exports.cancelPendingReservationByAuthorizeAction = cancelPendingReservationByAuthorizeAction;
 exports.cancelPendingReservationByAcceptAction = cancelPendingReservationByAcceptAction;
 const http_status_1 = require("http-status");
+const factory = require("../../factory");
+const factory_1 = require("./factory");
+function createCancelPendingReservationAction(params) {
+    const { object, instrument, project } = params;
+    return {
+        project: { id: project.id, typeOf: factory.organizationType.Project },
+        typeOf: factory.actionType.CancelAction,
+        agent: { id: project.id, typeOf: factory.organizationType.Project },
+        object,
+        instrument
+    };
+}
 function cancelPendingReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // object.pendingTransactionに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
-        let delTmpReserveParams;
-        // objectに進行中取引情報があれば利用する(2023-09-11~)
-        const pendingTransaction = params.action.object.pendingTransaction;
-        if (typeof (pendingTransaction === null || pendingTransaction === void 0 ? void 0 : pendingTransaction.typeOf) === 'string') {
-            delTmpReserveParams = {
-                theaterCode: pendingTransaction.theaterCode,
-                dateJouei: pendingTransaction.dateJouei,
-                titleCode: pendingTransaction.titleCode,
-                titleBranchNum: pendingTransaction.titleBranchNum,
-                timeBegin: pendingTransaction.timeBegin,
-                tmpReserveNum: pendingTransaction.tmpReserveNum
-            };
-        }
-        if (delTmpReserveParams !== undefined) {
-            // COAで仮予約取消
+        const actionAttributes = createCancelPendingReservationAction(params);
+        const { theaterCode, dateJouei, titleCode, titleBranchNum, timeBegin, tmpReserveNum } = actionAttributes.object;
+        const delTmpReserveArgs = { theaterCode, dateJouei, titleCode, titleBranchNum, timeBegin, tmpReserveNum };
+        let recipe = (0, factory_1.processCancelPendingCOAReserveResult2recipe)({
+            processCancelPendingCOAReserveResult: { delTmpReserveArgs },
+            project: { id: params.project.id }
+        });
+        const action = yield repos.action.start(actionAttributes, { recipe });
+        try {
             try {
-                yield repos.reserveService.delTmpReserve(delTmpReserveParams);
+                yield repos.reserveService.delTmpReserve(delTmpReserveArgs);
             }
             catch (error) {
                 let deleted = false;
@@ -43,6 +49,13 @@ function cancelPendingReservation(params) {
                         && error.code < http_status_1.INTERNAL_SERVER_ERROR) {
                         // すでに取消済の場合こうなるので、okとする
                         if (error.message === '座席取消失敗') {
+                            recipe = (0, factory_1.processCancelPendingCOAReserveResult2recipe)({
+                                processCancelPendingCOAReserveResult: {
+                                    delTmpReserveArgs,
+                                    delTmpReserveResult: Object.assign(Object.assign({}, error), { message: error.message })
+                                },
+                                project: { id: params.project.id }
+                            });
                             deleted = true;
                         }
                     }
@@ -52,6 +65,42 @@ function cancelPendingReservation(params) {
                 }
             }
         }
+        catch (error) {
+            try {
+                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        const actionResult = {};
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
+    });
+}
+function cancelPendingReservationByAuthorizeAction(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // object.pendingTransactionに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
+        let delTmpReserveParams;
+        // objectに進行中取引情報があれば利用する(2023-09-11~)
+        const pendingTransaction = params.action.object.pendingTransaction;
+        if (typeof (pendingTransaction === null || pendingTransaction === void 0 ? void 0 : pendingTransaction.typeOf) === 'string') {
+            delTmpReserveParams = {
+                theaterCode: pendingTransaction.theaterCode,
+                dateJouei: pendingTransaction.dateJouei,
+                titleCode: pendingTransaction.titleCode,
+                titleBranchNum: pendingTransaction.titleBranchNum,
+                timeBegin: pendingTransaction.timeBegin,
+                tmpReserveNum: pendingTransaction.tmpReserveNum
+            };
+        }
+        if (delTmpReserveParams !== undefined) {
+            yield cancelPendingReservation({
+                project: { id: params.action.project.id },
+                object: Object.assign(Object.assign({}, delTmpReserveParams), { reservationStatus: factory.reservationStatusType.ReservationPending, transactionNumber: delTmpReserveParams.tmpReserveNum, typeOf: factory.assetTransactionType.COAReserveTransaction }),
+                instrument: [params.action.purpose]
+            })(repos);
+        }
     });
 }
 function cancelPendingReservationByAcceptAction(params) {
@@ -63,9 +112,6 @@ function cancelPendingReservationByAcceptAction(params) {
         });
         if (recipe !== null) {
             let delTmpReserveParams;
-            // instrument,resultに連携内容情報が保管されているので、その情報を元に仮予約を取り消す
-            // const coaRequestBody = params.action.instrument?.requestBody;
-            // const coaResponseBody = params.action.result?.result?.responseBody;
             // recipeから連携情報取得に変更(2024-06-11~)
             const coaRequestBody = (_c = (_b = (_a = recipe.step[0]) === null || _a === void 0 ? void 0 : _a.itemListElement[0]) === null || _b === void 0 ? void 0 : _b.itemListElement[0]) === null || _c === void 0 ? void 0 : _c.beforeMedia;
             const coaResponseBody = (_f = (_e = (_d = recipe.step[0]) === null || _d === void 0 ? void 0 : _d.itemListElement[0]) === null || _e === void 0 ? void 0 : _e.itemListElement[0]) === null || _f === void 0 ? void 0 : _f.afterMedia;
@@ -80,28 +126,11 @@ function cancelPendingReservationByAcceptAction(params) {
                 };
             }
             if (delTmpReserveParams !== undefined) {
-                // COAで仮予約取消
-                try {
-                    yield repos.reserveService.delTmpReserve(delTmpReserveParams);
-                }
-                catch (error) {
-                    let deleted = false;
-                    // COAサービスエラーの場合ハンドリング
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore if */
-                    if (error.name === 'COAServiceError') {
-                        if (typeof error.code === 'number'
-                            && error.code < http_status_1.INTERNAL_SERVER_ERROR) {
-                            // すでに取消済の場合こうなるので、okとする
-                            if (error.message === '座席取消失敗') {
-                                deleted = true;
-                            }
-                        }
-                    }
-                    if (!deleted) {
-                        throw error;
-                    }
-                }
+                yield cancelPendingReservation({
+                    project: { id: params.action.project.id },
+                    object: Object.assign(Object.assign({}, delTmpReserveParams), { reservationStatus: factory.reservationStatusType.ReservationPending, transactionNumber: delTmpReserveParams.tmpReserveNum, typeOf: factory.assetTransactionType.COAReserveTransaction }),
+                    instrument: [params.action.purpose]
+                })(repos);
             }
         }
     });

package/lib/chevre/service/reserveCOA/factory.d.ts

@@ -0,0 +1,13 @@
+import type * as COA from '@motionpicture/coa-service';
+import * as factory from '../../factory';
+interface IProcessCancelPendingCOAReserveResult {
+    delTmpReserveArgs?: COA.factory.reserve.IDelTmpReserveArgs;
+    delTmpReserveResult?: factory.action.cancel.coaReserve.IDelTmpReserveResultAsError;
+}
+declare function processCancelPendingCOAReserveResult2recipe(params: {
+    processCancelPendingCOAReserveResult: IProcessCancelPendingCOAReserveResult;
+    project: {
+        id: string;
+    };
+}): factory.action.cancel.coaReserve.ICancelPendingCOAReserveRecipe;
+export { IProcessCancelPendingCOAReserveResult, processCancelPendingCOAReserveResult2recipe };

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

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processCancelPendingCOAReserveResult2recipe = processCancelPendingCOAReserveResult2recipe;
+const factory = require("../../factory");
+function processCancelPendingCOAReserveResult2recipe(params) {
+    const { processCancelPendingCOAReserveResult, project } = params;
+    const { delTmpReserveArgs, delTmpReserveResult } = processCancelPendingCOAReserveResult;
+    return {
+        project: { id: project.id, typeOf: factory.organizationType.Project },
+        typeOf: 'Recipe',
+        recipeCategory: factory.recipe.RecipeCategory.cancelPendingCOAReserve,
+        step: [{
+                typeOf: 'HowToSection',
+                itemListElement: [
+                    {
+                        typeOf: 'HowToStep',
+                        identifier: factory.recipe.StepIdentifier.delTmpReserve,
+                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (delTmpReserveArgs !== undefined) ? { beforeMedia: delTmpReserveArgs } : undefined), (delTmpReserveResult !== undefined) ? { afterMedia: delTmpReserveResult } : undefined)]
+                    }
+                ]
+            }]
+    };
+}

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

@@ -1,6 +1,6 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.cancelPendingReservation.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.cancelPendingReservation.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -10,37 +10,76 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
+// import * as COA from '@motionpicture/coa-service';
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
+// import { ReserveInterfaceRepo } from '../../repo/reserveInterface';
 const setting_1 = require("../../repo/setting");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
 const cancelReservation_1 = require("../reserve/cancelReservation");
+// import { cancelPendingReservation as cancelPendingCOAReserve } from '../reserveCOA/cancelReservation';
+// let coaAuthClientCreated: boolean = false;
+// let coaAuthClient: COA.auth.RefreshToken = new COA.auth.RefreshToken({
+//     endpoint: '', // 使用されないので空文字でok
+//     refreshToken: '', // 使用されないので空文字でok
+//     useFetch: true
+// });
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return (_a) => __awaiter(this, [_a], void 0, function* ({ connection, redisClient }) {
+        var _b, _c, _d, _e;
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        // アクション数は予約番号単位で1しかありえないはず(2023-06-05~)
-        // if (data.actionAttributes.length !== 1) {
-        //     throw new factory.errors.Argument('data.actionAttributes', 'data.actionAttributes.length must be 1');
-        // }
-        yield (0, cancelReservation_1.cancelPendingReservation)(data)({
-            action: new action_1.ActionRepo(connection),
-            assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
-            stockHolder: new stockHolder_1.StockHolderRepo(redisClient, connection),
-            offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),
-            reservation: new reservation_1.ReservationRepo(connection),
-            setting: new setting_1.SettingRepo(connection),
-            task: new task_1.TaskRepo(connection)
+        const { data } = params;
+        // support COAReserve(2025-03-01~)
+        if (((_b = data.purpose) === null || _b === void 0 ? void 0 : _b.typeOf) === factory.assetTransactionType.Reserve) {
+            yield (0, cancelReservation_1.cancelPendingReservation)({ purpose: data.purpose })({
+                action: new action_1.ActionRepo(connection),
+                assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+                stockHolder: new stockHolder_1.StockHolderRepo(redisClient, connection),
+                offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),
+                reservation: new reservation_1.ReservationRepo(connection),
+                setting: new setting_1.SettingRepo(connection),
+                task: new task_1.TaskRepo(connection)
+            });
+        }
+        else if (((_c = data.object) === null || _c === void 0 ? void 0 : _c.typeOf) === factory.assetTransactionType.COAReserveTransaction) {
+            throw new factory.errors.NotImplemented(`object.typeOf ${(_d = data.object) === null || _d === void 0 ? void 0 : _d.typeOf} not implemented`);
+            // if (!coaAuthClientCreated) {
+            //     const reserveInterfaceRepo = new ReserveInterfaceRepo(connection);
+            //     const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
+            //     const credentials = coaAPI?.availableChannel?.credentials;
+            //     if (typeof credentials?.refreshToken === 'string') {
+            //         coaAuthClient = new COA.auth.RefreshToken(credentials);
+            //         coaAuthClientCreated = true;
+            //     }
+            // }
+            // const reserveService = new COA.service.Reserve(
+            //     {
+            //         endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
+            //         auth: coaAuthClient
+            //     },
+            //     { timeout: settings.coa.timeout }
+            // );
+            // const { object, instrument } = data;
+            // await cancelPendingCOAReserve({
+            //     object,
+            //     instrument,
+            //     project: { id: params.project.id }
+            // })({
+            //     action: new ActionRepo(connection),
+            //     reserveService
+            // });
+        }
+        else {
+            throw new factory.errors.NotImplemented(`purpose.typeOf ${(_e = data.purpose) === null || _e === void 0 ? void 0 : _e.typeOf} not implemented`);
         }
-        // settings
-        );
     });
 }

package/lib/chevre/service/task.js

@@ -101,6 +101,7 @@ function execute(task) {
                 case factory.taskName.AcceptCOAOffer:
                 case factory.taskName.AggregateOnSystem:
                 case factory.taskName.AuthorizePayment:
+                case factory.taskName.CancelPendingReservation:
                 case factory.taskName.CheckMovieTicket:
                 case factory.taskName.DeletePerson:
                 case factory.taskName.HandleNotification:

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.393.0-alpha.33",
-    "@cinerino/sdk": "10.21.0-alpha.22",
+    "@chevre/factory": "4.393.0-alpha.35",
+    "@cinerino/sdk": "10.21.0-alpha.23",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.44"
+  "version": "22.9.0-alpha.46"
 }

package/example/src/chevre/migratePaymentServiceChannelsCreditCard.ts

@@ -1,104 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-// const excludedProject = { id: String(process.env.EXCLUDED_PROJECT_ID) };
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const paymentServiceRepo = await chevre.repository.PaymentService.createInstance(mongoose.connection);
-
-    const cursor = paymentServiceRepo.getCursor(
-        {
-            typeOf: { $eq: chevre.factory.service.paymentService.PaymentServiceType.CreditCard }
-            // _id: { $eq: 'cinerino' }
-        },
-        {
-            _id: 1,
-            availableChannel: 1,
-            productID: 1,
-            project: 1,
-            typeOf: 1
-        }
-    );
-    console.log('docs found');
-
-    let i = 0;
-    let updateCount = 0;
-    let serviceUrls: string[] = [];
-    const unexpectedProjectIds: string[] = [];
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const paymentService: Pick<
-            chevre.factory.service.paymentService.IService,
-            'availableChannel' | 'id' | 'productID' | 'project' | 'typeOf'
-        > = doc.toObject();
-
-        console.log(
-            'alreadyMigrated?', paymentService.project.id, i);
-        if (typeof paymentService.id !== 'string') {
-            throw new Error('id must be string');
-        }
-
-        let alreadyMigrated = false;
-        try {
-            const existingChannel = await paymentServiceRepo.findAvailableChannelCreditCard({
-                project: { id: paymentService.project.id },
-                id: paymentService.id
-            });
-            if (typeof existingChannel.credentials?.siteId === 'string'
-                && typeof existingChannel.credentials?.sitePass === 'string') {
-                alreadyMigrated = true;
-            }
-        } catch (error) {
-            // no op
-        }
-
-        const serviceUrl = paymentService.availableChannel?.serviceUrl;
-        if (typeof serviceUrl === 'string') {
-            serviceUrls.push(serviceUrl);
-        } else {
-            throw new Error('serviceUrl must be string');
-        }
-
-        // docs(same serviceUrl and different siteId,sitePass ) exist?
-        // const credentials =
-        //     <chevre.factory.serviceChannel.ICredentialsCreditCard | undefined>paymentService.availableChannel?.credentials;
-        // if (typeof credentials?.siteId !== 'string') {
-        //     throw new Error('siteId must be string');
-        // }
-        // if (typeof credentials?.sitePass !== 'string') {
-        //     throw new Error('sitePass must be string');
-        // }
-
-        if (alreadyMigrated) {
-            console.log(
-                'already migrated.', paymentService.project.id, i);
-        } else {
-            console.log(
-                'updating...',
-                paymentService.project.id, i);
-            // await paymentServiceRepo.saveChannelByServiceUrl(newChannel);
-            updateCount += 1;
-            console.log(
-                'updated.',
-                paymentService.project.id, i);
-        }
-    });
-
-    serviceUrls = [...new Set(serviceUrls)];
-    console.log('unexpectedProjectIds:', unexpectedProjectIds);
-    // console.log(serviceUrls);
-    console.log(serviceUrls);
-    console.log(serviceUrls.length, 'serviceUrls found');
-    console.log(i, 'docs checked');
-    console.log(updateCount, 'docs updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migratePaymentServiceChannelsMovieTicket.ts

@@ -1,112 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-// const excludedProject = { id: String(process.env.EXCLUDED_PROJECT_ID) };
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const paymentServiceRepo = await chevre.repository.PaymentService.createInstance(mongoose.connection);
-
-    const cursor = paymentServiceRepo.getCursor(
-        {
-            typeOf: { $eq: chevre.factory.service.paymentService.PaymentServiceType.MovieTicket }
-            // _id: { $eq: 'cinerino' }
-        },
-        {
-            _id: 1,
-            availableChannel: 1,
-            productID: 1,
-            project: 1,
-            typeOf: 1
-        }
-    );
-    console.log('docs found');
-
-    let i = 0;
-    let updateCount = 0;
-    let serviceUrls: string[] = [];
-    const unexpectedProjectIds: string[] = [];
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const paymentService: Pick<
-            chevre.factory.service.paymentService.IService,
-            'availableChannel' | 'id' | 'productID' | 'project' | 'typeOf'
-        > = doc.toObject();
-
-        console.log(
-            'alreadyMigrated?', paymentService.project.id, i);
-        if (typeof paymentService.id !== 'string') {
-            throw new Error('id must be string');
-        }
-
-        let alreadyMigrated = false;
-        try {
-            const existingChannel = await paymentServiceRepo.findAvailableChannelMovieTicket({
-                project: { id: paymentService.project.id },
-                id: paymentService.id
-            });
-            if (typeof existingChannel.credentials?.authorizeServerDomain === 'string') {
-                alreadyMigrated = true;
-            }
-        } catch (error) {
-            // no op
-        }
-
-        const serviceUrl = paymentService.availableChannel?.serviceUrl;
-        if (typeof serviceUrl === 'string') {
-            serviceUrls.push(serviceUrl);
-        } else {
-            throw new Error('serviceUrl must be string');
-        }
-
-        if (alreadyMigrated) {
-            console.log(
-                'already migrated.', paymentService.project.id, i);
-        } else {
-            const credentials =
-                <chevre.factory.serviceChannel.ICredentialsMovieTicket | undefined>paymentService.availableChannel?.credentials;
-            if (typeof credentials?.authorizeServerDomain !== 'string') {
-                throw new Error('authorizeServerDomain must be string');
-            }
-            if (typeof credentials?.clientId !== 'string') {
-                throw new Error('clientId must be string');
-            }
-            if (typeof credentials?.clientSecret !== 'string') {
-                throw new Error('clientSecret must be string');
-            }
-            const newChannel: chevre.factory.serviceChannel.IServiceChannelMovieTicket = {
-                credentials,
-                project: { id: '*', typeOf: chevre.factory.organizationType.Project },
-                providesService: {
-                    typeOf: chevre.factory.service.paymentService.PaymentServiceType.MovieTicket
-                },
-                serviceUrl,
-                typeOf: 'ServiceChannel'
-            };
-            console.log(
-                'updating...',
-                paymentService.project.id, i, newChannel);
-            await paymentServiceRepo.saveChannelByServiceUrl(newChannel);
-            updateCount += 1;
-            console.log(
-                'updated.',
-                paymentService.project.id, i);
-        }
-    });
-
-    serviceUrls = [...new Set(serviceUrls)];
-    console.log('unexpectedProjectIds:', unexpectedProjectIds);
-    console.log(serviceUrls);
-    console.log(serviceUrls.length, 'serviceUrls found');
-    console.log(i, 'docs checked');
-    console.log(updateCount, 'docs updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migrateWebSites.ts

@@ -1,111 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-// const excludedProject = { id: String(process.env.EXCLUDED_PROJECT_ID) };
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const paymentServiceRepo = await chevre.repository.PaymentService.createInstance(mongoose.connection);
-    // const potentialActionRepo = await chevre.repository.PotentialAction.createInstance(mongoose.connection);
-    // const identityProviderRepo = await chevre.repository.IdentityProvider.createInstance(mongoose.connection);
-    const webSiteRepo = await chevre.repository.WebSite.createInstance(mongoose.connection);
-
-    let webSiteIdentifiers: string[] = [];
-
-    const cursor = paymentServiceRepo.getCursor(
-        {
-            typeOf: { $eq: chevre.factory.service.paymentService.PaymentServiceType.CreditCard }
-        },
-        {
-            _id: 1,
-            availableChannel: 1,
-            productID: 1,
-            project: 1,
-            typeOf: 1
-        }
-    );
-    console.log('docs found');
-
-    let i = 0;
-    let updateCount = 0;
-
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-
-        const paymentService: Pick<
-            chevre.factory.service.paymentService.IService,
-            'availableChannel' | 'id' | 'productID' | 'project' | 'typeOf'
-        > = doc.toObject();
-
-        let webSiteIdentifier: string | undefined;
-        const serviceUrl = paymentService.availableChannel?.serviceUrl;
-        if (typeof serviceUrl === 'string') {
-            if (/appspot.com/.test(serviceUrl)) {
-                webSiteIdentifier = new URL(serviceUrl).hostname;
-                webSiteIdentifiers.push(webSiteIdentifier);
-            }
-        } else {
-            throw new Error('serviceUrl must be string');
-        }
-
-        if (typeof webSiteIdentifier !== 'string') {
-            console.log(
-                'already migrated.', serviceUrl, webSiteIdentifier, i);
-        } else {
-            let alreadyMigrated = false;
-            const existingWebSites = await webSiteRepo.projectFields(
-                {
-                    about: { identifier: { $eq: webSiteIdentifier } },
-                    project: { id: { $eq: paymentService.project.id } }
-                },
-                ['about']
-            );
-            alreadyMigrated = existingWebSites.length === 1;
-
-            if (alreadyMigrated) {
-                console.log(
-                    'already migrated.', webSiteIdentifier, i);
-            } else {
-                const creatingWebSite: Pick<
-                    chevre.factory.creativeWork.certification.webSite.ICertification,
-                    'about' | 'certificationStatus' | 'project' | 'auditDate'
-                > = {
-                    project: { id: paymentService.project.id, typeOf: chevre.factory.organizationType.Project },
-                    about: { identifier: webSiteIdentifier, typeOf: chevre.factory.creativeWorkType.WebSite },
-                    certificationStatus: chevre.factory.CertificationStatusEnumeration.CertificationInactive
-                };
-                console.log(
-                    'updating...', i, creatingWebSite);
-                const { id } = await webSiteRepo.save({
-                    attributes: creatingWebSite
-                });
-                await webSiteRepo.save({
-                    id,
-                    attributes: {
-                        ...creatingWebSite,
-                        auditDate: new Date(),
-                        certificationStatus: chevre.factory.CertificationStatusEnumeration.CertificationActive
-                    }
-                });
-                updateCount += 1;
-                console.log(
-                    'updated.', i);
-            }
-        }
-    });
-
-    webSiteIdentifiers = [...new Set(webSiteIdentifiers)];
-    console.log(webSiteIdentifiers);
-    console.log(webSiteIdentifiers.length, 'webSiteIdentifiers found');
-    console.log(i, 'docs checked');
-    console.log(updateCount, 'docs updated');
-}
-
-main()
-    .then()
-    .catch(console.error);