@chevre/domain 20.4.0-alpha.13 → 20.4.0-alpha.14

package/example/src/chevre/searchEventTicketOffers.ts

@@ -24,8 +24,11 @@ async function main() {
     const { ticketOffers } = await chevre.service.offer.event.searchEventTicketOffers({
         event: { id: 'ale6qiedf' },
         onlyValid: true,
-        sort: true,
-        validateOfferRateLimit: true
+        sort: false,
+        validateOfferRateLimit: true,
+        addSortIndex: true,
+        limit: 100,
+        page: 1
         // ...(typeof availableAtId === 'string') ? { store: { id: availableAtId } } : undefined
     })({
         event: eventRepo,
@@ -34,6 +37,7 @@ async function main() {
         priceSpecification: priceSpecificationRepo,
         product: productRepo
     });
+    console.log(ticketOffers.map((o) => o.sortIndex));
     console.log(ticketOffers.length);
 }
 

package/example/src/chevre/searchOffersByCatalog.ts

@@ -9,7 +9,7 @@ async function main() {
 
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
 
-    const offers = await offerRepo.findOffersByOfferCatalogId({
+    const { offers } = await offerRepo.findOffersByOfferCatalogId({
         ids: ['al96nqj7z', 'xxx', '1001'],
         // ids: ['xx', 'xxx'],
         offerCatalog: {

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

@@ -28,7 +28,10 @@ export declare class MongoRepository {
         limit?: number;
         page?: number;
         sort: boolean;
-    }): Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;
+    }): Promise<{
+        offers: factory.unitPriceOffer.IUnitPriceOffer[];
+        sortedOfferIds: string[];
+    }>;
     findById(params: {
         id: string;
     }): Promise<factory.unitPriceOffer.IUnitPriceOffer>;

package/lib/chevre/repo/offer.js

@@ -342,7 +342,7 @@ class MongoRepository {
                 : [];
             let offers = [];
             if (sortedOfferIds.length > 0) {
-                const searchOffersConditions = Object.assign(Object.assign({ id: { $in: sortedOfferIds } }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                const searchOffersConditions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ id: { $in: sortedOfferIds } }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                     ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } }
                     : undefined), { priceSpecification: {
                         appliesToMovieTicket: Object.assign(Object.assign({}, (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
@@ -356,14 +356,16 @@ class MongoRepository {
                                 serviceType: { $exists: false }
                             }
                             : undefined)
-                    } });
+                    } }), (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);
                 if (params.sort) {
                     // sorting
                     offers = offers.sort((a, b) => sortedOfferIds.indexOf(String(a.id)) - sortedOfferIds.indexOf(String(b.id)));
                 }
             }
-            return offers;
+            return { offers, sortedOfferIds };
         });
     }
     findById(params) {

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -208,11 +208,12 @@ function findOffers(params) {
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
                 const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                    availableOffers = yield repos.offer.findOffersByOfferCatalogId({
+                    const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
                         excludeAppliesToMovieTicket: false,
                         sort: false // ソート不要(2023-01-27~)
                     });
+                    availableOffers = findOffersByOfferCatalogIdResult.offers;
                 }
             }
             else {

package/lib/chevre/service/aggregation/event/aggregateUseActionsOnEvent.js

@@ -91,11 +91,12 @@ function findOffers(params) {
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
                 const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                    availableOffers = yield repos.offer.findOffersByOfferCatalogId({
+                    const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
                         excludeAppliesToMovieTicket: false,
                         sort: false // ソート不要(2023-01-27~)
                     });
+                    availableOffers = findOffersByOfferCatalogIdResult.offers;
                 }
             }
             else {

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

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

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

@@ -225,6 +225,7 @@ function validateAcceptedOffers(params) {
             event: { id: params.event.id },
             store: params.store,
             sort: false,
+            addSortIndex: false,
             validateOfferRateLimit: true
         })(repos);
         // 利用可能なチケットオファーであれば受け入れる

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

@@ -13,6 +13,9 @@ interface ISearchEventTicketOffersRepos {
 }
 declare type ISearchEventTicketOffersOperation<T> = (repos: ISearchEventTicketOffersRepos) => Promise<T>;
 declare type IAcceptedPaymentMethod = factory.paymentMethod.paymentCard.movieTicket.IMovieTicket;
+declare type ITicketOfferWithSortIndex = factory.product.ITicketOffer & {
+    sortIndex?: number;
+};
 /**
  * 興行オファー検索
  */
@@ -73,9 +76,10 @@ declare function searchEventTicketOffers(params: {
     limit?: number;
     page?: number;
     sort: boolean;
+    addSortIndex: boolean;
     validateOfferRateLimit: boolean;
 }): ISearchEventTicketOffersOperation<{
-    ticketOffers: factory.product.ITicketOffer[];
+    ticketOffers: ITicketOfferWithSortIndex[];
     unitPriceOffers: factory.unitPriceOffer.IUnitPriceOffer[];
 }>;
 export { searchEventTicketOffers };

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

@@ -28,19 +28,21 @@ function searchTransportationEventTicketOffers(params) {
         // 上映方式がなければMovieTicket除外(2023-02-21~)
         const excludeAppliesToMovieTicket = videoFormatTypes.length === 0;
         let availableOffers = [];
+        let sortedOfferIds = [];
         // 興行設定があれば興行のカタログを参照する(2022-08-31~)
         const eventOffers = screeningEvent.offers;
         if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
             const transportation = yield repos.product.findById({ id: eventOffers.itemOffered.id });
             if (typeof ((_b = transportation.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                availableOffers = yield repos.offer.findOffersByOfferCatalogId({
-                    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
-                });
+                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)
+                    ? {
+                        limit: params.limit,
+                        page: params.page
+                    }
+                    : undefined));
+                availableOffers = findOffersByOfferCatalogIdResult.offers;
+                sortedOfferIds = findOffersByOfferCatalogIdResult.sortedOfferIds;
             }
         }
         else {
@@ -80,19 +82,26 @@ function searchTransportationEventTicketOffers(params) {
             }
         });
         // paging処理を追加(2023-02-21~)
-        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);
+        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) {
+                sortIndex = sortedOfferIds.indexOf(String(availableOffer.id));
+            }
             return (0, factory_1.createCompoundPriceSpec4event)({
                 eligibleQuantity: eventOffers.eligibleQuantity,
                 offer: availableOffer,
                 videoFormatChargeSpecifications,
                 soundFormatChargeSpecifications,
                 movieTicketTypeChargeSpecs,
-                videoFormatTypes
+                videoFormatTypes,
+                sortIndex
             });
         });
         if (params.validateOfferRateLimit) {
@@ -141,19 +150,21 @@ function searchScreeningEventTicketOffers(params) {
         // 上映方式がなければMovieTicket除外(2023-02-21~)
         const excludeAppliesToMovieTicket = videoFormatTypes.length === 0;
         let availableOffers = [];
+        let sortedOfferIds = [];
         // 興行設定があれば興行のカタログを参照する(2022-08-31~)
         const eventOffers = screeningEvent.offers;
         if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
             const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
             if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                availableOffers = yield repos.offer.findOffersByOfferCatalogId({
-                    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
-                });
+                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)
+                    ? {
+                        limit: params.limit,
+                        page: params.page
+                    }
+                    : undefined));
+                availableOffers = findOffersByOfferCatalogIdResult.offers;
+                sortedOfferIds = findOffersByOfferCatalogIdResult.sortedOfferIds;
             }
         }
         else {
@@ -212,19 +223,26 @@ function searchScreeningEventTicketOffers(params) {
             });
         }
         // paging処理を追加(2023-02-21~)
-        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);
+        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) {
+                sortIndex = sortedOfferIds.indexOf(String(availableOffer.id));
+            }
             return (0, factory_1.createCompoundPriceSpec4event)({
                 eligibleQuantity: eventOffers.eligibleQuantity,
                 offer: availableOffer,
                 videoFormatChargeSpecifications,
                 soundFormatChargeSpecifications,
                 movieTicketTypeChargeSpecs,
-                videoFormatTypes
+                videoFormatTypes,
+                sortIndex
             });
         });
         if (params.validateOfferRateLimit) {
@@ -344,12 +362,13 @@ function searchAddOns(params) {
             const productWithAddOns = yield repos.product.findById({ id: productId });
             const offerCatalogId = (_b = productWithAddOns.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id;
             if (typeof offerCatalogId === 'string') {
-                offers = yield repos.offer.findOffersByOfferCatalogId({
+                const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                     offerCatalog: { id: offerCatalogId },
                     availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id },
                     excludeAppliesToMovieTicket: false,
                     sort: true
                 });
+                offers = findOffersByOfferCatalogIdResult.offers;
                 offers = offers.map((o) => {
                     return Object.assign(Object.assign({ additionalProperty: Array.isArray(o.additionalProperty) ? o.additionalProperty : [], alternateName: o.alternateName, availability: o.availability, availableAtOrFrom: o.availableAtOrFrom, color: o.color, description: o.description, id: o.id, identifier: o.identifier, itemOffered: {
                             description: productWithAddOns.description,
@@ -400,6 +419,7 @@ function searchEventTicketOffers(params) {
                         limit: params.limit,
                         page: params.page,
                         sort: params.sort,
+                        addSortIndex: params.addSortIndex,
                         validateOfferRateLimit: params.validateOfferRateLimit
                     })(repos);
                     offers = searchOffersResult.ticketOffers;
@@ -413,6 +433,7 @@ function searchEventTicketOffers(params) {
                         limit: params.limit,
                         page: params.page,
                         sort: params.sort,
+                        addSortIndex: params.addSortIndex,
                         validateOfferRateLimit: params.validateOfferRateLimit
                     })(repos);
                     offers = searchOffersResult.ticketOffers;

package/lib/chevre/service/offer/factory.d.ts

@@ -8,5 +8,8 @@ declare function createCompoundPriceSpec4event(params: {
     videoFormatChargeSpecifications: ICategoryCodeChargeSpecification[];
     soundFormatChargeSpecifications: ICategoryCodeChargeSpecification[];
     videoFormatTypes: string[];
-}): factory.product.ITicketOffer;
+    sortIndex?: number;
+}): factory.product.ITicketOffer & {
+    sortIndex?: number;
+};
 export { createCompoundPriceSpec4event };

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

@@ -104,6 +104,6 @@ function createCompoundPriceSpec4event(params) {
     };
     // 不要な属性を除外(2022-11-07~)
     const _b = params.offer, { project } = _b, unitOfferFields4ticketOffer = __rest(_b, ["project"]);
-    return Object.assign(Object.assign({}, unitOfferFields4ticketOffer), { eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification });
+    return Object.assign(Object.assign(Object.assign({}, unitOfferFields4ticketOffer), { eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined);
 }
 exports.createCompoundPriceSpec4event = createCompoundPriceSpec4event;

package/lib/chevre/service/offer/product/searchProductOffers.js

@@ -23,7 +23,7 @@ function searchProductOffers(params) {
         if (typeof offerCatalogId !== 'string') {
             return [];
         }
-        const offers = yield repos.offer.findOffersByOfferCatalogId({
+        const { offers } = yield repos.offer.findOffersByOfferCatalogId({
             offerCatalog: { id: offerCatalogId },
             excludeAppliesToMovieTicket: false,
             sort: params.sort

package/package.json

@@ -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.13"
+  "version": "20.4.0-alpha.14"
 }