@chevre/domain 20.4.0-alpha.27 → 20.4.0-alpha.29

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

@@ -118,27 +118,12 @@ function addReservations(params) {
                 // 対応アプリケーション条件追加(2023-01-27~)
                 store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
                 onlyValid: true,
-                sort: false,
                 addSortIndex: false,
                 validateOfferRateLimit: true
             })(repos);
             ticketOffers = searchEventTicketOffersResult.ticketOffers;
             availableOffers = searchEventTicketOffersResult.unitPriceOffers;
         }
-        // 冗長なfindOffersByOfferCatalogId処理を削除(2023-01-26~)
-        // let availableOffers: factory.unitPriceOffer.IUnitPriceOffer[] = [];
-        // // 興行設定があれば興行のカタログを参照する(2022-08-31~)
-        // const eventOffers = <factory.event.screeningEvent.IOffer | undefined>event.offers;
-        // if (typeof eventOffers?.itemOffered?.id === 'string') {
-        //     const eventService = <factory.product.IProduct>await repos.product.findById({ id: eventOffers.itemOffered.id });
-        //     if (typeof eventService.hasOfferCatalog?.id === 'string') {
-        //         availableOffers = await repos.offer.findOffersByOfferCatalogId({
-        //             offerCatalog: { id: eventService.hasOfferCatalog.id }
-        //         });
-        //     }
-        // } else {
-        //     throw new factory.errors.NotFound('event.offers.itemOffered.id');
-        // }
         const availableSeatOffers = yield searchAvailableSeatOffers({ acceptedOffers, event: { id: event.id } })(repos);
         // 仮予約作成
         const { acceptedOffers4transactionObject, objectSubReservations } = yield createAcceptedOffers4transactionObject({

package/lib/chevre/service/event.js

@@ -21,7 +21,6 @@ const difference = require("lodash.difference");
 const moment = require("moment-timezone");
 const credentials_1 = require("../credentials");
 const factory = require("../factory");
-const settings_1 = require("../settings");
 const offer_1 = require("./offer");
 // const customsearch = google.customsearch('v1');
 const debug = createDebug('chevre-domain:service:event');
@@ -450,11 +449,29 @@ function createScreeningEventFromCOA(params) {
         priceCurrency: factory.priceCurrency.JPY
     };
     const { additionalProperty, coaInfo } = createScreeningEventAdditionalPropertyFromCOA(params);
-    return Object.assign({ project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.eventType.ScreeningEvent, id: id, identifier: id, name: params.superEvent.name, eventStatus: factory.eventStatusType.EventScheduled, location: {
+    return {
+        project: { typeOf: params.project.typeOf, id: params.project.id },
+        typeOf: factory.eventType.ScreeningEvent,
+        id: id,
+        identifier: id,
+        name: params.superEvent.name,
+        eventStatus: factory.eventStatusType.EventScheduled,
+        location: {
             typeOf: params.screenRoom.typeOf,
             branchCode: params.screenRoom.branchCode,
             name: params.screenRoom.name
-        }, endDate: endDate, startDate: startDate, superEvent: params.superEvent, coaInfo, offers: offers, checkInCount: 0, attendeeCount: 0, maximumAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity, remainingAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity, additionalProperty }, (settings_1.settings.useEventWorkPerformed) ? { workPerformed: params.superEvent.workPerformed } : undefined);
+        },
+        endDate: endDate,
+        startDate: startDate,
+        superEvent: params.superEvent,
+        coaInfo,
+        offers: offers,
+        checkInCount: 0,
+        attendeeCount: 0,
+        maximumAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity,
+        remainingAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity,
+        additionalProperty
+    };
 }
 function createScreeningEventAdditionalPropertyFromCOA(params) {
     const coaInfo = {

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

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

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

@@ -73,7 +73,6 @@ declare function searchEventTicketOffers(params: {
     };
     limit?: number;
     page?: number;
-    sort: boolean;
     addSortIndex: boolean;
     validateOfferRateLimit: boolean;
 }): ISearchEventTicketOffersOperation<{

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

@@ -26,12 +26,18 @@ function searchTicketOffersByItemOffered(params) {
         if (typeof catalogId !== 'string') {
             throw new factory.errors.NotFound('itemOffered.hasOfferCatalog');
         }
-        const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId(Object.assign({ ids: params.ids, offerCatalog: { id: catalogId }, availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id }, unacceptedPaymentMethod: params.unacceptedPaymentMethod, excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket, onlyValid: params.onlyValid === true, sort: params.sort }, (!params.sort)
-            ? {
-                limit: params.limit,
-                page: params.page
-            }
-            : undefined));
+        const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
+            ids: params.ids,
+            offerCatalog: { id: catalogId },
+            availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
+            unacceptedPaymentMethod: params.unacceptedPaymentMethod,
+            excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
+            onlyValid: params.onlyValid === true,
+            // Mongoのpagingを利用するオプション(2023-02-21~)
+            limit: params.limit,
+            page: params.page,
+            sort: false
+        });
         const availableOffers = findOffersByOfferCatalogIdResult.offers;
         const sortedOfferIds = findOffersByOfferCatalogIdResult.sortedOfferIds;
         return { availableOffers, sortedOfferIds };
@@ -63,7 +69,6 @@ function searchEventTicketOffersByEvent(params) {
             store: params.store,
             limit: params.limit,
             page: params.page,
-            sort: params.sort,
             onlyValid: params.onlyValid,
             unacceptedPaymentMethod,
             excludeAppliesToMovieTicket
@@ -271,7 +276,6 @@ function searchEventTicketOffers(params) {
                     store: params.store,
                     limit: params.limit,
                     page: params.page,
-                    sort: params.sort,
                     addSortIndex: params.addSortIndex,
                     validateOfferRateLimit: params.validateOfferRateLimit,
                     onlyValid: params.onlyValid === true

package/lib/chevre/settings.d.ts

@@ -21,7 +21,6 @@ export declare type ISettings = factory.project.ISettings & {
     userPoolIdOld: string;
     userPoolIdNew: string;
     maxNumCreditCardPaymentMethod?: number;
-    useEventWorkPerformed: boolean;
     useAggregateEntranceGateProjects: string[];
     useAggregateOfferProjects: string[];
     useOfferRateLimitProjects: string[];

package/lib/chevre/settings.js

@@ -94,7 +94,7 @@ exports.settings = Object.assign(Object.assign({ transactionWebhookUrls, onOrder
         timeout: triggerWebhookTimeout
     }, maximumReservationGracePeriodInDays: MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS, userPoolIdOld: String(process.env.USERPOOL_ID_OLD), userPoolIdNew: String(process.env.USERPOOL_ID_NEW) }, (typeof MAX_NUM_CREDIT_CARD_PAYMENT_METHOD === 'number')
     ? { maxNumCreditCardPaymentMethod: MAX_NUM_CREDIT_CARD_PAYMENT_METHOD }
-    : undefined), { useEventWorkPerformed: process.env.USE_EVENT_WORK_PERFORMED === '1', useAggregateEntranceGateProjects: (typeof process.env.USE_AGGREGATE_ENTRANCE_GATE_PROJECTS === 'string')
+    : undefined), { useAggregateEntranceGateProjects: (typeof process.env.USE_AGGREGATE_ENTRANCE_GATE_PROJECTS === 'string')
         ? process.env.USE_AGGREGATE_ENTRANCE_GATE_PROJECTS.split(',')
         : [], useAggregateOfferProjects: (typeof process.env.USE_AGGREGATE_OFFER_PROJECTS === 'string')
         ? process.env.USE_AGGREGATE_OFFER_PROJECTS.split(',')

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.27"
+  "version": "20.4.0-alpha.29"
 }