@chevre/domain 21.29.0-alpha.12 → 21.29.0-alpha.14

package/lib/chevre/repo/account.js

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

package/lib/chevre/repo/aggregateOffer.js

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

package/lib/chevre/repo/creativeWork.js

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

package/lib/chevre/repo/event.js

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

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

@@ -21,15 +21,15 @@ const schemaDefinition = {
     priceCurrency: String,
     acceptedOffers: [mongoose_1.SchemaTypes.Mixed],
     paymentMethods: [mongoose_1.SchemaTypes.Mixed],
-    discounts: mongoose_1.SchemaTypes.Mixed,
+    // discounts: SchemaTypes.Mixed, // 廃止(2024-04-17~)
     url: String,
     orderStatus: String,
     previousOrderStatus: String,
     orderDate: Date,
     isGift: Boolean,
     dateReturned: Date,
-    orderedItem: [mongoose_1.SchemaTypes.Mixed],
-    additionalProperty: mongoose_1.SchemaTypes.Mixed // 追加(2023-02-13~) // 廃止(2024-04-12~)
+    orderedItem: [mongoose_1.SchemaTypes.Mixed] // 追加(2022-04-15~)
+    // additionalProperty: SchemaTypes.Mixed // 廃止(2024-04-17~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

package/lib/chevre/repo/paymentServiceProvider.js

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

package/lib/chevre/repo/product.js

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

package/lib/chevre/repo/seller.js

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

package/lib/chevre/repo/serviceOutput.js

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

package/lib/chevre/repo/transaction.js

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

package/lib/chevre/service/report/telemetry.js

@@ -184,7 +184,7 @@ function createSellerFlow(measuredFrom, measuredThrough, sellerId) {
         }, [], []);
         debug(actionsOnExpiredTransactions.length, 'actionsOnExpiredTransactions found.');
         const numbersOfActionsOnExpired = expiredTransactionIds.map((transactionId) => {
-            return actionsOnExpiredTransactions.filter((action) => action.purpose.id === transactionId).length;
+            return actionsOnExpiredTransactions.filter((action) => { var _a; return ((_a = action.purpose) === null || _a === void 0 ? void 0 : _a.id) === transactionId; }).length;
         });
         const totalNumberOfActionsOnExpired = numbersOfActionsOnExpired.reduce((a, b) => a + b, 0);
         const maxNumberOfActionsOnExpired = numbersOfActionsOnExpired.reduce((a, b) => Math.max(a, b), 0);

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

@@ -1,9 +1,5 @@
 import * as factory from '../../../../factory';
-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;
-    };
-};
+export type IMovieTicket4validate = Pick<factory.paymentMethod.paymentCard.movieTicket.IMovieTicketPaymentCard, 'identifier' | 'serviceOutput' | 'serviceType' | 'typeOf'>;
 /**
  * 興行オファー承認に対して決済承認条件が整っているかどうか検証する
  * 決済方法区分ごとに検証

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

@@ -175,67 +175,71 @@ function validateAppliesToMovieTicketIdentifiers(params) {
  */
 function authorizeSeatReservationActions2requiredMovieTickets(params) {
     const paymentMethodType = params.paymentMethodType;
-    // const seatReservationAuthorizeActions = params.seatReservationAuthorizeActions;
-    // ムビチケオファーを受け付けた座席予約を検索する
+    // 決済カードオファーを受け付けた座席予約を検索する
     const requiredMovieTickets = [];
-    // tslint:disable-next-line:max-func-body-length
-    // seatReservationAuthorizeActions.forEach((action) => {
-    //     const acceptedOffers = action.result?.acceptedOffers;
-    // });
     if (Array.isArray(params.acceptedOffers)) {
         params.acceptedOffers.forEach((offer) => {
             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) => {
+            // 単価仕様のappliesToMovieTicketを参照してrequiredMovieTicketsを作成する(2022-07-28~)
+            const unitPriceSpec = (_a = offer.priceSpecification) === null || _a === void 0 ? void 0 : _a.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;
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore if */
-                if (offer.itemOffered.reservationFor.typeOf !== factory.eventType.ScreeningEvent) {
-                    throw new factory.errors.NotImplemented(`offer.itemOffered.reservationFor.typeOf not imelemented [${offer.itemOffered.reservationFor.typeOf}]`);
-                }
+            // 現状、ScreeningEventのみ対応で十分(2024-04-16~)
+            if (offer.itemOffered.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
                 const reservationFor4movieTicket = {
                     typeOf: offer.itemOffered.reservationFor.typeOf,
                     id: offer.itemOffered.reservationFor.id
                 };
-                // 指定された決済方法の適用決済カードリスト
-                let appliesToMovieTickets4paymentMethod = [];
-                const appliesToMovieTickets4reservation = unitPriceSpec.appliesToMovieTicket;
-                if (Array.isArray(appliesToMovieTickets4reservation)) {
-                    appliesToMovieTickets4paymentMethod = appliesToMovieTickets4reservation.filter((a) => {
-                        return a.serviceOutput.typeOf === paymentMethodType;
-                    });
+                // 座席無に対応(2024-04-16~)
+                let ticketedSeat4MovieTicket;
+                // USE_VALIDATE_MOVIE_TICKET_BY_TICKET_IDENTIFIERのみ座席無に対応(2024-04-16~)
+                if (settings_1.USE_VALIDATE_MOVIE_TICKET_BY_TICKET_IDENTIFIER) {
+                    ticketedSeat4MovieTicket = {
+                        typeOf: factory.placeType.Seat,
+                        seatNumber: '',
+                        seatRow: '',
+                        seatSection: ''
+                    };
+                }
+                const offeredTicketedSeat = (_c = (_b = offer.itemOffered) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat;
+                const ticketedSeatExists = (offeredTicketedSeat === null || offeredTicketedSeat === void 0 ? void 0 : offeredTicketedSeat.typeOf) === factory.placeType.Seat;
+                if (ticketedSeatExists) {
+                    ticketedSeat4MovieTicket = offeredTicketedSeat;
                 }
-                if (Array.isArray(appliesToMovieTickets4paymentMethod) && appliesToMovieTickets4paymentMethod.length > 0) {
-                    appliesToMovieTickets4paymentMethod.forEach((appliesToMovieTicket) => {
-                        requiredMovieTickets.push({
-                            typeOf: paymentMethodType,
-                            identifier: String(appliesToMovieTicket.identifier),
-                            serviceType: appliesToMovieTicket.serviceType,
-                            serviceOutput: {
-                                reservationFor: reservationFor4movieTicket,
-                                reservedTicket: {
-                                    identifier: (typeof offer.itemOffered.reservedTicket.identifier === 'string')
-                                        ? offer.itemOffered.reservedTicket.identifier
-                                        : offer.itemOffered.id,
-                                    ticketedSeat: ticketedSeat4MovieTicket
-                                }
-                            }
+                if (ticketedSeat4MovieTicket !== undefined) {
+                    // チケット識別子(決済カード承認との照合に必要)
+                    const reservedTicketIdentifier = (typeof offer.itemOffered.reservedTicket.identifier === 'string')
+                        ? offer.itemOffered.reservedTicket.identifier
+                        : `${reservationFor4movieTicket.id}:${offer.itemOffered.id}`;
+                    const movieTicketServiceOutput4validate = {
+                        reservationFor: reservationFor4movieTicket,
+                        reservedTicket: {
+                            identifier: reservedTicketIdentifier,
+                            ticketedSeat: ticketedSeat4MovieTicket
+                        }
+                    };
+                    // 指定された決済方法の適用決済カードリスト
+                    let appliesToMovieTickets4paymentMethod = [];
+                    const appliesToMovieTickets4reservation = unitPriceSpec.appliesToMovieTicket;
+                    if (Array.isArray(appliesToMovieTickets4reservation)) {
+                        appliesToMovieTickets4paymentMethod = appliesToMovieTickets4reservation.filter((a) => {
+                            return a.serviceOutput.typeOf === paymentMethodType;
+                        });
+                    }
+                    if (Array.isArray(appliesToMovieTickets4paymentMethod) && appliesToMovieTickets4paymentMethod.length > 0) {
+                        appliesToMovieTickets4paymentMethod.forEach((appliesToMovieTicket) => {
+                            requiredMovieTickets.push({
+                                typeOf: paymentMethodType,
+                                identifier: String(appliesToMovieTicket.identifier),
+                                serviceType: appliesToMovieTicket.serviceType,
+                                serviceOutput: movieTicketServiceOutput4validate
+                            });
                         });
-                    });
+                    }
                 }
             }
         });

package/package.json

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