@chevre/domain 22.5.0-alpha.0 → 22.5.0-alpha.10

package/example/src/chevre/migrateProductHasOfferCatalog.ts

@@ -0,0 +1,80 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
+
+    const cursor = productRepo.getCursor(
+        {
+            typeOf: { $exists: true },
+            'hasOfferCatalog.id': { $exists: true }
+        },
+        {
+            project: 1,
+            typeOf: 1,
+            productID: 1,
+            hasOfferCatalog: 1,
+            id: { $toString: '$_id' }
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const product: Pick<chevre.factory.product.IProduct, 'hasOfferCatalog' | 'productID' | 'project' | 'typeOf' | 'id'> = doc;
+        // console.log(product);
+        const { hasOfferCatalog } = product;
+        if (typeof hasOfferCatalog?.id !== 'string') {
+            throw new Error(`${product.project.id} ${product.productID} has no catalog`);
+        }
+        if (typeof product.id !== 'string') {
+            throw new Error(`${product.project.id} ${product.productID} has no id`);
+        }
+
+        const alreadyMigrated = Array.isArray(hasOfferCatalog?.itemListElement)
+            && hasOfferCatalog?.itemListElement.length === 1
+            && hasOfferCatalog?.id === hasOfferCatalog.itemListElement[0].id;
+        if (alreadyMigrated) {
+            console.log(
+                'already exist.',
+                product.project.id,
+                product.typeOf,
+                product.id, product.productID, i, updateCount
+            );
+        } else {
+            updateCount += 1;
+            console.log(
+                'updating...',
+                product.project.id,
+                product.typeOf,
+                product.id, product.productID, i, updateCount
+            );
+            await productRepo.migrateHasOfferCatalogItemListElement({
+                id: product.id,
+                hasOfferCatalog: { id: hasOfferCatalog.id }
+            });
+            console.log(
+                'updated.',
+                product.project.id,
+                product.typeOf,
+                product.id, product.productID, i, updateCount
+            );
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(updateCount, 'docs updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/projectFields.ts

@@ -8,15 +8,15 @@ const project = { id: String(process.env.PROJECT_ID) };
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const repo = await chevre.repository.Task.createInstance(mongoose.connection);
+    const repo = await chevre.repository.OfferCatalogItem.createInstance(mongoose.connection);
 
     const docs = await repo.projectFields(
         {
-            limit: 1,
+            limit: 10,
             page: 1,
             project: { id: { $eq: project.id } }
         },
-        ['id', 'identifier', 'data']
+        ['relatedOffer']
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(docs, { depth: null });

package/example/src/chevre/searchEventHasOfferCatalog.ts

@@ -0,0 +1,43 @@
+// tslint:disable:no-console
+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);
+
+    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
+
+    const event = (await eventRepo.projectEventFields(
+        {
+            id: { $eq: 'bm0f0cadm' },
+            typeOf: chevre.factory.eventType.ScreeningEvent,
+            project: { id: { $eq: project.id } }
+        },
+        ['offers.itemOffered.id']
+    )).shift();
+    console.log('event:', event);
+    if (event === undefined) {
+        throw new Error('event not found');
+    }
+    const productId = event.offers.itemOffered.id;
+    if (typeof productId !== 'string') {
+        throw new Error('offers.itemOffered.id undefined');
+    }
+    const catalogs = await productRepo.aggregateHasOfferCatalog(
+        {
+            id: productId,
+            limit: 10,
+            page: 1
+        }
+    );
+    console.log(catalogs);
+    console.log(catalogs.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/searchOfferCatalogItemListElement.ts

@@ -0,0 +1,26 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const PROJECT_ID = process.env.PROJECT_ID;
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const offerCatalogRepo = await chevre.repository.OfferCatalog.createInstance(mongoose.connection);
+
+    const result = await offerCatalogRepo.searchItemListElement({
+        id: { $in: ['blpj322ni', 'blpc770py', 'xxxx', 'blos0d5gu'] },
+        itemListElement: { id: { $in: ['xxx', '65669285c7b871dba60ed72e', '65669285c7b871dba60ed742', '1008'] } }
+    });
+    console.log(result);
+    console.log(result.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/searchOfferCatalogItems.ts

@@ -18,10 +18,11 @@ async function main() {
 
     const result = await (await chevre.service.offer.createService()).event.searchOfferCatalogItems({
         event: {
-            id: 'cllkq475u'
+            id: 'bm0f0cadm'
         },
         limit: 10,
-        page: 1
+        page: 1,
+        options: { includedInDataCatalog: { id: 'blpj322ni' } }
     })({
         event: eventRepo,
         offerCatalog: offerCatalogRepo,

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

@@ -70,7 +70,7 @@ interface IAggregateEvent {
     statuses: IStatus[];
 }
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
-type IKeyOfProjection<T extends AvailableEventType> = Exclude<keyof factory.event.IEvent<T>, 'id'> | 'aggregateEntranceGate' | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered';
+type IKeyOfProjection<T extends AvailableEventType> = Exclude<keyof factory.event.IEvent<T>, 'id'> | 'aggregateEntranceGate' | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id';
 /**
  * minimizedEvent検索時のprojection候補
  * add(2024-07-18~)
@@ -316,20 +316,32 @@ export declare class EventRepo {
     getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, IDocType> & ((import("@chevre/factory/lib/event/anyEvent").IAttributes & {
         _id: string;
     } & Required<{
+        /**
+         * イベントリポジトリ
+         */
         _id: string;
     }>) | (import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
         aggregateOffer?: import("@chevre/factory/lib/event/anyEvent").IAggregateOffer | undefined;
     } & Required<{
+        /**
+         * イベントリポジトリ
+         */
         _id: string;
     }>)), import("mongoose").QueryOptions<Document<unknown, {}, IDocType> & ((import("@chevre/factory/lib/event/anyEvent").IAttributes & {
         _id: string;
     } & Required<{
+        /**
+         * イベントリポジトリ
+         */
         _id: string;
     }>) | (import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
         aggregateOffer?: import("@chevre/factory/lib/event/anyEvent").IAggregateOffer | undefined;
     } & Required<{
+        /**
+         * イベントリポジトリ
+         */
         _id: string;
     }>))>>;
     addAvailableAtOrFrom(params: {

package/lib/chevre/repo/event.js

@@ -66,7 +66,7 @@ class EventRepo {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(conditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27;
         const andConditions = [];
         const typeOfEq = conditions.typeOf;
         if (typeof typeOfEq === 'string') {
@@ -153,18 +153,17 @@ class EventRepo {
         if (Array.isArray(locationBranchCodeIn)) {
             andConditions.push({ 'location.branchCode': { $exists: true, $in: locationBranchCodeIn } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        const hasOfferCatalogIdEq = (_m = (_l = conditions.hasOfferCatalog) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$eq;
-        if (typeof hasOfferCatalogIdEq === 'string') {
-            andConditions.push({
-                'hasOfferCatalog.id': {
-                    $exists: true,
-                    $eq: hasOfferCatalogIdEq
-                }
-            });
-        }
-        const additionalPropertyElemMatch = (_o = conditions.additionalProperty) === null || _o === void 0 ? void 0 : _o.$elemMatch;
+        // discontinue(2024-09-30)
+        // const hasOfferCatalogIdEq = conditions.hasOfferCatalog?.id?.$eq;
+        // if (typeof hasOfferCatalogIdEq === 'string') {
+        //     andConditions.push({
+        //         'hasOfferCatalog.id': {
+        //             $exists: true,
+        //             $eq: hasOfferCatalogIdEq
+        //         }
+        //     });
+        // }
+        const additionalPropertyElemMatch = (_l = conditions.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -180,7 +179,7 @@ class EventRepo {
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (params.offers !== undefined) {
-                    const itemOfferedIdIn4event = (_q = (_p = params.offers.itemOffered) === null || _p === void 0 ? void 0 : _p.id) === null || _q === void 0 ? void 0 : _q.$in;
+                    const itemOfferedIdIn4event = (_o = (_m = params.offers.itemOffered) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$in;
                     if (Array.isArray(itemOfferedIdIn4event)) {
                         andConditions.push({
                             'offers.itemOffered.id': {
@@ -230,8 +229,8 @@ class EventRepo {
                         }
                     }
                 }
-                const sellerMakesOfferElemMatch4event = (_t = (_s = (_r = params.offers) === null || _r === void 0 ? void 0 : _r.seller) === null || _s === void 0 ? void 0 : _s.makesOffer) === null || _t === void 0 ? void 0 : _t.$elemMatch;
-                if (typeof ((_u = sellerMakesOfferElemMatch4event === null || sellerMakesOfferElemMatch4event === void 0 ? void 0 : sellerMakesOfferElemMatch4event['availableAtOrFrom.id']) === null || _u === void 0 ? void 0 : _u.$eq) === 'string') {
+                const sellerMakesOfferElemMatch4event = (_r = (_q = (_p = params.offers) === null || _p === void 0 ? void 0 : _p.seller) === null || _q === void 0 ? void 0 : _q.makesOffer) === null || _r === void 0 ? void 0 : _r.$elemMatch;
+                if (typeof ((_s = sellerMakesOfferElemMatch4event === null || sellerMakesOfferElemMatch4event === void 0 ? void 0 : sellerMakesOfferElemMatch4event['availableAtOrFrom.id']) === null || _s === void 0 ? void 0 : _s.$eq) === 'string') {
                     andConditions.push({
                         'offers.seller.makesOffer': {
                             $exists: true,
@@ -239,7 +238,7 @@ class EventRepo {
                         }
                     });
                 }
-                const reservationForIdentifierEq = (_z = (_y = (_x = (_w = (_v = params.offers) === null || _v === void 0 ? void 0 : _v.itemOffered) === null || _w === void 0 ? void 0 : _w.serviceOutput) === null || _x === void 0 ? void 0 : _x.reservationFor) === null || _y === void 0 ? void 0 : _y.identifier) === null || _z === void 0 ? void 0 : _z.$eq;
+                const reservationForIdentifierEq = (_x = (_w = (_v = (_u = (_t = params.offers) === null || _t === void 0 ? void 0 : _t.itemOffered) === null || _u === void 0 ? void 0 : _u.serviceOutput) === null || _v === void 0 ? void 0 : _v.reservationFor) === null || _w === void 0 ? void 0 : _w.identifier) === null || _x === void 0 ? void 0 : _x.$eq;
                 if (typeof reservationForIdentifierEq === 'string') {
                     andConditions.push({
                         'offers.itemOffered.serviceOutput.reservationFor.identifier': {
@@ -248,7 +247,7 @@ class EventRepo {
                         }
                     });
                 }
-                const reservationForArrivalBusStopBranchCodeEq = (_5 = (_4 = (_3 = (_2 = (_1 = (_0 = params.offers) === null || _0 === void 0 ? void 0 : _0.itemOffered) === null || _1 === void 0 ? void 0 : _1.serviceOutput) === null || _2 === void 0 ? void 0 : _2.reservationFor) === null || _3 === void 0 ? void 0 : _3.arrivalBusStop) === null || _4 === void 0 ? void 0 : _4.branchCode) === null || _5 === void 0 ? void 0 : _5.$eq;
+                const reservationForArrivalBusStopBranchCodeEq = (_3 = (_2 = (_1 = (_0 = (_z = (_y = params.offers) === null || _y === void 0 ? void 0 : _y.itemOffered) === null || _z === void 0 ? void 0 : _z.serviceOutput) === null || _0 === void 0 ? void 0 : _0.reservationFor) === null || _1 === void 0 ? void 0 : _1.arrivalBusStop) === null || _2 === void 0 ? void 0 : _2.branchCode) === null || _3 === void 0 ? void 0 : _3.$eq;
                 if (typeof reservationForArrivalBusStopBranchCodeEq === 'string') {
                     andConditions.push({
                         'offers.itemOffered.serviceOutput.reservationFor.arrivalBusStop.branchCode': {
@@ -257,7 +256,7 @@ class EventRepo {
                         }
                     });
                 }
-                const reservationForDepartureBusStopBranchCodeEq = (_11 = (_10 = (_9 = (_8 = (_7 = (_6 = params.offers) === null || _6 === void 0 ? void 0 : _6.itemOffered) === null || _7 === void 0 ? void 0 : _7.serviceOutput) === null || _8 === void 0 ? void 0 : _8.reservationFor) === null || _9 === void 0 ? void 0 : _9.departureBusStop) === null || _10 === void 0 ? void 0 : _10.branchCode) === null || _11 === void 0 ? void 0 : _11.$eq;
+                const reservationForDepartureBusStopBranchCodeEq = (_9 = (_8 = (_7 = (_6 = (_5 = (_4 = params.offers) === null || _4 === void 0 ? void 0 : _4.itemOffered) === null || _5 === void 0 ? void 0 : _5.serviceOutput) === null || _6 === void 0 ? void 0 : _6.reservationFor) === null || _7 === void 0 ? void 0 : _7.departureBusStop) === null || _8 === void 0 ? void 0 : _8.branchCode) === null || _9 === void 0 ? void 0 : _9.$eq;
                 if (typeof reservationForDepartureBusStopBranchCodeEq === 'string') {
                     andConditions.push({
                         'offers.itemOffered.serviceOutput.reservationFor.departureBusStop.branchCode': {
@@ -291,7 +290,7 @@ class EventRepo {
                 }
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
-                const superEventLocationIdEq = (_14 = (_13 = (_12 = params.superEvent) === null || _12 === void 0 ? void 0 : _12.location) === null || _13 === void 0 ? void 0 : _13.id) === null || _14 === void 0 ? void 0 : _14.$eq;
+                const superEventLocationIdEq = (_12 = (_11 = (_10 = params.superEvent) === null || _10 === void 0 ? void 0 : _10.location) === null || _11 === void 0 ? void 0 : _11.id) === null || _12 === void 0 ? void 0 : _12.$eq;
                 if (typeof superEventLocationIdEq === 'string') {
                     andConditions.push({
                         'superEvent.location.id': {
@@ -334,7 +333,7 @@ class EventRepo {
                         });
                     }
                 }
-                const itemOfferedIdIn = (_17 = (_16 = (_15 = params.offers) === null || _15 === void 0 ? void 0 : _15.itemOffered) === null || _16 === void 0 ? void 0 : _16.id) === null || _17 === void 0 ? void 0 : _17.$in;
+                const itemOfferedIdIn = (_15 = (_14 = (_13 = params.offers) === null || _13 === void 0 ? void 0 : _13.itemOffered) === null || _14 === void 0 ? void 0 : _14.id) === null || _15 === void 0 ? void 0 : _15.$in;
                 if (Array.isArray(itemOfferedIdIn)) {
                     andConditions.push({
                         'offers.itemOffered.id': {
@@ -343,7 +342,7 @@ class EventRepo {
                         }
                     });
                 }
-                const itemOfferedTicketedSeatTypeOfIn = (_22 = (_21 = (_20 = (_19 = (_18 = params.offers) === null || _18 === void 0 ? void 0 : _18.itemOffered) === null || _19 === void 0 ? void 0 : _19.serviceOutput) === null || _20 === void 0 ? void 0 : _20.reservedTicket) === null || _21 === void 0 ? void 0 : _21.ticketedSeat) === null || _22 === void 0 ? void 0 : _22.typeOfs;
+                const itemOfferedTicketedSeatTypeOfIn = (_20 = (_19 = (_18 = (_17 = (_16 = params.offers) === null || _16 === void 0 ? void 0 : _16.itemOffered) === null || _17 === void 0 ? void 0 : _17.serviceOutput) === null || _18 === void 0 ? void 0 : _18.reservedTicket) === null || _19 === void 0 ? void 0 : _19.ticketedSeat) === null || _20 === void 0 ? void 0 : _20.typeOfs;
                 if (Array.isArray(itemOfferedTicketedSeatTypeOfIn)) {
                     andConditions.push({
                         'offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOf': {
@@ -352,7 +351,7 @@ class EventRepo {
                         }
                     });
                 }
-                const itemOfferedServiceTypeIdIn = (_25 = (_24 = (_23 = params.offers) === null || _23 === void 0 ? void 0 : _23.itemOffered) === null || _24 === void 0 ? void 0 : _24.serviceType) === null || _25 === void 0 ? void 0 : _25.ids;
+                const itemOfferedServiceTypeIdIn = (_23 = (_22 = (_21 = params.offers) === null || _21 === void 0 ? void 0 : _21.itemOffered) === null || _22 === void 0 ? void 0 : _22.serviceType) === null || _23 === void 0 ? void 0 : _23.ids;
                 if (Array.isArray(itemOfferedServiceTypeIdIn)) {
                     andConditions.push({
                         'offers.itemOffered.serviceType.id': {
@@ -361,8 +360,8 @@ class EventRepo {
                         }
                     });
                 }
-                const sellerMakesOfferElemMatch = (_28 = (_27 = (_26 = params.offers) === null || _26 === void 0 ? void 0 : _26.seller) === null || _27 === void 0 ? void 0 : _27.makesOffer) === null || _28 === void 0 ? void 0 : _28.$elemMatch;
-                if (typeof ((_29 = sellerMakesOfferElemMatch === null || sellerMakesOfferElemMatch === void 0 ? void 0 : sellerMakesOfferElemMatch['availableAtOrFrom.id']) === null || _29 === void 0 ? void 0 : _29.$eq) === 'string') {
+                const sellerMakesOfferElemMatch = (_26 = (_25 = (_24 = params.offers) === null || _24 === void 0 ? void 0 : _24.seller) === null || _25 === void 0 ? void 0 : _25.makesOffer) === null || _26 === void 0 ? void 0 : _26.$elemMatch;
+                if (typeof ((_27 = sellerMakesOfferElemMatch === null || sellerMakesOfferElemMatch === void 0 ? void 0 : sellerMakesOfferElemMatch['availableAtOrFrom.id']) === null || _27 === void 0 ? void 0 : _27.$eq) === 'string') {
                     andConditions.push({
                         'offers.seller.makesOffer': {
                             $exists: true,

package/lib/chevre/repo/mongoose/schemas/offerCatalogItem.js

@@ -52,7 +52,7 @@ const schemaOptions = {
     }
 };
 /**
- * オファーカタログアイテムスキーマ
+ * サブカタログスキーマ
  */
 let schema;
 function createSchema() {

package/lib/chevre/repo/mongoose/schemas/product.js

@@ -19,9 +19,6 @@ const schemaDefinition = {
     // provider: [SchemaTypes.Mixed], // 廃止(2024-04-12~)
     serviceOutput: mongoose_1.SchemaTypes.Mixed,
     serviceType: mongoose_1.SchemaTypes.Mixed
-    // createdAt: SchemaTypes.Mixed,
-    // updatedAt: SchemaTypes.Mixed,
-    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -65,6 +62,15 @@ const indexes = [
             }
         }
     ],
+    [
+        { 'hasOfferCatalog.itemListElement.id': 1, productID: 1 },
+        {
+            name: 'offerCatalogItemId',
+            partialFilterExpression: {
+                'hasOfferCatalog.itemListElement.id': { $exists: true }
+            }
+        }
+    ],
     [
         { 'serviceOutput.typeOf': 1, productID: 1 },
         {

package/lib/chevre/repo/offer.js

@@ -21,13 +21,11 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OfferRepo = void 0;
-const createDebug = require("debug");
 const mongoose_1 = require("mongoose");
 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';
 /**
  * 単価オファーリポジトリ
@@ -545,7 +543,6 @@ class OfferRepo {
             });
             let offers = [];
             if (aggregateOfferIdsInDataCatalog.length > 0) {
-                debug('searchAllByIdsAndOfferCatalogId:searching offers...,aggregateOfferIdsInDataCatalog:', aggregateOfferIdsInDataCatalog, 'ids:', params.ids);
                 const searchOffersConditions = Object.assign({ 
                     // aggregateOffer.idで検索する(2023-09-09~)
                     parentOffer: { id: { $in: aggregateOfferIdsInDataCatalog } }, id: { $in: params.ids }, priceSpecification: {

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

@@ -30,8 +30,9 @@ export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, '
     numberOfItems?: number;
     itemListElementTypeOf: factory.offerType.Offer | 'OfferCatalog';
 };
+type IKeyOfProjection = 'name' | 'description' | 'project' | 'typeOf' | 'id' | 'identifier' | 'itemOffered' | 'additionalProperty' | 'numberOfItems' | 'itemListElementTypeOf' | 'dateSynced';
 /**
- * オファーカタログリポジトリ
+ * カタログリポジトリ
  */
 export declare class OfferCatalogRepo {
     private readonly offerCatalogModel;
@@ -105,7 +106,7 @@ export declare class OfferCatalogRepo {
             };
         };
     }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
-    search(params: factory.offerCatalog.ISearchConditions): Promise<IAggregatedOfferCatalog[]>;
+    projectFields(params: factory.offerCatalog.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IAggregatedOfferCatalog[]>;
     findItemListElementById(params: {
         id: string;
         project: {
@@ -133,6 +134,21 @@ export declare class OfferCatalogRepo {
         id: string;
         elementIndex: number;
     }[]>;
+    /**
+     * カタログIDとアイテムIDからアイテムを全て検索する
+     */
+    searchItemListElement(params: {
+        id: {
+            $in: string[];
+        };
+        itemListElement: {
+            id: {
+                $in: string[];
+            };
+        };
+    }): Promise<{
+        id: string;
+    }[]>;
     deleteById(params: {
         id: string;
     }): Promise<void>;
@@ -155,3 +171,4 @@ export declare class OfferCatalogRepo {
         _id: string;
     }>>>;
 }
+export {};

package/lib/chevre/repo/offerCatalog.js

@@ -23,8 +23,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OfferCatalogRepo = void 0;
 const factory = require("../factory");
 const offerCatalog_1 = require("./mongoose/schemas/offerCatalog");
+const AVAILABLE_PROJECT_FIELDS = [
+    'name',
+    'description',
+    'project',
+    'typeOf',
+    'identifier',
+    'itemOffered',
+    'additionalProperty',
+    'numberOfItems',
+    'itemListElementTypeOf',
+    'dateSynced'
+];
 /**
- * オファーカタログリポジトリ
+ * カタログリポジトリ
  */
 class OfferCatalogRepo {
     constructor(connection) {
@@ -294,39 +306,44 @@ class OfferCatalogRepo {
                 .exec();
         });
     }
-    search(params) {
+    projectFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = OfferCatalogRepo.CREATE_MONGO_CONDITIONS(params);
             const matchStages = conditions.map((condition) => {
                 return { $match: condition };
             });
-            const aggregate = this.offerCatalogModel.aggregate([
-                ...(((_a = params.sort) === null || _a === void 0 ? void 0 : _a.identifier) !== undefined) ? [{ $sort: { identifier: params.sort.identifier } }] : [],
-                ...matchStages,
-                {
-                    $project: {
-                        _id: 0,
-                        name: '$name',
-                        description: '$description',
-                        project: '$project',
-                        typeOf: '$typeOf',
-                        id: '$_id',
-                        identifier: '$identifier',
-                        itemOffered: '$itemOffered',
-                        additionalProperty: '$additionalProperty',
-                        numberOfItems: {
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+            }
+            else {
+                // throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+            }
+            const projection = Object.assign({ _id: 0, id: '$_id' }, Object.fromEntries(positiveProjectionFields.map((key) => {
+                let value;
+                switch (key) {
+                    case 'numberOfItems':
+                        value = {
                             $cond: {
                                 if: { $isArray: '$itemListElement' },
                                 then: { $size: '$itemListElement' },
                                 else: 0
                             }
-                        },
-                        // itemListElement.typeOfを追加(2023-09-14~)
-                        itemListElementTypeOf: { $first: '$itemListElement.typeOf' },
-                        dateSynced: '$dateSynced'
-                    }
+                        };
+                        break;
+                    case 'itemListElementTypeOf':
+                        value = { $first: '$itemListElement.typeOf' };
+                        break;
+                    default:
+                        value = 1;
                 }
+                return [key, value];
+            })));
+            const aggregate = this.offerCatalogModel.aggregate([
+                ...(((_a = params.sort) === null || _a === void 0 ? void 0 : _a.identifier) !== undefined) ? [{ $sort: { identifier: params.sort.identifier } }] : [],
+                ...matchStages,
+                { $project: projection }
             ]);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
@@ -402,6 +419,37 @@ class OfferCatalogRepo {
                 .exec();
         });
     }
+    /**
+     * カタログIDとアイテムIDからアイテムを全て検索する
+     */
+    searchItemListElement(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchStages = [
+                { $match: { _id: { $in: params.id.$in } } },
+                { $match: { 'itemListElement.id': { $exists: true, $in: params.itemListElement.id.$in } } }
+            ];
+            return this.offerCatalogModel.aggregate([
+                {
+                    $unwind: {
+                        path: '$itemListElement'
+                    }
+                },
+                ...matchStages,
+                {
+                    $group: {
+                        _id: '$itemListElement.id'
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        id: '$_id'
+                    }
+                }
+            ])
+                .exec();
+        });
+    }
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.offerCatalogModel.findOneAndRemove({

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

@@ -29,12 +29,9 @@ export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, '
     numberOfItems?: number;
     itemListElementTypeOf: factory.offerType.Offer;
 };
-type KeyOfOfferCatalogItem = keyof factory.offerCatalog.IOfferCatalog;
-type IProjection = {
-    [key in KeyOfOfferCatalogItem]?: 0 | 1;
-};
+type IKeyOfProjection = 'name' | 'description' | 'project' | 'typeOf' | 'id' | 'identifier' | 'itemOffered' | 'additionalProperty' | 'numberOfItems' | 'itemListElementTypeOf' | 'dateSynced' | 'relatedOffer';
 /**
- * オファーカタログアイテムリポジトリ
+ * サブカタログリポジトリ
  */
 export declare class OfferCatalogItemRepo {
     private readonly offerCatalogItemModel;
@@ -93,7 +90,7 @@ export declare class OfferCatalogItemRepo {
         };
     }): Promise<void>;
     count(params: Omit<factory.offerCatalog.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
-    search(params: factory.offerCatalog.ISearchConditions, projection: IProjection): Promise<IAggregatedOfferCatalog[]>;
+    projectFields(params: factory.offerCatalog.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IAggregatedOfferCatalog[]>;
     findItemListElementById(params: {
         id: string;
         project: {