@chevre/domain 21.9.0-alpha.16 → 21.9.0-alpha.17

package/example/src/chevre/syncCatalogs2aggregateOffers.ts

@@ -11,11 +11,12 @@ mongoose.Model.on('index', (...args) => {
 // tslint:disable-next-line:max-func-body-length
 async function main() {
     const now = new Date();
+    console.log('now:', now);
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
     const offerCatalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
-    const taskRepo = new chevre.repository.Task(mongoose.connection);
+    // const taskRepo = new chevre.repository.Task(mongoose.connection);
 
     const cursor = offerCatalogRepo.getCursor(
         {
@@ -53,24 +54,24 @@ async function main() {
             console.log('already synced.', offerCatalog.project.id, offerCatalog.id, offerCatalog.identifier, i);
         } else {
             console.log('creating task...', offerCatalog.project.id, offerCatalog.id, offerCatalog.identifier, i);
-            const syncTaskData: chevre.factory.task.onResourceUpdated.IData4common = {
-                typeOf: 'OfferCatalog',
-                id: [String(offerCatalog.id)],
-                isNew: false,
-                isDeleted: false,
-                project: { id: offerCatalog.project.id },
-                useInform: false
-            };
-            const syncTask: chevre.factory.task.IAttributes<chevre.factory.taskName.OnResourceUpdated> = {
-                data: syncTaskData,
-                executionResults: [],
-                name: chevre.factory.taskName.OnResourceUpdated,
-                numberOfTried: 0,
-                project: offerCatalog.project,
-                remainingNumberOfTries: 1,
-                runsAt: now,
-                status: chevre.factory.taskStatus.Ready
-            };
+            // const syncTaskData: chevre.factory.task.onResourceUpdated.IData4common = {
+            //     typeOf: 'OfferCatalog',
+            //     id: [String(offerCatalog.id)],
+            //     isNew: false,
+            //     isDeleted: false,
+            //     project: { id: offerCatalog.project.id },
+            //     useInform: false
+            // };
+            // const syncTask: chevre.factory.task.IAttributes<chevre.factory.taskName.OnResourceUpdated> = {
+            //     data: syncTaskData,
+            //     executionResults: [],
+            //     name: chevre.factory.taskName.OnResourceUpdated,
+            //     numberOfTried: 0,
+            //     project: offerCatalog.project,
+            //     remainingNumberOfTries: 1,
+            //     runsAt: now,
+            //     status: chevre.factory.taskStatus.Ready
+            // };
             // await taskRepo.saveMany([syncTask], { emitImmediately: false });
             updateCount += 1;
             console.log('task saved.', offerCatalog.project.id, offerCatalog.id, offerCatalog.identifier, i);

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

@@ -40,10 +40,10 @@ export declare class MongoRepository {
         offers: IUnitPriceOfferFromAggregateOffer[];
     }>;
     /**
-     * 単価オファーIDとカタログIDで単価オファーを検索する
-     * 必ずカタログデータから単価オファーIDを参照する
+     * 単価オファーIDとカタログIDで単価オファーを全て検索する
+     * 単価オファーIDを一定数指定する想定なのでpagingは不要
      */
-    searchByIdsAndOfferCatalogId(params: {
+    searchAllByIdsAndOfferCatalogId(params: {
         /**
          * 指定したIDの単価オファーだけ取得
          */
@@ -61,8 +61,6 @@ export declare class MongoRepository {
         unacceptedPaymentMethod?: string[];
         excludeAppliesToMovieTicket: boolean;
         onlyValid?: boolean;
-        limit?: number;
-        page?: number;
         projection?: IProjection;
     }): Promise<{
         offers: IUnitPriceOfferFromAggregateOffer[];

package/lib/chevre/repo/offer.js

@@ -21,12 +21,14 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
+const createDebug = require("debug");
 const mongoose_1 = require("mongoose");
 const uniqid = require("uniqid");
 const factory = require("../factory");
 const aggregateOffer_1 = require("./mongoose/schemas/aggregateOffer");
 const offerCatalog_1 = require("./mongoose/schemas/offerCatalog");
 const offerCatalogItem_1 = require("./mongoose/schemas/offerCatalogItem");
+const debug = createDebug('chevre-domain:repo:offer');
 const OFFERS_ARRAY_INDEX_NAME = 'offerIndex';
 /**
  * 単価オファーリポジトリ
@@ -474,29 +476,33 @@ class MongoRepository {
         });
     }
     /**
-     * 単価オファーIDとカタログIDで単価オファーを検索する
-     * 必ずカタログデータから単価オファーIDを参照する
+     * 単価オファーIDとカタログIDで単価オファーを全て検索する
+     * 単価オファーIDを一定数指定する想定なのでpagingは不要
      */
-    searchByIdsAndOfferCatalogId(params) {
+    searchAllByIdsAndOfferCatalogId(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const unitPriceOfferIds = params.ids;
-            let aggregateOfferIds; // 集計オファーIDでフィルターする場合
-            if (Array.isArray(unitPriceOfferIds)) {
-                // 解釈を集計オファーIDに変更する必要がある(2023-09-11~)
-                // 単価オファーIDリスト→集計オファーIDに変換→カタログ条件にセット
-                const searchDistinctAggregateOfferIdsResult = yield this.aggregateOfferModel.distinct('_id', { 'offers.id': { $in: unitPriceOfferIds } })
-                    .exec();
-                aggregateOfferIds = searchDistinctAggregateOfferIdsResult;
+            if (!Array.isArray(params.ids) || params.ids.length === 0) {
+                throw new factory.errors.ArgumentNull('offer.ids');
+            }
+            // 解釈を集計オファーIDに変更する必要がある(2023-09-11~)
+            // 単価オファーIDリスト→集計オファーIDに変換→カタログ条件にセット
+            const aggregateOfferIds = yield this.aggregateOfferModel.distinct('_id', { 'offers.id': { $in: params.ids } })
+                .exec();
+            if (aggregateOfferIds.length === 0) {
+                throw new factory.errors.NotFound(factory.offerType.AggregateOffer);
             }
-            const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog(Object.assign({ id: params.subOfferCatalog.id, isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem }, (Array.isArray(aggregateOfferIds)) ? { itemListElementIds: aggregateOfferIds } : undefined));
+            const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog({
+                id: params.subOfferCatalog.id,
+                isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem,
+                itemListElementIds: aggregateOfferIds
+            });
             let offers = [];
             if (sortedOfferIds.length > 0) {
-                const searchOffersConditions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ 
+                debug('searchAllByIdsAndOfferCatalogId:searching offers...,sortedOfferIds:', sortedOfferIds, 'ids:', params.ids);
+                const searchOffersConditions = Object.assign({ 
                     // aggregateOffer.idで検索する(2023-09-09~)
-                    parentOffer: { id: { $in: sortedOfferIds } } }, (Array.isArray(unitPriceOfferIds)) ? { id: { $in: unitPriceOfferIds } } : undefined), (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                    ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } }
-                    : undefined), { priceSpecification: {
+                    parentOffer: { id: { $in: sortedOfferIds } }, id: { $in: params.ids }, priceSpecification: {
                         appliesToMovieTicket: Object.assign(Object.assign({}, (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
                             ? {
                                 serviceOutput: {
@@ -508,10 +514,16 @@ class MongoRepository {
                                 serviceType: { $exists: false }
                             }
                             : undefined)
-                    }, onlyValid: params.onlyValid === true }), (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);
+                    }, onlyValid: params.onlyValid === true }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                    ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } } // store.idでのフィルターをmongoで処理(2023-01-27~)
+                    : 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
+                );
                 offers = yield this.search(searchOffersConditions, params.projection);
             }
             return { offers };

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

@@ -58,15 +58,15 @@ function searchTicketOffersByItemOffered(params) {
             if (!Array.isArray(params.ids)) {
                 throw new factory.errors.ArgumentNull('ids', 'ids must be specified');
             }
-            const { offers } = yield repos.offer.searchByIdsAndOfferCatalogId({
+            const { offers } = yield repos.offer.searchAllByIdsAndOfferCatalogId({
                 ids: params.ids,
                 subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
                 availableAtOrFrom: { id: (_e = params.store) === null || _e === void 0 ? void 0 : _e.id },
                 unacceptedPaymentMethod: params.unacceptedPaymentMethod,
                 excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
-                onlyValid: params.onlyValid === true,
-                limit: params.limit,
-                page: params.page
+                onlyValid: params.onlyValid === true
+                // limit: params.limit,
+                // page: params.page
             });
             return { availableOffers: offers };
         }

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

@@ -59,12 +59,12 @@ function searchProductOffers(params) {
             if (!Array.isArray(params.ids)) {
                 throw new factory.errors.ArgumentNull('ids', 'ids must be specified');
             }
-            const searchByOfferCatalogIdResult = yield repos.offer.searchByIdsAndOfferCatalogId({
+            const searchByOfferCatalogIdResult = yield repos.offer.searchAllByIdsAndOfferCatalogId({
                 ids: params.ids,
                 subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
                 excludeAppliesToMovieTicket: false,
-                limit: params.limit,
-                page: params.page,
+                // limit: params.limit,
+                // page: params.page,
                 onlyValid: params.onlyValid === true,
                 availableAtOrFrom: params.availableAt
             });

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

@@ -19,7 +19,6 @@ const placeOrderInProgress_1 = require("../transaction/placeOrderInProgress");
 const factory_1 = require("./product/factory");
 const searchProductOffers_1 = require("./product/searchProductOffers");
 exports.ERROR_MESSAGE_ALREADY_REGISTERED = 'Already registered';
-// export { searchProductOffers };
 /**
  * プロダクトオファーを検索する
  */
@@ -60,43 +59,17 @@ function search(params) {
                 }
             }
         }
-        // let offers: factory.product.ITicketOffer[] = [];
         const offers = yield (0, searchProductOffers_1.searchProductOffers)({
             ids: params.ids,
             itemOffered: { id: params.itemOffered.id },
             availableAt: params.availableAt,
             onlyValid: params.onlyValid,
             addSortIndex: params.addSortIndex,
-            useIncludeInDataCatalog: params.useIncludeInDataCatalog
+            useIncludeInDataCatalog: params.useIncludeInDataCatalog,
+            limit: params.limit,
+            page: params.page
         })(repos);
         return { offers, product };
-        // Mongoへ移行(2023-03-01~)
-        // 店舗条件によって対象を絞る
-        // const storeId = params.availableAt?.id;
-        // if (typeof storeId === 'string') {
-        //     // アプリケーションが利用可能なオファーに絞る
-        //     offers = offers.filter((o) => {
-        //         return Array.isArray(o.availableAtOrFrom)
-        //             && o.availableAtOrFrom.some((availableApplication) => availableApplication.id === storeId);
-        //     });
-        // }
-        // Mongoへ移行(2023-03-01~)
-        // 有効期間を適用
-        // if (params.onlyValid === true) {
-        //     offers = offers.filter((o) => {
-        //         let isValid = true;
-        //         if (o.validFrom !== undefined && moment(o.validFrom)
-        //             .isAfter(now)) {
-        //             isValid = false;
-        //         }
-        //         if (o.validThrough !== undefined && moment(o.validThrough)
-        //             .isBefore(now)) {
-        //             isValid = false;
-        //         }
-        //         return isValid;
-        //     });
-        // }
-        // return offers;
     });
 }
 exports.search = search;

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@chevre/factory": "4.330.0",
-    "@cinerino/sdk": "3.169.0-alpha.1",
+    "@cinerino/sdk": "3.169.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -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.16"
+  "version": "21.9.0-alpha.17"
 }