@chevre/domain 23.1.0-alpha.9 → 23.1.0

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

@@ -0,0 +1,123 @@
+"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.issueEventOfferTicket = issueEventOfferTicket;
+const moment = require("moment");
+const factory = require("../../../factory");
+const validateStartRequest_1 = require("../../assetTransaction/reserve/validateStartRequest");
+function createOfferTicket(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const { audience, expiresInSeconds, issuedBy, object, validFrom, author, project, instrument } = params;
+        const actionAttributes = {
+            project: { id: project.id, typeOf: factory.organizationType.Project },
+            typeOf: factory.actionType.AuthorizeAction,
+            agent: author,
+            recipient: author,
+            object: [object],
+            instrument: {
+                typeOf: factory.creativeWorkType.WebApplication,
+                id: instrument.id
+            }
+        };
+        const action = yield repos.action.start(actionAttributes);
+        let authorizations;
+        try {
+            authorizations = yield repos.authorization.issueAuthorization([{
+                    project: { id: project.id, typeOf: factory.organizationType.Project },
+                    object,
+                    validFrom,
+                    expiresInSeconds,
+                    author,
+                    issuedBy,
+                    audience
+                }]);
+        }
+        catch (error) {
+            try {
+                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        const result = authorizations.map(({ code, typeOf }) => ({ code, typeOf }));
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        const ticketToken = (_a = authorizations.shift()) === null || _a === void 0 ? void 0 : _a.code;
+        if (typeof ticketToken !== 'string') {
+            // 基本的にありえないフロー
+            throw new factory.errors.Internal('code not published by an unexpected reason');
+        }
+        // チケット作成
+        yield repos.ticket.issueByTicketToken({
+            project: { id: project.id },
+            ticketToken,
+            issuedBy
+        });
+        return { ticketToken };
+    });
+}
+function issueEventOfferTicket(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const { now, audience, eventId, eventOfferId, ticketedOffer, author, project, instrument } = params;
+        // 取引は存在するか
+        const transaction = yield repos.transaction.projectFieldsInProgressById({ typeOf: factory.transactionType.PlaceOrder, id: audience.id }, ['expires', 'typeOf', 'seller']);
+        // イベントは存在するか
+        const event = yield repos.event.projectEventFieldsById({ id: eventId }, ['project', 'offers', 'identifier']);
+        // 取引番号発行
+        // const { transactionNumber } = await transactionNumberRepo.publishByTimestamp({ startDate: now });
+        const { seller } = transaction;
+        // 承認作成
+        const issuedBy = Object.assign({ id: seller.id, typeOf: seller.typeOf }, (typeof seller.name.ja === 'string') ? { name: seller.name.ja } : undefined);
+        const validForMemberTierToken = (_a = ticketedOffer === null || ticketedOffer === void 0 ? void 0 : ticketedOffer.validForMemberTier) === null || _a === void 0 ? void 0 : _a.token;
+        const validForMemberProgramIdentifier = (_b = ticketedOffer === null || ticketedOffer === void 0 ? void 0 : ticketedOffer.validForMemberTier) === null || _b === void 0 ? void 0 : _b.isTierOf.identifier;
+        const authorizationObject = Object.assign(Object.assign(Object.assign({ typeOf: factory.offerType.Offer, itemOffered: {
+                typeOf: factory.product.ProductType.EventService,
+                serviceOutput: {
+                    typeOf: factory.reservationType.ReservationPackage,
+                    reservationFor: { id: eventId }
+                }
+            } }, (typeof eventOfferId === 'string' && eventOfferId !== '') ? { id: eventOfferId } : undefined), (typeof (ticketedOffer === null || ticketedOffer === void 0 ? void 0 : ticketedOffer.token) === 'string' && ticketedOffer.token !== '')
+            ? { token: ticketedOffer.token }
+            : undefined), (typeof validForMemberTierToken === 'string' && validForMemberTierToken !== ''
+            && typeof validForMemberProgramIdentifier === 'string' && validForMemberProgramIdentifier !== '')
+            ? {
+                validForMemberTier: {
+                    token: validForMemberTierToken,
+                    isTierOf: { identifier: validForMemberProgramIdentifier }
+                }
+            }
+            : undefined);
+        // validations(eventId,eventOfferIdentifier,offerToken...)
+        yield (0, validateStartRequest_1.validEventOfferByApplicationExists)({
+            event,
+            now,
+            availableAt: { id: instrument.id },
+            acceptedEventOffer: authorizationObject,
+            numAcceptedOffers: 0 // オファーチケット発行時は予約数を検証しないので0でok
+        })(repos);
+        const expiresInSeconds = moment(transaction.expires)
+            .diff(now, 'seconds');
+        const { ticketToken } = yield createOfferTicket({
+            object: authorizationObject,
+            validFrom: now,
+            expiresInSeconds,
+            issuedBy,
+            audience: { id: transaction.id, typeOf: transaction.typeOf },
+            author,
+            project,
+            instrument
+        })(repos);
+        return { ticketToken };
+    });
+}

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

@@ -1,8 +1,9 @@
 import { authorize } from './event/authorize';
 import { importCategoryCodesFromCOA, importFromCOA } from './event/importFromCOA';
+import { issueEventOfferTicket } from './event/issueEventOfferTicket';
 import { searchEventTicketOffers } from './event/searchEventTicketOffers';
 import { searchOfferAppliesToMovieTicket } from './event/searchOfferAppliesToMovieTicket';
 import { searchOfferCatalogItemAvailability } from './event/searchOfferCatalogItemAvailability';
 import { searchOfferCatalogItems } from './event/searchOfferCatalogItems';
 import { voidTransaction } from './event/voidTransaction';
-export { authorize, importCategoryCodesFromCOA, importFromCOA, voidTransaction, searchEventTicketOffers, searchOfferAppliesToMovieTicket, searchOfferCatalogItemAvailability, searchOfferCatalogItems };
+export { authorize, importCategoryCodesFromCOA, importFromCOA, issueEventOfferTicket, voidTransaction, searchEventTicketOffers, searchOfferAppliesToMovieTicket, searchOfferCatalogItemAvailability, searchOfferCatalogItems };

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

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchOfferCatalogItems = exports.searchOfferCatalogItemAvailability = exports.searchOfferAppliesToMovieTicket = exports.searchEventTicketOffers = exports.voidTransaction = exports.importFromCOA = exports.importCategoryCodesFromCOA = exports.authorize = void 0;
+exports.searchOfferCatalogItems = exports.searchOfferCatalogItemAvailability = exports.searchOfferAppliesToMovieTicket = exports.searchEventTicketOffers = exports.voidTransaction = exports.issueEventOfferTicket = 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 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; } });
+const issueEventOfferTicket_1 = require("./event/issueEventOfferTicket");
+Object.defineProperty(exports, "issueEventOfferTicket", { enumerable: true, get: function () { return issueEventOfferTicket_1.issueEventOfferTicket; } });
 const searchEventTicketOffers_1 = require("./event/searchEventTicketOffers");
 Object.defineProperty(exports, "searchEventTicketOffers", { enumerable: true, get: function () { return searchEventTicketOffers_1.searchEventTicketOffers; } });
 const searchOfferAppliesToMovieTicket_1 = require("./event/searchOfferAppliesToMovieTicket");

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

@@ -1,5 +1,6 @@
 import type { EventRepo } from '../repo/event';
 import type { SeatRepo } from '../repo/place/seat';
+import type { SectionRepo } from '../repo/place/section';
 import type { StockHolderRepo } from '../repo/stockHolder';
 import * as factory from '../factory';
 import * as EventOfferService from './offer/event';
@@ -25,6 +26,11 @@ type ISeatAsEventOffer = Pick<factory.place.seat.IPlaceWithOffer, 'branchCode' |
     };
     offers?: Pick<factory.place.seat.IOffer, 'availability'>[];
 };
+type ISeatOfferBySection = Pick<factory.place.seat.IOffer, 'availability'> & {
+    itemOffered: {
+        branchCode: string;
+    };
+};
 /**
  * イベントに対する座席オファーを検索する
  */
@@ -43,9 +49,33 @@ export declare function searchEventSeatOffersWithPaging(params: {
         id: string;
     };
     $projection?: factory.place.seat.IProjection;
-    options: {};
+    options: {
+        /**
+         * 自動的にひとつめのセクションに絞るかどうか
+         */
+        useDefaultSection: boolean;
+    };
 }): (repos: {
     event: EventRepo;
     stockHolder: StockHolderRepo;
     seat: SeatRepo;
+    section: SectionRepo;
 }) => Promise<ISeatAsEventOffer[]>;
+/**
+ * セクション指定でイベントに対する座席オファーを検索する
+ */
+export declare function findEventSeatOffersBySection(params: {
+    limit: number;
+    page: number;
+    projectId: string;
+    sellerId: string;
+    eventId: string;
+    /**
+     * セクションコード
+     */
+    sectionCode: string;
+}): (repos: {
+    event: EventRepo;
+    stockHolder: StockHolderRepo;
+    seat: SeatRepo;
+}) => Promise<ISeatOfferBySection[]>;

package/lib/chevre/service/offer.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
 exports.addOffers2Seat = addOffers2Seat;
 exports.searchEventSeatOffersWithPaging = searchEventSeatOffersWithPaging;
+exports.findEventSeatOffersBySection = findEventSeatOffersBySection;
 const moment = require("moment");
 const factory = require("../factory");
 const EventOfferService = require("./offer/event");
@@ -56,32 +57,48 @@ function addOffers2Seat(params) {
 /**
  * イベントに対する座席オファーを検索する
  */
-// tslint:disable-next-line:max-func-body-length
 function searchEventSeatOffersWithPaging(params) {
-    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        // const { excludePriceSpecification } = params.options;
+        const { useDefaultSection } = params.options;
         let offers = [];
         // optimize(2024-07-18~)
-        const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered']);
+        const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered', 'organizer']);
         // 座席指定利用可能かどうか
         const eventOffers = event.offers;
         const reservedSeatsAvailable = ((_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) !== undefined;
         if (reservedSeatsAvailable) {
             const roomBranchCode = String((_d = (_c = eventOffers.itemOffered) === null || _c === void 0 ? void 0 : _c.availableChannel) === null || _d === void 0 ? void 0 : _d.serviceLocation.branchCode);
             const movieTheaterBranchCode = String((_f = (_e = eventOffers.itemOffered) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.serviceLocation.containedInPlace.branchCode);
+            let defaultSectionCode;
+            if (useDefaultSection) {
+                const defaultSection = (yield repos.section.findSectionsByRoom({
+                    limit: 1,
+                    page: 1,
+                    projectId: event.project.id,
+                    sellerId: event.organizer.id,
+                    movieTheaterCode: movieTheaterBranchCode,
+                    roomCode: roomBranchCode
+                })).shift();
+                if (defaultSection === undefined) {
+                    return [];
+                }
+                defaultSectionCode = defaultSection.branchCode;
+                // console.log('searchEventSeatOffersWithPaging:defaultSectionCode:', defaultSectionCode);
+            }
             const seats = yield repos.seat.projectSeatsByScreeningRoom(Object.assign(Object.assign({}, params), { project: { id: { $eq: event.project.id } }, screeningRoom: {
                     branchCode: { $eq: roomBranchCode },
                     containedInPlace: {
                         branchCode: { $eq: movieTheaterBranchCode }
                     }
                 }, containedInPlace: {
-                    branchCode: {
-                        $eq: (typeof ((_h = (_g = params.containedInPlace) === null || _g === void 0 ? void 0 : _g.branchCode) === null || _h === void 0 ? void 0 : _h.$eq) === 'string')
-                            ? (_k = (_j = params.containedInPlace) === null || _j === void 0 ? void 0 : _j.branchCode) === null || _k === void 0 ? void 0 : _k.$eq
-                            : undefined
-                    }
+                    branchCode: Object.assign({}, (typeof defaultSectionCode === 'string')
+                        ? { $eq: defaultSectionCode }
+                        : {
+                            $eq: (typeof ((_h = (_g = params.containedInPlace) === null || _g === void 0 ? void 0 : _g.branchCode) === null || _h === void 0 ? void 0 : _h.$eq) === 'string')
+                                ? (_k = (_j = params.containedInPlace) === null || _j === void 0 ? void 0 : _j.branchCode) === null || _k === void 0 ? void 0 : _k.$eq
+                                : undefined
+                        })
                 }, $projection: Object.assign({}, params.$projection) }));
             if (seats.length > 0) {
                 const availabilities = yield repos.stockHolder.searchHolders({
@@ -98,31 +115,6 @@ function searchEventSeatOffersWithPaging(params) {
                         };
                     })
                 });
-                // ルームに含まれる座席区分のみ加算料金を検索(2024-08-05~)
-                // const uniqueSeatingTypes = await repos.seat.aggregateSeatingTypes({
-                //     project: { id: { $eq: event.project.id } },
-                //     containedInPlace: {
-                //         containedInPlace: {
-                //             branchCode: { $eq: roomBranchCode },
-                //             containedInPlace: { branchCode: { $eq: movieTheaterBranchCode } }
-                //         }
-                //     }
-                // });
-                // 座席タイプ価格仕様を検索
-                // let priceSpecs: ICategoryCodeChargeSpecification[] = [];
-                // if (!excludePriceSpecification) {
-                //     if (Array.isArray(uniqueSeatingTypes) && uniqueSeatingTypes.length > 0) {
-                //         priceSpecs =
-                //             await repos.priceSpecification.search<factory.priceSpecificationType.CategoryCodeChargeSpecification>({
-                //                 project: { id: { $eq: event.project.id } },
-                //                 typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                //                 appliesToCategoryCode: {
-                //                     inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } },
-                //                     codeValue: { $in: uniqueSeatingTypes } // ルームに含まれる座席区分のみ加算料金を検索(2024-08-05~)
-                //                 }
-                //             });
-                //     }
-                // }
                 offers = seats.map((seat, index) => {
                     return addOffers2Seat({
                         seat,
@@ -137,3 +129,81 @@ function searchEventSeatOffersWithPaging(params) {
         return offers;
     });
 }
+/**
+ * セクション指定でイベントに対する座席オファーを検索する
+ */
+function findEventSeatOffersBySection(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f;
+        const { limit, page, projectId, sellerId, eventId, sectionCode } = params;
+        let offers = [];
+        const event = (yield repos.event.projectEventFields({
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: projectId } },
+            organizer: { id: { $eq: sellerId } },
+            id: { $eq: eventId },
+            typeOf: factory.eventType.ScreeningEvent
+        }, ['startDate', 'offers.itemOffered'])).shift();
+        if (event === undefined) {
+            throw new factory.errors.NotFound(factory.eventType.ScreeningEvent);
+        }
+        // 座席指定利用可能かどうか
+        const eventOffers = event.offers;
+        const reservedSeatsAvailable = ((_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) !== undefined;
+        if (reservedSeatsAvailable) {
+            const roomBranchCode = String((_d = (_c = eventOffers.itemOffered) === null || _c === void 0 ? void 0 : _c.availableChannel) === null || _d === void 0 ? void 0 : _d.serviceLocation.branchCode);
+            const movieTheaterBranchCode = String((_f = (_e = eventOffers.itemOffered) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.serviceLocation.containedInPlace.branchCode);
+            const seats = yield repos.seat.projectSeatsByScreeningRoom({
+                limit,
+                page,
+                project: { id: { $eq: projectId } },
+                screeningRoom: {
+                    branchCode: { $eq: roomBranchCode },
+                    containedInPlace: {
+                        branchCode: { $eq: movieTheaterBranchCode }
+                    }
+                },
+                containedInPlace: {
+                    branchCode: { $eq: sectionCode } // セクション指定
+                },
+                $projection: {
+                    'containedInPlace.branchCode': 0,
+                    'containedInPlace.containedInPlace': 0,
+                    'containedInPlace.typeOf': 0,
+                    'containedInPlace.name': 0,
+                    typeOf: 0,
+                    additionalProperty: 0,
+                    seatingType: 0,
+                    name: 0
+                }
+            });
+            if (seats.length > 0) {
+                const availabilities = yield repos.stockHolder.searchHolders({
+                    project: { id: projectId },
+                    eventId,
+                    startDate: moment(event.startDate)
+                        .toDate(),
+                    hasTicketedSeat: true,
+                    offers: seats.map((s) => {
+                        return {
+                            seatNumber: s.branchCode,
+                            seatSection: sectionCode
+                        };
+                    })
+                });
+                offers = seats.map((seat, index) => {
+                    return {
+                        availability: (typeof availabilities[index] === 'string')
+                            ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
+                            : factory.itemAvailability.InStock,
+                        itemOffered: {
+                            branchCode: seat.branchCode
+                        }
+                    };
+                });
+            }
+        }
+        return offers;
+    });
+}

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

@@ -5,6 +5,7 @@ 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 { IInvoiceByTicketToken } from '../factory';
 interface IFixTransactionNumberRepos {
     action: ActionRepo;
     authorization: AuthorizationRepo;
@@ -27,6 +28,14 @@ declare function fixTransactionNumber(params: {
     transactionNumber: string;
     pendingPaymentAgencyTransaction?: PayTransactionService.IPaymentAgencyTransaction;
     creditCard?: factory.action.authorize.paymentMethod.any.ICreditCard;
+    /**
+     * 承認時に指定のチケット、あるいは、決済採用時に指定のチケット
+     */
+    invoiceByTicketToken?: IInvoiceByTicketToken;
+    /**
+     * 承認時に指定のチケット、あるいは、決済採用時に指定のチケット
+     */
+    ticketToken?: string;
     permitOrInvoice?: never;
     id?: never;
 } | {

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

@@ -18,13 +18,16 @@ const handlePrePublishedPaymentMethodIdOnAuthorizing_1 = require("./handlePrePub
  */
 function fixTransactionNumber(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f;
         const { paymentServiceType, transaction, object } = params;
         // 取引番号生成
         let transactionNumber;
         let pendingPaymentAgencyTransaction;
         let creditCard = object.creditCard;
+        let invoiceByTicketToken;
+        let ticketToken;
         // ticketTokenを解釈(2024-08-13~)
-        const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
+        const { verifyPaymentMethodTicketResult } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
             project: { id: transaction.project.id },
             object: object,
             paymentServiceType,
@@ -34,18 +37,21 @@ function fixTransactionNumber(params) {
          * 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~)
-            }
+        if (((_a = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.permit.PermitType.Permit) {
+            throw new factory.errors.Argument('ticketToken', `typeOfGood.typeOf ${(_b = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _b === void 0 ? void 0 : _b.typeOf} discontinued`);
+            // paymentMethodIdByTicketToken = permitOrInvoice?.identifier;
+            // if (typeof paymentMethodIdByTicketToken === 'string') {
+            //     transactionNumber = paymentMethodIdByTicketToken; // メンバーシップ指定の場合、取引番号に適用(2024-08-13~)
+            // }
         }
-        else if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === 'Invoice') {
+        else if (((_c = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _c === void 0 ? void 0 : _c.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 ((_d = verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _d === void 0 ? void 0 : _d.paymentMethodId) === 'string') {
+                paymentMethodIdByTicketToken = (_e = verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _e === void 0 ? void 0 : _e.paymentMethodId;
                 if (typeof paymentMethodIdByTicketToken === 'string') {
                     transactionNumber = paymentMethodIdByTicketToken;
+                    invoiceByTicketToken = verifyPaymentMethodTicketResult.invoiceByTicketToken;
+                    ticketToken = verifyPaymentMethodTicketResult.ticketToken;
                 }
             }
         }
@@ -63,14 +69,18 @@ function fixTransactionNumber(params) {
                 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;
+                if (typeof ((_f = authorizeParams.acceptAction2ticketResult) === null || _f === void 0 ? void 0 : _f.ticketToken) === 'string') {
+                    invoiceByTicketToken = authorizeParams.acceptAction2ticketResult.invoiceByTicketToken;
+                    ticketToken = authorizeParams.acceptAction2ticketResult.ticketToken;
+                }
             }
             else {
                 throw new factory.errors.NotImplemented('pendingPaymentAgencyTransaction required on paymentMethodId specified');
@@ -81,7 +91,8 @@ function fixTransactionNumber(params) {
             const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
-        return Object.assign(Object.assign({ transactionNumber }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined
+        return Object.assign(Object.assign(Object.assign({ transactionNumber,
+            ticketToken }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined), (invoiceByTicketToken !== undefined) ? { invoiceByTicketToken } : undefined
         // ...(permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined
         );
     });

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

@@ -1,23 +1,40 @@
 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 * as PayTransactionService from '../../../assetTransaction/pay';
+import type { IInvoiceByTicketToken } from '../factory';
 type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail;
+interface IAcceptAction2ticketResult {
+    invoiceByTicketToken: IInvoiceByTicketToken;
+    ticketToken: string;
+}
+/**
+ * 決済承認前の決済採用アクションを参照する
+ */
 declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
-    object: Pick<IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod'>;
+    object: Pick<IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod' | 'referencesOrder'>;
     prePublishedPaymentMethodId: string;
     transaction: Pick<ITransactionInProgress<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'typeOf' | 'project' | 'seller'>;
 }): (repos: {
     action: ActionRepo;
+    authorization: AuthorizationRepo;
+    ticket: TicketRepo;
     transaction: TransactionRepo;
 }) => Promise<{
     authorizeParams?: {
         creditCard: factory.action.authorize.paymentMethod.any.ICreditCard;
         paymentMethodByTransaction: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
         pendingPaymentAgencyTransaction: PayTransactionService.IPaymentAgencyTransaction;
+        acceptAction2ticketResult?: IAcceptAction2ticketResult;
     };
-    existingCompletedAuthorizeAction?: {
+    existingCompletedAuthorizeAction?: never;
+} | {
+    existingCompletedAuthorizeAction: {
         id: string;
     };
+    authorizeParams?: never;
+    acceptAction2ticketResult?: never;
 }>;
 export { handlePrePublishedPaymentMethodIdOnAuthorizing };