@chevre/domain 21.28.0 → 21.29.0-alpha.1

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

@@ -32,7 +32,7 @@ const schemaDefinition = {
     isGift: Boolean,
     dateReturned: Date,
     orderedItem: [mongoose_1.SchemaTypes.Mixed],
-    additionalProperty: [mongoose_1.SchemaTypes.Mixed] // 追加(2023-02-13~)
+    additionalProperty: mongoose_1.SchemaTypes.Mixed // 追加(2023-02-13~) // 廃止(2024-04-12~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -27,6 +27,7 @@ const schemaDefinition = {
     cancelReservationUrl: String,
     checkinUrl: String,
     confirmReservationUrl: String,
+    identifier: String,
     modifiedTime: Date,
     modifyReservationUrl: String,
     numSeats: Number,

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

@@ -69,12 +69,10 @@ export declare class MongoRepository {
     /**
      * 変更可能な属性を更新する
      */
-    updateChangeableAttributes(params: {
+    updateChangeableAttributes(params: Pick<factory.order.IOrder, 'name'> & {
         project: {
             id: string;
         };
-        additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
-        name?: string;
         orderNumber: string;
     }): Promise<{
         updatedAt: Date;
@@ -144,7 +142,7 @@ export declare class MongoRepository {
     })[]>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<any>;
+        filter: FilterQuery<factory.order.IOrder>;
         $unset: any;
     }): Promise<import("mongodb").UpdateResult>;
 }

package/lib/chevre/repo/order.js

@@ -23,7 +23,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22;
         const andConditions = [
             { typeOf: { $eq: factory.order.OrderType.Order } }
         ];
@@ -31,22 +31,22 @@ class MongoRepository {
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        const additionalPropertyAll = (_c = params.additionalProperty) === null || _c === void 0 ? void 0 : _c.$all;
-        if (Array.isArray(additionalPropertyAll)) {
-            andConditions.push({ additionalProperty: { $exists: true, $all: additionalPropertyAll } });
-        }
-        const additionalPropertyIn = (_d = params.additionalProperty) === null || _d === void 0 ? void 0 : _d.$in;
-        if (Array.isArray(additionalPropertyIn)) {
-            andConditions.push({ additionalProperty: { $exists: true, $in: additionalPropertyIn } });
-        }
-        const additionalPropertyNin = (_e = params.additionalProperty) === null || _e === void 0 ? void 0 : _e.$nin;
-        if (Array.isArray(additionalPropertyNin)) {
-            andConditions.push({ additionalProperty: { $nin: additionalPropertyNin } });
-        }
-        const additionalPropertyElemMatch = (_f = params.additionalProperty) === null || _f === void 0 ? void 0 : _f.$elemMatch;
-        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
-            andConditions.push({ additionalProperty: { $exists: true, $elemMatch: additionalPropertyElemMatch } });
-        }
+        // const additionalPropertyAll = params.additionalProperty?.$all; // 廃止(2024-04-12~)
+        // if (Array.isArray(additionalPropertyAll)) {
+        //     andConditions.push({ additionalProperty: { $exists: true, $all: additionalPropertyAll } });
+        // }
+        // const additionalPropertyIn = params.additionalProperty?.$in; // 廃止(2024-04-12~)
+        // if (Array.isArray(additionalPropertyIn)) {
+        //     andConditions.push({ additionalProperty: { $exists: true, $in: additionalPropertyIn } });
+        // }
+        // const additionalPropertyNin = params.additionalProperty?.$nin; // 廃止(2024-04-12~)
+        // if (Array.isArray(additionalPropertyNin)) {
+        //     andConditions.push({ additionalProperty: { $nin: additionalPropertyNin } });
+        // }
+        // const additionalPropertyElemMatch = params.additionalProperty?.$elemMatch; // 廃止(2024-04-12~)
+        // if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+        //     andConditions.push({ additionalProperty: { $exists: true, $elemMatch: additionalPropertyElemMatch } });
+        // }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.identifier !== undefined) {
@@ -71,15 +71,15 @@ class MongoRepository {
                 });
             }
         }
-        const providerIdEq = (_h = (_g = params.provider) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$eq;
+        const providerIdEq = (_d = (_c = params.provider) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
         if (typeof providerIdEq === 'string') {
             andConditions.push({ 'seller.id': { $exists: true, $eq: providerIdEq } });
         }
-        const sellerIdEq = (_k = (_j = params.seller) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$eq;
+        const sellerIdEq = (_f = (_e = params.seller) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$eq;
         if (typeof sellerIdEq === 'string') {
             andConditions.push({ 'seller.id': { $exists: true, $eq: sellerIdEq } });
         }
-        const sellerIds = (_l = params.seller) === null || _l === void 0 ? void 0 : _l.ids;
+        const sellerIds = (_g = params.seller) === null || _g === void 0 ? void 0 : _g.ids;
         if (Array.isArray(sellerIds)) {
             andConditions.push({ 'seller.id': { $exists: true, $in: sellerIds } });
         }
@@ -87,7 +87,7 @@ class MongoRepository {
         // if (typeof params.seller?.typeOf === 'string') {
         //     andConditions.push({ 'seller.typeOf': { $exists: true, $eq: params.seller.typeOf } });
         // }
-        const brokerIdEq = (_o = (_m = params.broker) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$eq;
+        const brokerIdEq = (_j = (_h = params.broker) === null || _h === void 0 ? void 0 : _h.id) === null || _j === void 0 ? void 0 : _j.$eq;
         if (typeof brokerIdEq === 'string') {
             andConditions.push({
                 'broker.id': {
@@ -304,7 +304,7 @@ class MongoRepository {
                 }
             }
         }
-        const nameEq = (_p = params.name) === null || _p === void 0 ? void 0 : _p.$eq;
+        const nameEq = (_k = params.name) === null || _k === void 0 ? void 0 : _k.$eq;
         if (typeof nameEq === 'string') {
             andConditions.push({
                 name: {
@@ -313,7 +313,7 @@ class MongoRepository {
                 }
             });
         }
-        const nameRegex = (_q = params.name) === null || _q === void 0 ? void 0 : _q.$regex;
+        const nameRegex = (_l = params.name) === null || _l === void 0 ? void 0 : _l.$regex;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             andConditions.push({
                 name: {
@@ -346,19 +346,19 @@ class MongoRepository {
                 }
             });
         }
-        const orderedItemSize = (_r = params.orderedItem) === null || _r === void 0 ? void 0 : _r.$size;
+        const orderedItemSize = (_m = params.orderedItem) === null || _m === void 0 ? void 0 : _m.$size;
         if (typeof orderedItemSize === 'number') {
             andConditions.push({ orderedItem: { $size: orderedItemSize } });
         }
-        const acceptedOffersSize = (_s = params.acceptedOffers) === null || _s === void 0 ? void 0 : _s.$size;
+        const acceptedOffersSize = (_o = params.acceptedOffers) === null || _o === void 0 ? void 0 : _o.$size;
         if (typeof acceptedOffersSize === 'number') {
             andConditions.push({ acceptedOffers: { $size: acceptedOffersSize } });
         }
-        const serialNumberEq = (_u = (_t = params.acceptedOffers) === null || _t === void 0 ? void 0 : _t.serialNumber) === null || _u === void 0 ? void 0 : _u.$eq;
+        const serialNumberEq = (_q = (_p = params.acceptedOffers) === null || _p === void 0 ? void 0 : _p.serialNumber) === null || _q === void 0 ? void 0 : _q.$eq;
         if (typeof serialNumberEq === 'string') {
             andConditions.push({ 'acceptedOffers.serialNumber': { $exists: true, $eq: serialNumberEq } });
         }
-        const itemOfferedIdentifierIn = (_x = (_w = (_v = params.acceptedOffers) === null || _v === void 0 ? void 0 : _v.itemOffered) === null || _w === void 0 ? void 0 : _w.identifier) === null || _x === void 0 ? void 0 : _x.$in;
+        const itemOfferedIdentifierIn = (_t = (_s = (_r = params.acceptedOffers) === null || _r === void 0 ? void 0 : _r.itemOffered) === null || _s === void 0 ? void 0 : _s.identifier) === null || _t === void 0 ? void 0 : _t.$in;
         if (Array.isArray(itemOfferedIdentifierIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.identifier': {
@@ -367,7 +367,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedTypeOfIn = (_0 = (_z = (_y = params.acceptedOffers) === null || _y === void 0 ? void 0 : _y.itemOffered) === null || _z === void 0 ? void 0 : _z.typeOf) === null || _0 === void 0 ? void 0 : _0.$in;
+        const itemOfferedTypeOfIn = (_w = (_v = (_u = params.acceptedOffers) === null || _u === void 0 ? void 0 : _u.itemOffered) === null || _v === void 0 ? void 0 : _v.typeOf) === null || _w === void 0 ? void 0 : _w.$in;
         if (Array.isArray(itemOfferedTypeOfIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.typeOf': {
@@ -376,7 +376,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIssuedThroughTypeOfEq = (_4 = (_3 = (_2 = (_1 = params.acceptedOffers) === null || _1 === void 0 ? void 0 : _1.itemOffered) === null || _2 === void 0 ? void 0 : _2.issuedThrough) === null || _3 === void 0 ? void 0 : _3.typeOf) === null || _4 === void 0 ? void 0 : _4.$eq;
+        const itemOfferedIssuedThroughTypeOfEq = (_0 = (_z = (_y = (_x = params.acceptedOffers) === null || _x === void 0 ? void 0 : _x.itemOffered) === null || _y === void 0 ? void 0 : _y.issuedThrough) === null || _z === void 0 ? void 0 : _z.typeOf) === null || _0 === void 0 ? void 0 : _0.$eq;
         if (typeof itemOfferedIssuedThroughTypeOfEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.issuedThrough.typeOf': {
@@ -385,7 +385,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIssuedThroughIdIn = (_8 = (_7 = (_6 = (_5 = params.acceptedOffers) === null || _5 === void 0 ? void 0 : _5.itemOffered) === null || _6 === void 0 ? void 0 : _6.issuedThrough) === null || _7 === void 0 ? void 0 : _7.id) === null || _8 === void 0 ? void 0 : _8.$in;
+        const itemOfferedIssuedThroughIdIn = (_4 = (_3 = (_2 = (_1 = params.acceptedOffers) === null || _1 === void 0 ? void 0 : _1.itemOffered) === null || _2 === void 0 ? void 0 : _2.issuedThrough) === null || _3 === void 0 ? void 0 : _3.id) === null || _4 === void 0 ? void 0 : _4.$in;
         if (Array.isArray(itemOfferedIssuedThroughIdIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.issuedThrough.id': {
@@ -394,7 +394,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedProgramMembershipUsedIdentifierEq = (_12 = (_11 = (_10 = (_9 = params.acceptedOffers) === null || _9 === void 0 ? void 0 : _9.itemOffered) === null || _10 === void 0 ? void 0 : _10.programMembershipUsed) === null || _11 === void 0 ? void 0 : _11.identifier) === null || _12 === void 0 ? void 0 : _12.$eq;
+        const itemOfferedProgramMembershipUsedIdentifierEq = (_8 = (_7 = (_6 = (_5 = params.acceptedOffers) === null || _5 === void 0 ? void 0 : _5.itemOffered) === null || _6 === void 0 ? void 0 : _6.programMembershipUsed) === null || _7 === void 0 ? void 0 : _7.identifier) === null || _8 === void 0 ? void 0 : _8.$eq;
         if (typeof itemOfferedProgramMembershipUsedIdentifierEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.programMembershipUsed.identifier': {
@@ -403,7 +403,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_18 = (_17 = (_16 = (_15 = (_14 = (_13 = params.acceptedOffers) === null || _13 === void 0 ? void 0 : _13.itemOffered) === null || _14 === void 0 ? void 0 : _14.programMembershipUsed) === null || _15 === void 0 ? void 0 : _15.issuedThrough) === null || _16 === void 0 ? void 0 : _16.serviceType) === null || _17 === void 0 ? void 0 : _17.codeValue) === null || _18 === void 0 ? void 0 : _18.$eq;
+        const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_14 = (_13 = (_12 = (_11 = (_10 = (_9 = params.acceptedOffers) === null || _9 === void 0 ? void 0 : _9.itemOffered) === null || _10 === void 0 ? void 0 : _10.programMembershipUsed) === null || _11 === void 0 ? void 0 : _11.issuedThrough) === null || _12 === void 0 ? void 0 : _12.serviceType) === null || _13 === void 0 ? void 0 : _13.codeValue) === null || _14 === void 0 ? void 0 : _14.$eq;
         if (typeof itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.programMembershipUsed.issuedThrough.serviceType.codeValue': {
@@ -565,11 +565,11 @@ class MongoRepository {
                 }
             }
         }
-        const paymentMethodIdentifierIn = (_21 = (_20 = (_19 = params.paymentMethods) === null || _19 === void 0 ? void 0 : _19.paymentMethod) === null || _20 === void 0 ? void 0 : _20.identifier) === null || _21 === void 0 ? void 0 : _21.$in;
+        const paymentMethodIdentifierIn = (_17 = (_16 = (_15 = params.paymentMethods) === null || _15 === void 0 ? void 0 : _15.paymentMethod) === null || _16 === void 0 ? void 0 : _16.identifier) === null || _17 === void 0 ? void 0 : _17.$in;
         if (Array.isArray(paymentMethodIdentifierIn)) {
             andConditions.push({ 'paymentMethods.paymentMethod.identifier': { $exists: true, $in: paymentMethodIdentifierIn } });
         }
-        const paymentMethodsTypeOfIn = (_22 = params.paymentMethods) === null || _22 === void 0 ? void 0 : _22.typeOfs;
+        const paymentMethodsTypeOfIn = (_18 = params.paymentMethods) === null || _18 === void 0 ? void 0 : _18.typeOfs;
         if (Array.isArray(paymentMethodsTypeOfIn)) {
             // paymentMethod.identifierで検索(2023-11-15~)
             // andConditions.push({ 'paymentMethods.typeOf': { $exists: true, $in: paymentMethodsTypeOfIn } });
@@ -599,7 +599,7 @@ class MongoRepository {
                 });
             }
         }
-        const paymentMethodAdditionalPropertyAll = (_24 = (_23 = params.paymentMethods) === null || _23 === void 0 ? void 0 : _23.additionalProperty) === null || _24 === void 0 ? void 0 : _24.$all;
+        const paymentMethodAdditionalPropertyAll = (_20 = (_19 = params.paymentMethods) === null || _19 === void 0 ? void 0 : _19.additionalProperty) === null || _20 === void 0 ? void 0 : _20.$all;
         if (Array.isArray(paymentMethodAdditionalPropertyAll)) {
             andConditions.push({
                 'paymentMethods.additionalProperty': {
@@ -608,7 +608,7 @@ class MongoRepository {
                 }
             });
         }
-        const paymentMethodAdditionalPropertyIn = (_26 = (_25 = params.paymentMethods) === null || _25 === void 0 ? void 0 : _25.additionalProperty) === null || _26 === void 0 ? void 0 : _26.$in;
+        const paymentMethodAdditionalPropertyIn = (_22 = (_21 = params.paymentMethods) === null || _21 === void 0 ? void 0 : _21.additionalProperty) === null || _22 === void 0 ? void 0 : _22.$in;
         if (Array.isArray(paymentMethodAdditionalPropertyIn)) {
             andConditions.push({
                 'paymentMethods.additionalProperty': {
@@ -802,7 +802,7 @@ class MongoRepository {
                 'project.id': { $eq: params.project.id },
                 typeOf: { $eq: factory.order.OrderType.Order }
             }, {
-                $set: Object.assign(Object.assign({}, (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined), (typeof params.name === 'string') ? { name: params.name } : undefined)
+                $set: Object.assign({}, (typeof params.name === 'string') ? { name: params.name } : undefined)
             }, {
                 new: true,
                 projection: {

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");
@@ -396,7 +397,7 @@ function createIssuedThrough(params) {
 exports.createIssuedThrough = createIssuedThrough;
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createReservation(params) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     // 適用メンバーシップ確認
     validateEligibleMembershipType({
         availableOffer: params.availableOffer,
@@ -412,9 +413,12 @@ function createReservation(params) {
     // priceを最適化
     const price4reservation = (0, price_1.createPrice)(params);
     if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
+        const reservationIdentifier = (typeof ((_a = params.reservedTicket.ticketedSeat) === null || _a === void 0 ? void 0 : _a.seatNumber) === 'string')
+            ? util.format('%s:%s:%s:%s', params.reservationFor.typeOf, params.reservationFor.id, params.reservedTicket.ticketedSeat.seatSection, params.reservedTicket.ticketedSeat.seatNumber)
+            : util.format('%s:%s:%s', params.reservationFor.typeOf, params.reservationFor.id, params.id);
         return Object.assign(Object.assign(Object.assign({ 
             // project: params.project, // 廃止(2024-04-08~)
-            typeOf: factory.reservationType.EventReservation, id: params.id, 
+            typeOf: factory.reservationType.EventReservation, id: params.id, identifier: reservationIdentifier, 
             // reservationPackage保管に移行(2023-06-06~)
             // issuedThrough,
             additionalProperty: params.additionalProperty, 
@@ -435,14 +439,17 @@ function createReservation(params) {
                     };
                 })
             }
-            : undefined), (typeof ((_a = params.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
+            : undefined), (typeof ((_b = params.programMembershipUsed) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
             ? { programMembershipUsed: params.programMembershipUsed }
             : undefined);
     }
     else {
+        const reservationIdentifier = (typeof ((_c = params.reservedTicket.ticketedSeat) === null || _c === void 0 ? void 0 : _c.seatNumber) === 'string')
+            ? util.format('%s:%s:%s:%s', params.reservationFor.typeOf, params.reservationFor.id, params.reservedTicket.ticketedSeat.seatSection, params.reservedTicket.ticketedSeat.seatNumber)
+            : util.format('%s:%s:%s', params.reservationFor.typeOf, params.reservationFor.id, params.id);
         return Object.assign(Object.assign(Object.assign({ 
             // project: params.project,
-            typeOf: factory.reservationType.BusReservation, id: params.id, 
+            typeOf: factory.reservationType.BusReservation, id: params.id, identifier: reservationIdentifier, 
             // reservationPackage保管に移行(2023-06-06~)
             // issuedThrough,
             additionalProperty: params.additionalProperty, 
@@ -463,7 +470,7 @@ function createReservation(params) {
                     };
                 })
             }
-            : undefined), (typeof ((_b = params.programMembershipUsed) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
+            : undefined), (typeof ((_d = params.programMembershipUsed) === null || _d === void 0 ? void 0 : _d.identifier) === 'string')
             ? { programMembershipUsed: params.programMembershipUsed }
             : undefined);
     }

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

@@ -240,8 +240,8 @@ function createReservation(params) {
         if (params.issuedThrough.typeOf !== factory.product.ProductType.EventService) {
             throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.EventService}`);
         }
-        reservationItem = Object.assign({ typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: params.reservationNumber, reservationFor,
-            reservedTicket }, (typeof ((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+        reservationItem = Object.assign(Object.assign({ typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: params.reservationNumber, reservationFor,
+            reservedTicket }, (typeof itemOffered.identifier === 'string') ? { identifier: itemOffered.identifier } : undefined), (typeof ((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);
     }
@@ -268,8 +268,8 @@ function createReservation(params) {
         if (params.issuedThrough.typeOf !== factory.product.ProductType.Transportation) {
             throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.Transportation}`);
         }
-        reservationItem = Object.assign({ typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: params.reservationNumber, reservationFor,
-            reservedTicket }, (typeof ((_d = itemOffered.programMembershipUsed) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
+        reservationItem = Object.assign(Object.assign({ typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: params.reservationNumber, reservationFor,
+            reservedTicket }, (typeof itemOffered.identifier === 'string') ? { identifier: itemOffered.identifier } : undefined), (typeof ((_d = itemOffered.programMembershipUsed) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);
     }

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) {
@@ -77,7 +78,7 @@ function responseBody2acceptedOffers4result(params) {
     // 座席仮予約からオファー情報を生成する
     // tslint:disable-next-line:max-func-body-length
     acceptedOffers4result.push(...params.responseBody.listTmpReserve.map((tmpReserve, index) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const requestedOffer = params.acceptedOffer.find((o) => {
             var _a, _b, _c, _d;
             return ((_d = (_c = (_b = (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatNumber) === tmpReserve.seatNum
@@ -172,7 +173,11 @@ function responseBody2acceptedOffers4result(params) {
                 }
             }
         };
-        const reservation = Object.assign(Object.assign(Object.assign({ typeOf: factory.reservationType.EventReservation, id: reservationId, issuedThrough }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), { 
+        const reservationIdentifier = (typeof ((_e = reservedTicket.ticketedSeat) === null || _e === void 0 ? void 0 : _e.seatNumber) === 'string')
+            ? util.format('%s:%s:%s:%s', reservationFor.typeOf, reservationFor.id, reservedTicket.ticketedSeat.seatSection, reservedTicket.ticketedSeat.seatNumber)
+            : util.format('%s:%s:%s', reservationFor.typeOf, reservationFor.id, reservationId);
+        const reservation = Object.assign(Object.assign(Object.assign({ typeOf: factory.reservationType.EventReservation, id: reservationId, identifier: reservationIdentifier, // 予約識別子追加(2024-04-14~)
+            issuedThrough }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), { 
             // numSeats: 1, // 廃止(2022-08-18~)
             reservationFor: reservationFor, reservationNumber: reservationNumber, reservedTicket: reservedTicket });
         if (requestedOffer.priceSpecification === undefined) {

package/lib/chevre/service/order/onOrderUpdated/factory.d.ts

@@ -1,5 +1,5 @@
 import * as factory from '../../../factory';
-export type IUpdatedOrder4inform = Pick<factory.order.IOrder, 'typeOf' | 'orderNumber' | 'name' | 'additionalProperty' | 'project'> & {
+export type IUpdatedOrder4inform = Pick<factory.order.IOrder, 'typeOf' | 'orderNumber' | 'name' | 'project'> & {
     updatedAt: Date;
 };
 declare function createInformTasks(order: IUpdatedOrder4inform): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];

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,7 +66,9 @@ function creatPayTransactionStartParams(params) {
 exports.creatPayTransactionStartParams = creatPayTransactionStartParams;
 function createMovieTicket(params) {
     var _a;
+    const reservationIdentifier = util.format('%s:%s:%s:%s', params.serviceOutput.reservationFor.typeOf, params.serviceOutput.reservationFor.id, params.serviceOutput.reservedTicket.ticketedSeat.seatSection, params.serviceOutput.reservedTicket.ticketedSeat.seatNumber);
     const serviceOutput = {
+        identifier: reservationIdentifier,
         reservationFor: {
             typeOf: params.serviceOutput.reservationFor.typeOf,
             id: params.serviceOutput.reservationFor.id

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

@@ -177,7 +177,6 @@ function authorizeSeatReservationActions2requiredMovieTickets(params) {
                 const reservationFor4movieTicket = {
                     typeOf: offer.itemOffered.reservationFor.typeOf,
                     id: offer.itemOffered.reservationFor.id
-                    // offers: { offeredThrough: { identifier: eventOfferedThroughIdentifier } }
                 };
                 // 指定された決済方法の適用決済カードリスト
                 let appliesToMovieTickets4paymentMethod = [];
@@ -194,6 +193,9 @@ function authorizeSeatReservationActions2requiredMovieTickets(params) {
                             identifier: String(appliesToMovieTicket.identifier),
                             serviceType: appliesToMovieTicket.serviceType,
                             serviceOutput: {
+                                identifier: (typeof offer.itemOffered.identifier === 'string')
+                                    ? offer.itemOffered.identifier
+                                    : offer.itemOffered.id,
                                 reservationFor: reservationFor4movieTicket,
                                 reservedTicket: { ticketedSeat: ticketedSeat4MovieTicket }
                             }

package/package.json

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