@chevre/domain 25.1.0-alpha.3 → 25.2.0-alpha.0

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

@@ -65,7 +65,7 @@ export declare class AuthorizeOfferActionRepo extends ActionProcessRepo<IAuthori
     }): Promise<void>;
     reCompleteAuthorizeEventOfferAction(params: {
         id: string;
-        object: factory.action.authorize.offer.eventService.IObject;
+        object: factory.action.authorize.offer.eventService.IObject4COA;
         result: factory.action.authorize.offer.eventService.IResult;
     }): Promise<void>;
 }

package/lib/chevre/repo/setting/waiter.js

@@ -29,7 +29,6 @@ class WaiterSettingRepo {
             .exec();
         // キャッシュを更新
         if (settingDoc?.waiter !== undefined) {
-            console.log('document exist!', settingDoc);
             WaiterSettingRepo.cachedSettings = settingDoc.waiter;
             WaiterSettingRepo.cacheExpiry = now + WaiterSettingRepo.CACHE_TTL_MS;
         }

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

@@ -8,7 +8,6 @@ interface ICancelRepos {
     reserveService: COA.service.Reserve;
     task: TaskRepo;
 }
-type ICancelOperation<T> = (repos: ICancelRepos) => Promise<T>;
 interface ICancelByAcceptActionRepos {
     action: ActionRepo;
     acceptCOAOfferAction: AcceptCOAOfferActionRepo;
@@ -16,17 +15,6 @@ interface ICancelByAcceptActionRepos {
     task: TaskRepo;
 }
 type ICancelByAcceptActionOperation<T> = (repos: ICancelByAcceptActionRepos) => Promise<T>;
-/**
- * 興行オファー承認アクションからCOA予約を取り消す
- */
-declare function cancel(params: {
-    action: factory.action.authorize.offer.eventService.IAction;
-}, options: {
-    /**
-     * cancelPendingReservation async?(2025-03-03~)
-     */
-    asyncCancelPendingReservation: boolean;
-}): ICancelOperation<void>;
 /**
  * 興行オファー採用アクションからCOA予約を取り消す
  */
@@ -38,4 +26,4 @@ declare function cancelByAcceptAction(params: {
      */
     asyncCancelPendingReservation: boolean;
 }): ICancelByAcceptActionOperation<void>;
-export { ICancelRepos, ICancelByAcceptActionRepos, cancel, cancelByAcceptAction };
+export { ICancelRepos, ICancelByAcceptActionRepos, cancelByAcceptAction };

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

@@ -1,62 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cancel = cancel;
 exports.cancelByAcceptAction = cancelByAcceptAction;
 const factory_1 = require("../../../factory");
 const cancelReservation_1 = require("../../reserveCOA/cancelReservation");
-/**
- * 興行オファー承認アクションからCOA予約を取り消す
- */
-function cancel(params, options) {
-    return async (repos) => {
-        // object.pendingTransactionに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
-        let delTmpReserveParams;
-        // objectに進行中取引情報があれば利用する(2023-09-11~)
-        const pendingTransaction = params.action.object.pendingTransaction;
-        if (typeof 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 = {
-                ...delTmpReserveParams,
-                reservationStatus: factory_1.factory.reservationStatusType.ReservationPending,
-                transactionNumber: delTmpReserveParams.tmpReserveNum,
-                typeOf: factory_1.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_1.factory.organizationType.Project },
-                    name: factory_1.factory.taskName.CancelPendingReservation,
-                    status: factory_1.factory.taskStatus.Ready,
-                    runsAt: new Date(),
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data
-                };
-                await repos.task.saveMany([cancelPendingReservationTask], { emitImmediately: true });
-            }
-            else {
-                await (0, cancelReservation_1.cancelPendingReservation)({
-                    project: { id: params.action.project.id },
-                    object,
-                    instrument
-                })(repos);
-            }
-        }
-    };
-}
+// /**
+//  * 興行オファー承認アクションからCOA予約を取り消す
+//  */
+// function cancel(
+//     params: {
+//         action: factory.action.authorize.offer.eventService.IAction;
+//     },
+//     options: {
+//         /**
+//          * cancelPendingReservation async?(2025-03-03~)
+//          */
+//         asyncCancelPendingReservation: boolean;
+//     }
+// ): ICancelOperation<void> {
+//     return async (repos: {
+//         action: ActionRepo;
+//         reserveService: COA.service.Reserve;
+//         task: TaskRepo;
+//     }) => {
+//         // object.pendingTransactionに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
+//         let delTmpReserveParams: COA.factory.reserve.IDelTmpReserveArgs | undefined;
+//         // objectに進行中取引情報があれば利用する(2023-09-11~)
+//         const pendingTransaction = params.action.object.pendingTransaction;
+//         if (typeof 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: factory.action.cancel.coaReserve.IObject = {
+//                 ...delTmpReserveParams,
+//                 reservationStatus: factory.reservationStatusType.ReservationPending,
+//                 transactionNumber: delTmpReserveParams.tmpReserveNum,
+//                 typeOf: factory.assetTransactionType.COAReserveTransaction
+//             };
+//             const instrument: factory.action.cancel.coaReserve.IPlaceOrderAsInstrument[] = [params.action.purpose];
+//             if (asyncCancelPendingReservation) {
+//                 // support async(2025-03-03~)
+//                 const data: factory.task.cancelPendingReservation.IPotentialCancelCOAReserveAction = { object, instrument };
+//                 const cancelPendingReservationTask: factory.task.cancelPendingReservation.IAttributes = {
+//                     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
+//                 };
+//                 await repos.task.saveMany([cancelPendingReservationTask], { emitImmediately: true });
+//             } else {
+//                 await cancelPendingReservation({
+//                     project: { id: params.action.project.id },
+//                     object,
+//                     instrument
+//                 })(repos);
+//             }
+//         }
+//     };
+// }
 /**
  * 興行オファー採用アクションからCOA予約を取り消す
  */

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

@@ -12,6 +12,7 @@ declare function processVoidTransaction4coa(params: {
     asyncCancelPendingReservation: boolean;
 }): (repos: {
     action: ActionRepo;
+    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
     reserveService: COA.service.Reserve;
     task: TaskRepo;
 }) => Promise<void>;

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

@@ -2,10 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processVoidTransaction4coa = processVoidTransaction4coa;
 exports.processVoidTransactionByAcceptAction4coa = processVoidTransactionByAcceptAction4coa;
+const factory_1 = require("../../../../factory");
 const cancel_1 = require("../../../assetTransaction/reserveCOA/cancel");
 function processVoidTransaction4coa(params, options) {
     return async (repos) => {
-        await (0, cancel_1.cancel)(params, options)(repos);
+        // 採用アクションから取り消すように変更(2026-07-03~)
+        // await cancel(params, options)(repos);
+        // COA承認の場合、採用アクションは必ず存在するはず
+        const acceptActionId = params.action.object.id;
+        if (typeof acceptActionId !== 'string') {
+            throw new factory_1.factory.errors.NotFound('action.object.id');
+        }
+        const acceptAction = await repos.acceptCOAOfferAction.findById({ id: acceptActionId, typeOf: factory_1.factory.actionType.AcceptAction });
+        console.log('processVoidTransaction4coa processing...', params.action.id, params.action.purpose.id, acceptAction);
+        await (0, cancel_1.cancelByAcceptAction)({ action: acceptAction }, options)(repos);
     };
 }
 function processVoidTransactionByAcceptAction4coa(params, options) {

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

@@ -89,6 +89,7 @@ function voidTransaction(params) {
                     }
                     await (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({ action }, { asyncCancelPendingReservation: true })({
                         action: repos.action,
+                        acceptCOAOfferAction: repos.acceptCOAOfferAction,
                         reserveService,
                         task: repos.task
                     });

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

@@ -2,6 +2,7 @@ import type { COA } from '@motionpicture/coa-service';
 import { factory } from '../../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { ActionRepo } from '../../../repo/action';
+import { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
@@ -16,6 +17,7 @@ interface IVoidTransactionByActionIdRepos {
      * CancelAction開始で使用される
      */
     action: ActionRepo;
+    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
     authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;

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

@@ -57,6 +57,7 @@ function voidTransactionByActionId(params) {
                 }
                 await (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({ action }, { asyncCancelPendingReservation: false })({
                     action: repos.action,
+                    acceptCOAOfferAction: repos.acceptCOAOfferAction,
                     reserveService,
                     task: repos.task
                 });

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "9.4.0",
+    "@chevre/factory": "9.5.0-alpha.0",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.1.0-alpha.3"
+  "version": "25.2.0-alpha.0"
 }