@chevre/domain 22.4.0-alpha.4 → 22.4.0-alpha.5

package/example/src/chevre/searchOfferCatalogItemAvailability.ts

@@ -18,11 +18,12 @@ async function main() {
 
     const result = await (await chevre.service.offer.createService()).event.searchOfferCatalogItemAvailability({
         event: {
-            id: 'cllkq475u'
+            id: 'bm0f0cadh'
         },
         limit: 10,
         page: 1,
-        availableAtOrFrom: { id: '3eo6okferrsdpfd9j2ce1iv9k7' }
+        availableAtOrFrom: { id: '3eo6okferrsdpfd9j2ce1iv9k7' },
+        options: { considerUnacceptedPaymentMethod: true }
     })({
         event: eventRepo,
         offer: offerRepo,

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

@@ -175,6 +175,7 @@ export declare class OfferRepo {
         availableAtOrFrom: {
             id: string;
         };
+        unacceptedPaymentMethod: string[];
     }): Promise<{
         id: string;
     }[]>;

package/lib/chevre/repo/offer.js

@@ -675,24 +675,22 @@ class OfferRepo {
      */
     searchAvailableCatalogs(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { unacceptedPaymentMethod } = params;
             const aggregate = this.aggregateOfferModel.aggregate([
                 { $unwind: { path: '$offers' } },
-                // { $unwind: { path: '$offers.includedInDataCatalog' } },
                 { $unwind: { path: '$includedInDataCatalog' } },
                 {
-                    $match: {
-                        'project.id': { $eq: params.project.id },
-                        // 'offers.includedInDataCatalog.id': { $exists: true, $in: params.includedInDataCatalog.id },
-                        'includedInDataCatalog.id': { $exists: true, $in: params.includedInDataCatalog.id },
-                        'offers.availableAtOrFrom.id': { $exists: true, $eq: params.availableAtOrFrom.id }
-                    }
+                    $match: Object.assign({ 'project.id': { $eq: params.project.id }, 'includedInDataCatalog.id': { $exists: true, $in: params.includedInDataCatalog.id }, 'offers.availableAtOrFrom.id': { $exists: true, $eq: params.availableAtOrFrom.id } }, (Array.isArray(unacceptedPaymentMethod) && unacceptedPaymentMethod.length > 0)
+                        ? {
+                            'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': {
+                                $nin: unacceptedPaymentMethod
+                            }
+                        }
+                        : undefined)
                 },
                 {
                     $group: {
-                        // _id: '$offers.includedInDataCatalog.id',
-                        // includedInDataCatalog: { $first: '$offers.includedInDataCatalog' }
                         _id: '$includedInDataCatalog.id'
-                        // includedInDataCatalog: { $first: '$includedInDataCatalog' }
                     }
                 },
                 {

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

@@ -129,6 +129,12 @@ declare function searchOfferCatalogItemAvailability(params: {
     };
     limit: number;
     page: number;
+    options: {
+        /**
+         * イベントの利用不可決済方法区分を考慮するかどうか(2024-09-26~)
+         */
+        considerUnacceptedPaymentMethod: boolean;
+    };
 }): (repos: {
     event: EventRepo;
     offer: OfferRepo;

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

@@ -205,9 +205,9 @@ function searchEventTicketOffersByEvent(params) {
     });
 }
 function getUnacceptedPaymentMethodByEvent(params) {
+    var _a;
     let unacceptedPaymentMethod = [];
-    const eventOffers = params.event.offers;
-    const unacceptedPaymentMethodByEvent = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.unacceptedPaymentMethod;
+    const unacceptedPaymentMethodByEvent = (_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.unacceptedPaymentMethod;
     // 施設コンテンツを参照する必要はない(2022-10-31~)
     if (Array.isArray(unacceptedPaymentMethodByEvent)) {
         unacceptedPaymentMethod = unacceptedPaymentMethodByEvent;
@@ -489,6 +489,7 @@ exports.searchOfferCatalogItems = searchOfferCatalogItems;
 function searchOfferCatalogItemAvailability(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
+        const { considerUnacceptedPaymentMethod } = params.options;
         if (typeof params.limit !== 'number') {
             throw new factory.errors.Argument('limit', 'must be number');
         }
@@ -497,7 +498,7 @@ function searchOfferCatalogItemAvailability(params) {
         }
         let availabilities = [];
         // optimize(2024-07-18~)
-        const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'offers.itemOffered.id']);
+        const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'offers.itemOffered.id', 'offers.unacceptedPaymentMethod']);
         // 興行設定があれば興行のカタログを参照する
         const eventOffers = event.offers;
         let catalogId;
@@ -524,12 +525,14 @@ function searchOfferCatalogItemAvailability(params) {
                 limit: params.limit,
                 page: params.page
             });
+            const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event });
             if (catalogItemListElements.length > 0) {
                 // 単価オファーから利用可能なサブカタログを検索
                 const availableCatalogs = yield repos.offer.searchAvailableCatalogs({
                     project: { id: event.project.id },
                     includedInDataCatalog: { id: catalogItemListElements.map((element) => element.id) },
-                    availableAtOrFrom: { id: params.availableAtOrFrom.id }
+                    availableAtOrFrom: { id: params.availableAtOrFrom.id },
+                    unacceptedPaymentMethod: (considerUnacceptedPaymentMethod) ? unacceptedPaymentMethod : []
                 });
                 availabilities = catalogItemListElements.map((element) => {
                     return {

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.4.0-alpha.4"
+  "version": "22.4.0-alpha.5"
 }