@chevre/domain 25.2.0-alpha.24 → 25.2.0-alpha.26

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

@@ -37,4 +37,19 @@ export declare class AcceptPayActionRepo extends ActionProcessRepo<IAcceptPayAct
             transactionNumber: string;
         };
     }, inclusion: IKeyOfProjection[]): Promise<IAcceptPayAction[]>;
+    /**
+     * アクションIDからレシピのafterMediaを参照する
+     */
+    findPaymentUrlById(params: {
+        project: {
+            id: string;
+        };
+        /**
+         * アクションID
+         */
+        id: string;
+    }): Promise<{
+        paymentMethodId: string;
+        paymentUrl?: string;
+    }>;
 }

package/lib/chevre/repo/action/acceptPay.js

@@ -29,25 +29,6 @@ class AcceptPayActionRepo extends actionProcess_1.ActionProcessRepo {
             ...(typeof limit === 'number') ? { limit } : undefined,
             ...(typeof page === 'number') ? { page } : undefined,
         }, inclusion);
-        // const andConditions: FilterQuery<IAcceptPayAction>[] = [
-        //     { typeOf: { $eq: factory.actionType.AcceptAction } },
-        //     { 'project.id': { $eq: params.project.id } },
-        //     { 'object.typeOf': { $exists: true, $eq: factory.assetTransactionType.Pay } },
-        //     { 'purpose.id': { $exists: true, $eq: params.purpose.id } }
-        // ];
-        // let positiveProjectionFields: IKeyOfProjection[] = AVAILABLE_PROJECT_FIELDS;
-        // if (Array.isArray(inclusion) && inclusion.length > 0) {
-        //     positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
-        // }
-        // const projection: ProjectionType<IAcceptPayAction> = {
-        //     _id: 0,
-        //     id: { $toString: '$_id' },
-        //     ...Object.fromEntries<1>(positiveProjectionFields.map((key) => ([key, 1])))
-        // };
-        // const query = this.actionModel.find({ $and: andConditions }, projection);
-        // return query.setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-        //     .lean<IAcceptPayAction[]>()
-        //     .exec();
     }
     /**
      * 決済取引番号から完了済の決済採用アクションを参照する
@@ -66,5 +47,52 @@ class AcceptPayActionRepo extends actionProcess_1.ActionProcessRepo {
             }
         }, inclusion);
     }
+    /**
+     * アクションIDからレシピのafterMediaを参照する
+     */
+    async findPaymentUrlById(params) {
+        const acceptActionWithResult = await this.actionModel.findOne({
+            typeOf: { $eq: factory_1.factory.actionType.AcceptAction }, // 採用アクション
+            _id: { $eq: params.id }
+        }, {
+            _id: 0,
+            result: 1,
+            object: 1
+        })
+            .lean() // 2024-08-26~
+            .exec();
+        if (acceptActionWithResult === null) {
+            throw new factory_1.factory.errors.NotFound(this.actionModel.modelName);
+        }
+        const paymentMethodId = acceptActionWithResult.object.transactionNumber;
+        // アクション未完了であればpaymentMethodIdだけ返す
+        if (acceptActionWithResult.result === undefined) {
+            return { paymentMethodId };
+        }
+        const recipe = await this.actionRecipeModel.findOne({
+            'project.id': { $eq: params.project.id },
+            'recipeFor.id': { $eq: params.id }
+        }, {
+            _id: 0,
+            step: 1
+        })
+            .lean()
+            .exec();
+        const afterMedia = recipe?.step[0]?.itemListElement[1]?.itemListElement[0]?.afterMedia;
+        let paymentUrl;
+        // 3DS拡張(2024-01-02~)
+        const retUrl = acceptActionWithResult.object.object.paymentMethod.creditCard?.retUrl;
+        if (typeof retUrl === 'string' && retUrl.length > 0) {
+            paymentUrl = afterMedia?.redirectUrl;
+        }
+        else {
+            paymentUrl = afterMedia?.acsUrl;
+        }
+        // アクション完了済であれば、レシピからpaymentUrlを必ず参照できるはず
+        if (typeof paymentUrl !== 'string' || paymentUrl === '') {
+            throw new factory_1.factory.errors.Internal(`Payment URL unable to publish. [retUrl: ${retUrl}]`);
+        }
+        return { paymentMethodId, paymentUrl };
+    }
 }
 exports.AcceptPayActionRepo = AcceptPayActionRepo;

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -13,6 +13,10 @@ interface IOnReservationStatusChanged {
      * AggService通知先
      */
     informReservation?: factory.project.IInformParams[];
+    /**
+     * 確定予約最小化をサポート(2026-07-14~)
+     */
+    minimizeReservation?: boolean;
 }
 interface IOnTaskStatusChanged {
     /**

package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.js

@@ -167,7 +167,7 @@ function publishPaymentUrl(params, options) {
         }
         const actionResult = {
             paymentMethodId: result.paymentMethodId,
-            paymentUrl: result.paymentUrl
+            // paymentUrl: result.paymentUrl // result.paymentUrlは廃止(2026-07-14~)
         };
         await repos.acceptPayAction.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         return result;

package/lib/chevre/service/payment/any/findAcceptAction.d.ts

@@ -18,7 +18,9 @@ interface IFindAcceptActionResult {
         name?: string;
         message?: string;
     };
-    result?: factory.action.accept.pay.IResult;
+    result?: Pick<factory.action.accept.pay.IResult, 'paymentMethodId'> & {
+        paymentUrl: string;
+    };
 }
 declare function findAcceptAction(params: {
     project: {

package/lib/chevre/service/payment/any/findAcceptAction.js

@@ -42,12 +42,20 @@ function findAcceptAction(params) {
                     if (acceptAction.purpose?.id !== params.purpose.id) {
                         throw new factory_1.factory.errors.NotFound('Action');
                     }
-                    const acceptActionWithResult = await repos.acceptPayAction.findById({ id: acceptAction.id, typeOf: factory_1.factory.actionType.AcceptAction }, ['result', 'object'], []);
+                    // result.paymentUrl廃止につき、paymentUrlはrecipeを参照する(2026-07-14~)
+                    // const acceptActionWithResult = await repos.acceptPayAction.findById(
+                    //     { id: acceptAction.id, typeOf: factory.actionType.AcceptAction },
+                    //     ['result', 'object'],
+                    //     []
+                    // ) as Pick<factory.action.accept.pay.IAction, 'result' | 'object'>;
+                    const acceptPayResult = await repos.acceptPayAction.findPaymentUrlById({
+                        project: { id: params.project.id },
+                        id: acceptAction.id
+                    });
                     action = {
                         id: acceptAction.id,
                         actionStatus: acceptAction.actionStatus,
-                        // add object.transactionNumber(2025-08-26~)
-                        object: { transactionNumber: acceptActionWithResult.object.transactionNumber },
+                        object: { transactionNumber: acceptPayResult.paymentMethodId }, // add object.transactionNumber(2025-08-26~)
                         ...(acceptAction.error !== undefined)
                             ? {
                                 error: (Array.isArray(acceptAction.error))
@@ -55,11 +63,11 @@ function findAcceptAction(params) {
                                     : acceptAction.error
                             }
                             : undefined,
-                        ...(acceptActionWithResult?.result !== undefined)
+                        ...(typeof acceptPayResult.paymentUrl === 'string')
                             ? {
                                 result: {
-                                    paymentMethodId: acceptActionWithResult.result.paymentMethodId,
-                                    paymentUrl: acceptActionWithResult.result.paymentUrl
+                                    paymentMethodId: acceptPayResult.paymentMethodId,
+                                    paymentUrl: acceptPayResult.paymentUrl
                                 }
                             }
                             : undefined

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

@@ -46,6 +46,7 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
         // const informReservations = settings.onReservationStatusChanged.informReservation;
         const informReservations = setting?.onReservationStatusChanged?.informReservation;
+        const minimizeReservation = setting?.onReservationStatusChanged?.minimizeReservation === true;
         let orderAsAbout;
         if (Array.isArray(reserveAction.instrument)) {
             for (const eachInstrument of reserveAction.instrument) {
@@ -98,16 +99,24 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
             }
             const subReservations4inform = confirmedReservations.map((r) => {
                 const { additionalProperty, additionalTicketText, id, modifiedTime, price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
+                let reservedTicket4inform;
+                if (minimizeReservation) {
+                    const { ticketType: _ticketType, ...reservedTicketWithNoTicketType } = reservedTicket;
+                    reservedTicket4inform = reservedTicketWithNoTicketType;
+                }
+                else {
+                    reservedTicket4inform = reservedTicket; // eslint-disable-line @typescript-eslint/no-explicit-any
+                }
                 return {
                     id,
                     typeOf,
-                    reservedTicket,
-                    ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
+                    reservedTicket: reservedTicket4inform,
                     ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
                     ...(modifiedTime instanceof Date) ? { modifiedTime } : undefined,
-                    ...(price !== undefined) ? { price } : undefined,
-                    ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
-                    ...(Array.isArray(subReservation)) ? { subReservation } : undefined
+                    ...(Array.isArray(subReservation)) ? { subReservation } : undefined,
+                    ...(!minimizeReservation && Array.isArray(additionalProperty)) ? { additionalProperty } : undefined, // eslint-disable-line @typescript-eslint/no-explicit-any
+                    ...(!minimizeReservation && price !== undefined) ? { price } : undefined, // eslint-disable-line @typescript-eslint/no-explicit-any
+                    ...(!minimizeReservation && programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined, // eslint-disable-line @typescript-eslint/no-explicit-any
                 };
             });
             if (typeof issuedThrough.id !== 'string') {
@@ -116,7 +125,6 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
             }
             const informObject = {
                 bookingTime,
-                issuedThrough, // subReservationから移行(2024-03-20~)
                 project,
                 provider, // subReservationから移行(2024-03-20~)
                 reservationFor,
@@ -124,8 +132,9 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                 reservationStatus: factory_1.factory.reservationStatusType.ReservationConfirmed,
                 subReservation: subReservations4inform,
                 typeOf: factory_1.factory.reservationType.ReservationPackage,
-                ...(typeof underName?.typeOf === 'string')
-                    ? { underName: (0, factory_2.optimizeUnderName4inform)({ underName }) }
+                ...(!minimizeReservation) ? { issuedThrough } : undefined, // eslint-disable-line @typescript-eslint/no-explicit-any
+                ...(!minimizeReservation && typeof underName?.typeOf === 'string')
+                    ? { underName: (0, factory_2.optimizeUnderName4inform)({ underName }) } // eslint-disable-line @typescript-eslint/no-explicit-any
                     : undefined
             };
             const informIdentifier = `${factory_1.factory.reservationType.ReservationPackage}:${informObject.reservationNumber}:${informObject.reservationStatus}`;

package/lib/chevre/service/transaction/deleteTransaction/deleteReservationsByPlaceOrder.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteReservationsByPlaceOrder = deleteReservationsByPlaceOrder;
-/* eslint-disable @typescript-eslint/no-explicit-any */
 const factory_1 = require("../../../factory");
 function deleteReservationsByPlaceOrder(params) {
     return async (repos) => {

package/lib/chevre/service/transaction/placeOrder/confirm/validation.js

@@ -115,8 +115,8 @@ function validatePaymentUrl(params) {
         // check existing accept action(2025-02-26~)
         const acceptActionExists = acceptPayActions.some(({ object, result }) => {
             return object.transactionNumber === paymentMethodId
-                && result?.paymentMethodId === paymentMethodId
-                && typeof result?.paymentUrl === 'string';
+                && result?.paymentMethodId === paymentMethodId;
+            // && typeof result?.paymentUrl === 'string'; // result.paymentUrlは廃止(2026-07-14~)
         });
         debug('validatePaymentUrl: acceptActionExists:', acceptActionExists);
         if (!acceptActionExists) {

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.5.0-alpha.7",
+    "@chevre/factory": "9.5.0-alpha.9",
     "@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.2.0-alpha.24"
+  "version": "25.2.0-alpha.26"
 }