@chevre/domain 20.2.0-alpha.32 → 20.2.0-alpha.33

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

@@ -20,6 +20,9 @@ export declare class MongoRepository {
         offerCatalog: {
             id: string;
         };
+        limit?: number;
+        page?: number;
+        sort: boolean;
     }): Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;
     findById(params: {
         id: string;

package/lib/chevre/repo/offer.js

@@ -346,8 +346,10 @@ class MongoRepository {
             let offers = [];
             if (sortedOfferIds.length > 0) {
                 offers = yield this.search({ id: { $in: sortedOfferIds } });
-                // sorting
-                offers = offers.sort((a, b) => sortedOfferIds.indexOf(String(a.id)) - sortedOfferIds.indexOf(String(b.id)));
+                if (params.sort) {
+                    // sorting
+                    offers = offers.sort((a, b) => sortedOfferIds.indexOf(String(a.id)) - sortedOfferIds.indexOf(String(b.id)));
+                }
             }
             return offers;
         });

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

@@ -93,13 +93,6 @@ function aggregateByEvent(params) {
             screeningRoom: screeningRoom
         })(repos);
         debug('offers aggregated', aggregateOffer);
-        // 入場ゲートごとの集計
-        // const aggregateEntranceGate = await aggregateEntranceGateByEvent({
-        //     aggregateDate: now,
-        //     event,
-        //     entranceGates: movieTheater.hasEntranceGate
-        // })(repos);
-        // debug('entrances aggregated', aggregateEntranceGate);
         // 値がundefinedの場合に更新しないように注意
         const update = {
             $set: Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date(), // $setオブジェクトが空だとMongoエラーになるので
@@ -200,20 +193,13 @@ function findOffers(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') {
                     availableOffers = yield repos.offer.findOffersByOfferCatalogId({
-                        offerCatalog: { id: eventService.hasOfferCatalog.id }
+                        offerCatalog: { id: eventService.hasOfferCatalog.id },
+                        sort: false // ソート不要(2023-01-27~)
                     });
                 }
             }
             else {
-                // hasOfferCatalog参照廃止(2022-09-02~)
                 throw new factory.errors.NotFound('event.offers.itemOffered.id');
-                // if (typeof params.event.hasOfferCatalog?.id === 'string') {
-                //     availableOffers = await repos.offer.findOffersByOfferCatalogId({
-                //         offerCatalog: {
-                //             id: params.event.hasOfferCatalog.id
-                //         }
-                //     });
-                // }
             }
         }
         catch (error) {

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

@@ -92,18 +92,13 @@ function findOffers(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') {
                     availableOffers = yield repos.offer.findOffersByOfferCatalogId({
-                        offerCatalog: { id: eventService.hasOfferCatalog.id }
+                        offerCatalog: { id: eventService.hasOfferCatalog.id },
+                        sort: false // ソート不要(2023-01-27~)
                     });
                 }
             }
             else {
-                // hasOfferCatalog参照廃止(2022-09-02~)
                 throw new factory.errors.NotFound('event.offers.itemOffered.id');
-                // if (typeof params.event.hasOfferCatalog?.id === 'string') {
-                //     availableOffers = await repos.offer.findOffersByOfferCatalogId({
-                //         offerCatalog: { id: params.event.hasOfferCatalog.id }
-                //     });
-                // }
             }
         }
         catch (error) {

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

@@ -93,7 +93,10 @@ exports.start = start;
 function createTransactionObject(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // オファー検索
-        const offers = yield (0, searchProductOffers_1.searchProductOffers)({ itemOffered: { id: String(params.product.id) } })(repos);
+        const offers = yield (0, searchProductOffers_1.searchProductOffers)({
+            itemOffered: { id: String(params.product.id) },
+            sort: false // ソート不要(2023-01-27~)
+        })(repos);
         const transactionObject = [];
         for (const acceptedOffer of params.acceptedOffers) {
             const offer = offers.find((o) => o.id === acceptedOffer.id);

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

@@ -93,7 +93,8 @@ function addReservations(params) {
         // イベントオファー検索
         const { ticketOffers, unitPriceOffers } = yield OfferService.event.searchEventTicketOffers({
             ids: acceptedOfferIds,
-            event: { id: event.id }
+            event: { id: event.id },
+            sort: false // ソート不要(2023-01-27~)
         })(repos);
         // 冗長なfindOffersByOfferCatalogId処理を削除(2023-01-26~)
         const availableOffers = unitPriceOffers;

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

@@ -288,7 +288,8 @@ function validateAcceptedOffers(params) {
             ids: offerIds,
             event: { id: params.event.id },
             seller: params.seller,
-            store: params.store
+            store: params.store,
+            sort: false // ソート不要(2023-01-27~)
         })(repos);
         // 利用可能なチケットオファーであれば受け入れる
         const acceptedOffers = (Array.isArray(acceptedOffersWithoutDetail))

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

@@ -76,6 +76,7 @@ declare function searchEventTicketOffers(params: {
          */
         kbnEisyahousiki: string;
     };
+    sort: boolean;
 }): ISearchEventTicketOffersOperation<{
     ticketOffers: factory.product.ITicketOffer[];
     unitPriceOffers: factory.unitPriceOffer.IUnitPriceOffer[];

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

@@ -31,7 +31,8 @@ function searchTransportationEventTicketOffers(params) {
             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 }
+                    offerCatalog: { id: transportation.hasOfferCatalog.id },
+                    sort: params.sort
                 });
             }
         }
@@ -145,7 +146,8 @@ function searchScreeningEventTicketOffers(params) {
             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 }
+                    offerCatalog: { id: eventService.hasOfferCatalog.id },
+                    sort: params.sort
                 });
             }
         }
@@ -331,7 +333,10 @@ 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({ offerCatalog: { id: offerCatalogId } });
+                offers = yield repos.offer.findOffersByOfferCatalogId({
+                    offerCatalog: { id: offerCatalogId },
+                    sort: true
+                });
                 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,
@@ -376,12 +381,20 @@ function searchEventTicketOffers(params) {
             default:
                 // Chevreで券種オファーを検索
                 if (event.typeOf === factory.eventType.ScreeningEvent) {
-                    const searchOffersResult = yield searchScreeningEventTicketOffers({ ids: params.ids, event })(repos);
+                    const searchOffersResult = yield searchScreeningEventTicketOffers({
+                        ids: params.ids,
+                        event,
+                        sort: params.sort
+                    })(repos);
                     offers = searchOffersResult.ticketOffers;
                     unitPriceOffers = searchOffersResult.unitPriceOffers;
                 }
                 else if (event.typeOf === factory.eventType.Event) {
-                    const searchOffersResult = yield searchTransportationEventTicketOffers({ ids: params.ids, event })(repos);
+                    const searchOffersResult = yield searchTransportationEventTicketOffers({
+                        ids: params.ids,
+                        event,
+                        sort: params.sort
+                    })(repos);
                     offers = searchOffersResult.ticketOffers;
                     unitPriceOffers = searchOffersResult.unitPriceOffers;
                 }

package/lib/chevre/service/offer/product/searchProductOffers.d.ts

@@ -8,6 +8,7 @@ export declare function searchProductOffers(params: {
     itemOffered: {
         id: string;
     };
+    sort: boolean;
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;

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({ offerCatalog: { id: offerCatalogId } });
+        const offers = yield repos.offer.findOffersByOfferCatalogId({ offerCatalog: { id: offerCatalogId }, sort: params.sort });
         return offers.map((o) => {
             const unitSpec = o.priceSpecification;
             const compoundPriceSpecification = {

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

@@ -50,6 +50,7 @@ export declare function search(params: {
         id: string;
     };
     onlyValid: boolean;
+    sort: boolean;
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;

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

@@ -58,7 +58,10 @@ function search(params) {
                 return offers;
             }
         }
-        offers = yield (0, searchProductOffers_1.searchProductOffers)({ itemOffered: { id: params.itemOffered.id } })(repos);
+        offers = yield (0, searchProductOffers_1.searchProductOffers)({
+            itemOffered: { id: params.itemOffered.id },
+            sort: params.sort
+        })(repos);
         // 店舗条件によって対象を絞る
         const storeId = (_b = params.availableAt) === null || _b === void 0 ? void 0 : _b.id;
         if (typeof storeId === 'string') {
@@ -198,7 +201,8 @@ function fixProductAndOffers(params) {
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
-        const availableOffers = yield search(Object.assign({ project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined))(repos);
+        const availableOffers = yield search(Object.assign(Object.assign({ project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined), { sort: false // ソート不要(2023-01-27~)
+         }))(repos);
         return { product, availableOffers };
     });
 }

package/lib/chevre/service/transaction/orderProgramMembership.js

@@ -218,7 +218,8 @@ function processAuthorizeProductOffer(params) {
             project: { id: params.project.id },
             itemOffered: { id: params.product.id },
             seller: { id: String(seller.id) },
-            onlyValid: true
+            onlyValid: true,
+            sort: false // ソート不要(2023-01-27~)
         })(repos);
         const acceptedProductOffer = offers.find((o) => o.identifier === acceptedOffer.identifier);
         if (acceptedProductOffer === undefined) {

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.2.0-alpha.32"
+  "version": "20.2.0-alpha.33"
 }