@chevre/domain 22.9.0-alpha.49 → 22.9.0-alpha.50

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

@@ -1,14 +1,26 @@
 import type * as COA from '@motionpicture/coa-service';
 import * as factory from '../../../factory';
 import { ActionRepo } from '../../../repo/action';
+import { TaskRepo } from '../../../repo/task';
 type ICancelOperation<T> = (repos: {
     action: ActionRepo;
     reserveService: COA.service.Reserve;
+    task: TaskRepo;
 }) => Promise<T>;
 declare function cancel(params: {
     action: factory.action.authorize.offer.eventService.IAction;
+}, options: {
+    /**
+     * cancelPendingReservation async?(2025-03-03~)
+     */
+    asyncCancelPendingReservation: boolean;
 }): ICancelOperation<void>;
 declare function cancelByAcceptAction(params: {
     action: factory.action.accept.coaOffer.IAction;
+}, options: {
+    /**
+     * cancelPendingReservation async?(2025-03-03~)
+     */
+    asyncCancelPendingReservation: boolean;
 }): ICancelOperation<void>;
 export { cancel, cancelByAcceptAction };

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

@@ -11,14 +11,102 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cancel = cancel;
 exports.cancelByAcceptAction = cancelByAcceptAction;
+const factory = require("../../../factory");
 const cancelReservation_1 = require("../../reserveCOA/cancelReservation");
-function cancel(params) {
+function cancel(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield (0, cancelReservation_1.cancelPendingReservationByAuthorizeAction)(params)(repos);
+        // 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) {
+            const { asyncCancelPendingReservation } = options;
+            const object = Object.assign(Object.assign({}, delTmpReserveParams), { reservationStatus: factory.reservationStatusType.ReservationPending, transactionNumber: delTmpReserveParams.tmpReserveNum, typeOf: factory.assetTransactionType.COAReserveTransaction });
+            const instrument = [params.action.purpose];
+            if (asyncCancelPendingReservation) {
+                // support async(2025-03-03~)
+                const data = { object, instrument };
+                const cancelPendingReservationTask = {
+                    project: { id: params.action.project.id, typeOf: factory.organizationType.Project },
+                    name: factory.taskName.CancelPendingReservation,
+                    status: factory.taskStatus.Ready,
+                    runsAt: new Date(),
+                    remainingNumberOfTries: 10,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data
+                };
+                yield repos.task.saveMany([cancelPendingReservationTask], { emitImmediately: true });
+            }
+            else {
+                yield (0, cancelReservation_1.cancelPendingReservation)({
+                    project: { id: params.action.project.id },
+                    object,
+                    instrument
+                })(repos);
+            }
+        }
     });
 }
-function cancelByAcceptAction(params) {
+function cancelByAcceptAction(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield (0, cancelReservation_1.cancelPendingReservationByAcceptAction)(params)(repos);
+        var _a, _b, _c, _d, _e, _f;
+        const recipe = yield repos.action.findRecipeByAction({
+            project: { id: params.action.project.id },
+            recipeFor: { id: params.action.id }
+        });
+        if (recipe !== null) {
+            let delTmpReserveParams;
+            // 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;
+            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) {
+                const { asyncCancelPendingReservation } = options;
+                const object = Object.assign(Object.assign({}, delTmpReserveParams), { reservationStatus: factory.reservationStatusType.ReservationPending, transactionNumber: delTmpReserveParams.tmpReserveNum, typeOf: factory.assetTransactionType.COAReserveTransaction });
+                const instrument = [params.action.purpose];
+                if (asyncCancelPendingReservation) {
+                    // support async(2025-03-03~)
+                    const data = { object, instrument };
+                    const cancelPendingReservationTask = {
+                        project: { id: params.action.project.id, typeOf: factory.organizationType.Project },
+                        name: factory.taskName.CancelPendingReservation,
+                        status: factory.taskStatus.Ready,
+                        runsAt: new Date(),
+                        remainingNumberOfTries: 10,
+                        numberOfTried: 0,
+                        executionResults: [],
+                        data
+                    };
+                    yield repos.task.saveMany([cancelPendingReservationTask], { emitImmediately: true });
+                }
+                else {
+                    yield (0, cancelReservation_1.cancelPendingReservation)({
+                        project: { id: params.action.project.id },
+                        object,
+                        instrument
+                    })(repos);
+                }
+            }
+        }
     });
 }

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

@@ -1,16 +1,29 @@
 import type * as COA from '@motionpicture/coa-service';
 import * as factory from '../../../../factory';
 import { ActionRepo } from '../../../../repo/action';
+import { TaskRepo } from '../../../../repo/task';
 declare function processVoidTransaction4coa(params: {
     action: factory.action.authorize.offer.eventService.IAction;
+}, options: {
+    /**
+     * cancelPendingReservation async?(2025-03-03~)
+     */
+    asyncCancelPendingReservation: boolean;
 }): (repos: {
     action: ActionRepo;
     reserveService: COA.service.Reserve;
+    task: TaskRepo;
 }) => Promise<void>;
 declare function processVoidTransactionByAcceptAction4coa(params: {
     action: factory.action.accept.coaOffer.IAction;
+}, options: {
+    /**
+     * cancelPendingReservation async?(2025-03-03~)
+     */
+    asyncCancelPendingReservation: boolean;
 }): (repos: {
     action: ActionRepo;
     reserveService: COA.service.Reserve;
+    task: TaskRepo;
 }) => Promise<void>;
 export { processVoidTransaction4coa, processVoidTransactionByAcceptAction4coa };

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

@@ -12,13 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processVoidTransaction4coa = processVoidTransaction4coa;
 exports.processVoidTransactionByAcceptAction4coa = processVoidTransactionByAcceptAction4coa;
 const cancel_1 = require("../../../assetTransaction/reserveCOA/cancel");
-function processVoidTransaction4coa(params) {
+function processVoidTransaction4coa(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield (0, cancel_1.cancel)(params)(repos);
+        yield (0, cancel_1.cancel)(params, options)(repos);
     });
 }
-function processVoidTransactionByAcceptAction4coa(params) {
+function processVoidTransactionByAcceptAction4coa(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield (0, cancel_1.cancelByAcceptAction)(params)(repos);
+        yield (0, cancel_1.cancelByAcceptAction)(params, options)(repos);
     });
 }

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

@@ -82,12 +82,10 @@ function voidTransaction(params) {
                     if (reserveService === undefined) {
                         throw new factory.errors.Internal('repos.reserveService required');
                     }
-                    yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({
-                        // action: <factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.COA>>action
-                        action
-                    })({
+                    yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({ action }, { asyncCancelPendingReservation: true })({
                         action: repos.action,
-                        reserveService
+                        reserveService,
+                        task: repos.task
                     });
                     break;
                 default:
@@ -162,9 +160,10 @@ function cancelAcceptActions(params) {
             if (reserveService === undefined) {
                 throw new factory.errors.Internal('repos.reserveService required');
             }
-            yield (0, processVoidTransaction4coa_1.processVoidTransactionByAcceptAction4coa)({ action })({
+            yield (0, processVoidTransaction4coa_1.processVoidTransactionByAcceptAction4coa)({ action }, { asyncCancelPendingReservation: true })({
                 action: repos.action,
-                reserveService
+                reserveService,
+                task: repos.task
             });
         })));
     });

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

@@ -57,11 +57,10 @@ function voidTransactionByActionId(params) {
                 if (reserveService === undefined) {
                     throw new factory.errors.Internal('repos.reserveService required');
                 }
-                yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({
-                    action
-                })({
+                yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({ action }, { asyncCancelPendingReservation: false })({
                     action: repos.action,
-                    reserveService
+                    reserveService,
+                    task: repos.task
                 });
                 break;
             default:

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

@@ -9,16 +9,4 @@ declare function cancelPendingReservation(params: factory.task.cancelPendingRese
     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: {
-    action: factory.action.accept.coaOffer.IAction;
-}): (repos: {
-    action: ActionRepo;
-    reserveService: COA.service.Reserve;
-}) => Promise<void>;
-export { cancelPendingReservation, cancelPendingReservationByAuthorizeAction, cancelPendingReservationByAcceptAction };
+export { cancelPendingReservation };

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

@@ -10,8 +10,6 @@ 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");
@@ -78,60 +76,3 @@ function cancelPendingReservation(params) {
         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) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
-        const recipe = yield repos.action.findRecipeByAction({
-            project: { id: params.action.project.id },
-            recipeFor: { id: params.action.id }
-        });
-        if (recipe !== null) {
-            let delTmpReserveParams;
-            // 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;
-            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) {
-                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/task/cancelPendingReservation.js

@@ -10,29 +10,29 @@ 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 COA = require("@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 reserveInterface_1 = require("../../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
-// });
+const cancelReservation_2 = require("../reserveCOA/cancelReservation");
+let coaAuthClientCreated = false;
+let coaAuthClient = new COA.auth.RefreshToken({
+    endpoint: '', // 使用されないので空文字でok
+    refreshToken: '', // 使用されないので空文字でok
+    useFetch: true
+});
 /**
  * タスク実行関数
  */
 function call(params) {
-    return (_a) => __awaiter(this, [_a], void 0, function* ({ connection, redisClient }) {
+    return (_a) => __awaiter(this, [_a], void 0, function* ({ connection, redisClient, settings }) {
         var _b, _c, _d, _e;
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
@@ -51,32 +51,29 @@ function call(params) {
             });
         }
         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
-            // });
+            // throw new factory.errors.NotImplemented(`object.typeOf ${data.object?.typeOf} not implemented`);
+            if (!coaAuthClientCreated) {
+                const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
+                const coaAPI = yield reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
+                const credentials = (_d = coaAPI === null || coaAPI === void 0 ? void 0 : coaAPI.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials;
+                if (typeof (credentials === null || credentials === void 0 ? void 0 : credentials.refreshToken) === 'string') {
+                    coaAuthClient = new COA.auth.RefreshToken(credentials);
+                    coaAuthClientCreated = true;
+                }
+            }
+            const reserveService = new COA.service.Reserve({
+                endpoint: coaAuthClient.options.endpoint,
+                auth: coaAuthClient
+            }, { timeout: settings.coa.timeout });
+            const { object, instrument } = data;
+            yield (0, cancelReservation_2.cancelPendingReservation)({
+                object,
+                instrument,
+                project: { id: params.project.id }
+            })({
+                action: new action_1.ActionRepo(connection),
+                reserveService
+            });
         }
         else {
             throw new factory.errors.NotImplemented(`purpose.typeOf ${(_e = data.purpose) === null || _e === void 0 ? void 0 : _e.typeOf} not implemented`);

package/package.json

@@ -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.49"
+  "version": "22.9.0-alpha.50"
 }