@chevre/domain 20.4.0-alpha.16 → 20.4.0-alpha.17

package/example/src/chevre/searchEventTicketOffers.ts

@@ -22,7 +22,7 @@ async function main() {
     const productRepo = new chevre.repository.Product(mongoose.connection);
 
     const { ticketOffers } = await chevre.service.offer.event.searchEventTicketOffers({
-        event: { id: 'ale5c99n2' },
+        event: { id: 'ale6qiedi' },
         onlyValid: true,
         sort: false,
         validateOfferRateLimit: true,

package/lib/chevre/repo/mongoose/model/offer.js

@@ -196,6 +196,18 @@ schema.index({ additionalProperty: 1, 'priceSpecification.price': 1 }, {
         additionalProperty: { $exists: true }
     }
 });
+schema.index({ validFrom: 1, 'priceSpecification.price': 1 }, {
+    name: 'searchByValidFrom',
+    partialFilterExpression: {
+        validFrom: { $exists: true }
+    }
+});
+schema.index({ validThrough: 1, 'priceSpecification.price': 1 }, {
+    name: 'searchByValidThrough',
+    partialFilterExpression: {
+        validThrough: { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

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

@@ -25,6 +25,7 @@ export declare class MongoRepository {
         };
         unacceptedPaymentMethod?: string[];
         excludeAppliesToMovieTicket: boolean;
+        onlyValid?: boolean;
         limit?: number;
         page?: number;
         sort: boolean;

package/lib/chevre/repo/offer.js

@@ -310,6 +310,20 @@ class MongoRepository {
                 }
             });
         }
+        if (params.onlyValid === true) {
+            const now = new Date();
+            andConditions.push({
+                $or: [
+                    { validFrom: { $exists: false } },
+                    { validFrom: { $exists: true, $lte: now } }
+                ]
+            }, {
+                $or: [
+                    { validThrough: { $exists: false } },
+                    { validThrough: { $exists: true, $gte: now } }
+                ]
+            });
+        }
         return andConditions;
     }
     /**
@@ -356,7 +370,7 @@ class MongoRepository {
                                 serviceType: { $exists: false }
                             }
                             : undefined)
-                    } }), (typeof params.limit === 'number' && typeof params.page === 'number')
+                    }, onlyValid: params.onlyValid === true }), (typeof params.limit === 'number' && typeof params.page === 'number')
                     ? { sort: { _id: factory.sortType.Ascending } }
                     : undefined), (typeof params.limit === 'number') ? { limit: params.limit } : undefined), (typeof params.page === 'number') ? { page: params.page } : undefined);
                 offers = yield this.search(searchOffersConditions);

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

@@ -117,6 +117,7 @@ function addReservations(params) {
                 event: { id: event.id },
                 // 対応アプリケーション条件追加(2023-01-27~)
                 store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
+                onlyValid: true,
                 sort: false,
                 addSortIndex: false,
                 validateOfferRateLimit: true

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

@@ -224,6 +224,7 @@ function validateAcceptedOffers(params) {
             ids: offerIds,
             event: { id: params.event.id },
             store: params.store,
+            onlyValid: true,
             sort: false,
             addSortIndex: false,
             validateOfferRateLimit: true

package/lib/chevre/service/offer/event/searchEventTicketOffers.d.ts

@@ -39,7 +39,7 @@ declare function searchEventTicketOffers(params: {
     /**
      * 有効期間内のみかどうか
      */
-    onlyValid?: boolean;
+    onlyValid: boolean;
     /**
      * どの決済方法に対して
      */

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

@@ -35,7 +35,7 @@ function searchTransportationEventTicketOffers(params) {
             const transportation = yield repos.product.findById({ id: eventOffers.itemOffered.id });
             if (typeof ((_b = transportation.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                 const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId(Object.assign({ ids: params.ids, offerCatalog: { id: transportation.hasOfferCatalog.id }, availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id }, unacceptedPaymentMethod,
-                    excludeAppliesToMovieTicket, sort: params.sort }, (!params.sort)
+                    excludeAppliesToMovieTicket, onlyValid: params.onlyValid === true, sort: params.sort }, (!params.sort)
                     ? {
                         limit: params.limit,
                         page: params.page
@@ -81,14 +81,6 @@ function searchTransportationEventTicketOffers(params) {
                 return true;
             }
         });
-        // paging処理を追加(2023-02-21~)
-        if (params.sort) {
-            if (typeof params.limit === 'number' && typeof params.page === 'number') {
-                const start = params.limit * (params.page - 1);
-                const end = params.limit * params.page;
-                availableOffers = availableOffers.slice(start, end);
-            }
-        }
         let offers4event = availableOffers.map((availableOffer) => {
             let sortIndex;
             if (params.addSortIndex) {
@@ -157,7 +149,7 @@ function searchScreeningEventTicketOffers(params) {
             const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
             if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                 const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId(Object.assign({ ids: params.ids, offerCatalog: { id: eventService.hasOfferCatalog.id }, availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id }, unacceptedPaymentMethod,
-                    excludeAppliesToMovieTicket, sort: params.sort }, (!params.sort)
+                    excludeAppliesToMovieTicket, onlyValid: params.onlyValid === true, sort: params.sort }, (!params.sort)
                     ? {
                         limit: params.limit,
                         page: params.page
@@ -222,14 +214,6 @@ function searchScreeningEventTicketOffers(params) {
                 }
             });
         }
-        // paging処理を追加(2023-02-21~)
-        if (params.sort) {
-            if (typeof params.limit === 'number' && typeof params.page === 'number') {
-                const start = params.limit * (params.page - 1);
-                const end = params.limit * params.page;
-                availableOffers = availableOffers.slice(start, end);
-            }
-        }
         let offers4event = availableOffers.map((availableOffer) => {
             let sortIndex;
             if (params.addSortIndex) {
@@ -420,7 +404,8 @@ function searchEventTicketOffers(params) {
                         page: params.page,
                         sort: params.sort,
                         addSortIndex: params.addSortIndex,
-                        validateOfferRateLimit: params.validateOfferRateLimit
+                        validateOfferRateLimit: params.validateOfferRateLimit,
+                        onlyValid: params.onlyValid === true
                     })(repos);
                     offers = searchOffersResult.ticketOffers;
                     unitPriceOffers = searchOffersResult.unitPriceOffers;
@@ -434,7 +419,8 @@ function searchEventTicketOffers(params) {
                         page: params.page,
                         sort: params.sort,
                         addSortIndex: params.addSortIndex,
-                        validateOfferRateLimit: params.validateOfferRateLimit
+                        validateOfferRateLimit: params.validateOfferRateLimit,
+                        onlyValid: params.onlyValid === true
                     })(repos);
                     offers = searchOffersResult.ticketOffers;
                     unitPriceOffers = searchOffersResult.unitPriceOffers;
@@ -451,21 +437,22 @@ function searchEventTicketOffers(params) {
                 //             && o.availableAtOrFrom.some((availableApplication) => availableApplication.id === specifiedStoreId);
                 //     });
                 // }
+                // mongo条件へ移行(2023-02-24~)
                 // 有効期間を適用
-                if (params.onlyValid === true) {
-                    offers = offers.filter((o) => {
-                        let isvalid = true;
-                        if (o.validFrom !== undefined && moment(o.validFrom)
-                            .isAfter(now)) {
-                            isvalid = false;
-                        }
-                        if (o.validThrough !== undefined && moment(o.validThrough)
-                            .isBefore(now)) {
-                            isvalid = false;
-                        }
-                        return isvalid;
-                    });
-                }
+                // if (params.onlyValid === true) {
+                //     offers = offers.filter((o) => {
+                //         let isvalid = true;
+                //         if (o.validFrom !== undefined && moment(o.validFrom)
+                //             .isAfter(now)) {
+                //             isvalid = false;
+                //         }
+                //         if (o.validThrough !== undefined && moment(o.validThrough)
+                //             .isBefore(now)) {
+                //             isvalid = false;
+                //         }
+                //         return isvalid;
+                //     });
+                // }
                 for (const offer of offers) {
                     if (Array.isArray(offer.addOn)) {
                         // store.idでのフィルターをmongoに移行(2023-01-27~)

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

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompoundPriceSpec4event = void 0;
 const factory = require("../../factory");
@@ -102,8 +91,16 @@ function createCompoundPriceSpec4event(params) {
         valueAddedTaxIncluded: true,
         priceComponent
     };
-    // 不要な属性を除外(2022-11-07~)
-    const _b = params.offer, { project } = _b, unitOfferFields4ticketOffer = __rest(_b, ["project"]);
-    return Object.assign(Object.assign(Object.assign({}, unitOfferFields4ticketOffer), { eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined);
+    // 必要な属性のみに限定(2023-02-24~)
+    // const { project, ...unitOfferFields4ticketOffer } = params.offer;
+    const { name, description, alternateName, color, typeOf, id, addOn, availability, availableAtOrFrom, category, eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation, priceCurrency, validFrom, validThrough, validRateLimit, additionalProperty, identifier, itemOffered } = params.offer;
+    return Object.assign({ 
+        // ...unitOfferFields4ticketOffer,
+        name, description, alternateName, color, typeOf, id,
+        addOn, availability, availableAtOrFrom, category,
+        eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation,
+        priceCurrency,
+        validFrom, validThrough, validRateLimit, additionalProperty,
+        identifier, itemOffered, eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }, (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined);
 }
 exports.createCompoundPriceSpec4event = createCompoundPriceSpec4event;

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

@@ -13,8 +13,9 @@ function creatPayTransactionStartParams(params) {
     const accountId = (typeof params.accountId === 'string')
         ? params.accountId
         : (typeof params.object.accountId === 'string') ? params.object.accountId : undefined;
+    // movieTickets最適化(2023-02-24~)
+    const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(createMovieTicket) : undefined;
     return Object.assign(Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
-            // Sellerに変更(2022-05-30~)
             typeOf: params.transaction.seller.typeOf,
             id: String(params.transaction.seller.id),
             name: (typeof params.transaction.seller.name === 'string')
@@ -38,7 +39,7 @@ function creatPayTransactionStartParams(params) {
             typeOf: params.paymentServiceType,
             // 決済サービスIDを連携(2022-04-12~)
             id: issuedThroughId,
-            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: params.object.paymentMethod, amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(params.object.movieTickets)) ? { movieTickets: params.object.movieTickets } : undefined)
+            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: params.object.paymentMethod, amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined)
         }, expires: expires }, (typeof confirmationNumber === 'string')
         ? {
             purpose: {
@@ -51,6 +52,31 @@ function creatPayTransactionStartParams(params) {
         : undefined);
 }
 exports.creatPayTransactionStartParams = creatPayTransactionStartParams;
+function createMovieTicket(params) {
+    const serviceOutput = {
+        reservationFor: {
+            typeOf: params.serviceOutput.reservationFor.typeOf,
+            id: params.serviceOutput.reservationFor.id
+        },
+        reservedTicket: {
+            ticketedSeat: {
+                typeOf: factory.placeType.Seat,
+                seatNumber: params.serviceOutput.reservedTicket.ticketedSeat.seatNumber,
+                seatRow: params.serviceOutput.reservedTicket.ticketedSeat.seatRow,
+                seatSection: params.serviceOutput.reservedTicket.ticketedSeat.seatSection
+            }
+        }
+    };
+    return {
+        project: { id: params.project.id, typeOf: factory.organizationType.Project },
+        typeOf: params.typeOf,
+        identifier: params.identifier,
+        accessCode: params.accessCode,
+        category: { codeValue: params.category.codeValue },
+        serviceType: params.serviceType,
+        serviceOutput
+    };
+}
 function createAuthorizeResult(params) {
     var _a, _b, _c, _d;
     const payTransactionObject = params.payTransaction.object;

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.289.0-alpha.12",
-    "@cinerino/sdk": "3.140.0-alpha.14",
+    "@chevre/factory": "4.289.0-alpha.14",
+    "@cinerino/sdk": "3.140.0-alpha.15",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.4.0-alpha.16"
+  "version": "20.4.0-alpha.17"
 }