@chevre/domain 21.9.0-alpha.8 → 21.9.0-alpha.9

package/example/src/chevre/searchEventTicketOffers.ts

@@ -28,6 +28,7 @@ async function main() {
     const { ticketOffers } = await chevre.service.offer.event.searchEventTicketOffers({
         event: { id: 'ale6qiedq' },
         onlyValid: true,
+        priceSpecification: {},
         validateOfferRateLimit: true,
         addSortIndex: true,
         useIncludeInDataCatalog: true,

package/example/src/chevre/searchOffersByCatalog.ts

@@ -14,11 +14,17 @@ async function main() {
         page: 1,
         // ids: ['xx', 'xxx', '1001', '901'],
         subOfferCatalog: {
-            id: 'xxx',
-            isOfferCatalogItem: true
+            id: '0001',
+            isOfferCatalogItem: false
         },
         excludeAppliesToMovieTicket: false,
-        useIncludeInDataCatalog: false
+        useIncludeInDataCatalog: false,
+        priceSpecification: {
+            // appliesToMovieTicket: {
+            //     serviceOutput: { typeOf: { $eq: 'SurfRock' } },
+            //     serviceType: { $exists: true }
+            // }
+        }
     });
     // console.log(offers);
     console.log(offers.map((offer) => {

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

@@ -84,6 +84,10 @@ export declare class MongoRepository {
         };
         unacceptedPaymentMethod?: string[];
         excludeAppliesToMovieTicket: boolean;
+        /**
+         * 適用決済カード条件
+         */
+        priceSpecification: Pick<factory.unitPriceOffer.IPriceSpecificationSearchConditions, 'appliesToMovieTicket'>;
         onlyValid?: boolean;
         useIncludeInDataCatalog: boolean;
         limit?: number;

package/lib/chevre/repo/offer.js

@@ -507,7 +507,7 @@ class MongoRepository {
      * カタログ内ソートインデックスはsortedOfferIdsで判断する
      */
     searchByOfferCatalogIdWithSortIndex(params) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
             const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog({
                 id: params.subOfferCatalog.id,
@@ -515,23 +515,30 @@ class MongoRepository {
             });
             let offers = [];
             if (sortedOfferIds.length > 0) {
-                const searchOffersConditions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (params.useIncludeInDataCatalog)
+                const appliesToMovieTicketServiceOutputTypeOfEq = (_d = (_c = (_b = (_a = params.priceSpecification) === null || _a === void 0 ? void 0 : _a.appliesToMovieTicket) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.typeOf) === null || _d === void 0 ? void 0 : _d.$eq;
+                const appliesToMovieTicketServiceTypeExists = (_g = (_f = (_e = params.priceSpecification) === null || _e === void 0 ? void 0 : _e.appliesToMovieTicket) === null || _f === void 0 ? void 0 : _f.serviceType) === null || _g === void 0 ? void 0 : _g.$exists;
+                // 適用決済カード条件なしのみを検索するかどうか
+                const onlyNoAppliesToMovieTicket = params.excludeAppliesToMovieTicket || (appliesToMovieTicketServiceTypeExists === false);
+                const onlyAppliesToMovieTicket = !params.excludeAppliesToMovieTicket && (appliesToMovieTicketServiceTypeExists === true);
+                const priceSpecificationConditions = {
+                    appliesToMovieTicket: Object.assign(Object.assign({ serviceOutput: {
+                            typeOf: Object.assign(Object.assign({}, (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
+                                // 利用不可決済方法区分条件を追加(2023-02-21~)
+                                ? { $nin: params.unacceptedPaymentMethod }
+                                : undefined), (typeof appliesToMovieTicketServiceOutputTypeOfEq === 'string')
+                                ? { $eq: appliesToMovieTicketServiceOutputTypeOfEq }
+                                : undefined)
+                        } }, (onlyNoAppliesToMovieTicket)
+                        ? { serviceType: { $exists: false } }
+                        : undefined), (onlyAppliesToMovieTicket)
+                        ? { serviceType: { $exists: true } }
+                        : undefined)
+                };
+                const searchOffersConditions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ priceSpecification: priceSpecificationConditions, onlyValid: params.onlyValid === true }, (params.useIncludeInDataCatalog)
                     ? { includedInDataCatalog: { id: { $in: [params.subOfferCatalog.id] } } }
-                    : { parentOffer: { id: { $in: sortedOfferIds } } }), (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                    : { parentOffer: { id: { $in: sortedOfferIds } } }), (typeof ((_h = params.availableAtOrFrom) === null || _h === void 0 ? void 0 : _h.id) === 'string')
                     ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } } // store.idでのフィルターをmongoで処理(2023-01-27~)
-                    : undefined), { priceSpecification: {
-                        appliesToMovieTicket: Object.assign(Object.assign({}, (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
-                            ? {
-                                serviceOutput: {
-                                    typeOf: { $nin: params.unacceptedPaymentMethod }
-                                }
-                            }
-                            : undefined), (params.excludeAppliesToMovieTicket)
-                            ? {
-                                serviceType: { $exists: false }
-                            }
-                            : undefined)
-                    }, onlyValid: params.onlyValid === true }), (typeof params.limit === 'number' && typeof params.page === 'number')
+                    : undefined), (typeof params.limit === 'number' && typeof params.page === 'number')
                     // 明示的なソート指定を調整(決して重複しない属性が相応)(2023-09-07~)
                     ? { sort: { identifier: factory.sortType.Ascending } }
                     : undefined), (typeof params.limit === 'number') ? { limit: params.limit } : undefined), (typeof params.page === 'number') ? { page: params.page } : undefined);

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

@@ -82,9 +82,6 @@ export declare class MongoRepository {
         };
     }): Promise<import("mongodb").UpdateResult | undefined>;
     search(params: factory.offerCatalog.ISearchConditions): Promise<IAggregatedOfferCatalog[]>;
-    /**
-     * 強制的に親カタログのみ検索する
-     */
     findItemListElementById(params: {
         id: string;
         project: {

package/lib/chevre/repo/offerCatalog.js

@@ -282,20 +282,6 @@ class MongoRepository {
             return aggregate.exec();
         });
     }
-    /**
-     * 強制的に親カタログのみ検索する
-     */
-    // public async searchParentCatalogsForcibly(
-    //     params: factory.offerCatalog.ISearchConditions
-    // ): Promise<IAggregatedOfferCatalog[]> {
-    //     return this.search({
-    //         ...params,
-    //         itemListElement: {
-    //             ...params.itemListElement,
-    //             typeOf: { $eq: factory.offerType.Offer }
-    //         }
-    //     });
-    // }
     findItemListElementById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.offerCatalogModel.findOne({

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

@@ -118,6 +118,7 @@ function addReservations(params) {
                 event: { id: event.id },
                 // 対応アプリケーション条件追加(2023-01-27~)
                 store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
+                priceSpecification: {},
                 onlyValid: true,
                 addSortIndex: false,
                 validateOfferRateLimit: true,

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

@@ -237,6 +237,7 @@ function validateAcceptedOffers(params) {
             ids: offerIds,
             event: { id: params.event.id },
             store: params.store,
+            priceSpecification: {},
             onlyValid: true,
             addSortIndex: false,
             validateOfferRateLimit: true,

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

@@ -39,12 +39,7 @@ declare function searchEventTicketOffers(params: {
      * 有効期間内のみかどうか
      */
     onlyValid: boolean;
-    /**
-     * どの決済方法に対して
-     */
-    /**
-     * COAムビチケ券種もほしい場合に指定
-     */
+    priceSpecification: Pick<factory.unitPriceOffer.IPriceSpecificationSearchConditions, 'appliesToMovieTicket'>;
     limit?: number;
     page?: number;
     addSortIndex: boolean;

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

@@ -45,6 +45,7 @@ function searchTicketOffersByItemOffered(params) {
                 availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
                 unacceptedPaymentMethod: params.unacceptedPaymentMethod,
                 excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
+                priceSpecification: params.priceSpecification,
                 onlyValid: params.onlyValid === true,
                 useIncludeInDataCatalog: params.useIncludeInDataCatalog,
                 limit: params.limit,
@@ -115,6 +116,7 @@ function searchEventTicketOffersByEvent(params) {
             onlyValid: params.onlyValid,
             unacceptedPaymentMethod,
             excludeAppliesToMovieTicket,
+            priceSpecification: params.priceSpecification,
             withSortIndex: params.addSortIndex,
             useIncludeInDataCatalog: params.useIncludeInDataCatalog
         })(repos);
@@ -276,6 +278,7 @@ function searchEventTicketOffers(params) {
                     ids: params.ids,
                     event,
                     store: params.store,
+                    priceSpecification: params.priceSpecification,
                     limit: params.limit,
                     page: params.page,
                     addSortIndex: params.addSortIndex,

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

@@ -44,6 +44,7 @@ function searchProductOffers(params) {
                 // ids: params.ids,
                 subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
                 excludeAppliesToMovieTicket: false,
+                priceSpecification: {},
                 limit: params.limit,
                 page: params.page,
                 onlyValid: params.onlyValid === true,

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.9.0-alpha.8"
+  "version": "21.9.0-alpha.9"
 }