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

package/example/src/chevre/searchEventTicketOffers.ts

@@ -23,7 +23,8 @@ async function main() {
 
     const { ticketOffers } = await chevre.service.offer.event.searchEventTicketOffers({
         event: { id: 'al9ew43f5' },
-        onlyValid: true
+        onlyValid: true,
+        sort: true
         // ...(typeof sellerId === 'string') ? { seller: { id: sellerId } } : undefined,
         // ...(typeof availableAtId === 'string') ? { store: { id: availableAtId } } : undefined
     })({

package/example/src/chevre/searchOffersByCatalog.ts

@@ -15,7 +15,8 @@ async function main() {
         offerCatalog: {
             id: '0001'
             // id: 'xxx'
-        }
+        },
+        sort: true
     });
     console.log(offers.map((o) => o.id));
     console.log(offers.length);

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

@@ -20,6 +20,9 @@ export declare class MongoRepository {
         offerCatalog: {
             id: string;
         };
+        availableAtOrFrom?: {
+            id?: string;
+        };
         limit?: number;
         page?: number;
         sort: boolean;

package/lib/chevre/repo/offer.js

@@ -301,6 +301,7 @@ class MongoRepository {
      * カタログに登録されたオファーの順序は保証される
      */
     findOffersByOfferCatalogId(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             // aggregateで再実装(2023-01-26~)
             const matchStages = [{ $match: { _id: { $eq: params.offerCatalog.id } } }];
@@ -345,7 +346,9 @@ class MongoRepository {
             // }
             let offers = [];
             if (sortedOfferIds.length > 0) {
-                offers = yield this.search({ id: { $in: sortedOfferIds } });
+                offers = yield this.search(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));
                 if (params.sort) {
                     // sorting
                     offers = offers.sort((a, b) => sortedOfferIds.indexOf(String(a.id)) - sortedOfferIds.indexOf(String(b.id)));

package/lib/chevre/service/assetTransaction/reserve.d.ts

@@ -62,12 +62,24 @@ interface IConfirmRepo {
     task: TaskRepo;
 }
 export declare type IConfirmOperation<T> = (repos: IConfirmRepo) => Promise<T>;
+declare type IStartParams = factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
+    /**
+     * 承認アクションを介した場合に検索済のオファーリスト
+     */
+    preSearchedTicketOffers?: factory.product.ITicketOffer[];
+    /**
+     * 承認アクションを介した場合に検索済の単価オファーリスト
+     */
+    preSearchedUnitPriceOffers?: factory.unitPriceOffer.IUnitPriceOffer[];
+    availableAtOrFrom?: {
+        id?: string;
+    };
+    validateAppliesToMovieTicket: boolean;
+};
 /**
  * 取引開始
  */
-export declare function start(params: factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
-    validateAppliesToMovieTicket: boolean;
-}): IStartOperation<factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>>;
+export declare function start(params: IStartParams): IStartOperation<factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>>;
 /**
  * 取引確定
  */

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

@@ -26,7 +26,7 @@ const factory_1 = require("./reserve/factory");
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         // 自動発行廃止(2022-05-17~)
         const reservationNumber = params.transactionNumber;
         if (typeof reservationNumber !== 'string' || reservationNumber.length === 0) {
@@ -51,6 +51,9 @@ function start(params) {
             transaction = yield addReservations({
                 id: transaction.id,
                 object: params.object,
+                preSearchedTicketOffers: params.preSearchedTicketOffers,
+                preSearchedUnitPriceOffers: params.preSearchedUnitPriceOffers,
+                availableAtOrFrom: { id: (_b = params.availableAtOrFrom) === null || _b === void 0 ? void 0 : _b.id },
                 validateAppliesToMovieTicket: params.validateAppliesToMovieTicket
             })(repos);
         }
@@ -64,7 +67,7 @@ exports.start = start;
 function addReservations(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const now = new Date();
         let transaction = yield repos.assetTransaction.findById({ typeOf: factory.assetTransactionType.Reserve, id: params.id });
         // イベント存在確認
@@ -90,14 +93,26 @@ function addReservations(params) {
         }
         // 受け入れたオファーIDだけ取得する(2023-01-26~)
         const acceptedOfferIds = [...new Set(acceptedOffers.map((o) => String(o.id)))];
-        // イベントオファー検索
-        const { ticketOffers, unitPriceOffers } = yield OfferService.event.searchEventTicketOffers({
-            ids: acceptedOfferIds,
-            event: { id: event.id },
-            sort: false // ソート不要(2023-01-27~)
-        })(repos);
+        let ticketOffers;
+        let availableOffers;
+        // 承認アクションを介した予約取引開始時の冗長なオファー検索処理について最適化(2023-01-27~)
+        if (Array.isArray(params.preSearchedTicketOffers) && Array.isArray(params.preSearchedUnitPriceOffers)) {
+            ticketOffers = params.preSearchedTicketOffers;
+            availableOffers = params.preSearchedUnitPriceOffers;
+        }
+        else {
+            // イベントオファー検索
+            const searchEventTicketOffersResult = yield OfferService.event.searchEventTicketOffers({
+                ids: acceptedOfferIds,
+                event: { id: event.id },
+                // 対応アプリケーション条件追加(2023-01-27~)
+                store: { id: (_b = params.availableAtOrFrom) === null || _b === void 0 ? void 0 : _b.id },
+                sort: false // ソート不要(2023-01-27~)
+            })(repos);
+            ticketOffers = searchEventTicketOffersResult.ticketOffers;
+            availableOffers = searchEventTicketOffersResult.unitPriceOffers;
+        }
         // 冗長なfindOffersByOfferCatalogId処理を削除(2023-01-26~)
-        const availableOffers = unitPriceOffers;
         // let availableOffers: factory.unitPriceOffer.IUnitPriceOffer[] = [];
         // // 興行設定があれば興行のカタログを参照する(2022-08-31~)
         // const eventOffers = <factory.event.screeningEvent.IOffer | undefined>event.offers;

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

@@ -24,7 +24,7 @@ function authorize(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
         const { transaction, event, bookingServiceIdentifire } = yield validateCreateRequest(Object.assign(Object.assign({}, params), { now, store: params.store }))({ event: repos.event, transaction: repos.transaction });
-        const acceptedOffers = yield validateAcceptedOffers({
+        const { acceptedOffers, ticketOffers, unitPriceOffers } = yield validateAcceptedOffers({
             object: params.object,
             event,
             seller: { typeOf: transaction.seller.typeOf, id: String(transaction.seller.id) },
@@ -63,7 +63,10 @@ function authorize(params) {
                         action,
                         event,
                         transactionNumber,
-                        transaction
+                        transaction,
+                        availableAtOrFrom: { id: params.store.id },
+                        ticketOffers,
+                        unitPriceOffers
                     })(repos);
                     // requestBody = processStartReserveResult.requestBody;
                     // responseBody = processStartReserveResult.responseBody;
@@ -168,7 +171,7 @@ function processStartReserve4chevre(params) {
         // requestBody = startParams;
         const startParamObject = yield validateObjectWithoutDetail(startParams)(repos);
         // 予約取引開始
-        responseBody = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, validateAppliesToMovieTicket: true }))(repos);
+        responseBody = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateAppliesToMovieTicket: true }))(repos);
         // 予約取引からオファー情報を生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
             responseBody: responseBody,
@@ -283,11 +286,11 @@ function validateAcceptedOffers(params) {
             ? [...new Set(acceptedOffersWithoutDetail.map((o) => o.id))]
             : [];
         // 利用可能なチケットオファーを検索
-        const { ticketOffers } = yield (0, searchEventTicketOffers_1.searchEventTicketOffers)({
+        const { ticketOffers, unitPriceOffers } = yield (0, searchEventTicketOffers_1.searchEventTicketOffers)({
             // 受け入れたオファーIDだけ取得する(2023-01-26~)
             ids: offerIds,
             event: { id: params.event.id },
-            seller: params.seller,
+            // seller: params.seller,
             store: params.store,
             sort: false // ソート不要(2023-01-27~)
         })(repos);
@@ -333,7 +336,7 @@ function validateAcceptedOffers(params) {
                 }
             }
         });
-        return acceptedOffers;
+        return { acceptedOffers, ticketOffers, unitPriceOffers };
     });
 }
 function acceptedOfferWithoutDetail2acceptedOffer(params) {

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

@@ -29,12 +29,10 @@ declare function searchEventTicketOffers(params: {
     };
     /**
      * どの販売者に対して
+     * 不要なので廃止(2023-01-27~)
      */
-    seller?: {
-        id?: string;
-    };
     /**
-     * どの店舗に対して
+     * どのアプリケーションに対して
      */
     store?: {
         id?: string;

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

@@ -19,7 +19,7 @@ const factory_1 = require("../factory");
 function searchTransportationEventTicketOffers(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const screeningEvent = params.event;
         const soundFormatTypes = [];
         const videoFormatTypes = [];
@@ -32,6 +32,7 @@ function searchTransportationEventTicketOffers(params) {
                 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 },
                     sort: params.sort
                 });
             }
@@ -109,9 +110,12 @@ function searchTransportationEventTicketOffers(params) {
             const offerAddOn = [];
             if (Array.isArray(offer.addOn)) {
                 for (const addOn of offer.addOn) {
-                    const productId = (_c = addOn.itemOffered) === null || _c === void 0 ? void 0 : _c.id;
+                    const productId = (_d = addOn.itemOffered) === null || _d === void 0 ? void 0 : _d.id;
                     if (typeof productId === 'string') {
-                        const productOffers = yield searchAddOns({ product: { id: productId } })(repos);
+                        const productOffers = yield searchAddOns({
+                            product: { id: productId },
+                            store: params.store
+                        })(repos);
                         offerAddOn.push(...productOffers);
                     }
                 }
@@ -130,7 +134,7 @@ function searchTransportationEventTicketOffers(params) {
 function searchScreeningEventTicketOffers(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         // イベント取得属性最適化(2023-01-23~)
         // const screeningEvent = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: params.eventId });
         const screeningEvent = params.event;
@@ -147,6 +151,7 @@ function searchScreeningEventTicketOffers(params) {
                 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 },
                     sort: params.sort
                 });
             }
@@ -224,7 +229,7 @@ function searchScreeningEventTicketOffers(params) {
             const offerAddOn = [];
             if (Array.isArray(offer.addOn)) {
                 for (const addOn of offer.addOn) {
-                    const productId = (_c = addOn.itemOffered) === null || _c === void 0 ? void 0 : _c.id;
+                    const productId = (_d = addOn.itemOffered) === null || _d === void 0 ? void 0 : _d.id;
                     if (typeof productId === 'string') {
                         const productOffers = yield searchAddOns({ product: { id: productId } })(repos);
                         offerAddOn.push(...productOffers);
@@ -326,7 +331,7 @@ function checkAvailability(params) {
  */
 function searchAddOns(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         let offers = [];
         const productId = (_a = params.product) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof productId === 'string') {
@@ -335,6 +340,7 @@ function searchAddOns(params) {
             if (typeof offerCatalogId === 'string') {
                 offers = yield repos.offer.findOffersByOfferCatalogId({
                     offerCatalog: { id: offerCatalogId },
+                    availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id },
                     sort: true
                 });
                 offers = offers.map((o) => {
@@ -358,7 +364,6 @@ function searchAddOns(params) {
 function searchEventTicketOffers(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const now = moment();
         let event;
         // イベント取得属性最適化(2023-01-23~)
@@ -384,6 +389,7 @@ function searchEventTicketOffers(params) {
                     const searchOffersResult = yield searchScreeningEventTicketOffers({
                         ids: params.ids,
                         event,
+                        store: params.store,
                         sort: params.sort
                     })(repos);
                     offers = searchOffersResult.ticketOffers;
@@ -393,6 +399,7 @@ function searchEventTicketOffers(params) {
                     const searchOffersResult = yield searchTransportationEventTicketOffers({
                         ids: params.ids,
                         event,
+                        store: params.store,
                         sort: params.sort
                     })(repos);
                     offers = searchOffersResult.ticketOffers;
@@ -401,14 +408,15 @@ function searchEventTicketOffers(params) {
                 else {
                     throw new factory.errors.NotImplemented(`'${event.typeOf}' not implemented`);
                 }
-                const specifiedStoreId = (_a = params.store) === null || _a === void 0 ? void 0 : _a.id;
-                if (typeof specifiedStoreId === 'string') {
-                    // アプリケーションが利用可能なオファーに絞る
-                    offers = offers.filter((o) => {
-                        return Array.isArray(o.availableAtOrFrom)
-                            && o.availableAtOrFrom.some((availableApplication) => availableApplication.id === specifiedStoreId);
-                    });
-                }
+                // store.idでのフィルターをmongoに移行(2023-01-27~)
+                // const specifiedStoreId = params.store?.id;
+                // if (typeof specifiedStoreId === 'string') {
+                //     // アプリケーションが利用可能なオファーに絞る
+                //     offers = offers.filter((o) => {
+                //         return Array.isArray(o.availableAtOrFrom)
+                //             && o.availableAtOrFrom.some((availableApplication) => availableApplication.id === specifiedStoreId);
+                //     });
+                // }
                 // 有効期間を適用
                 if (params.onlyValid === true) {
                     offers = offers.filter((o) => {
@@ -426,14 +434,17 @@ function searchEventTicketOffers(params) {
                 }
                 for (const offer of offers) {
                     if (Array.isArray(offer.addOn)) {
+                        // store.idでのフィルターをmongoに移行(2023-01-27~)
                         // addOnsに対しても利用可能アプリケーション設定を適用
-                        if (typeof specifiedStoreId === 'string') {
-                            // アプリケーションが利用可能なオファーに絞る
-                            offer.addOn = offer.addOn.filter((offer4addOn) => {
-                                return Array.isArray(offer4addOn.availableAtOrFrom)
-                                    && offer4addOn.availableAtOrFrom.some((availableApplication) => availableApplication.id === specifiedStoreId);
-                            });
-                        }
+                        // if (typeof specifiedStoreId === 'string') {
+                        //     // アプリケーションが利用可能なオファーに絞る
+                        //     offer.addOn = offer.addOn.filter((offer4addOn) => {
+                        //         return Array.isArray(offer4addOn.availableAtOrFrom)
+                        //             && offer4addOn.availableAtOrFrom.some(
+                        //                 (availableApplication) => availableApplication.id === specifiedStoreId
+                        //             );
+                        //     });
+                        // }
                         // addOnsに対しても有効期間を適用
                         if (params.onlyValid === true) {
                             offer.addOn = offer.addOn.filter((offer4addOn) => {

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