@chevre/domain 21.32.0-alpha.15 → 21.32.0-alpha.17

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

@@ -49,6 +49,16 @@ interface IStatus {
 interface IAggregateAction {
     statuses: IStatus[];
 }
+export interface ICancelActionAction {
+    typeOf: factory.actionType.CancelAction;
+    agent: factory.action.IParticipantAsPerson | factory.action.IParticipantAsProject | factory.action.IParticipantAsWebApplication;
+    endTime: Date;
+    startTime: Date;
+    sameAs?: {
+        id: string;
+        typeOf: 'Task';
+    };
+}
 /**
  * アクションリポジトリ
  */
@@ -81,8 +91,9 @@ export declare class MongoRepository {
      * アクション取消
      */
     cancelWithVoid(params: {
-        typeOf: factory.actionType;
+        typeOf: factory.actionType.AuthorizeAction;
         id: string;
+        cancelAction?: Pick<ICancelActionAction, 'agent' | 'sameAs' | 'startTime'>;
     }): Promise<void>;
     /**
      * アクション失敗

package/lib/chevre/repo/action.js

@@ -505,19 +505,30 @@ class MongoRepository {
      */
     cancelWithVoid(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const cancelDate = new Date();
+            const cancelAction = (params.cancelAction !== undefined)
+                ? Object.assign(Object.assign({}, params.cancelAction), { endTime: cancelDate, typeOf: factory.actionType.CancelAction }) : undefined;
             const doc = yield this.actionModel.findOneAndUpdate({
                 _id: { $eq: params.id },
-                typeOf: { $eq: params.typeOf }
-            }, { $set: { actionStatus: factory.actionStatusType.CanceledActionStatus } }, { new: false, projection: { _id: 1 } })
+                typeOf: { $eq: params.typeOf },
+                actionStatus: { $ne: factory.actionStatusType.CanceledActionStatus } // 冪等性確保(2024-05-26~)
+            }, {
+                $set: Object.assign({ actionStatus: factory.actionStatusType.CanceledActionStatus }, (cancelAction !== undefined) ? { cancelAction } : undefined // cancelAction連携(2024-05-26~)
+                )
+            }, { new: false, projection: { _id: 1 } })
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.actionModel.modelName);
+                // 既にCanceledActionStatusであればok
+                const existingAction = yield this.findById({ id: params.id, typeOf: params.typeOf }, ['actionStatus'], []);
+                if (existingAction.actionStatus !== factory.actionStatusType.CanceledActionStatus) {
+                    throw new factory.errors.NotFound(this.actionModel.modelName);
+                }
             }
             // endDateが存在しなければセット(2024-04-22~)
             yield this.actionModel.updateOne({
                 _id: { $eq: params.id },
                 endDate: { $exists: false }
-            }, { $set: { endDate: new Date() } })
+            }, { $set: { endDate: cancelDate } })
                 .exec();
         });
     }

package/lib/chevre/repo/mongoose/schemas/action.js

@@ -27,7 +27,8 @@ const schemaDefinition = {
     location: mongoose_1.SchemaTypes.Mixed,
     replacer: mongoose_1.SchemaTypes.Mixed,
     targetCollection: mongoose_1.SchemaTypes.Mixed,
-    sameAs: mongoose_1.SchemaTypes.Mixed // タスク関連付けのために追加(2024-04-20~)
+    sameAs: mongoose_1.SchemaTypes.Mixed,
+    cancelAction: mongoose_1.SchemaTypes.Mixed // add(2024-05-26~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -0,0 +1,24 @@
+import * as factory from '../../../../factory';
+import type { MongoRepository as ActionRepo } from '../../../../repo/action';
+import type { MongoRepository as AssetTransactionRepo } from '../../../../repo/assetTransaction';
+import type { MongoRepository as OrderInTransactionRepo } from '../../../../repo/orderInTransaction';
+import type { RedisRepository as OfferRateLimitRepo } from '../../../../repo/rateLimit/offer';
+import type { MongoRepository as ReservationRepo } from '../../../../repo/reservation';
+import type { StockHolderRepository as StockHolderRepo } from '../../../../repo/stockHolder';
+import type { MongoRepository as TaskRepo } from '../../../../repo/task';
+import type { MongoRepository as TransactionRepo } from '../../../../repo/transaction';
+export import WebAPIIdentifier = factory.service.webAPI.Identifier;
+interface IVoidTransactionRepos {
+    action: ActionRepo;
+    assetTransaction: AssetTransactionRepo;
+    stockHolder: StockHolderRepo;
+    offerRateLimit: OfferRateLimitRepo;
+    orderInTransaction: OrderInTransactionRepo;
+    reservation: ReservationRepo;
+    task: TaskRepo;
+    transaction: TransactionRepo;
+}
+declare function processVoidTransaction4chevre(params: {
+    action: factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.Chevre>;
+}): (repos: IVoidTransactionRepos) => Promise<void>;
+export { processVoidTransaction4chevre };

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

@@ -0,0 +1,35 @@
+"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.processVoidTransaction4chevre = exports.WebAPIIdentifier = void 0;
+const factory = require("../../../../factory");
+const reserve_1 = require("../../../assetTransaction/reserve");
+exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
+function processVoidTransaction4chevre(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const transactionNumber = (_a = params.action.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.transactionNumber;
+        if (typeof transactionNumber === 'string') {
+            // 取引が存在すれば中止
+            const assetTransactions = yield repos.assetTransaction.search({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: params.action.project.id } },
+                typeOf: factory.assetTransactionType.Reserve,
+                transactionNumber: { $eq: transactionNumber }
+            }, ['_id']);
+            if (assetTransactions.length > 0) {
+                yield (0, reserve_1.cancel)({ transactionNumber })(repos);
+            }
+        }
+    });
+}
+exports.processVoidTransaction4chevre = processVoidTransaction4chevre;

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

@@ -0,0 +1,6 @@
+import * as factory from '../../../../factory';
+export import WebAPIIdentifier = factory.service.webAPI.Identifier;
+declare function processVoidTransaction4coa(params: {
+    action: factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.COA>;
+}): Promise<void>;
+export { processVoidTransaction4coa };

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

@@ -0,0 +1,83 @@
+"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.processVoidTransaction4coa = exports.WebAPIIdentifier = void 0;
+const COA = require("@motionpicture/coa-service");
+const http_status_1 = require("http-status");
+const credentials_1 = require("../../../../credentials");
+const factory = require("../../../../factory");
+const coaAuthClient = new COA.auth.RefreshToken({
+    endpoint: credentials_1.credentials.coa.endpoint,
+    refreshToken: credentials_1.credentials.coa.refreshToken,
+    useFetch: credentials_1.credentials.coa.useFetch
+});
+exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
+function processVoidTransaction4coa(params) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
+        // COAの場合、objectあるいはresultに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
+        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
+            };
+        }
+        else {
+            const coaRequestBody = (_a = params.action.result) === null || _a === void 0 ? void 0 : _a.requestBody;
+            const coaResponseBody = (_b = params.action.result) === null || _b === void 0 ? void 0 : _b.responseBody;
+            if (coaRequestBody !== undefined && coaResponseBody !== undefined) {
+                delTmpReserveParams = {
+                    theaterCode: coaRequestBody.theaterCode,
+                    dateJouei: coaRequestBody.dateJouei,
+                    titleCode: coaRequestBody.titleCode,
+                    titleBranchNum: coaRequestBody.titleBranchNum,
+                    timeBegin: coaRequestBody.timeBegin,
+                    tmpReserveNum: coaResponseBody.tmpReserveNum
+                };
+            }
+        }
+        if (delTmpReserveParams !== undefined) {
+            // COAで仮予約取消
+            try {
+                const reserveService = new COA.service.Reserve({
+                    endpoint: credentials_1.credentials.coa.endpoint,
+                    auth: coaAuthClient
+                }, { timeout: credentials_1.credentials.coa.timeout });
+                yield 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;
+                }
+            }
+        }
+    });
+}
+exports.processVoidTransaction4coa = processVoidTransaction4coa;

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

@@ -19,8 +19,15 @@ interface IVoidTransactionRepos {
     transaction: TransactionRepo;
 }
 /**
- * 興行オファー承認取消(タスクから実行)
- * 取引中の承認アクション全てについて処理する
+ * 興行オファー承認取消(タスクから実行 or apiから実行))
+ * 取引中の承認アクション全てについて処理する or 特定の承認アクションについて処理する
  */
-export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidReserveTransaction>): (repos: IVoidTransactionRepos) => Promise<void>;
+export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidReserveTransaction> & {
+    sameAs?: {
+        /**
+         * 実行元タスクID
+         */
+        id: string;
+    };
+}): (repos: IVoidTransactionRepos) => Promise<void>;
 export {};

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

@@ -10,25 +10,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.voidTransaction = exports.WebAPIIdentifier = void 0;
-const COA = require("@motionpicture/coa-service");
-const http_status_1 = require("http-status");
-const credentials_1 = require("../../../credentials");
 const factory = require("../../../factory");
-const ReserveTransactionService = require("../../assetTransaction/reserve");
 const any_1 = require("../any");
-const coaAuthClient = new COA.auth.RefreshToken({
-    endpoint: credentials_1.credentials.coa.endpoint,
-    refreshToken: credentials_1.credentials.coa.refreshToken,
-    useFetch: credentials_1.credentials.coa.useFetch
-});
+const processVoidTransaction4chevre_1 = require("./voidTransaction/processVoidTransaction4chevre");
+const processVoidTransaction4coa_1 = require("./voidTransaction/processVoidTransaction4coa");
+const voidTransactionByActionId_1 = require("./voidTransactionByActionId");
 exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
 /**
- * 興行オファー承認取消(タスクから実行)
- * 取引中の承認アクション全てについて処理する
+ * 興行オファー承認取消(タスクから実行 or apiから実行))
+ * 取引中の承認アクション全てについて処理する or 特定の承認アクションについて処理する
  */
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
+        // support void by action ID(2024-05-26~)
+        if (typeof params.id === 'string') {
+            yield (0, voidTransactionByActionId_1.voidTransactionByActionId)(params)(repos);
+            return;
+        }
+        const cancelAction = Object.assign({ startTime: new Date(), agent: { id: params.project.id, typeOf: factory.organizationType.Project } }, (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined);
         const transaction = yield repos.transaction.findById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id,
@@ -49,7 +49,7 @@ function voidTransaction(params) {
             // 確定取引に対応(2023-05-07~)
             case factory.transactionStatusType.Confirmed:
                 // OrderCancelledを考慮(2023-08-30~)
-                const orderCancelled = ((_b = (_a = params.purpose.result) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.orderStatus) === factory.orderStatus.OrderCancelled;
+                const orderCancelled = ((_c = (_b = params.purpose.result) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.orderStatus) === factory.orderStatus.OrderCancelled;
                 if (!orderCancelled) {
                     // 取り消すべきアクションに絞る
                     authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
@@ -77,98 +77,19 @@ function voidTransaction(params) {
             }
         }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
-            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
+            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
             switch (action.instrument.identifier) {
                 case exports.WebAPIIdentifier.COA:
-                    yield processVoidTransaction4coa({
+                    yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({
                         action: action
                     });
                     break;
                 default:
-                    yield processVoidTransaction4chevre({
-                        action: action,
-                        project: params.project
+                    yield (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
+                        action: action
                     })(repos);
             }
         })));
     });
 }
 exports.voidTransaction = voidTransaction;
-function processVoidTransaction4coa(params) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        // COAの場合、objectあるいはresultに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
-        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
-            };
-        }
-        else {
-            const coaRequestBody = (_a = params.action.result) === null || _a === void 0 ? void 0 : _a.requestBody;
-            const coaResponseBody = (_b = params.action.result) === null || _b === void 0 ? void 0 : _b.responseBody;
-            if (coaRequestBody !== undefined && coaResponseBody !== undefined) {
-                delTmpReserveParams = {
-                    theaterCode: coaRequestBody.theaterCode,
-                    dateJouei: coaRequestBody.dateJouei,
-                    titleCode: coaRequestBody.titleCode,
-                    titleBranchNum: coaRequestBody.titleBranchNum,
-                    timeBegin: coaRequestBody.timeBegin,
-                    tmpReserveNum: coaResponseBody.tmpReserveNum
-                };
-            }
-        }
-        if (delTmpReserveParams !== undefined) {
-            // COAで仮予約取消
-            try {
-                const reserveService = new COA.service.Reserve({
-                    endpoint: credentials_1.credentials.coa.endpoint,
-                    auth: coaAuthClient
-                }, { timeout: credentials_1.credentials.coa.timeout });
-                yield 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;
-                }
-            }
-        }
-    });
-}
-function processVoidTransaction4chevre(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const transactionNumber = (_a = params.action.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.transactionNumber;
-        if (typeof transactionNumber === 'string') {
-            // 取引が存在すれば中止
-            const assetTransactions = yield repos.assetTransaction.search({
-                limit: 1,
-                project: { id: { $eq: params.project.id } },
-                typeOf: factory.assetTransactionType.Reserve,
-                transactionNumber: { $eq: transactionNumber }
-            });
-            if (assetTransactions.length > 0) {
-                yield ReserveTransactionService.cancel({ transactionNumber })(repos);
-            }
-        }
-    });
-}

package/lib/chevre/service/offer/event/{cancel.d.ts → voidTransactionByActionId.d.ts}

@@ -7,7 +7,7 @@ import type { MongoRepository as ReservationRepo } from '../../../repo/reservati
 import type { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
-interface ICancelRepos {
+interface IVoidTransactionByActionIdRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
@@ -21,26 +21,12 @@ interface ICancelRepos {
  * 興行オファー承認取消(apiから実行)
  * 特定の承認アクションについて処理する
  */
-export declare function cancel(params: {
-    project: {
+declare function voidTransactionByActionId(params: factory.task.IData<factory.taskName.VoidReserveTransaction> & {
+    sameAs?: {
+        /**
+         * 実行元タスクID
+         */
         id: string;
-        typeOf: factory.organizationType.Project;
     };
-    /**
-     * 承認アクションID
-     */
-    id: string;
-    /**
-     * 取引進行者
-     */
-    agent: {
-        id: string;
-    };
-    /**
-     * 取引
-     */
-    transaction: {
-        id: string;
-    };
-}): (repos: ICancelRepos) => Promise<void>;
-export {};
+}): (repos: IVoidTransactionByActionIdRepos) => Promise<void>;
+export { voidTransactionByActionId };

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

@@ -0,0 +1,85 @@
+"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.voidTransactionByActionId = void 0;
+const factory = require("../../../factory");
+const any_1 = require("../any");
+const processVoidTransaction4chevre_1 = require("./voidTransaction/processVoidTransaction4chevre");
+const processVoidTransaction4coa_1 = require("./voidTransaction/processVoidTransaction4coa");
+/**
+ * 興行オファー承認取消(apiから実行)
+ * 特定の承認アクションについて処理する
+ */
+function voidTransactionByActionId(params) {
+    // export function cancel(params: {
+    //     project: { id: string; typeOf: factory.organizationType.Project };
+    //     /**
+    //      * 承認アクションID
+    //      */
+    //     id: string;
+    //     /**
+    //      * 取引進行者
+    //      */
+    //     agent: { id: string };
+    //     /**
+    //      * 取引
+    //      */
+    //     transaction: { id: string };
+    // }) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        if (typeof params.id !== 'string' || params.id === '') {
+            throw new factory.errors.ArgumentNull('id');
+        }
+        const cancelAction = Object.assign({ startTime: new Date(), agent: { id: params.project.id, typeOf: factory.organizationType.Project } }, (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined);
+        const transaction = yield repos.transaction.findInProgressById({
+            typeOf: factory.transactionType.PlaceOrder,
+            id: params.purpose.id
+        });
+        // if (transaction.agent.id !== params.agent.id) {
+        //     throw new factory.errors.Forbidden('Transaction not yours');
+        // }
+        const action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
+            throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
+        }
+        // MongoDBでcompleteステータスであるにも関わらず、Chevreでは削除されている、というのが最悪の状況
+        // それだけは回避するためにMongoDBを先に変更
+        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id, cancelAction });
+        // add orderInTransaction(2024-01-15~)
+        // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
+        const orderNumberByTransaction = transaction.object.orderNumber;
+        if (typeof orderNumberByTransaction === 'string') {
+            yield (0, any_1.voidAcceptedOffer)({
+                // authorizeActions: [action],
+                authorizeActionsWithInstrument: [action],
+                orderNumber: orderNumberByTransaction
+            })(repos);
+        }
+        switch (action.instrument.identifier) {
+            case factory.service.webAPI.Identifier.COA:
+                yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({
+                    action: action
+                });
+                break;
+            default:
+                yield (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
+                    action: action
+                })(repos);
+            // const transactionNumber = action.object.pendingTransaction?.transactionNumber;
+            // if (typeof transactionNumber === 'string') {
+            //     // すでに取消済であったとしても、すべて取消処理(actionStatusに関係なく)
+            //     await ReserveTransactionService.cancel({ transactionNumber })(repos);
+            // }
+        }
+    });
+}
+exports.voidTransactionByActionId = voidTransactionByActionId;

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

@@ -1,6 +1,5 @@
 import { authorize } from './event/authorize';
-import { cancel } from './event/cancel';
 import { importCategoryCodesFromCOA, importFromCOA } from './event/importFromCOA';
 import { searchEventTicketOffers, searchOfferAppliesToMovieTicket, searchOfferCatalogItemAvailability, searchOfferCatalogItems } from './event/searchEventTicketOffers';
 import { voidTransaction } from './event/voidTransaction';
-export { authorize, cancel, importCategoryCodesFromCOA, importFromCOA, voidTransaction, searchEventTicketOffers, searchOfferAppliesToMovieTicket, searchOfferCatalogItemAvailability, searchOfferCatalogItems };
+export { authorize, importCategoryCodesFromCOA, importFromCOA, voidTransaction, searchEventTicketOffers, searchOfferAppliesToMovieTicket, searchOfferCatalogItemAvailability, searchOfferCatalogItems };

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

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchOfferCatalogItems = exports.searchOfferCatalogItemAvailability = exports.searchOfferAppliesToMovieTicket = exports.searchEventTicketOffers = exports.voidTransaction = exports.importFromCOA = exports.importCategoryCodesFromCOA = exports.cancel = exports.authorize = void 0;
+exports.searchOfferCatalogItems = exports.searchOfferCatalogItemAvailability = exports.searchOfferAppliesToMovieTicket = exports.searchEventTicketOffers = exports.voidTransaction = exports.importFromCOA = exports.importCategoryCodesFromCOA = exports.authorize = void 0;
 const authorize_1 = require("./event/authorize");
 Object.defineProperty(exports, "authorize", { enumerable: true, get: function () { return authorize_1.authorize; } });
-const cancel_1 = require("./event/cancel");
-Object.defineProperty(exports, "cancel", { enumerable: true, get: function () { return cancel_1.cancel; } });
+// import { cancel } from './event/cancel';
 const importFromCOA_1 = require("./event/importFromCOA");
 Object.defineProperty(exports, "importCategoryCodesFromCOA", { enumerable: true, get: function () { return importFromCOA_1.importCategoryCodesFromCOA; } });
 Object.defineProperty(exports, "importFromCOA", { enumerable: true, get: function () { return importFromCOA_1.importFromCOA; } });

package/lib/chevre/service/offer/eventServiceByCOA/cancel.d.ts

@@ -15,6 +15,9 @@ interface ICancelResult {
  * COA興行オファー承認取消
  */
 export declare function cancel(params: {
+    project: {
+        id: string;
+    };
     /**
      * 承認アクションID
      */

package/lib/chevre/service/offer/eventServiceByCOA/cancel.js

@@ -18,6 +18,10 @@ exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
  */
 function cancel(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const cancelAction = {
+            startTime: new Date(),
+            agent: { id: params.project.id, typeOf: factory.organizationType.Project }
+        };
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
@@ -30,7 +34,7 @@ function cancel(params) {
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }
-        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id, cancelAction });
         // add orderInTransaction(2024-01-15~)
         // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
         const orderNumberByTransaction = transaction.object.orderNumber;

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

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

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

@@ -19,25 +19,46 @@ const reservation_1 = require("../../repo/reservation");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
-const EventOfferService = require("../offer/event");
+const transactionProcess_1 = require("../../repo/transactionProcess");
+const event_1 = require("../offer/event");
 /**
  * タスク実行関数
  */
-function call(data) {
-    return (settings) => __awaiter(this, void 0, void 0, function* () {
+function call(params) {
+    // export function call(data: factory.task.IData<factory.taskName.VoidReserveTransaction>): IOperationExecute<void> {
+    return (settings, options) => __awaiter(this, void 0, void 0, function* () {
         if (settings.redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        yield EventOfferService.voidTransaction(data)({
-            action: new action_1.MongoRepository(settings.connection),
-            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
-            stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection),
-            offerRateLimit: new offer_1.RedisRepository(settings.redisClient),
-            orderInTransaction: new orderInTransaction_1.MongoRepository(settings.connection),
-            reservation: new reservation_1.MongoRepository(settings.connection),
-            task: new task_1.MongoRepository(settings.connection),
-            transaction: new transaction_1.MongoRepository(settings.connection)
-        });
+        const voidByActionId = typeof params.data.id === 'string';
+        if (voidByActionId) {
+            // 遅延実行(executeByName)には対応しない
+            if (!options.executeById) {
+                return;
+            }
+        }
+        const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepository(settings.redisClient, { lockExpiresInSeconds: 120 });
+        try {
+            yield (0, event_1.voidTransaction)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
+                action: new action_1.MongoRepository(settings.connection),
+                assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+                stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection),
+                offerRateLimit: new offer_1.RedisRepository(settings.redisClient),
+                orderInTransaction: new orderInTransaction_1.MongoRepository(settings.connection),
+                reservation: new reservation_1.MongoRepository(settings.connection),
+                task: new task_1.MongoRepository(settings.connection),
+                transaction: new transaction_1.MongoRepository(settings.connection)
+            });
+        }
+        catch (error) {
+            throw error;
+        }
+        finally {
+            // アクションID指定であれば取引プロセスロック解除(2024-05-26~)
+            if (voidByActionId) {
+                yield transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
+            }
+        }
     });
 }
 exports.call = call;

package/lib/chevre/service/task.js

@@ -109,6 +109,7 @@ function execute(task) {
                 case factory.taskName.CheckMovieTicket:
                 case factory.taskName.PublishPaymentUrl:
                 case factory.taskName.Refund:
+                case factory.taskName.VoidReserveTransaction:
                     yield call(task)(settings, options);
                     break;
                 default:

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.32.0-alpha.15"
+  "version": "21.32.0-alpha.17"
 }

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

@@ -1,57 +0,0 @@
-"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.cancel = void 0;
-const factory = require("../../../factory");
-const ReserveTransactionService = require("../../assetTransaction/reserve");
-const any_1 = require("../any");
-/**
- * 興行オファー承認取消(apiから実行)
- * 特定の承認アクションについて処理する
- */
-function cancel(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const transaction = yield repos.transaction.findInProgressById({
-            typeOf: factory.transactionType.PlaceOrder,
-            id: params.transaction.id
-        });
-        if (transaction.agent.id !== params.agent.id) {
-            throw new factory.errors.Forbidden('Transaction not yours');
-        }
-        // MongoDBでcompleteステータスであるにも関わらず、Chevreでは削除されている、というのが最悪の状況
-        // それだけは回避するためにMongoDBを先に変更
-        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
-        const action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
-        switch (action.instrument.identifier) {
-            case factory.service.webAPI.Identifier.COA:
-                // 実質使用する予定なしなので廃止(2022-05-12~)
-                throw new factory.errors.NotImplemented(`booking service '${action.instrument.identifier}' not implemented`);
-            default:
-                // add orderInTransaction(2024-01-15~)
-                // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
-                const orderNumberByTransaction = transaction.object.orderNumber;
-                if (typeof orderNumberByTransaction === 'string') {
-                    yield (0, any_1.voidAcceptedOffer)({
-                        // authorizeActions: [action],
-                        authorizeActionsWithInstrument: [action],
-                        orderNumber: orderNumberByTransaction
-                    })(repos);
-                }
-                const transactionNumber = (_a = action.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.transactionNumber;
-                if (typeof transactionNumber === 'string') {
-                    // すでに取消済であったとしても、すべて取消処理(actionStatusに関係なく)
-                    yield ReserveTransactionService.cancel({ transactionNumber })(repos);
-                }
-        }
-    });
-}
-exports.cancel = cancel;