@chevre/domain 23.0.0-alpha.3 → 23.0.0-alpha.30

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.js

@@ -10,118 +10,37 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateStartRequest = validateStartRequest;
-const jwt = require("jsonwebtoken");
 const moment = require("moment");
 const factory = require("../../../factory");
-function verifyOfferedByToken(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let result;
-        const { issuer, secret, token } = params;
-        try {
-            result = yield new Promise((resolve, reject) => {
-                jwt.verify(token, secret, {
-                    issuer
-                    // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
-                }, (err, decoded) => {
-                    if (err instanceof Error) {
-                        reject(err);
-                    }
-                    else {
-                        resolve(decoded);
-                    }
-                });
-            });
-        }
-        catch (error) {
-            // JWTエラーをハンドリング
-            if (error instanceof jwt.TokenExpiredError) {
-                throw new factory.errors.Argument('memberOfToken', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
-            }
-            else if (error instanceof jwt.JsonWebTokenError) {
-                throw new factory.errors.Argument('memberOfToken', `invalid token. [${error.message}]`);
-            }
-            throw error;
-        }
-        return result;
-    });
-}
+const validateIssuedOfferIfExists_1 = require("./validateStartRequest/validateIssuedOfferIfExists");
+const validateMemberTierIfExists_1 = require("./validateStartRequest/validateMemberTierIfExists");
 function validateStartRequest(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a;
         const now = params.now;
         const event = params.event;
         if (params.validateEventOfferPeriod === true) {
             if (typeof ((_a = params.store) === null || _a === void 0 ? void 0 : _a.id) !== 'string') {
                 throw new factory.errors.NotFound('store.id');
             }
-            const tokenizedMemberProgramTier = (_c = (_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
-            yield validateEventOfferPeriod(Object.assign({ event,
-                now, availableAt: { id: params.store.id } }, (typeof (tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.token) === 'string') ? { tokenizedMemberProgramTier } : undefined))(repos);
+            yield validateApplicationOffer({
+                event,
+                now,
+                availableAt: { id: params.store.id },
+                object: params.object
+            })(repos);
         }
         if (params.validateEvent === true) {
             validateEvent({ event, object: params.object });
         }
     });
 }
-function validateMemberTier(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
-        const { acceptedDate, event, verifiedValidForMemberTier, memberProgramIdentifierMustBe, aggregateOfferIdentifier } = params;
-        const tierIdentifier = (_b = (_a = verifiedValidForMemberTier.member) === null || _a === void 0 ? void 0 : _a.memberOf) === null || _b === void 0 ? void 0 : _b.identifier;
-        const memberProgramIdentifier = (_e = (_d = (_c = verifiedValidForMemberTier.member) === null || _c === void 0 ? void 0 : _c.memberOf) === null || _d === void 0 ? void 0 : _d.isTierOf) === null || _e === void 0 ? void 0 : _e.identifier;
-        if (typeof tierIdentifier !== 'string') {
-            throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', 'tier identifier must be string');
-        }
-        if (typeof memberProgramIdentifier !== 'string') {
-            throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', 'member program must be string');
-        }
-        if (memberProgramIdentifier !== memberProgramIdentifierMustBe) {
-            throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', 'member program not matched');
-        }
-        const sellerId = event.offers.seller.id;
-        if (typeof sellerId !== 'string' || sellerId === '') {
-            throw new factory.errors.NotFound('event.offers.seller.id');
-        }
-        // 有効なプロダクトオファーを検証
-        const productOfferForMemberTier = (yield repos.productOffer.findProductOffers({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: event.project.id } },
-            // availableAtOrFrom: { id: { $eq: availableAt.id } },
-            itemOffered: { identifier: { $eq: aggregateOfferIdentifier } }, // オファーコレクションコード
-            validForMemberTier: { identifier: { $eq: tierIdentifier } },
-            validFrom: { $lte: acceptedDate.toDate() },
-            validThrough: { $gte: acceptedDate.toDate() },
-            offeredBy: { id: { $eq: sellerId } } // オファー提供者も検証する
-        }, ['identifier'])).shift();
-        if (productOfferForMemberTier === undefined) {
-            throw new factory.errors.NotFound(factory.offerType.Offer, 'valid product offers for member tier not found');
-        }
-        // let validThroughMoment: moment.Moment;
-        // let validFromMoment: moment.Moment;
-        // validThroughMoment = moment(productOfferForMemberTier.validThrough, ROLE_DATE_FORMAT, true);
-        // validFromMoment = moment(productOfferForMemberTier.validFrom, ROLE_DATE_FORMAT, true);
-        // if (acceptedDate.isBefore(validFromMoment)) {
-        //     throw new factory.errors.Argument(
-        //         'reservationFor.offers.validForMemberTier',
-        //         `the offer id valid from ${validFromMoment}`
-        //     );
-        // }
-        // if (acceptedDate.isAfter(validThroughMoment)) {
-        //     throw new factory.errors.Argument(
-        //         'reservationFor.offers.validForMemberTier',
-        //         `the offer id valid through ${validThroughMoment}`
-        //     );
-        // }
-    });
-}
 /**
- * イベントのオファー有効期間を検証する
+ * アプリケーションごとのオファーを検証する
  */
-function validateEventOfferPeriod(params) {
+function validateApplicationOffer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const { event, availableAt, tokenizedMemberProgramTier } = params;
+        const { event, availableAt } = params;
         const acceptedDate = moment(params.now);
         const eventOffers = event.offers;
         // アプリケーションごとの設定を参照する(2022-11-19~)
@@ -149,51 +68,19 @@ function validateEventOfferPeriod(params) {
             }
         }
         // 有効メンバープログラムティアが存在する場合
-        // support validForMemberTier(2025-05-14~)
-        const validForMemberTierExists = ((_a = makesOfferOnApplication.validForMemberTier) === null || _a === void 0 ? void 0 : _a.typeOf) === 'MemberProgramTier';
-        if (validForMemberTierExists) {
-            const validForMemberTierToken = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.token;
-            const memberProgramIdentifierMustBe = (_b = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.isTierOf) === null || _b === void 0 ? void 0 : _b.identifier;
-            // ティアトークンが必須
-            if (typeof validForMemberTierToken !== 'string' || validForMemberTierToken === '') {
-                throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier.token');
-            }
-            // メンバープログラムコード指定が必須
-            if (typeof memberProgramIdentifierMustBe !== 'string' || memberProgramIdentifierMustBe === '') {
-                throw new factory.errors.ArgumentNull('reservationFor.offers.validForMemberTier.isTierOf.identifier');
-            }
-            // 有効メンバープログラムティアが存在する場合、オファーコレクションコードが必須
-            const aggregateOfferIdentifier = eventOffers.identifier;
-            if (typeof aggregateOfferIdentifier !== 'string' || aggregateOfferIdentifier === '') {
-                throw new factory.errors.NotFound('makesOfferOnApplication.identifier');
-            }
-            // トークン検証
-            const memberProgram = (yield repos.memberProgram.projectMemberPrograms({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: params.event.project.id } },
-                identifier: { $eq: memberProgramIdentifierMustBe }
-            })).shift();
-            if (memberProgram === undefined) {
-                throw new factory.errors.NotFound('MemberProgram', `MemberProgram '${memberProgramIdentifierMustBe}' not found`);
-            }
-            const issuer = yield repos.issuer.findByIdentifier({
-                project: { id: params.event.project.id },
-                identifier: memberProgram.hostingOrganization.identifier
-            });
-            if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
-                throw new factory.errors.NotFound('issuer.tokenSecret');
-            }
-            const verifiedValidForMemberTier = yield verifyOfferedByToken({
-                secret: issuer.tokenSecret,
-                issuer: issuer.url,
-                token: validForMemberTierToken
-            });
-            yield validateMemberTier({
-                event, acceptedDate, verifiedValidForMemberTier,
-                memberProgramIdentifierMustBe, aggregateOfferIdentifier
-            })(repos);
-        }
+        yield (0, validateMemberTierIfExists_1.validateMemberTierIfExists)({
+            event,
+            now: params.now,
+            object: params.object,
+            makesOfferOnApplication
+        })(repos);
+        // オファートークン検証(2025-10-21~)
+        yield (0, validateIssuedOfferIfExists_1.validateIssuedOfferIfExists)({
+            event,
+            now: params.now,
+            object: params.object,
+            makesOfferOnApplication
+        })(repos);
     });
 }
 /**

package/lib/chevre/service/event.js

@@ -239,7 +239,7 @@ function saveScreeningEventSeries(params) {
             kubunClass: '043'
         });
         debug('kubunNames found.');
-        const availablePaymentMethodTypes = yield repos.categoryCode.projectFields({
+        const availablePaymentMethodTypes = yield repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
         }, ['additionalProperty', 'codeValue']);

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

@@ -117,7 +117,7 @@ function importCategoryCodesFromCOA(params) {
                     upsert: true
                 });
             });
-            yield repos.categoryCode.saveManyByCodeValue(saveParams);
+            yield repos.categoryCode.saveCategoryCodesByCodeValue(saveParams);
         }
         catch (error) {
             let throwsError = true;

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

@@ -53,15 +53,15 @@ function authorize(params) {
                 'superEvent', 'typeOf', 'identifier', 'name'
             ] // optimize(2024-07-18~)
             );
-            const availablePaymentMethodTypes = yield repos.categoryCode.projectFields({
+            const availablePaymentMethodTypes = yield repos.categoryCode.projectCategoryCodeFields({
                 project: { id: { $eq: transaction.project.id } },
                 inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
             }, []);
-            const seatingTypes = yield repos.categoryCode.projectFields({
+            const seatingTypes = yield repos.categoryCode.projectCategoryCodeFields({
                 project: { id: { $eq: transaction.project.id } },
                 inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
             }, []);
-            const videoFormatTypes = yield repos.categoryCode.projectFields({
+            const videoFormatTypes = yield repos.categoryCode.projectCategoryCodeFields({
                 project: { id: { $eq: transaction.project.id } },
                 inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
             }, []);

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

@@ -79,15 +79,15 @@ function changeOffers(params) {
             'superEvent', 'typeOf', 'identifier', 'name'
         ] // optimize(2024-07-18~)
         );
-        const availablePaymentMethodTypes = yield repos.categoryCode.projectFields({
+        const availablePaymentMethodTypes = yield repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
         }, []);
-        const seatingTypes = yield repos.categoryCode.projectFields({
+        const seatingTypes = yield repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
         }, []);
-        const videoFormatTypes = yield repos.categoryCode.projectFields({
+        const videoFormatTypes = yield repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
         }, []);

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

@@ -111,41 +111,37 @@ function createInformTasks(params, setting) {
                 typeOf: params.typeOf
             }, [
                 'project', 'organizer', 'typeOf', 'name', 'doorTime', 'endDate',
-                'eventStatus', 'location', 'startDate', 'superEvent', 'offers', 'additionalProperty'
+                'eventStatus', 'location', 'startDate', 'superEvent', 'offers', 'additionalProperty', 'identifier'
             ] // inclusion(2024-07-30~)
             );
             // 最適化(2024-03-22~)
-            events4inform = screeningEvents4inform.map(({ project, organizer, typeOf, name, doorTime, endDate, eventStatus, location, startDate, superEvent, offers, id, additionalProperty }) => {
+            events4inform = screeningEvents4inform.map(({ project, organizer, typeOf, name, doorTime, endDate, eventStatus, location, startDate, superEvent, offers, id, additionalProperty, identifier }) => {
                 var _a;
-                return {
-                    project, organizer, typeOf, name, doorTime, endDate,
-                    eventStatus, location, startDate, superEvent, id, additionalProperty,
-                    offers: (((_a = offers.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA)
-                        ? {
-                            typeOf: offers.typeOf,
-                            itemOffered: offers.itemOffered
+                const eventOfferAsNotification = (((_a = offers.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA)
+                    ? {
+                        typeOf: offers.typeOf,
+                        itemOffered: offers.itemOffered
+                    }
+                    : {
+                        typeOf: offers.typeOf,
+                        itemOffered: offers.itemOffered,
+                        seller: {
+                            id: offers.seller.id,
+                            typeOf: offers.seller.typeOf,
+                            // makesOfferを追加(2024-03-26~)
+                            makesOffer: (Array.isArray(offers.seller.makesOffer))
+                                ? offers.seller.makesOffer.map((eventSellerMakesOffer) => {
+                                    return Object.assign({ availabilityEnds: eventSellerMakesOffer.availabilityEnds, availabilityStarts: eventSellerMakesOffer.availabilityStarts, validFrom: eventSellerMakesOffer.validFrom, validThrough: eventSellerMakesOffer.validThrough, availableAtOrFrom: [eventSellerMakesOffer.availableAtOrFrom] }, (typeof eventSellerMakesOffer.identifier === 'string')
+                                        ? { identifier: eventSellerMakesOffer.identifier }
+                                        : undefined // support notify identifier(2025-11-01~)
+                                    );
+                                })
+                                : []
                         }
-                        : {
-                            typeOf: offers.typeOf,
-                            itemOffered: offers.itemOffered,
-                            seller: {
-                                id: offers.seller.id,
-                                typeOf: offers.seller.typeOf,
-                                // makesOfferを追加(2024-03-26~)
-                                makesOffer: (Array.isArray(offers.seller.makesOffer))
-                                    ? offers.seller.makesOffer.map(({ availabilityEnds, availabilityStarts, availableAtOrFrom, validFrom, validThrough }) => {
-                                        // support availableAtOrFrom as non-array(2024-10-13~)
-                                        const availableAtOrFrom4inform = (Array.isArray(availableAtOrFrom))
-                                            ? availableAtOrFrom
-                                            : (typeof (availableAtOrFrom === null || availableAtOrFrom === void 0 ? void 0 : availableAtOrFrom.id) === 'string') ? [availableAtOrFrom] : undefined;
-                                        return Object.assign({ availabilityEnds, availabilityStarts, validFrom, validThrough }, (Array.isArray(availableAtOrFrom4inform))
-                                            ? { availableAtOrFrom: availableAtOrFrom4inform }
-                                            : undefined);
-                                    })
-                                    : []
-                            }
-                        }
-                };
+                    };
+                return Object.assign({ project, organizer, typeOf, name, doorTime, endDate,
+                    eventStatus, location, startDate, superEvent, id, additionalProperty, offers: eventOfferAsNotification }, (typeof identifier === 'string') ? { identifier } : undefined // support notify identifier(2025-11-01~)
+                );
             });
         }
         else {

package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.d.ts

@@ -0,0 +1,39 @@
+import * as factory from '../../../../factory';
+import type { ActionRepo } from '../../../../repo/action';
+import type { AuthorizationRepo } from '../../../../repo/authorization';
+import type { TicketRepo } from '../../../../repo/ticket';
+import type { ITransactionInProgress, TransactionRepo } from '../../../../repo/transaction';
+import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
+import * as PayTransactionService from '../../../assetTransaction/pay';
+import { IPermitOrInvoice } from '../verifyTicketTokenAsNeeded';
+interface IFixTransactionNumberRepos {
+    action: ActionRepo;
+    authorization: AuthorizationRepo;
+    ticket: TicketRepo;
+    transaction: TransactionRepo;
+    transactionNumber: TransactionNumberRepo;
+}
+type IFixTransactionNumberOperation<T> = (repos: IFixTransactionNumberRepos) => Promise<T>;
+type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail & {
+    ticketToken?: string;
+};
+/**
+ * 決済承認時の取引番号を決定する
+ */
+declare function fixTransactionNumber(params: {
+    object: IObjectWithoutDetail;
+    transaction: Pick<ITransactionInProgress<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'typeOf' | 'project' | 'seller'>;
+    paymentServiceType: factory.service.paymentService.PaymentServiceType;
+}): IFixTransactionNumberOperation<{
+    transactionNumber: string;
+    pendingPaymentAgencyTransaction?: PayTransactionService.IPaymentAgencyTransaction;
+    creditCard?: factory.action.authorize.paymentMethod.any.ICreditCard;
+    permitOrInvoice?: IPermitOrInvoice;
+    id?: never;
+} | {
+    /**
+     * 完了済の決済承認アクションID
+     */
+    id: string;
+}>;
+export { fixTransactionNumber };

package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.js

@@ -0,0 +1,86 @@
+"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.fixTransactionNumber = fixTransactionNumber;
+const factory = require("../../../../factory");
+const verifyTicketTokenAsNeeded_1 = require("../verifyTicketTokenAsNeeded");
+const handlePrePublishedPaymentMethodIdOnAuthorizing_1 = require("./handlePrePublishedPaymentMethodIdOnAuthorizing");
+/**
+ * 決済承認時の取引番号を決定する
+ */
+function fixTransactionNumber(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { paymentServiceType, transaction, object } = params;
+        // 取引番号生成
+        let transactionNumber;
+        let pendingPaymentAgencyTransaction;
+        let creditCard = object.creditCard;
+        // ticketTokenを解釈(2024-08-13~)
+        const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
+            project: { id: transaction.project.id },
+            object: object,
+            paymentServiceType,
+            purpose: { id: transaction.id }
+        })(repos);
+        /**
+         * ticketTokenによって指定された決済方法ID
+         */
+        let paymentMethodIdByTicketToken;
+        if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) {
+            paymentMethodIdByTicketToken = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.identifier;
+            if (typeof paymentMethodIdByTicketToken === 'string') {
+                transactionNumber = paymentMethodIdByTicketToken; // メンバーシップ指定の場合、取引番号に適用(2024-08-13~)
+            }
+        }
+        else if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === 'Invoice') {
+            // support paymentServiceType.MovieTicket(2024-11-23~)
+            if (typeof (permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.paymentMethodId) === 'string') {
+                paymentMethodIdByTicketToken = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.paymentMethodId;
+                if (typeof paymentMethodIdByTicketToken === 'string') {
+                    transactionNumber = paymentMethodIdByTicketToken;
+                }
+            }
+        }
+        // リクエストでpaymentMethodIdを指定された場合、取引に保管されたpaymentMethodIdに一致すればそちらを適用(外部サイト決済対応)
+        if (typeof object.paymentMethodId === 'string' && object.paymentMethodId.length > 0) {
+            if (typeof paymentMethodIdByTicketToken === 'string') {
+                // 指定されたpaymentMethodIdとチケットから読み取った決済方法IDは一致しなければいけない
+                if (paymentMethodIdByTicketToken !== object.paymentMethodId) {
+                    throw new factory.errors.Argument('ticketToken', 'not matched with paymentMethodId');
+                }
+            }
+            const { authorizeParams, existingCompletedAuthorizeAction } = yield (0, handlePrePublishedPaymentMethodIdOnAuthorizing_1.handlePrePublishedPaymentMethodIdOnAuthorizing)({
+                object: object,
+                prePublishedPaymentMethodId: object.paymentMethodId,
+                transaction
+            })(repos);
+            if (existingCompletedAuthorizeAction !== undefined) {
+                return { id: existingCompletedAuthorizeAction.id };
+            }
+            else if (authorizeParams !== undefined) {
+                // creditCardを決済URL発行時の情報で上書き(2024-01-08~)
+                // creditCard = authorizeParams.paymentMethodByTransaction.paymentMethod?.creditCard;
+                creditCard = authorizeParams.creditCard;
+                transactionNumber = object.paymentMethodId;
+                pendingPaymentAgencyTransaction = authorizeParams.pendingPaymentAgencyTransaction;
+            }
+            else {
+                throw new factory.errors.NotImplemented('pendingPaymentAgencyTransaction required on paymentMethodId specified');
+            }
+        }
+        // 取引番号発行済でなければ発行
+        if (typeof transactionNumber !== 'string') {
+            const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+            transactionNumber = publishTransactionNumberResult.transactionNumber;
+        }
+        return Object.assign(Object.assign(Object.assign({ transactionNumber }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined), (permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined);
+    });
+}

package/lib/chevre/service/payment/any/{handlePrePublishedPaymentMethodIdOnAuthorizing.d.ts → authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.d.ts}

@@ -1,7 +1,7 @@
-import * as factory from '../../../factory';
-import type { ActionRepo } from '../../../repo/action';
-import type { ITransactionInProgress, TransactionRepo } from '../../../repo/transaction';
-import * as PayTransactionService from '../../assetTransaction/pay';
+import * as factory from '../../../../factory';
+import type { ActionRepo } from '../../../../repo/action';
+import type { ITransactionInProgress, TransactionRepo } from '../../../../repo/transaction';
+import * as PayTransactionService from '../../../assetTransaction/pay';
 type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail;
 declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
     object: Pick<IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod'>;

package/lib/chevre/service/payment/any/{handlePrePublishedPaymentMethodIdOnAuthorizing.js → authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.js}

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlePrePublishedPaymentMethodIdOnAuthorizing = handlePrePublishedPaymentMethodIdOnAuthorizing;
 const createDebug = require("debug");
-const factory = require("../../../factory");
+const factory = require("../../../../factory");
 const debug = createDebug('chevre-domain:service:payment');
 function recipe2paymentAgencyTransaction(actionRecipe) {
     var _a;

package/lib/chevre/service/payment/any/publishPaymentUrl/fixTransactionNumberOnPublishPaymentUrl.d.ts

@@ -0,0 +1,25 @@
+import * as factory from '../../../../factory';
+import type { AuthorizationRepo } from '../../../../repo/authorization';
+import type { TicketRepo } from '../../../../repo/ticket';
+import type { ITransactionInProgress } from '../../../../repo/transaction';
+import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
+interface IFixTransactionNumberRepos {
+    authorization: AuthorizationRepo;
+    ticket: TicketRepo;
+    transactionNumber: TransactionNumberRepo;
+}
+type IFixTransactionNumberOperation<T> = (repos: IFixTransactionNumberRepos) => Promise<T>;
+type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail & {
+    ticketToken?: string;
+};
+/**
+ * 外部決済ロケーション発行時の取引番号を決定する
+ */
+declare function fixTransactionNumberOnPublishPaymentUrl(params: {
+    object: IObjectWithoutDetail;
+    transaction: Pick<ITransactionInProgress<factory.transactionType.PlaceOrder>, 'id' | 'project'>;
+    paymentServiceType: factory.service.paymentService.PaymentServiceType;
+}): IFixTransactionNumberOperation<{
+    transactionNumber: string;
+}>;
+export { fixTransactionNumberOnPublishPaymentUrl };

package/lib/chevre/service/payment/any/publishPaymentUrl/fixTransactionNumberOnPublishPaymentUrl.js

@@ -0,0 +1,51 @@
+"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.fixTransactionNumberOnPublishPaymentUrl = fixTransactionNumberOnPublishPaymentUrl;
+const factory = require("../../../../factory");
+const verifyTicketTokenAsNeeded_1 = require("../verifyTicketTokenAsNeeded");
+/**
+ * 外部決済ロケーション発行時の取引番号を決定する
+ */
+function fixTransactionNumberOnPublishPaymentUrl(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { paymentServiceType, transaction, object } = params;
+        // 取引番号生成
+        let transactionNumber;
+        // support ticketToken(2024-08-21~)
+        const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
+            project: { id: transaction.project.id },
+            object,
+            paymentServiceType,
+            purpose: { id: transaction.id }
+        })(repos);
+        if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) {
+            const paymentMethodIdByPermit = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.identifier;
+            if (typeof paymentMethodIdByPermit === 'string') {
+                transactionNumber = paymentMethodIdByPermit;
+            }
+        }
+        else if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === 'Invoice') {
+            // support Invoice ticket(2025-11-09~)
+            if (typeof (permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.paymentMethodId) === 'string') {
+                transactionNumber = permitOrInvoice.paymentMethodId;
+            }
+        }
+        if (typeof transactionNumber !== 'string') {
+            const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+            transactionNumber = publishTransactionNumberResult.transactionNumber;
+        }
+        return {
+            transactionNumber
+            // ...(permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined
+        };
+    });
+}

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

@@ -8,11 +8,11 @@ declare function verifyTicketTokenAsNeeded(params: {
     };
     object: Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'issuedThrough' | 'ticketToken'>;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
-    purpose: factory.action.authorize.paymentMethod.any.IPurpose;
+    purpose: Pick<factory.action.authorize.paymentMethod.any.IPurpose, 'id'>;
 }): (repos: {
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
 }) => Promise<{
     permitOrInvoice?: IPermitOrInvoice;
 }>;
-export { verifyTicketTokenAsNeeded };
+export { IPermitOrInvoice, verifyTicketTokenAsNeeded };