@chevre/domain 24.1.0-alpha.52 → 24.1.0-alpha.53

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

@@ -412,24 +412,26 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'acceptedOffers.itemOffered.reservedTicket.ticketedSeat.seatNumber': 1, orderDate: -1 },
-        {
-            name: 'searchByReservedTicketTicketedSeatSeatNumber',
-            partialFilterExpression: {
-                'acceptedOffers.itemOffered.reservedTicket.ticketedSeat.seatNumber': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'acceptedOffers.itemOffered.reservedTicket.identifier': 1, orderDate: -1 },
-        {
-            name: 'searchByReservedTicketIdentifier',
-            partialFilterExpression: {
-                'acceptedOffers.itemOffered.reservedTicket.identifier': { $exists: true }
-            }
-        }
-    ],
+    // discontinue(2026-06-08~)
+    // [
+    //     { 'acceptedOffers.itemOffered.reservedTicket.ticketedSeat.seatNumber': 1, orderDate: -1 },
+    //     {
+    //         name: 'searchByReservedTicketTicketedSeatSeatNumber',
+    //         partialFilterExpression: {
+    //             'acceptedOffers.itemOffered.reservedTicket.ticketedSeat.seatNumber': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // discontinue(2026-06-08~)
+    // [
+    //     { 'acceptedOffers.itemOffered.reservedTicket.identifier': 1, orderDate: -1 },
+    //     {
+    //         name: 'searchByReservedTicketIdentifier',
+    //         partialFilterExpression: {
+    //             'acceptedOffers.itemOffered.reservedTicket.identifier': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'acceptedOffers.serialNumber': 1, orderDate: -1 },
         {

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

@@ -80,7 +80,7 @@ function createSubReservations(params) {
                 ticketOffer: ticketOffer
             });
             const additionalTicketText = (0, createReservation_1.createAdditionalTicketText)({ acceptedOffer, reservedTicket });
-            const additionalProperty = (0, createReservation_1.createAdditionalProperty)({ acceptedOffer });
+            // const additionalProperty = createAdditionalProperty({ acceptedOffer });
             // 座席指定であれば、座席タイプチャージを検索する
             const seatPriceComponent = [];
             // 区分加算料金を適用しないオプションを追加(2023-01-26~)
@@ -179,7 +179,7 @@ function createSubReservations(params) {
                 id: reservationId,
                 reservationFor: params.event,
                 reservedTicket: reservedTicket,
-                additionalProperty: additionalProperty,
+                // additionalProperty: additionalProperty,
                 additionalTicketText: additionalTicketText,
                 ticketOffer: ticketOffer,
                 seatPriceComponent: seatPriceComponent,

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

@@ -20,12 +20,6 @@ declare function validateAppliesToMovieTicket(params: {
     availableOffer: factory.unitPriceOffer.IUnitPriceOffer;
     appliesToMovieTicket?: factory.assetTransaction.reserve.IAcceptedAppliesToMovieTicket;
 }): void;
-/**
- * 追加特性を生成する
- */
-declare function createAdditionalProperty(params: {
-    acceptedOffer: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail;
-}): factory.propertyValue.IPropertyValue<string>[];
 /**
  * 追加チケットテキストを生成する
  */
@@ -41,7 +35,6 @@ declare function createReservation(params: {
     id: string;
     reservationFor: IMinimizedIndividualEvent;
     reservedTicket: factory.assetTransaction.reserve.ISubReservationReservedTicket;
-    additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
     additionalTicketText?: string;
     ticketOffer: factory.product.ITicketOffer;
     seatPriceComponent: factory.place.seat.IPriceComponent[];
@@ -52,4 +45,4 @@ declare function createReservation(params: {
     appliesToMovieTicket?: factory.assetTransaction.reserve.IAcceptedAppliesToMovieTicket;
     validateAppliesToMovieTicket: boolean;
 }): IObjectSubReservation;
-export { createAdditionalProperty, createAdditionalTicketText, createReservation, createReservedTicket, IAcceptedAddOn, validateAppliesToMovieTicket };
+export { createAdditionalTicketText, createReservation, createReservedTicket, IAcceptedAddOn, validateAppliesToMovieTicket };

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

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAdditionalProperty = createAdditionalProperty;
 exports.createAdditionalTicketText = createAdditionalTicketText;
 exports.createReservation = createReservation;
 exports.createReservedTicket = createReservedTicket;
@@ -16,14 +15,15 @@ const price_1 = require("./price");
 const debug = (0, debug_1.default)('chevre-domain:service:assetTransaction');
 function createTicketIdentifier(params) {
     // チケット識別子の規定値を作成
-    let ticketIdentifier = (typeof params.ticketedSeat?.seatNumber === 'string')
+    const ticketIdentifier = (typeof params.ticketedSeat?.seatNumber === 'string')
         ? (0, util_1.format)('%s:%s:%s', params.reservationFor.id, params.ticketedSeat.seatSection, params.ticketedSeat.seatNumber)
         : (0, util_1.format)('%s:%s', params.reservationFor.id, params.id);
-    // 指定があれば採用
-    const ticketIdentifierByRequest = params.acceptedOffer.itemOffered?.serviceOutput?.reservedTicket?.identifier;
-    if (typeof ticketIdentifierByRequest === 'string' && ticketIdentifierByRequest.length > 0) {
-        ticketIdentifier = ticketIdentifierByRequest;
-    }
+    // チケット識別子のカスタム指定を廃止(2026-06-08~)
+    // // 指定があれば採用
+    // const ticketIdentifierByRequest = params.acceptedOffer.itemOffered?.serviceOutput?.reservedTicket?.identifier;
+    // if (typeof ticketIdentifierByRequest === 'string' && ticketIdentifierByRequest.length > 0) {
+    //     ticketIdentifier = ticketIdentifierByRequest;
+    // }
     return ticketIdentifier;
 }
 function createReservedTicket(params) {
@@ -295,16 +295,18 @@ function validateAppliesToMovieTicket(params) {
         // Arrayでないケースは廃止(2022-09-10~)
     }
 }
-/**
- * 追加特性を生成する
- */
-function createAdditionalProperty(params) {
-    let additionalProperty = params.acceptedOffer.itemOffered?.serviceOutput?.additionalProperty;
-    if (!Array.isArray(additionalProperty)) {
-        additionalProperty = [];
-    }
-    return additionalProperty;
-}
+// /**
+//  * 追加特性を生成する
+//  */
+// function createAdditionalProperty(params: {
+//     acceptedOffer: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail;
+// }): factory.propertyValue.IPropertyValue<string>[] {
+//     let additionalProperty = params.acceptedOffer.itemOffered?.serviceOutput?.additionalProperty;
+//     if (!Array.isArray(additionalProperty)) {
+//         additionalProperty = [];
+//     }
+//     return additionalProperty;
+// }
 /**
  * 追加チケットテキストを生成する
  */

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

@@ -316,9 +316,10 @@ function createReservation(params) {
     const reservedTicket = {
         typeOf: itemOffered.reservedTicket.typeOf,
         ticketType,
-        ...(typeof itemOffered.reservedTicket.identifier === 'string')
-            ? { identifier: itemOffered.reservedTicket.identifier }
-            : undefined, // チケット識別子追加(2024-04-15~)
+        identifier: itemOffered.reservedTicket.identifier, // チケット識別子必須化(2026-06-08~)
+        // ...(typeof itemOffered.reservedTicket.identifier === 'string')
+        //     ? { identifier: itemOffered.reservedTicket.identifier }
+        //     : undefined, // チケット識別子追加(2024-04-15~)
         ...(itemOffered.reservedTicket.ticketedSeat !== undefined)
             ? { ticketedSeat: itemOffered.reservedTicket.ticketedSeat }
             : undefined

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

@@ -237,51 +237,6 @@ function validateAcceptedOffers(params) {
                 })();
             }))
             : [];
-        // reserveTransaction.startへ処理を移行(2024-07-03~)
-        // オファーIDごとにオファー適用条件を確認
-        // offerIds.forEach((offerId) => {
-        //     const acceptedOffersByOfferId = acceptedOffers.filter((o) => o.id === offerId);
-        //     const numAcceptedOffersByOfferId = acceptedOffersByOfferId.length;
-        //     let referenceQuantityValue = 1;
-        //     // 単価仕様を取り出す
-        //     const unitPriceSpec = acceptedOffersByOfferId[0].priceSpecification.priceComponent.find(
-        //         (spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification && (!Array.isArray(spec.appliesToAddOn))
-        //     );
-        //     // 単価仕様は必ず存在するはず
-        //     if (unitPriceSpec?.typeOf !== factory.priceSpecificationType.UnitPriceSpecification) {
-        //         throw new factory.errors.Internal(`unitPriceSpec of the offer '${offerId}' not found`);
-        //     }
-        //     const unitPriceSpecReferenceQuantityValue = unitPriceSpec.referenceQuantity?.value;
-        //     if (typeof unitPriceSpecReferenceQuantityValue === 'number') {
-        //         referenceQuantityValue = unitPriceSpecReferenceQuantityValue;
-        //     }
-        //     // アイテム数が適用単位要件を満たしていなければエラー
-        //     if (numAcceptedOffersByOfferId % referenceQuantityValue !== 0) {
-        //         throw new factory.errors.Argument(
-        //             'acceptedOffers',
-        //             `Offer ${offerId} requires reference quantity value ${referenceQuantityValue}`
-        //         );
-        //     }
-        //     // 適用数量要件を満たしていなければエラー
-        //     const maxValue = unitPriceSpec.eligibleQuantity?.maxValue;
-        //     if (typeof maxValue === 'number') {
-        //         if (numAcceptedOffersByOfferId > maxValue) {
-        //             throw new factory.errors.Argument(
-        //                 'acceptedOffers',
-        //                 `Number of offer:${offerId} must be less than or equal to ${maxValue}`
-        //             );
-        //         }
-        //     }
-        //     const minValue = unitPriceSpec.eligibleQuantity?.minValue;
-        //     if (typeof minValue === 'number') {
-        //         if (numAcceptedOffersByOfferId < minValue) {
-        //             throw new factory.errors.Argument(
-        //                 'acceptedOffers',
-        //                 `Number of offer:${offerId} must be more than or equal to ${minValue}`
-        //             );
-        //         }
-        //     }
-        // });
         return { acceptedOffers, ticketOffers, unitPriceOffers };
     };
 }
@@ -293,27 +248,7 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
         if (offer === undefined) {
             throw new factory_1.factory.errors.NotFound('Ticket Offer', `Ticket Offer ${offerWithoutDetail.id} not found`);
         }
-        // // ポイント特典入金先の指定があれば入金識別子を発行
-        // const pointAward = createPointAwardByOfferWithoutDetail({
-        //     offerWithoutDetail,
-        //     transaction: params.transaction
-        // });
         const acceptedAppliesToMovieTicket = offerWithoutDetail.priceSpecification?.appliesToMovieTicket;
-        // 承認アクションオブジェクトのacceptedOfferにappliesToMovieTicketを連携する(2022-08-02~)
-        // const priceSpecification: IAcceptedOfferPriceSpecification = {
-        //     // 必要な属性のみに最適化(2024-04-09~)
-        //     // ...offer.priceSpecification,
-        //     typeOf: offer.priceSpecification.typeOf,
-        //     priceCurrency: offer.priceSpecification.priceCurrency,
-        //     // valueAddedTaxIncluded: offer.priceSpecification.valueAddedTaxIncluded,
-        //     priceComponent: offer.priceSpecification.priceComponent.map(({
-        //         name, accounting, id, priceCurrency, valueAddedTaxIncluded, ...necessaryComponentFields
-        //     }) => necessaryComponentFields),
-        //     // appliesToMovieTicket.identifierを連携する
-        //     ...(Array.isArray(acceptedAppliesToMovieTicket) || typeof acceptedAppliesToMovieTicket?.identifier === 'string')
-        //         ? { appliesToMovieTicket: acceptedAppliesToMovieTicket }
-        //         : undefined
-        // };
         const priceSpecification = {
             // appliesToMovieTicket.identifierを連携する
             ...(Array.isArray(acceptedAppliesToMovieTicket) || typeof acceptedAppliesToMovieTicket?.identifier === 'string')
@@ -339,7 +274,7 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
         // itemOfferedServiceOutputを最適化(2024-04-08~)
         let itemOfferedServiceOutput;
         if (typeof serviceOutputByOfferWithoutDetail?.typeOf === 'string') {
-            const { typeOf, additionalProperty, additionalTicketText, programMembershipUsed, reservedTicket, subReservation } = serviceOutputByOfferWithoutDetail;
+            const { typeOf, additionalTicketText, programMembershipUsed, reservedTicket, subReservation } = serviceOutputByOfferWithoutDetail;
             let ticketedSeat;
             if (typeof reservedTicket?.ticketedSeat?.typeOf === 'string') {
                 ticketedSeat = {
@@ -353,36 +288,19 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
                 };
             }
             switch (typeOf) {
-                // case factory.reservationType.BusReservation:
-                //     const serviceOutputAsBusReservation: factory.assetTransaction.reserve.IBusReservatonAsItemOfferedServiceOutput = {
-                //         typeOf,
-                //         ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
-                //         ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
-                //         ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
-                //         ...(Array.isArray(subReservation)) ? { subReservation } : undefined,
-                //         ...(reservedTicket !== undefined) ? {
-                //             reservedTicket: {
-                //                 typeOf: 'Ticket',
-                //                 // チケット識別子指定拡張(2024-04-15~)
-                //                 ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
-                //                 ...(typeof ticketedSeat?.typeOf === 'string') ? { ticketedSeat } : undefined
-                //             }
-                //         } : undefined
-                //     };
-                //     itemOfferedServiceOutput = serviceOutputAsBusReservation;
-                //     break;
                 case factory_1.factory.reservationType.EventReservation: {
                     const serviceOutputAsEventReservation = {
                         typeOf,
-                        ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
+                        // ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined, // 追加特性指定を廃止(2026-06-08~)
                         ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
                         ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
                         ...(Array.isArray(subReservation)) ? { subReservation } : undefined,
                         ...(reservedTicket !== undefined) ? {
                             reservedTicket: {
                                 typeOf: 'Ticket',
-                                // チケット識別子指定拡張(2024-04-15~)
-                                ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
+                                // チケット識別子のカスタム指定を廃止(2026-06-08~)
+                                // // チケット識別子指定拡張(2024-04-15~)
+                                // ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
                                 ...(typeof ticketedSeat?.typeOf === 'string') ? { ticketedSeat } : undefined
                             }
                         } : undefined
@@ -398,15 +316,9 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
         return {
             // オファーの中身を最適化する(必要最低限の情報のみに)
             id: String(offer.id),
-            // identifier: offer.identifier,
             priceSpecification,
-            // typeOf: offer.typeOf,
-            // priceCurrency: offer.priceCurrency,
             itemOffered: {
-                // typeOf: factory.product.ProductType.EventService,
                 ...(itemOfferedServiceOutput !== undefined) ? { serviceOutput: itemOfferedServiceOutput } : undefined,
-                // discontinue(2026-04-18~)
-                // ...(pointAward !== undefined) ? { pointAward } : undefined
             },
             addOn: acceptedAddOns,
             // 追加属性をマージ
@@ -414,9 +326,6 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
                 ...(Array.isArray(offerWithoutDetail.additionalProperty)) ? offerWithoutDetail.additionalProperty : [],
                 ...(Array.isArray(offer.additionalProperty)) ? offer.additionalProperty : []
             ]
-            // ...(Array.isArray(offer.acceptedPaymentMethod)) // discontinue(2024-07-03~)
-            //     ? { acceptedPaymentMethod: offer.acceptedPaymentMethod }
-            //     : undefined
         };
     };
 }

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

@@ -162,12 +162,13 @@ function creatPayTransactionStartParams(params) {
     };
 }
 function createMovieTicket(params) {
-    let ticketIdentifier = (0, util_1.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 ticketIdentifier = (0, util_1.format)('%s:%s:%s', params.serviceOutput.reservationFor.id, params.serviceOutput.reservedTicket.ticketedSeat.seatSection, params.serviceOutput.reservedTicket.ticketedSeat.seatNumber);
+    // カスタム指定は廃止(2026-06-08~)
+    // // 指定があれば採用(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,

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "8.2.0-alpha.6",
+    "@chevre/factory": "8.2.0-alpha.7",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.1.0-alpha.52"
+  "version": "24.1.0-alpha.53"
 }