@chevre/domain 21.29.0-alpha.2 → 21.29.0-alpha.4

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

@@ -65,7 +65,7 @@ function createPointAward(params) {
     return pointAward;
 }
 exports.createPointAward = createPointAward;
-function createTicketNumber(params) {
+function createTicketIdentifier(params) {
     var _a;
     return (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)
@@ -127,13 +127,12 @@ function createReservedTicket(params) {
     }
     const ticketType = createTicketType({ availableOffer: params.availableOffer });
     const issuedBy = createIssuedBy({ acceptedOffer: params.acceptedOffer, availableOffer: params.availableOffer });
-    const ticketNumber = createTicketNumber({
+    const ticketIdentifier = createTicketIdentifier({
         id: params.id,
         reservationFor: params.reservationFor,
         ticketedSeat
     });
-    return Object.assign({ dateIssued: params.dateIssued, issuedBy,
-        ticketNumber,
+    return Object.assign({ dateIssued: params.dateIssued, identifier: ticketIdentifier, issuedBy,
         ticketType, typeOf: 'Ticket' }, (ticketedSeat !== undefined) ? { ticketedSeat } : {});
 }
 exports.createReservedTicket = createReservedTicket;

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

@@ -215,8 +215,8 @@ function createReservation(params) {
             name: itemOffered.reservedTicket.ticketType.name,
             description: itemOffered.reservedTicket.ticketType.description,
             additionalProperty: itemOffered.reservedTicket.ticketType.additionalProperty
-        } }, (typeof itemOffered.reservedTicket.ticketNumber === 'string')
-        ? { ticketNumber: itemOffered.reservedTicket.ticketNumber }
+        } }, (typeof itemOffered.reservedTicket.identifier === 'string')
+        ? { identifier: itemOffered.reservedTicket.identifier }
         : undefined), (itemOffered.reservedTicket.ticketedSeat !== undefined)
         ? { ticketedSeat: itemOffered.reservedTicket.ticketedSeat }
         : undefined);

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

@@ -145,6 +145,7 @@ function responseBody2acceptedOffers4result(params) {
                 seatRow: '',
                 seatSection: tmpReserve.seatSection
             },
+            identifier: ticketNumber,
             // ticketNumber: ticketToken,
             ticketNumber,
             ticketToken: ticketToken,

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

@@ -66,14 +66,14 @@ function creatPayTransactionStartParams(params) {
 exports.creatPayTransactionStartParams = creatPayTransactionStartParams;
 function createMovieTicket(params) {
     var _a;
-    const ticketNumber = util.format('%s:%s:%s', params.serviceOutput.reservationFor.id, params.serviceOutput.reservedTicket.ticketedSeat.seatSection, params.serviceOutput.reservedTicket.ticketedSeat.seatNumber);
+    const ticketIdentifier = util.format('%s:%s:%s', params.serviceOutput.reservationFor.id, params.serviceOutput.reservedTicket.ticketedSeat.seatSection, params.serviceOutput.reservedTicket.ticketedSeat.seatNumber);
     const serviceOutput = {
         reservationFor: {
             typeOf: params.serviceOutput.reservationFor.typeOf,
             id: params.serviceOutput.reservationFor.id
         },
         reservedTicket: {
-            ticketNumber,
+            identifier: ticketIdentifier,
             ticketedSeat: {
                 typeOf: factory.placeType.Seat,
                 seatNumber: params.serviceOutput.reservedTicket.ticketedSeat.seatNumber,

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

@@ -260,7 +260,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/validation/validateMovieTicket.js

@@ -195,8 +195,8 @@ function authorizeSeatReservationActions2requiredMovieTickets(params) {
                             serviceOutput: {
                                 reservationFor: reservationFor4movieTicket,
                                 reservedTicket: {
-                                    ticketNumber: (typeof offer.itemOffered.reservedTicket.ticketNumber === 'string')
-                                        ? offer.itemOffered.reservedTicket.ticketNumber
+                                    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,26 @@ 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-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/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.367.0-alpha.3",
+    "@chevre/factory": "4.367.0-alpha.4",
     "@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.2"
+  "version": "21.29.0-alpha.4"
 }