@chevre/domain 22.0.0-alpha.16 → 22.0.0-alpha.18

package/example/src/chevre/searchMinimizedEvent.ts

@@ -19,13 +19,8 @@ async function main() {
             // id: 'blxonxv1m'
         },
         [
-            'project', 'typeOf', 'startDate',
-            // 'superEvent.id',
-            // 'offers.itemOffered',
-            'offers.itemOffered.id',
-            'offers.offeredThrough',
-            'offers.eligibleQuantity',
-            'offers.unacceptedPaymentMethod'
+            'additionalProperty', 'startDate', 'offers.offeredThrough', 'superEvent.workPerformed.identifier',
+            'location.branchCode'
         ]
     );
     // tslint:disable-next-line:no-null-keyword

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

@@ -74,7 +74,7 @@ type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<
  * minimizedEvent検索時のprojection候補
  * add(2024-07-18~)
  */
-type IKeyOfProjection4minimizedEvent<T extends factory.eventType> = T extends factory.eventType.ScreeningEvent ? keyof IMinimizedIndividualEvent<T> | 'project' | 'typeOf' | 'startDate' | 'superEvent.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity' : T extends factory.eventType.Event ? keyof IMinimizedIndividualEvent<T> | 'project' | 'typeOf' | 'startDate' | 'superEvent.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity' : never;
+type IKeyOfProjection4minimizedEvent<T extends factory.eventType> = T extends factory.eventType.ScreeningEvent ? keyof IMinimizedIndividualEvent<T> | 'superEvent.id' | 'location.branchCode' | 'superEvent.workPerformed.identifier' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity' : T extends factory.eventType.Event ? keyof IMinimizedIndividualEvent<T> | 'superEvent.id' | 'location.branchCode' | 'superEvent.workPerformed.identifier' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity' : never;
 type IUnset<T extends factory.eventType> = {
     [key in keyof factory.event.IEvent<T>]?: 1;
 };

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

@@ -22,8 +22,8 @@ function aggregateUseActionsOnEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
         // 集計対象イベント検索
-        // イベント取得属性最適化(2023-01-23~)
-        const event = yield repos.event.findMinimizedIndividualEventById(params, []);
+        const event = yield repos.event.findMinimizedIndividualEventById(params, ['offers.itemOffered.id', 'project', 'startDate', 'superEvent', 'typeOf'] // optimize projection(2024-07-19~)
+        );
         // 入場ゲート検索
         const entranceGates = yield findEntranceGates({ event })(repos);
         // 入場ゲートごとの集計

package/lib/chevre/service/aggregation/event/findEventOffers.d.ts

@@ -1,14 +1,18 @@
-import type { IMinimizedIndividualEvent } from '../../../repo/event';
 import type { IUnitPriceOfferFromAggregateOffer, OfferRepo } from '../../../repo/offer';
 import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { ProductRepo } from '../../../repo/product';
-import * as factory from '../../../factory';
 /**
  * 興行オファー検索
  * NotFoundエラーをハンドリングする
  */
 export declare function findEventOffers(params: {
-    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
+    event: {
+        offers?: {
+            itemOffered?: {
+                id?: string;
+            };
+        };
+    };
 }): (repos: {
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.js

@@ -53,9 +53,10 @@ function checkMovieTicket(params) {
             if (eventIds.length !== 1) {
                 throw new factory.errors.Argument('movieTickets', 'Number of events must be 1');
             }
-            // イベント取得属性最適化(2023-01-23~)
-            let screeningEvent;
-            screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, []);
+            const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, [
+                'typeOf', 'project', 'additionalProperty', 'startDate', 'offers.offeredThrough', 'superEvent.workPerformed.identifier'
+            ] // optimize projection(2024-07-19~)
+            );
             const sellerId = (_f = optimizedCheckObject[0]) === null || _f === void 0 ? void 0 : _f.seller.id;
             const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
                 seller: { id: sellerId },
@@ -65,10 +66,8 @@ function checkMovieTicket(params) {
                 throw new factory.errors.Argument('transactionId', `payment not accepted [${paymentMethodType}]`);
             }
             processPurchaseNumberAuthResult = yield (0, processPurchaseNumberAuth_1.processPurchaseNumberAuth)({
-                movieTickets: movieTickets,
-                seller: { id: sellerId },
-                screeningEvent: screeningEvent,
-                paymentServiceId
+                movieTickets, screeningEvent, paymentServiceId,
+                seller: { id: sellerId }
             })(repos, settings);
             // add recipe(2024-06-07~)
             recipe = (0, factory_1.processPurchaseNumberAuthResult2checkRecipe)({

package/lib/chevre/service/payment/movieTicket/factory.d.ts

@@ -1,11 +1,22 @@
 import * as surfrock from '@surfrock/sdk';
 import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
+type IEvent4seatInfoSync = Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'additionalProperty' | 'startDate'> & {
+    location: Pick<factory.event.event.ILocation, 'branchCode'>;
+    offers: {
+        offeredThrough?: factory.event.screeningEvent.IOfferedThrough | factory.event.screeningEvent.IOffer4COA['offeredThrough'];
+    };
+    superEvent: {
+        workPerformed: {
+            identifier: string;
+        };
+    };
+};
 declare function createSeatInfoSyncIn(params: {
     paymentMethodType: string;
     paymentMethodId: string;
     movieTickets: factory.action.trade.pay.IMovieTicket[];
-    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
+    event: IEvent4seatInfoSync;
     purpose: factory.action.trade.pay.IPurpose;
     credentials: {
         kgygishCd: string;
@@ -50,4 +61,4 @@ declare enum MovieticketReserveRequestErrorMessage {
     ReservationResult19 = "ReservationResult 19",
     CancellationPeriodPassed = "\u5EA7\u5E2D\u4E88\u7D04\u53D6\u6D88\u53EF\u80FD\u671F\u9593\u3092\u904E\u304E\u3066\u3044\u307E\u3059\u3002"
 }
-export { createSeatInfoSyncIn, createStartingPayAction, processPurchaseNumberAuthResult2checkRecipe, processSeatInfoSyncResult2payRecipe, processSeatInfoSyncResult2refundRecipe, MovieticketReserveRequestErrorMessage, IProcessPurchaseNumberAuthResult, IProcessSeatInfoSyncResult, IProcessSeatInfoSyncCancelResult };
+export { createSeatInfoSyncIn, createStartingPayAction, processPurchaseNumberAuthResult2checkRecipe, processSeatInfoSyncResult2payRecipe, processSeatInfoSyncResult2refundRecipe, MovieticketReserveRequestErrorMessage, IEvent4seatInfoSync, IProcessPurchaseNumberAuthResult, IProcessSeatInfoSyncResult, IProcessSeatInfoSyncCancelResult };

package/lib/chevre/service/payment/movieTicket/payMovieTicket.js

@@ -111,8 +111,12 @@ function payActionParams2seatInfoSyncIn(params) {
         if (eventIds.length !== 1) {
             throw new factory.errors.Argument('movieTickets', 'Number of events must be 1');
         }
-        // イベント取得属性最適化(2023-01-23~)
-        const event = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, []);
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, 
+        // optimize projection(2024-07-19~)
+        [
+            'superEvent', 'additionalProperty', 'startDate', 'project',
+            'offers.offeredThrough', 'location.branchCode', 'superEvent.workPerformed.identifier'
+        ]);
         const sellerId = String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id);
         // 全購入管理番号のMovieTicketをマージ
         const movieTickets = params.object.reduce((a, b) => [...a, ...(Array.isArray(b.movieTickets)) ? b.movieTickets : []], []);

package/lib/chevre/service/payment/movieTicket/processPurchaseNumberAuth.d.ts

@@ -7,16 +7,22 @@ interface ICheckResult {
     purchaseNumberAuthIn: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthIn;
     purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;
 }
+type IEvent4checkByIdentifier = Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'typeOf' | 'project' | 'additionalProperty' | 'startDate'> & {
+    offers: {
+        offeredThrough?: factory.event.screeningEvent.IOfferedThrough | factory.event.screeningEvent.IOffer4COA['offeredThrough'];
+    };
+    superEvent: {
+        workPerformed: {
+            identifier: string;
+        };
+    };
+};
 interface ICheckByIdentifierParams {
     movieTickets: factory.action.check.paymentMethod.movieTicket.IMovieTicket[];
     seller: {
         id: string;
     };
-    screeningEvent: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'typeOf' | 'project' | 'additionalProperty' | 'superEvent' | 'startDate'> & {
-        offers: {
-            offeredThrough?: factory.event.screeningEvent.IOfferedThrough | factory.event.screeningEvent.IOffer4COA['offeredThrough'];
-        };
-    };
+    screeningEvent: IEvent4checkByIdentifier;
     paymentServiceId: string;
 }
 declare function processPurchaseNumberAuth(params: ICheckByIdentifierParams): (repos: {

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -45,7 +45,9 @@ function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNot
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // イベント取得属性最適化(2023-01-23~)
-        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, ['typeOf', 'project', 'additionalProperty', 'superEvent', 'startDate', 'offers.offeredThrough'] // optimize(2024-07-18~)
+        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, [
+            'typeOf', 'project', 'additionalProperty', 'startDate', 'offers.offeredThrough', 'superEvent.workPerformed.identifier'
+        ] // optimize(2024-07-18~)
         );
         // 販売者からムビチケ決済情報取得
         const sellerId = (_c = params.recipient) === null || _c === void 0 ? void 0 : _c.id;

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.0.0-alpha.16"
+  "version": "22.0.0-alpha.18"
 }