@chevre/domain 21.9.0-alpha.1 → 21.9.0-alpha.2

package/example/src/chevre/searchOffersByCatalog.ts

@@ -14,7 +14,8 @@ async function main() {
         page: 1,
         // ids: ['xx', 'xxx', '1001', '901'],
         subOfferCatalog: {
-            id: 'xxx'
+            id: '0001',
+            isOfferCatalogItem: false
         },
         excludeAppliesToMovieTicket: false,
         useIncludeInDataCatalog: true

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

@@ -0,0 +1,89 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
+import { Schema } from 'mongoose';
+declare const modelName = "OfferCatalogItem";
+/**
+ * オファーカタログアイテムスキーマ
+ */
+declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
+    collection: string;
+    id: true;
+    read: string;
+    writeConcern: import("mongodb").WriteConcern;
+    strict: true;
+    strictQuery: false;
+    timestamps: {
+        createdAt: string;
+        updatedAt: string;
+    };
+    toJSON: {
+        getters: false;
+        virtuals: false;
+        minimize: false;
+        versionKey: false;
+    };
+    toObject: {
+        getters: false;
+        virtuals: true;
+        minimize: false;
+        versionKey: false;
+    };
+}, {
+    typeOf: string;
+    additionalProperty: any[];
+    identifier: string;
+    itemListElement: any[];
+    name?: any;
+    project?: any;
+    alternateName?: any;
+    description?: any;
+    itemOffered?: any;
+    dateSynced?: Date | undefined;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    typeOf: string;
+    additionalProperty: any[];
+    identifier: string;
+    itemListElement: any[];
+    name?: any;
+    project?: any;
+    alternateName?: any;
+    description?: any;
+    itemOffered?: any;
+    dateSynced?: Date | undefined;
+}>> & Omit<import("mongoose").FlatRecord<{
+    typeOf: string;
+    additionalProperty: any[];
+    identifier: string;
+    itemListElement: any[];
+    name?: any;
+    project?: any;
+    alternateName?: any;
+    description?: any;
+    itemOffered?: any;
+    dateSynced?: Date | undefined;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+}, never>>;
+export { modelName, schema };

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

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.schema = exports.modelName = void 0;
+const mongoose_1 = require("mongoose");
+const writeConcern_1 = require("../writeConcern");
+const modelName = 'OfferCatalogItem';
+exports.modelName = modelName;
+/**
+ * オファーカタログアイテムスキーマ
+ */
+const schema = new mongoose_1.Schema({
+    project: mongoose_1.SchemaTypes.Mixed,
+    // _id: String,
+    identifier: {
+        type: String,
+        required: true
+    },
+    name: mongoose_1.SchemaTypes.Mixed,
+    description: mongoose_1.SchemaTypes.Mixed,
+    alternateName: mongoose_1.SchemaTypes.Mixed,
+    typeOf: {
+        type: String,
+        required: true
+    },
+    itemListElement: [mongoose_1.SchemaTypes.Mixed],
+    itemOffered: mongoose_1.SchemaTypes.Mixed,
+    additionalProperty: [mongoose_1.SchemaTypes.Mixed],
+    dateSynced: Date
+}, {
+    collection: 'offerCatalogItems',
+    id: true,
+    read: 'primaryPreferred',
+    writeConcern: writeConcern_1.writeConcern,
+    strict: true,
+    strictQuery: false,
+    timestamps: {
+        createdAt: 'createdAt',
+        updatedAt: 'updatedAt'
+    },
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+});
+exports.schema = schema;
+schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
+schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });

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

@@ -17,6 +17,7 @@ export type IUnitPriceOfferFromAggregateOffer = factory.unitPriceOffer.IUnitPric
 export declare class MongoRepository {
     private readonly aggregateOfferModel;
     private readonly offerCatalogModel;
+    private readonly offerCatalogItemModel;
     constructor(connection: Connection);
     static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): IMatchStage[];
     static CREATE_AGGREGATE_OFFERS_PROJECTION(params: IProjection): {
@@ -32,6 +33,7 @@ export declare class MongoRepository {
              * サブカタログID
              */
             id: string;
+            isOfferCatalogItem: boolean;
         };
         projection?: IProjection;
     }): Promise<{
@@ -51,6 +53,7 @@ export declare class MongoRepository {
              * サブカタログID
              */
             id: string;
+            isOfferCatalogItem: boolean;
         };
         availableAtOrFrom?: {
             id?: string;
@@ -74,6 +77,7 @@ export declare class MongoRepository {
              * サブカタログID
              */
             id: string;
+            isOfferCatalogItem: boolean;
         };
         availableAtOrFrom?: {
             id?: string;

package/lib/chevre/repo/offer.js

@@ -25,6 +25,7 @@ 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 OFFERS_ARRAY_INDEX_NAME = 'offerIndex';
 /**
  * 単価オファーリポジトリ
@@ -33,6 +34,7 @@ class MongoRepository {
     constructor(connection) {
         this.aggregateOfferModel = connection.model(aggregateOffer_1.modelName, aggregateOffer_1.schema);
         this.offerCatalogModel = connection.model(offerCatalog_1.modelName, offerCatalog_1.schema);
+        this.offerCatalogItemModel = connection.model(offerCatalogItem_1.modelName, offerCatalogItem_1.schema);
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params) {
@@ -442,7 +444,8 @@ class MongoRepository {
     searchAllByOfferCatalogId(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog({
-                id: params.subOfferCatalog.id
+                id: params.subOfferCatalog.id,
+                isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem
             });
             let offers = [];
             if (sortedOfferIds.length > 0) {
@@ -470,7 +473,7 @@ class MongoRepository {
                     .exec();
                 aggregateOfferIds = searchDistinctAggregateOfferIdsResult;
             }
-            const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog(Object.assign({ id: params.subOfferCatalog.id }, (Array.isArray(aggregateOfferIds)) ? { itemListElementIds: aggregateOfferIds } : undefined));
+            const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog(Object.assign({ id: params.subOfferCatalog.id, isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem }, (Array.isArray(aggregateOfferIds)) ? { itemListElementIds: aggregateOfferIds } : undefined));
             let offers = [];
             if (sortedOfferIds.length > 0) {
                 const searchOffersConditions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ 
@@ -506,14 +509,15 @@ class MongoRepository {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog({
-                id: params.subOfferCatalog.id
+                id: params.subOfferCatalog.id,
+                isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem
             });
             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.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 } } }
+                    ? { 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)
                             ? {
@@ -800,17 +804,33 @@ class MongoRepository {
             if (Array.isArray(params.itemListElementIds)) {
                 matchStages.push({ $match: { 'itemListElement.id': { $exists: true, $in: params.itemListElementIds } } });
             }
-            const itemListElements = yield this.offerCatalogModel.aggregate([
-                { $unwind: '$itemListElement' },
-                ...matchStages,
-                {
-                    $project: {
-                        _id: 0,
-                        id: '$itemListElement.id'
+            let itemListElements;
+            if (params.isOfferCatalogItem) {
+                itemListElements = yield this.offerCatalogItemModel.aggregate([
+                    { $unwind: '$itemListElement' },
+                    ...matchStages,
+                    {
+                        $project: {
+                            _id: 0,
+                            id: '$itemListElement.id'
+                        }
                     }
-                }
-            ])
-                .exec();
+                ])
+                    .exec();
+            }
+            else {
+                itemListElements = yield this.offerCatalogModel.aggregate([
+                    { $unwind: '$itemListElement' },
+                    ...matchStages,
+                    {
+                        $project: {
+                            _id: 0,
+                            id: '$itemListElement.id'
+                        }
+                    }
+                ])
+                    .exec();
+            }
             return (Array.isArray(itemListElements))
                 ? itemListElements.map((element) => element.id)
                 : [];

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

@@ -85,7 +85,6 @@ export declare class MongoRepository {
     /**
      * 強制的に親カタログのみ検索する
      */
-    searchParentCatalogsForcibly(params: factory.offerCatalog.ISearchConditions): Promise<IAggregatedOfferCatalog[]>;
     findItemListElementById(params: {
         id: string;
         project: {

package/lib/chevre/repo/offerCatalog.js

@@ -285,11 +285,17 @@ class MongoRepository {
     /**
      * 強制的に親カタログのみ検索する
      */
-    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 } }) }));
-        });
-    }
+    // 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/repo/offerCatalogItem.d.ts

@@ -0,0 +1,32 @@
+import { Connection } from 'mongoose';
+import * as factory from '../factory';
+export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'additionalProperty'> & {
+    numberOfItems?: number;
+    itemListElementTypeOf: 'OfferCatalog';
+};
+/**
+ * オファーカタログアイテムリポジトリ
+ */
+export declare class MongoRepository {
+    private readonly offerCatalogItemModel;
+    constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: factory.offerCatalog.ISearchConditions): any[];
+    save(params: factory.offerCatalog.IOfferCatalog): Promise<factory.offerCatalog.IOfferCatalog>;
+    /**
+     * 同期日時を更新する
+     */
+    updateDateSynced(params: {
+        id: string;
+        dateSynced: Date;
+    }): Promise<void>;
+    search(params: factory.offerCatalog.ISearchConditions): Promise<IAggregatedOfferCatalog[]>;
+    findItemListElementById(params: {
+        id: string;
+        project: {
+            id: string;
+        };
+    }): Promise<Pick<factory.offerCatalog.IOfferCatalog, 'itemListElement'>>;
+    deleteById(params: {
+        id: string;
+    }): Promise<void>;
+}

package/lib/chevre/repo/offerCatalogItem.js

@@ -0,0 +1,185 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MongoRepository = void 0;
+const factory = require("../factory");
+const offerCatalogItem_1 = require("./mongoose/schemas/offerCatalogItem");
+/**
+ * オファーカタログアイテムリポジトリ
+ */
+class MongoRepository {
+    constructor(connection) {
+        this.offerCatalogItemModel = connection.model(offerCatalogItem_1.modelName, offerCatalogItem_1.schema);
+    }
+    // tslint:disable-next-line:max-func-body-length
+    static CREATE_MONGO_CONDITIONS(params) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        // MongoDB検索条件
+        const andConditions = [];
+        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const idIn = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$in;
+        if (Array.isArray(idIn)) {
+            andConditions.push({ _id: { $in: idIn } });
+        }
+        const idRegex = (_d = params.id) === null || _d === void 0 ? void 0 : _d.$regex;
+        if (typeof idRegex === 'string' && idRegex.length > 0) {
+            andConditions.push({ _id: { $regex: new RegExp(idRegex) } });
+        }
+        const identifierEq = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$eq;
+        if (typeof identifierEq === 'string') {
+            andConditions.push({
+                identifier: { $eq: identifierEq }
+            });
+        }
+        const identifierRegex = (_f = params.identifier) === null || _f === void 0 ? void 0 : _f.$regex;
+        if (typeof identifierRegex === 'string' && identifierRegex.length > 0) {
+            andConditions.push({ identifier: { $regex: new RegExp(identifierRegex) } });
+        }
+        if (params.name !== undefined) {
+            andConditions.push({
+                $or: [
+                    { 'name.ja': new RegExp(params.name) },
+                    { 'name.en': new RegExp(params.name) }
+                ]
+            });
+        }
+        const itemListElementTypeOfEq = (_h = (_g = params.itemListElement) === null || _g === void 0 ? void 0 : _g.typeOf) === null || _h === void 0 ? void 0 : _h.$eq;
+        if (typeof itemListElementTypeOfEq === 'string') {
+            andConditions.push({ 'itemListElement.typeOf': { $exists: true, $eq: itemListElementTypeOfEq } });
+        }
+        const itemListElementIdIn = (_k = (_j = params.itemListElement) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$in;
+        if (Array.isArray(itemListElementIdIn)) {
+            andConditions.push({ 'itemListElement.id': { $exists: true, $in: itemListElementIdIn } });
+        }
+        const itemListElementIdNin = (_m = (_l = params.itemListElement) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$nin;
+        if (Array.isArray(itemListElementIdNin)) {
+            andConditions.push({ 'itemListElement.id': { $nin: itemListElementIdNin } });
+        }
+        const itemListElementIdAll = (_p = (_o = params.itemListElement) === null || _o === void 0 ? void 0 : _o.id) === null || _p === void 0 ? void 0 : _p.$all;
+        if (Array.isArray(itemListElementIdAll)) {
+            andConditions.push({ 'itemListElement.id': { $exists: true, $all: itemListElementIdAll } });
+        }
+        const itemOfferedTypeOfEq = (_r = (_q = params.itemOffered) === null || _q === void 0 ? void 0 : _q.typeOf) === null || _r === void 0 ? void 0 : _r.$eq;
+        if (typeof itemOfferedTypeOfEq === 'string') {
+            andConditions.push({ 'itemOffered.typeOf': { $exists: true, $eq: itemOfferedTypeOfEq } });
+        }
+        const itemOfferedServiceTypeCodeValueEq = (_u = (_t = (_s = params.itemOffered) === null || _s === void 0 ? void 0 : _s.serviceType) === null || _t === void 0 ? void 0 : _t.codeValue) === null || _u === void 0 ? void 0 : _u.$eq;
+        if (typeof itemOfferedServiceTypeCodeValueEq === 'string') {
+            andConditions.push({ 'itemOffered.serviceType.codeValue': { $exists: true, $eq: itemOfferedServiceTypeCodeValueEq } });
+        }
+        const additionalPropertyElemMatch = (_v = params.additionalProperty) === null || _v === void 0 ? void 0 : _v.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+            andConditions.push({ additionalProperty: { $exists: true, $elemMatch: additionalPropertyElemMatch } });
+        }
+        return andConditions;
+    }
+    save(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let doc;
+            if (typeof params.id !== 'string' || params.id.length === 0) {
+                const { id } = params, creatingDoc = __rest(params, ["id"]);
+                doc = yield this.offerCatalogItemModel.create(creatingDoc);
+            }
+            else {
+                const { id, identifier, project, typeOf } = params, updateFields = __rest(params, ["id", "identifier", "project", "typeOf"]);
+                doc = yield this.offerCatalogItemModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true })
+                    .exec();
+            }
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.offerCatalogItemModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
+    /**
+     * 同期日時を更新する
+     */
+    updateDateSynced(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.offerCatalogItemModel.updateOne({ _id: { $eq: params.id } }, { $set: { dateSynced: params.dateSynced } })
+                .exec();
+        });
+    }
+    search(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const matchStages = conditions.map((condition) => {
+                return { $match: condition };
+            });
+            const aggregate = this.offerCatalogItemModel.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: {
+                            $cond: {
+                                if: { $isArray: '$itemListElement' },
+                                then: { $size: '$itemListElement' },
+                                else: 0
+                            }
+                        },
+                        itemListElementTypeOf: { $first: '$itemListElement.typeOf' }
+                    }
+                }
+            ]);
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                aggregate.limit(params.limit * page)
+                    .skip(params.limit * (page - 1));
+            }
+            return aggregate.exec();
+        });
+    }
+    findItemListElementById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.offerCatalogItemModel.findOne({
+                'project.id': { $eq: params.project.id },
+                _id: { $eq: params.id }
+            }, { 'itemListElement.id': 1 })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.offerCatalogItemModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
+    deleteById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.offerCatalogItemModel.findOneAndRemove({ _id: params.id })
+                .exec();
+        });
+    }
+}
+exports.MongoRepository = MongoRepository;

package/lib/chevre/repository.d.ts

@@ -21,6 +21,7 @@ import { MongoRepository as MemberRepo } from './repo/member';
 import { MongoRepository as MerchantReturnPolicyRepo } from './repo/merchantReturnPolicy';
 import { MongoRepository as OfferRepo } from './repo/offer';
 import { MongoRepository as OfferCatalogRepo } from './repo/offerCatalog';
+import { MongoRepository as OfferCatalogItemRepo } from './repo/offerCatalogItem';
 import { MongoRepository as OfferItemConditionRepo } from './repo/offerItemCondition';
 import { MongoRepository as OrderRepo } from './repo/order';
 import { MongoRepository as OwnershipInfoRepo } from './repo/ownershipInfo';
@@ -131,6 +132,8 @@ export declare class MerchantReturnPolicy extends MerchantReturnPolicyRepo {
 }
 export declare class OfferCatalog extends OfferCatalogRepo {
 }
+export declare class OfferCatalogItem extends OfferCatalogItemRepo {
+}
 export declare class OfferItemCondition extends OfferItemConditionRepo {
 }
 export declare class Offer extends OfferRepo {

package/lib/chevre/repository.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
 // tslint:disable:max-classes-per-file completed-docs
 /**
  * リポジトリ
@@ -25,6 +25,7 @@ const member_1 = require("./repo/member");
 const merchantReturnPolicy_1 = require("./repo/merchantReturnPolicy");
 const offer_1 = require("./repo/offer");
 const offerCatalog_1 = require("./repo/offerCatalog");
+const offerCatalogItem_1 = require("./repo/offerCatalogItem");
 const offerItemCondition_1 = require("./repo/offerItemCondition");
 const order_1 = require("./repo/order");
 const ownershipInfo_1 = require("./repo/ownershipInfo");
@@ -157,6 +158,9 @@ exports.MerchantReturnPolicy = MerchantReturnPolicy;
 class OfferCatalog extends offerCatalog_1.MongoRepository {
 }
 exports.OfferCatalog = OfferCatalog;
+class OfferCatalogItem extends offerCatalogItem_1.MongoRepository {
+}
+exports.OfferCatalogItem = OfferCatalogItem;
 class OfferItemCondition extends offerItemCondition_1.MongoRepository {
 }
 exports.OfferItemCondition = OfferItemCondition;

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

@@ -28,12 +28,14 @@ function findEventOffers(params) {
                 if (typeof offerCatalogId === 'string') {
                     // サブカタログIDを決定
                     let subOfferCatalogId = offerCatalogId;
+                    let isOfferCatalogItem = false;
                     const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: offerCatalogId });
                     if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
                         subOfferCatalogId = offerCatalogFirstElement.id;
+                        isOfferCatalogItem = true;
                     }
                     const { offers } = yield repos.offer.searchAllByOfferCatalogId({
-                        subOfferCatalog: { id: subOfferCatalogId }
+                        subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem }
                     });
                     availableOffers = offers;
                 }

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

@@ -28,9 +28,11 @@ function searchTicketOffersByItemOffered(params) {
         }
         // サブカタログIDを決定
         let subOfferCatalogId = catalogId;
+        let isOfferCatalogItem = false;
         const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: catalogId });
         if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
             subOfferCatalogId = offerCatalogFirstElement.id;
+            isOfferCatalogItem = true;
         }
         if (params.withSortIndex) {
             // addSortIndexの場合はid指定廃止(2023-09-13~)
@@ -39,7 +41,7 @@ function searchTicketOffersByItemOffered(params) {
             }
             const { offers, sortedOfferIds } = yield repos.offer.searchByOfferCatalogIdWithSortIndex({
                 // ids: params.ids,
-                subOfferCatalog: { id: subOfferCatalogId },
+                subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
                 availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
                 unacceptedPaymentMethod: params.unacceptedPaymentMethod,
                 excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
@@ -57,7 +59,7 @@ function searchTicketOffersByItemOffered(params) {
             }
             const { offers } = yield repos.offer.searchByIdsAndOfferCatalogId({
                 ids: params.ids,
-                subOfferCatalog: { id: subOfferCatalogId },
+                subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
                 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.js

@@ -27,9 +27,11 @@ function searchProductOffers(params) {
         }
         // サブカタログIDを決定
         let subOfferCatalogId = offerCatalogId;
+        let isOfferCatalogItem = false;
         const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: offerCatalogId });
         if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
             subOfferCatalogId = offerCatalogFirstElement.id;
+            isOfferCatalogItem = true;
         }
         let offers;
         let sortedOfferIds;
@@ -40,7 +42,7 @@ function searchProductOffers(params) {
             }
             const searchByOfferCatalogIdResult = yield repos.offer.searchByOfferCatalogIdWithSortIndex({
                 // ids: params.ids,
-                subOfferCatalog: { id: subOfferCatalogId },
+                subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
                 excludeAppliesToMovieTicket: false,
                 limit: params.limit,
                 page: params.page,
@@ -58,7 +60,7 @@ function searchProductOffers(params) {
             }
             const searchByOfferCatalogIdResult = yield repos.offer.searchByIdsAndOfferCatalogId({
                 ids: params.ids,
-                subOfferCatalog: { id: subOfferCatalogId },
+                subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
                 excludeAppliesToMovieTicket: false,
                 limit: params.limit,
                 page: params.page,

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.1"
+  "version": "21.9.0-alpha.2"
 }