@chevre/domain 21.8.0-alpha.67 → 21.8.0-alpha.68

package/example/src/chevre/findItemListElementByCatalogId.ts

@@ -16,6 +16,13 @@ async function main() {
     );
     console.log(catalog);
     console.log(catalog.itemListElement.length);
+
+    const firstElement = await offerCatalogRepo.findFirstItemListElementById(
+        {
+            id: '0001'
+        }
+    );
+    console.log('firstElement:', firstElement);
 }
 
 main()

package/example/src/chevre/searchEventTicketOffers.ts

@@ -16,11 +16,12 @@ async function main() {
     });
     await client.connect();
 
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const eventRepo = new chevre.repository.Event(mongoose.connection);
     const priceSpecificationRepo = new chevre.repository.PriceSpecification(mongoose.connection);
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
+    const offerCatalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
     const offerRateLimitRepo = new chevre.repository.rateLimit.Offer(client);
     const productRepo = new chevre.repository.Product(mongoose.connection);
 
@@ -36,6 +37,7 @@ async function main() {
     })({
         event: eventRepo,
         offer: offerRepo,
+        offerCatalog: offerCatalogRepo,
         offerRateLimit: offerRateLimitRepo,
         priceSpecification: priceSpecificationRepo,
         product: productRepo

package/example/src/chevre/searchOffersByCatalog.ts

@@ -9,19 +9,21 @@ async function main() {
 
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
 
-    const { offers } = await offerRepo.searchByOfferCatalogIdWithSortIndex({
-        limit: 100,
+    const { offers, sortedOfferIds } = await offerRepo.searchByOfferCatalogIdWithSortIndex({
+        limit: 10,
         page: 1,
         // ids: ['xx', 'xxx', '1001', '901'],
-        offerCatalog: {
-            id: '0004'
+        subOfferCatalog: {
+            id: 'xxx'
         },
         excludeAppliesToMovieTicket: false,
         useIncludeInDataCatalog: true
     });
     // console.log(offers);
     console.log(offers.map((offer) => {
-        return `${offer.project?.id} ${offer.identifier} ${offer.priceSpecification?.price} ${offer.name?.ja} ${offer.id} ${offer.offerIndex}`;
+        const sortIndex = sortedOfferIds.findIndex((s) => s === offer.id);
+
+        return `${offer.project?.id} ${offer.identifier} ${offer.priceSpecification?.price} ${offer.name?.ja} ${offer.id} ${offer.offerIndex} ${sortIndex}`;
     }));
     console.log(offers.length);
     console.log('USE_AGGREGATE_OFFERS_AS_PRIMARY:', process.env.USE_AGGREGATE_OFFERS_AS_PRIMARY);

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

@@ -28,7 +28,10 @@ export declare class MongoRepository {
      * 必ずカタログデータから単価オファーIDを参照する
      */
     searchAllByOfferCatalogId(params: {
-        offerCatalog: {
+        subOfferCatalog: {
+            /**
+             * サブカタログID
+             */
             id: string;
         };
         projection?: IProjection;
@@ -44,7 +47,10 @@ export declare class MongoRepository {
          * 指定したIDの単価オファーだけ取得
          */
         ids: string[];
-        offerCatalog: {
+        subOfferCatalog: {
+            /**
+             * サブカタログID
+             */
             id: string;
         };
         availableAtOrFrom?: {
@@ -64,7 +70,10 @@ export declare class MongoRepository {
      * カタログ内ソートインデックスはsortedOfferIdsで判断する
      */
     searchByOfferCatalogIdWithSortIndex(params: {
-        offerCatalog: {
+        subOfferCatalog: {
+            /**
+             * サブカタログID
+             */
             id: string;
         };
         availableAtOrFrom?: {

package/lib/chevre/repo/offer.js

@@ -441,7 +441,7 @@ class MongoRepository {
      */
     searchAllByOfferCatalogId(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = [{ $match: { _id: { $eq: params.offerCatalog.id } } }];
+            const matchStages = [{ $match: { _id: { $eq: params.subOfferCatalog.id } } }];
             const itemListElements = yield this.offerCatalogModel.aggregate([
                 { $unwind: '$itemListElement' },
                 ...matchStages,
@@ -483,7 +483,7 @@ class MongoRepository {
                 aggregateOfferIds = searchDistinctAggregateOfferIdsResult;
             }
             // aggregateで再実装(2023-01-26~)
-            const matchStages = [{ $match: { _id: { $eq: params.offerCatalog.id } } }];
+            const matchStages = [{ $match: { _id: { $eq: params.subOfferCatalog.id } } }];
             if (Array.isArray(aggregateOfferIds)) {
                 matchStages.push({ $match: { 'itemListElement.id': { $exists: true, $in: aggregateOfferIds } } });
             }
@@ -548,7 +548,7 @@ class MongoRepository {
             //     aggregateOfferIds = searchDistinctAggregateOfferIdsResult;
             // }
             // aggregateで再実装(2023-01-26~)
-            const matchStages = [{ $match: { _id: { $eq: params.offerCatalog.id } } }];
+            const matchStages = [{ $match: { _id: { $eq: params.subOfferCatalog.id } } }];
             // if (Array.isArray(aggregateOfferIds)) {
             //     matchStages.push({ $match: { 'itemListElement.id': { $exists: true, $in: aggregateOfferIds } } });
             // }
@@ -569,7 +569,7 @@ class MongoRepository {
             let offers = [];
             if (sortedOfferIds.length > 0) {
                 const searchOffersConditions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (params.useIncludeInDataCatalog)
-                    ? { includedInDataCatalog: { id: { $in: [params.offerCatalog.id] } } }
+                    ? { includedInDataCatalog: { id: { $in: [params.subOfferCatalog.id] } } }
                     : { parentOffer: { id: { $in: sortedOfferIds } } }), (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                     ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } }
                     : undefined), { priceSpecification: {

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

@@ -82,12 +82,22 @@ export declare class MongoRepository {
         };
     }): Promise<import("mongodb").UpdateResult | undefined>;
     search(params: factory.offerCatalog.ISearchConditions): Promise<IAggregatedOfferCatalog[]>;
+    /**
+     * 強制的に親カタログのみ検索する
+     */
+    searchParentCatalogsForcibly(params: factory.offerCatalog.ISearchConditions): Promise<IAggregatedOfferCatalog[]>;
     findItemListElementById(params: {
         id: string;
         project: {
             id: string;
         };
     }): Promise<Pick<factory.offerCatalog.IOfferCatalog, 'itemListElement'>>;
+    /**
+     * 一つ目のitemListElementを取得する
+     */
+    findFirstItemListElementById(params: {
+        id: string;
+    }): Promise<factory.offerCatalog.IItemListElement>;
     deleteById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/offerCatalog.js

@@ -282,6 +282,14 @@ class MongoRepository {
             return aggregate.exec();
         });
     }
+    /**
+     * 強制的に親カタログのみ検索する
+     */
+    searchParentCatalogsForcibly(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.search(Object.assign(Object.assign({}, params), { itemListElement: Object.assign(Object.assign({}, params.itemListElement), { typeOf: { $eq: factory.offerType.Offer } }) }));
+        });
+    }
     findItemListElementById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.offerCatalogModel.findOne({
@@ -295,6 +303,30 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    /**
+     * 一つ目のitemListElementを取得する
+     */
+    findFirstItemListElementById(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const aggregate = this.offerCatalogModel.aggregate([
+                {
+                    $match: { _id: { $eq: params.id } }
+                },
+                {
+                    $project: {
+                        firstElement: { $first: '$itemListElement' }
+                    }
+                }
+            ]);
+            const catalogs = yield aggregate.exec();
+            const firstElement = (_a = catalogs.shift()) === null || _a === void 0 ? void 0 : _a.firstElement;
+            if (firstElement === undefined) {
+                throw new factory.errors.NotFound(this.offerCatalogModel.modelName);
+            }
+            return firstElement;
+        });
+    }
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.offerCatalogModel.findOneAndRemove({

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

@@ -1,12 +1,14 @@
 import { MongoRepository as ActionRepo } from '../../../repo/action';
 import { MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PlaceRepo } from '../../../repo/place';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
 export type IAggregateOperation<T> = (repos: {
     action: ActionRepo;
     event: EventRepo;
     offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
     place: PlaceRepo;
     product: ProductRepo;
 }) => Promise<T>;

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

@@ -1,5 +1,6 @@
 import { IMinimizedIndividualEvent } from '../../../repo/event';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
 import * as factory from '../../../factory';
 /**
@@ -9,6 +10,7 @@ import * as factory from '../../../factory';
 export declare function findEventOffers(params: {
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
 }): (repos: {
-    product: ProductRepo;
     offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
+    product: ProductRepo;
 }) => Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;

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

@@ -24,9 +24,16 @@ function findEventOffers(params) {
             const eventOffers = params.event.offers;
             if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
                 const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
-                if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
+                const offerCatalogId = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id;
+                if (typeof offerCatalogId === 'string') {
+                    // サブカタログIDを決定
+                    let subOfferCatalogId = offerCatalogId;
+                    const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: offerCatalogId });
+                    if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
+                        subOfferCatalogId = offerCatalogFirstElement.id;
+                    }
                     const { offers } = yield repos.offer.searchAllByOfferCatalogId({
-                        offerCatalog: { id: eventService.hasOfferCatalog.id }
+                        subOfferCatalog: { id: subOfferCatalogId }
                     });
                     availableOffers = offers;
                 }

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

@@ -1,5 +1,6 @@
 import { MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
 import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
@@ -8,6 +9,7 @@ interface ISearchEventTicketOffersRepos {
     event: EventRepo;
     priceSpecification: PriceSpecificationRepo;
     offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
     offerRateLimit: OfferRateLimitRepo;
     product: ProductRepo;
 }

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

@@ -26,6 +26,12 @@ function searchTicketOffersByItemOffered(params) {
         if (typeof catalogId !== 'string') {
             throw new factory.errors.NotFound('itemOffered.hasOfferCatalog');
         }
+        // サブカタログIDを決定
+        let subOfferCatalogId = catalogId;
+        const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: catalogId });
+        if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
+            subOfferCatalogId = offerCatalogFirstElement.id;
+        }
         if (params.withSortIndex) {
             // addSortIndexの場合はid指定廃止(2023-09-13~)
             if (Array.isArray(params.ids)) {
@@ -33,7 +39,7 @@ function searchTicketOffersByItemOffered(params) {
             }
             const { offers, sortedOfferIds } = yield repos.offer.searchByOfferCatalogIdWithSortIndex({
                 // ids: params.ids,
-                offerCatalog: { id: catalogId },
+                subOfferCatalog: { id: subOfferCatalogId },
                 availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
                 unacceptedPaymentMethod: params.unacceptedPaymentMethod,
                 excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
@@ -51,7 +57,7 @@ function searchTicketOffersByItemOffered(params) {
             }
             const { offers } = yield repos.offer.searchByIdsAndOfferCatalogId({
                 ids: params.ids,
-                offerCatalog: { id: catalogId },
+                subOfferCatalog: { id: subOfferCatalogId },
                 availableAtOrFrom: { id: (_e = params.store) === null || _e === void 0 ? void 0 : _e.id },
                 unacceptedPaymentMethod: params.unacceptedPaymentMethod,
                 excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,

package/lib/chevre/service/offer/product/searchProductOffers.d.ts

@@ -1,5 +1,6 @@
 import * as factory from '../../../factory';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
 type ITicketOffer = factory.product.ITicketOffer & {
     parentOffer?: {
@@ -27,6 +28,7 @@ export declare function searchProductOffers(params: {
     page?: number;
 }): (repos: {
     offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
     product: ProductRepo;
 }) => Promise<ITicketOffer[]>;
 export {};

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

@@ -15,6 +15,7 @@ const settings_1 = require("../../../settings");
 /**
  * プロダクトオファーを検索する
  */
+// tslint:disable-next-line:max-func-body-length
 function searchProductOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -24,6 +25,12 @@ function searchProductOffers(params) {
         if (typeof offerCatalogId !== 'string') {
             return [];
         }
+        // サブカタログIDを決定
+        let subOfferCatalogId = offerCatalogId;
+        const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: offerCatalogId });
+        if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
+            subOfferCatalogId = offerCatalogFirstElement.id;
+        }
         let offers;
         let sortedOfferIds;
         if (params.addSortIndex) {
@@ -33,7 +40,7 @@ function searchProductOffers(params) {
             }
             const searchByOfferCatalogIdResult = yield repos.offer.searchByOfferCatalogIdWithSortIndex({
                 // ids: params.ids,
-                offerCatalog: { id: offerCatalogId },
+                subOfferCatalog: { id: subOfferCatalogId },
                 excludeAppliesToMovieTicket: false,
                 limit: params.limit,
                 page: params.page,
@@ -51,7 +58,7 @@ function searchProductOffers(params) {
             }
             const searchByOfferCatalogIdResult = yield repos.offer.searchByIdsAndOfferCatalogId({
                 ids: params.ids,
-                offerCatalog: { id: offerCatalogId },
+                subOfferCatalog: { id: subOfferCatalogId },
                 excludeAppliesToMovieTicket: false,
                 limit: params.limit,
                 page: params.page,

package/lib/chevre/service/offer/product.d.ts

@@ -58,6 +58,7 @@ export declare function search(params: {
     useIncludeInDataCatalog: boolean;
 }): (repos: {
     offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
     product: ProductRepo;
 }) => Promise<{
     offers: factory.product.ITicketOffer[];

package/lib/chevre/service/task/aggregateUseActionsOnEvent.js

@@ -14,6 +14,7 @@ const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const event_1 = require("../../repo/event");
 const offer_1 = require("../../repo/offer");
+const offerCatalog_1 = require("../../repo/offerCatalog");
 const place_1 = require("../../repo/place");
 const product_1 = require("../../repo/product");
 const AggregationService = require("../aggregation");
@@ -29,6 +30,7 @@ function call(data) {
             action: new action_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
             offer: new offer_1.MongoRepository(settings.connection),
+            offerCatalog: new offerCatalog_1.MongoRepository(settings.connection),
             place: new place_1.MongoRepository(settings.connection),
             product: new product_1.MongoRepository(settings.connection)
         });

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.329.0-alpha.15",
-    "@cinerino/sdk": "3.167.0-alpha.6",
+    "@chevre/factory": "4.329.0",
+    "@cinerino/sdk": "3.167.0-alpha.9",
     "@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.8.0-alpha.67"
+  "version": "21.8.0-alpha.68"
 }

package/example/src/chevre/sync2aggregateOffer.ts

@@ -1,27 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const offerRepo = new chevre.repository.Offer(mongoose.connection);
-
-    const result = await offerRepo.sync2aggregateOffer({
-        id: {
-            $in: ['1001']
-        },
-        project: {
-            id: String(process.env.PROJECT_ID)
-        },
-        isDeleted: false,
-        typeOf: chevre.factory.offerType.AggregateOffer
-    });
-    console.log(result);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/example/src/chevre/syncAggregateOffer.ts

@@ -1,25 +0,0 @@
-// tslint:disable:no-console
-// import * as redis from 'redis';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const offerRepo = new chevre.repository.Offer(mongoose.connection);
-
-    const result = await offerRepo.sync2aggregateOffer({
-        project: { id: project.id },
-        identifier: { $in: ['COA-120-15'] },
-        isDeleted: false,
-        typeOf: chevre.factory.offerType.Offer
-    });
-    console.log(result);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);