@chevre/domain 21.29.0-alpha.0 → 21.29.0-alpha.10

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -8,22 +8,23 @@ async function main() {
 
     let updateResult: any;
 
-    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
-    updateResult = await productRepo.unsetUnnecessaryFields({
+    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
+    updateResult = await orderRepo.unsetUnnecessaryFields({
         filter: {
-            'serviceType.project': { $exists: true }
+            additionalProperty: { $exists: true }
         },
         $unset: {
-            'serviceType.project': 1
+            additionalProperty: 1
         }
     });
     console.log('unset processed.', updateResult);
-    updateResult = await productRepo.unsetUnnecessaryFields({
+
+    updateResult = await orderRepo.unsetUnnecessaryFields({
         filter: {
-            provider: { $exists: true }
+            orderNumber: { $exists: true }
         },
         $unset: {
-            provider: 1
+            discounts: 1
         }
     });
     console.log('unset processed.', updateResult);

package/lib/chevre/repo/mongoose/schemas/order.js

@@ -9,10 +9,7 @@ exports.modelName = modelName;
 const schemaDefinition = {
     broker: mongoose_1.SchemaTypes.Mixed,
     project: mongoose_1.SchemaTypes.Mixed,
-    typeOf: {
-        type: String,
-        required: true
-    },
+    typeOf: { type: String, required: true },
     identifier: [mongoose_1.SchemaTypes.Mixed],
     name: String,
     seller: mongoose_1.SchemaTypes.Mixed,
@@ -24,7 +21,7 @@ const schemaDefinition = {
     priceCurrency: String,
     acceptedOffers: [mongoose_1.SchemaTypes.Mixed],
     paymentMethods: [mongoose_1.SchemaTypes.Mixed],
-    discounts: [mongoose_1.SchemaTypes.Mixed],
+    discounts: mongoose_1.SchemaTypes.Mixed,
     url: String,
     orderStatus: String,
     previousOrderStatus: String,
@@ -455,15 +452,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { additionalProperty: 1, orderDate: -1 },
-        {
-            name: 'searchByAdditionalProperty',
-            partialFilterExpression: {
-                additionalProperty: { $exists: true }
-            }
-        }
-    ],
     [
         { typeOf: 1, orderDate: -1 },
         { name: 'searchByTypeOf' }

package/lib/chevre/repo/order.js

@@ -1016,7 +1016,7 @@ class MongoRepository {
     }
     unsetUnnecessaryFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.orderModel.updateMany(params.filter, { $unset: params.$unset })
+            return this.orderModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
                 .exec();
         });
     }

package/lib/chevre/repo/transaction.d.ts

@@ -86,6 +86,9 @@ export declare class MongoRepository {
      */
     findInProgressConfirmationNumberById(params: {
         id: string;
+        status: {
+            $in: factory.transactionStatusType[];
+        };
     }): Promise<string | undefined>;
     /**
      * 取引進行者プロフィールを更新
@@ -209,6 +212,9 @@ export declare class MongoRepository {
     }): Promise<void>;
     saveConfirmationNumberIfNotExist(params: {
         id: string;
+        status: {
+            $in: factory.transactionStatusType[];
+        };
         confirmationNumber: string;
     }): Promise<void>;
     findByIdAndDelete(params: {

package/lib/chevre/repo/transaction.js

@@ -323,8 +323,7 @@ class MongoRepository {
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
             }
-            const transaction = doc.toObject();
-            return transaction.object.orderNumber;
+            return doc.toObject().object.orderNumber;
         });
     }
     /**
@@ -335,14 +334,13 @@ class MongoRepository {
             const doc = yield this.transactionModel.findOne({
                 _id: { $eq: params.id },
                 typeOf: { $eq: factory.transactionType.PlaceOrder },
-                status: { $eq: factory.transactionStatusType.InProgress }
+                status: { $in: params.status.$in }
             }, { 'object.confirmationNumber': 1 })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
             }
-            const transaction = doc.toObject();
-            return transaction.object.confirmationNumber;
+            return doc.toObject().object.confirmationNumber;
         });
     }
     /**
@@ -742,9 +740,10 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.transactionModel.updateOne({
                 _id: { $eq: params.id },
-                status: { $eq: factory.transactionStatusType.InProgress },
+                // status: { $eq: factory.transactionStatusType.InProgress },
+                status: { $in: params.status.$in },
                 'object.confirmationNumber': { $exists: false }
-            }, { 'object.confirmationNumber': params.confirmationNumber })
+            }, { $set: { 'object.confirmationNumber': params.confirmationNumber } })
                 .exec();
         });
     }

package/lib/chevre/service/assetTransaction/reserve/factory.d.ts

@@ -25,9 +25,13 @@ export declare function createPointAward(params: {
     assetTransaction: factory.assetTransaction.reserve.ITransaction;
 }): factory.action.transfer.moneyTransfer.IPointAward | undefined;
 export declare function createReservedTicket(params: {
+    id: string;
     acceptedOffer: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail;
     availableOffer: factory.unitPriceOffer.IUnitPriceOffer;
     dateIssued: Date;
+    reservationFor: {
+        id: string;
+    };
     reservedSeatsOnly: boolean;
     screeningRoomSections?: factory.place.screeningRoomSection.IPlace[];
     availableSeatOffers: factory.place.seat.IPlaceWithOffer[];

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

@@ -5,6 +5,7 @@ exports.createCancelPendingReservationAction = exports.createPotentialActions =
  * 予約取引ファクトリー
  */
 const moment = require("moment");
+const util = require("util");
 const factory = require("../../../factory");
 const accountTransactionIdentifier_1 = require("../../../factory/accountTransactionIdentifier");
 const settings_1 = require("../../../settings");
@@ -64,6 +65,19 @@ function createPointAward(params) {
     return pointAward;
 }
 exports.createPointAward = createPointAward;
+function createTicketIdentifier(params) {
+    var _a, _b, _c, _d;
+    // チケット識別子の規定値を作成
+    let ticketIdentifier = (typeof ((_a = params.ticketedSeat) === null || _a === void 0 ? void 0 : _a.seatNumber) === 'string')
+        ? util.format('%s:%s:%s', params.reservationFor.id, params.ticketedSeat.seatSection, params.ticketedSeat.seatNumber)
+        : util.format('%s:%s', params.reservationFor.id, params.id);
+    // 指定があれば採用
+    const ticketIdentifierByRequest = (_d = (_c = (_b = params.acceptedOffer.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.reservedTicket) === null || _d === void 0 ? void 0 : _d.identifier;
+    if (typeof ticketIdentifierByRequest === 'string' && ticketIdentifierByRequest.length > 0) {
+        ticketIdentifier = ticketIdentifierByRequest;
+    }
+    return ticketIdentifier;
+}
 function createReservedTicket(params) {
     var _a, _b, _c;
     let acceptedTicketedSeat;
@@ -120,7 +134,13 @@ function createReservedTicket(params) {
     }
     const ticketType = createTicketType({ availableOffer: params.availableOffer });
     const issuedBy = createIssuedBy({ acceptedOffer: params.acceptedOffer, availableOffer: params.availableOffer });
-    return Object.assign({ dateIssued: params.dateIssued, issuedBy,
+    const ticketIdentifier = createTicketIdentifier({
+        acceptedOffer: params.acceptedOffer,
+        id: params.id,
+        reservationFor: params.reservationFor,
+        ticketedSeat
+    });
+    return Object.assign({ dateIssued: params.dateIssued, identifier: ticketIdentifier, issuedBy,
         ticketType, typeOf: 'Ticket' }, (ticketedSeat !== undefined) ? { ticketedSeat } : {});
 }
 exports.createReservedTicket = createReservedTicket;

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

@@ -352,6 +352,7 @@ function createReservations4transactionObject(params) {
         let reservationIndex = -1;
         for (const acceptedOffer of params.acceptedOffers) {
             reservationIndex += 1;
+            const reservationId = `${reservationNumber}-${reservationIndex}`;
             const ticketOffer = params.ticketOffers.find((t) => t.id === acceptedOffer.id);
             if (ticketOffer === undefined) {
                 throw new factory.errors.NotFound('Ticket Offer');
@@ -372,10 +373,11 @@ function createReservations4transactionObject(params) {
             })(repos);
             // チケット作成
             const reservedTicket = (0, factory_1.createReservedTicket)({
+                id: reservationId,
                 acceptedOffer: acceptedOffer,
                 availableOffer: ticketType,
                 dateIssued: params.now,
-                // event: params.event,
+                reservationFor: { id: params.event.id },
                 reservedSeatsOnly,
                 availableSeatOffers: params.availableSeatOffers,
                 ticketOffer: ticketOffer,
@@ -463,7 +465,6 @@ function createReservations4transactionObject(params) {
                 // );
             }
             const subReservation = (_j = (_h = acceptedOffer.itemOffered) === null || _h === void 0 ? void 0 : _h.serviceOutput) === null || _j === void 0 ? void 0 : _j.subReservation;
-            const reservationId = `${reservationNumber}-${reservationIndex}`;
             reservations.push((0, factory_1.createReservation)({
                 project: params.transaction.project,
                 id: reservationId,

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

@@ -290,13 +290,13 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
             switch (typeOf) {
                 case factory.reservationType.BusReservation:
                     const serviceOutputAsBusReservation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), (programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined), (Array.isArray(subReservation)) ? { subReservation } : undefined), (reservedTicket !== undefined) ? {
-                        reservedTicket: Object.assign({ typeOf: 'Ticket' }, (typeof (ticketedSeat === null || ticketedSeat === void 0 ? void 0 : ticketedSeat.typeOf) === 'string') ? { ticketedSeat } : undefined)
+                        reservedTicket: Object.assign(Object.assign({ typeOf: 'Ticket' }, (typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined), (typeof (ticketedSeat === null || ticketedSeat === void 0 ? void 0 : ticketedSeat.typeOf) === 'string') ? { ticketedSeat } : undefined)
                     } : undefined);
                     itemOfferedServiceOutput = serviceOutputAsBusReservation;
                     break;
                 case factory.reservationType.EventReservation:
                     const serviceOutputAsEventReservation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), (programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined), (Array.isArray(subReservation)) ? { subReservation } : undefined), (reservedTicket !== undefined) ? {
-                        reservedTicket: Object.assign({ typeOf: 'Ticket' }, (typeof (ticketedSeat === null || ticketedSeat === void 0 ? void 0 : ticketedSeat.typeOf) === 'string') ? { ticketedSeat } : undefined)
+                        reservedTicket: Object.assign(Object.assign({ typeOf: 'Ticket' }, (typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined), (typeof (ticketedSeat === null || ticketedSeat === void 0 ? void 0 : ticketedSeat.typeOf) === 'string') ? { ticketedSeat } : undefined)
                     } : undefined);
                     itemOfferedServiceOutput = serviceOutputAsEventReservation;
                     break;

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

@@ -208,14 +208,16 @@ function createReservation(params) {
     const itemOffered = params.itemOffered;
     const event = params.event;
     let reservationItem;
-    const reservedTicket = Object.assign({ typeOf: itemOffered.reservedTicket.typeOf, ticketType: {
+    const reservedTicket = Object.assign(Object.assign({ typeOf: itemOffered.reservedTicket.typeOf, ticketType: {
             typeOf: itemOffered.reservedTicket.ticketType.typeOf,
             id: itemOffered.reservedTicket.ticketType.id,
             identifier: itemOffered.reservedTicket.ticketType.identifier,
             name: itemOffered.reservedTicket.ticketType.name,
             description: itemOffered.reservedTicket.ticketType.description,
             additionalProperty: itemOffered.reservedTicket.ticketType.additionalProperty
-        } }, (itemOffered.reservedTicket.ticketedSeat !== undefined)
+        } }, (typeof itemOffered.reservedTicket.identifier === 'string')
+        ? { identifier: itemOffered.reservedTicket.identifier }
+        : undefined), (itemOffered.reservedTicket.ticketedSeat !== undefined)
         ? { ticketedSeat: itemOffered.reservedTicket.ticketedSeat }
         : undefined);
     if (itemOffered.typeOf === factory.reservationType.EventReservation

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.responseBody2acceptedOffers4result = exports.offers2resultPrice = exports.createAuthorizeSeatReservationActionAttributes = exports.WebAPIIdentifier = void 0;
 const moment = require("moment");
+const util = require("util");
 const factory = require("../../../factory");
 exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
 function createAuthorizeSeatReservationActionAttributes(params) {
@@ -131,6 +132,7 @@ function responseBody2acceptedOffers4result(params) {
                 duration: event.superEvent.duration,
                 coaInfo: event.superEvent.coaInfo
             }, id: event.id });
+        const ticketNumber = util.format('%s:%s:%s', reservationFor.id, tmpReserve.seatSection, tmpReserve.seatNum);
         const reservedTicket = {
             typeOf: 'Ticket',
             coaTicketInfo: requestedOffer.ticketInfo,
@@ -143,7 +145,9 @@ function responseBody2acceptedOffers4result(params) {
                 seatRow: '',
                 seatSection: tmpReserve.seatSection
             },
-            ticketNumber: ticketToken,
+            identifier: ticketNumber,
+            // ticketNumber: ticketToken,
+            ticketNumber,
             ticketToken: ticketToken,
             ticketType: {
                 typeOf: factory.offerType.Offer,

package/lib/chevre/service/order/placeOrder.js

@@ -92,7 +92,9 @@ function placeOrderWithoutTransaction(params) {
         };
         const action = yield repos.action.start(orderActionAttributes);
         try {
-            yield repos.order.createIfNotExist(Object.assign(Object.assign({}, order), { discounts: [], acceptedOffers: [] }));
+            yield repos.order.createIfNotExist(Object.assign(Object.assign({}, order), { 
+                // discounts: [], // 廃止(2024-04-16~)
+                acceptedOffers: [] }));
         }
         catch (error) {
             try {

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.optimizeAction4inform = exports.createAuthorizeResult = exports.creatPayTransactionStartParams = void 0;
 const moment = require("moment");
+const util = require("util");
 const factory = require("../../../factory");
 function creatPayTransactionStartParams(params) {
     var _a, _b, _c, _d;
@@ -65,12 +66,19 @@ function creatPayTransactionStartParams(params) {
 exports.creatPayTransactionStartParams = creatPayTransactionStartParams;
 function createMovieTicket(params) {
     var _a;
+    let ticketIdentifier = util.format('%s:%s:%s', params.serviceOutput.reservationFor.id, params.serviceOutput.reservedTicket.ticketedSeat.seatSection, params.serviceOutput.reservedTicket.ticketedSeat.seatNumber);
+    // 指定があれば採用(2024-04-16~)
+    const ticketIdentifierByRequest = params.serviceOutput.reservedTicket.identifier;
+    if (typeof ticketIdentifierByRequest === 'string' && ticketIdentifierByRequest.length > 0) {
+        ticketIdentifier = ticketIdentifierByRequest;
+    }
     const serviceOutput = {
         reservationFor: {
             typeOf: params.serviceOutput.reservationFor.typeOf,
             id: params.serviceOutput.reservationFor.id
         },
         reservedTicket: {
+            identifier: ticketIdentifier,
             ticketedSeat: {
                 typeOf: factory.placeType.Seat,
                 seatNumber: params.serviceOutput.reservedTicket.ticketedSeat.seatNumber,
@@ -80,8 +88,6 @@ function createMovieTicket(params) {
         }
     };
     return {
-        // optimize(2023-03-06~)
-        // project: { id: params.project.id, typeOf: factory.organizationType.Project },
         typeOf: params.typeOf,
         identifier: params.identifier,
         accessCode: params.accessCode,

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

@@ -30,7 +30,7 @@ declare function cancelReservation(actionAttributesList: factory.action.cancel.r
 declare function processUnlockOfferRateLimit(params: {
     reservation: {
         reservationNumber: string;
-        reservedTicket: factory.assetTransaction.reserve.IObjectSubReservationReservedTicket;
+        reservedTicket: factory.reservation.ITicket;
     };
     reservationFor: factory.assetTransaction.reserve.IReservationFor;
 }): (repos: {

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.js

@@ -32,6 +32,7 @@ function confirm(params) {
         // 確認番号を事前発行
         yield (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
             id: params.id,
+            status: { $in: [factory.transactionStatusType.Confirmed, factory.transactionStatusType.InProgress] },
             object: { orderDate: params.result.order.orderDate }
         })(repos);
         const transaction = yield repos.transaction.findById({
@@ -260,7 +261,7 @@ function createResult(params) {
         authorizeEventServiceOfferActions: params.authorizeEventServiceOfferActions
     });
     // 注文オファー検証
-    (0, validation_1.validateNumItems)({
+    (0, validation_1.validateAcceptedOffers)({
         result: params.result,
         acceptedOffers: params.acceptedOffers
     });

package/lib/chevre/service/transaction/placeOrderInProgress/publishConfirmationNumberIfNotExist.d.ts

@@ -1,5 +1,6 @@
 import type { RedisRepository as ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
+import * as factory from '../../../factory';
 /**
  * 未発行であれば、注文の確認番号を発行して取引に保管する
  */
@@ -8,6 +9,9 @@ declare function publishConfirmationNumberIfNotExist(params: {
      * 取引ID
      */
     id: string;
+    status: {
+        $in: factory.transactionStatusType[];
+    };
     object: {
         orderDate: Date;
     };

package/lib/chevre/service/transaction/placeOrderInProgress/publishConfirmationNumberIfNotExist.js

@@ -16,8 +16,10 @@ const factory = require("../../../factory");
  */
 function publishConfirmationNumberIfNotExist(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 最適化(2023-02-03~)
-        let confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({ id: params.id });
+        let confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({
+            id: params.id,
+            status: { $in: params.status.$in }
+        });
         // すでに発行済であれば何もしない
         if (typeof confirmationNumber === 'string') {
             return confirmationNumber;
@@ -27,11 +29,14 @@ function publishConfirmationNumberIfNotExist(params) {
         // 取引に存在しなければ保管
         yield repos.transaction.saveConfirmationNumberIfNotExist({
             id: params.id,
+            status: { $in: params.status.$in },
             confirmationNumber
         });
         // 確認番号を取引から再取得
-        // 最適化(2023-02-03~)
-        confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({ id: params.id });
+        confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({
+            id: params.id,
+            status: { $in: params.status.$in }
+        });
         // 万が一処理が想定通りでない場合confirmationNumberが存在しない
         if (typeof confirmationNumber !== 'string') {
             throw new factory.errors.ServiceUnavailable('transaction.object.confirmationNumber not found');

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -15,10 +15,12 @@ function createOrder(params) {
     const { paymentMethods, price } = createPaymentMethods({
         authorizePaymentActions: params.authorizePaymentActions
     });
-    const discounts = [];
+    // const discounts: factory.order.IDiscount[] = [];
     const name = (typeof params.transaction.object.name === 'string') ? params.transaction.object.name : undefined;
     const broker = (typeof ((_a = params.transaction.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.transaction.object.broker : undefined;
-    return Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.order.OrderType.Order, seller: seller, customer: customer, price: price, priceCurrency: factory.priceCurrency.JPY, paymentMethods: paymentMethods, discounts: discounts, confirmationNumber: '', orderNumber: params.orderNumber, orderedItem: orderedItems, 
+    return Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.order.OrderType.Order, seller: seller, customer: customer, price: price, priceCurrency: factory.priceCurrency.JPY, paymentMethods: paymentMethods, 
+        // discounts: discounts, // 廃止(2024-04-16~)
+        confirmationNumber: '', orderNumber: params.orderNumber, orderedItem: orderedItems, 
         // acceptedOffers: acceptedOffers,
         url: '', orderStatus: params.orderStatus, orderDate: params.orderDate, identifier: [], isGift: params.isGift }, (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined);
 }

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.d.ts

@@ -1,7 +1,7 @@
 import * as factory from '../../../../factory';
-export type IMovieTicket4validate = Pick<factory.paymentMethod.paymentCard.movieTicket.IMovieTicket, 'identifier' | 'serviceOutput' | 'serviceType' | 'typeOf'> & {
-    serviceOutput: factory.paymentMethod.paymentCard.movieTicket.IServiceOutput & {
-        reservationFor: factory.paymentMethod.paymentCard.movieTicket.IReservationFor & {};
+export type IMovieTicket4validate = Pick<factory.paymentMethod.paymentCard.movieTicket.IMovieTicketPaymentCard, 'identifier' | 'serviceOutput' | 'serviceType' | 'typeOf'> & {
+    serviceOutput: factory.paymentMethod.paymentCard.movieTicket.IMovieTicketServiceOutput & {
+        reservationFor: factory.paymentMethod.paymentCard.movieTicket.IMovieTicketReservationFor;
     };
 };
 /**

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.js

@@ -6,6 +6,7 @@ exports.validateMovieTicket = void 0;
  */
 const createDebug = require("debug");
 const factory = require("../../../../factory");
+const settings_1 = require("../../../../settings");
 const debug = createDebug('chevre-domain:service:validateMovieTicket');
 /**
  * 興行オファー承認に対して決済承認条件が整っているかどうか検証する
@@ -58,9 +59,11 @@ eventReservationAcceptedOffers) {
     // イベントとムビチケ券種区分ごとに枚数OK?
     const eventIds = [...new Set(requiredMovieTickets.map((t) => t.serviceOutput.reservationFor.id))];
     debug('movie ticket event ids:', eventIds, 'transaction:', transaction.id);
+    // tslint:disable-next-line:max-func-body-length
     eventIds.forEach((eventId) => {
         const requiredMovieTicketsByEvent = requiredMovieTickets.filter((t) => t.serviceOutput.reservationFor.id === eventId);
         const authorizedMovieTicketsByEvent = authorizedMovieTickets.filter((t) => t.serviceOutput.reservationFor.id === eventId);
+        debug('validating authorizedMovieTicketsByEvent,requiredMovieTicketsByEvent by eventId...', eventId, authorizedMovieTicketsByEvent, requiredMovieTicketsByEvent);
         // 合計枚数OK?
         if (requiredMovieTicketsByEvent.length !== authorizedMovieTicketsByEvent.length) {
             throw new factory.errors.Argument('transactionId', `required movie tickets for the event '${eventId}' not satisfied`);
@@ -77,6 +80,22 @@ eventReservationAcceptedOffers) {
             if (!authorizedMovieTicketExists) {
                 throw new factory.errors.Argument('transactionId', `required movie tickets for the event '${eventId}' not satisfied`);
             }
+            // チケット識別子での検証に対応(2024-04-16)
+            if (settings_1.USE_VALIDATE_MOVIE_TICKET_BY_TICKET_IDENTIFIER) {
+                const authorizedMovieTicketByTicketIdentifierExists = authorizedMovieTicketsByEvent.some((authorizedMovieTicket) => {
+                    return authorizedMovieTicket.serviceType === requiredMovieTicket.serviceType
+                        && authorizedMovieTicket.serviceOutput.reservedTicket.ticketedSeat.seatNumber
+                            === requiredMovieTicket.serviceOutput.reservedTicket.ticketedSeat.seatNumber
+                        && authorizedMovieTicket.serviceOutput.reservedTicket.ticketedSeat.seatSection
+                            === requiredMovieTicket.serviceOutput.reservedTicket.ticketedSeat.seatSection
+                        && typeof authorizedMovieTicket.serviceOutput.reservedTicket.identifier === 'string'
+                        && authorizedMovieTicket.serviceOutput.reservedTicket.identifier
+                            === requiredMovieTicket.serviceOutput.reservedTicket.identifier;
+                });
+                if (!authorizedMovieTicketByTicketIdentifierExists) {
+                    throw new factory.errors.Argument('transactionId', `required movie tickets(reservedTicket.identifier) for the event '${eventId}' not satisfied`);
+                }
+            }
         });
         // 券種ごとに枚数が適切か確認
         const serviceTypesAuthorized = [...new Set(authorizedMovieTicketsByEvent.map(({ serviceType }) => serviceType))];
@@ -109,6 +128,26 @@ eventReservationAcceptedOffers) {
                 throw new factory.errors.Argument('transactionId', `required movie tickets for seatNumber '${seatNumber}' not satisfied`);
             }
         });
+        if (settings_1.USE_VALIDATE_MOVIE_TICKET_BY_TICKET_IDENTIFIER) {
+            // チケット識別子リストが一致しているか確認
+            const reservedTicketIdentifierAuthorized = authorizedMovieTicketsByEvent.map(({ serviceOutput }) => serviceOutput.reservedTicket.identifier);
+            const reservedTicketIdentifiers = requiredMovieTicketsByEvent.map(({ serviceOutput }) => serviceOutput.reservedTicket.identifier);
+            if (reservedTicketIdentifierAuthorized.length !== reservedTicketIdentifiers.length) {
+                throw new factory.errors.Argument('transactionId', `required movie tickets(reservedTicket.identifier) for event '${eventId}' not satisfied`);
+            }
+            reservedTicketIdentifiers.forEach((reservedTicketIdentifier) => {
+                if (typeof reservedTicketIdentifier !== 'string') {
+                    throw new factory.errors.Argument('transactionId', `reservedTicket.identifier for event '${eventId}' required`);
+                }
+                const requiredMovieTicketsByReservedTicketIdentifier = requiredMovieTicketsByEvent.filter((t) => t.serviceOutput.reservedTicket.identifier === reservedTicketIdentifier);
+                const authorizedMovieTicketsByReservedTicketIdentifier = authorizedMovieTicketsByEvent.filter((t) => {
+                    return t.serviceOutput.reservedTicket.identifier === reservedTicketIdentifier;
+                });
+                if (requiredMovieTicketsByReservedTicketIdentifier.length !== authorizedMovieTicketsByReservedTicketIdentifier.length) {
+                    throw new factory.errors.Argument('transactionId', `required movie tickets for reservedTicket.identifier '${reservedTicketIdentifier}' not satisfied`);
+                }
+            });
+        }
         validateAppliesToMovieTicketIdentifiers({
             requiredMovieTicketsByEvent,
             authorizedMovieTicketsByEvent,
@@ -145,30 +184,24 @@ function authorizeSeatReservationActions2requiredMovieTickets(params) {
     // });
     if (Array.isArray(params.acceptedOffers)) {
         params.acceptedOffers.forEach((offer) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c;
             let offeredTicketedSeat;
             const acceptedTicketedSeatByItemOffered = (_b = (_a = offer.itemOffered) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat;
             if (typeof (acceptedTicketedSeatByItemOffered === null || acceptedTicketedSeatByItemOffered === void 0 ? void 0 : acceptedTicketedSeatByItemOffered.typeOf) === 'string') {
                 offeredTicketedSeat = acceptedTicketedSeatByItemOffered;
             }
+            // シンプルに単価仕様のappliesToMovieTicketを参照してrequiredMovieTicketsを作成する(2022-07-28~)
+            const unitPriceSpec = (_c = offer.priceSpecification) === null || _c === void 0 ? void 0 : _c.priceComponent.find((component) => {
+                return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification
+                    && (!Array.isArray(component.appliesToAddOn));
+            });
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore if */
+            if (unitPriceSpec === undefined) {
+                throw new factory.errors.NotFound('UnitPriceSpecification of acceptedOffer');
+            }
             if (typeof (offeredTicketedSeat === null || offeredTicketedSeat === void 0 ? void 0 : offeredTicketedSeat.typeOf) === 'string') {
                 const ticketedSeat4MovieTicket = offeredTicketedSeat;
-                const eventOfferedThroughIdentifier = (_c = offer.offeredThrough) === null || _c === void 0 ? void 0 : _c.identifier;
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore if */
-                if (typeof eventOfferedThroughIdentifier !== 'string') {
-                    throw new factory.errors.NotFound('offer.offeredThrough.identifier', `offer.offeredThrough.identifier undefined [serialNumber:${offer.serialNumber}]`);
-                }
-                // シンプルに単価仕様のappliesToMovieTicketを参照してrequiredMovieTicketsを作成する(2022-07-28~)
-                const unitPriceSpec = (_d = offer.priceSpecification) === null || _d === void 0 ? void 0 : _d.priceComponent.find((component) => {
-                    return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification
-                        && (!Array.isArray(component.appliesToAddOn));
-                });
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore if */
-                if (unitPriceSpec === undefined) {
-                    throw new factory.errors.NotFound('UnitPriceSpecification of acceptedOffer');
-                }
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore if */
                 if (offer.itemOffered.reservationFor.typeOf !== factory.eventType.ScreeningEvent) {
@@ -177,7 +210,6 @@ function authorizeSeatReservationActions2requiredMovieTickets(params) {
                 const reservationFor4movieTicket = {
                     typeOf: offer.itemOffered.reservationFor.typeOf,
                     id: offer.itemOffered.reservationFor.id
-                    // offers: { offeredThrough: { identifier: eventOfferedThroughIdentifier } }
                 };
                 // 指定された決済方法の適用決済カードリスト
                 let appliesToMovieTickets4paymentMethod = [];
@@ -195,7 +227,12 @@ function authorizeSeatReservationActions2requiredMovieTickets(params) {
                             serviceType: appliesToMovieTicket.serviceType,
                             serviceOutput: {
                                 reservationFor: reservationFor4movieTicket,
-                                reservedTicket: { ticketedSeat: ticketedSeat4MovieTicket }
+                                reservedTicket: {
+                                    identifier: (typeof offer.itemOffered.reservedTicket.identifier === 'string')
+                                        ? offer.itemOffered.reservedTicket.identifier
+                                        : offer.itemOffered.id,
+                                    ticketedSeat: ticketedSeat4MovieTicket
+                                }
                             }
                         });
                     });

package/lib/chevre/service/transaction/placeOrderInProgress/validation.d.ts

@@ -12,7 +12,7 @@ export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 /**
  * 注文オファー数検証
  */
-export declare function validateNumItems(params: {
+export declare function validateAcceptedOffers(params: {
     result: {
         order: PlaceOrderFactory.IResultOrderParams;
     };

package/lib/chevre/service/transaction/placeOrderInProgress/validation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateEventOffers = exports.validatePaymentMethods = exports.validateOrderedItem = exports.validateNumItems = exports.validateTransaction = void 0;
+exports.validateEventOffers = exports.validatePaymentMethods = exports.validateOrderedItem = exports.validateAcceptedOffers = exports.validateTransaction = void 0;
 /**
  * 注文取引バリデーション
  */
@@ -202,7 +202,7 @@ function validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOf
 /**
  * 注文オファー数検証
  */
-function validateNumItems(params) {
+function validateAcceptedOffers(params) {
     var _a, _b, _c;
     if (!Array.isArray(params.acceptedOffers)) {
         throw new factory.errors.Argument('order.acceptedOffers', 'must be array');
@@ -241,8 +241,44 @@ function validateNumItems(params) {
             throw new factory.errors.Argument('Transaction', (0, util_1.format)('Number of reservationNumbers must be less than or equal to %s', maxNumCOAReservationNumbers));
         }
     }
+    // チケット識別子ユニークネス検証(2024-04-16~)
+    let ticketIdentifiers = [];
+    params.acceptedOffers.forEach(({ itemOffered }) => {
+        if (itemOffered.typeOf === factory.reservationType.BusReservation
+            || itemOffered.typeOf === factory.reservationType.EventReservation) {
+            if (typeof itemOffered.reservedTicket.identifier === 'string') {
+                ticketIdentifiers.push(itemOffered.reservedTicket.identifier);
+            }
+        }
+    });
+    if (ticketIdentifiers.length > 0) {
+        ticketIdentifiers = [...new Set(ticketIdentifiers)];
+        debug('ticketIdentifiers unique?', ticketIdentifiers.join(' '), 'numAcceptedOffers:', numAcceptedOffers);
+        // チケット識別子が注文内ユニークなので、注文オファー数に一致するはず
+        if (ticketIdentifiers.length !== numAcceptedOffers) {
+            throw new factory.errors.Argument('Transaction', 'ticketNumbers must be unique');
+        }
+    }
+    // チケット識別子ユニークネス検証(2024-04-15~)
+    let ticketNumbers = [];
+    params.acceptedOffers.forEach(({ itemOffered }) => {
+        if (itemOffered.typeOf === factory.reservationType.BusReservation
+            || itemOffered.typeOf === factory.reservationType.EventReservation) {
+            if (typeof itemOffered.reservedTicket.ticketNumber === 'string') {
+                ticketNumbers.push(itemOffered.reservedTicket.ticketNumber);
+            }
+        }
+    });
+    if (ticketNumbers.length > 0) {
+        ticketNumbers = [...new Set(ticketNumbers)];
+        debug('ticketNumbers unique?', ticketNumbers.join(' '), 'numAcceptedOffers:', numAcceptedOffers);
+        // チケット識別子が注文内ユニークなので、注文オファー数に一致するはず
+        if (ticketNumbers.length !== numAcceptedOffers) {
+            throw new factory.errors.Argument('Transaction', 'ticketNumbers must be unique');
+        }
+    }
 }
-exports.validateNumItems = validateNumItems;
+exports.validateAcceptedOffers = validateAcceptedOffers;
 function validateOrderedItem(params) {
     var _a, _b;
     if (!Array.isArray(params.order.orderedItem)) {

package/lib/chevre/settings.d.ts

@@ -43,6 +43,7 @@ export declare const USE_OWNERSHIP_INFO_BY_WEB_APPLICATION: boolean;
 export declare const USE_CHECK_RESOURCE_TASK: boolean;
 export declare const USE_OPTIMIZE_RESERVATION_EXCEPTIONS: string[];
 export declare const USE_OPTIMIZE_INFORM_EVENT: boolean;
+export declare const USE_VALIDATE_MOVIE_TICKET_BY_TICKET_IDENTIFIER: boolean;
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
 export declare const MONGO_AUTO_INDEX: boolean;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_OPTIMIZE_INFORM_EVENT = exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = exports.USE_CHECK_RESOURCE_TASK = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_VALIDATE_MOVIE_TICKET_BY_TICKET_IDENTIFIER = exports.USE_OPTIMIZE_INFORM_EVENT = exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = exports.USE_CHECK_RESOURCE_TASK = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(' ')
@@ -69,6 +69,7 @@ exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = (typeof process.env.USE_OPTIMIZE_R
     ? process.env.USE_OPTIMIZE_RESERVATION_EXCEPTIONS.split(' ')
     : [];
 exports.USE_OPTIMIZE_INFORM_EVENT = process.env.USE_OPTIMIZE_INFORM_EVENT === '1';
+exports.USE_VALIDATE_MOVIE_TICKET_BY_TICKET_IDENTIFIER = process.env.USE_VALIDATE_MOVIE_TICKET_BY_TICKET_IDENTIFIER === '1';
 exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
     ? Number(process.env.MONGO_MAX_TIME_MS)
     // tslint:disable-next-line:no-magic-numbers

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.367.0-alpha.1",
+    "@chevre/factory": "4.367.0-alpha.6",
     "@cinerino/sdk": "5.17.1",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.29.0-alpha.0"
+  "version": "21.29.0-alpha.10"
 }