@chevre/domain 20.4.0-alpha.8 → 20.4.0

package/lib/chevre/repo/mongoose/model/member.js

@@ -10,14 +10,17 @@ const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
  */
 const schema = new mongoose.Schema({
     project: mongoose.SchemaTypes.Mixed,
-    typeOf: String,
+    typeOf: {
+        type: String,
+        required: true
+    },
     member: mongoose.SchemaTypes.Mixed
 }, {
     collection: 'members',
     id: true,
     read: 'primaryPreferred',
     writeConcern: writeConcern,
-    strict: false,
+    strict: true,
     useNestedStrict: true,
     timestamps: {
         createdAt: 'createdAt',

package/lib/chevre/repo/mongoose/model/offer.js

@@ -11,8 +11,6 @@ const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
 const schema = new mongoose.Schema({
     project: mongoose.SchemaTypes.Mixed,
     _id: String,
-    // Stringに変更(2022-08-08~)
-    // identifier: mongoose.SchemaTypes.Mixed,
     identifier: String,
     typeOf: String,
     name: mongoose.SchemaTypes.Mixed,
@@ -21,16 +19,16 @@ const schema = new mongoose.Schema({
     color: mongoose.SchemaTypes.Mixed,
     additionalProperty: [mongoose.SchemaTypes.Mixed],
     alternateName: mongoose.SchemaTypes.Mixed,
-    acceptedPaymentMethod: mongoose.SchemaTypes.Mixed,
-    addOn: mongoose.SchemaTypes.Mixed,
-    availableAddOn: mongoose.SchemaTypes.Mixed,
+    // acceptedPaymentMethod: mongoose.SchemaTypes.Mixed, // 削除(2023-02-27~)
+    addOn: [mongoose.SchemaTypes.Mixed],
+    // availableAddOn: mongoose.SchemaTypes.Mixed, // 削除(2023-02-27~)
     availability: String,
-    availabilityEnds: Date,
-    availabilityStarts: Date,
-    availableAtOrFrom: mongoose.SchemaTypes.Mixed,
+    // availabilityEnds: Date, // 削除(2023-02-27~)
+    // availabilityStarts: Date, // 削除(2023-02-27~)
+    availableAtOrFrom: [mongoose.SchemaTypes.Mixed],
     hasMerchantReturnPolicy: mongoose.SchemaTypes.Mixed,
     itemOffered: mongoose.SchemaTypes.Mixed,
-    price: Number,
+    // price: Number, // 削除(2023-02-27~)
     priceCurrency: String,
     priceSpecification: mongoose.SchemaTypes.Mixed,
     eligibleCustomerType: mongoose.SchemaTypes.Mixed,
@@ -196,6 +194,18 @@ schema.index({ additionalProperty: 1, 'priceSpecification.price': 1 }, {
         additionalProperty: { $exists: true }
     }
 });
+schema.index({ validFrom: 1, 'priceSpecification.price': 1 }, {
+    name: 'searchByValidFrom',
+    partialFilterExpression: {
+        validFrom: { $exists: true }
+    }
+});
+schema.index({ validThrough: 1, 'priceSpecification.price': 1 }, {
+    name: 'searchByValidThrough',
+    partialFilterExpression: {
+        validThrough: { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/repo/mongoose/model/priceSpecification.js

@@ -10,29 +10,24 @@ const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
  */
 const schema = new mongoose.Schema({
     project: mongoose.SchemaTypes.Mixed,
-    typeOf: {
-        type: String,
-        required: true
-    },
-    eligibleQuantity: mongoose.SchemaTypes.Mixed,
-    eligibleTransactionVolume: [mongoose.SchemaTypes.Mixed],
-    maxPrice: Number,
-    minPrice: Number,
-    price: Number,
+    typeOf: { type: String, required: true },
+    name: mongoose.SchemaTypes.Mixed,
+    price: { type: Number, required: true },
     priceCurrency: String,
     validFrom: Date,
     validThrough: Date,
     valueAddedTaxIncluded: Boolean,
-    referenceQuantity: mongoose.SchemaTypes.Mixed,
-    appliesToSoundFormat: String,
-    appliesToVideoFormat: String,
-    priceComponent: [mongoose.SchemaTypes.Mixed]
+    // referenceQuantity: mongoose.SchemaTypes.Mixed,
+    // appliesToSoundFormat: String,
+    appliesToCategoryCode: mongoose.SchemaTypes.Mixed,
+    appliesToMovieTicket: mongoose.SchemaTypes.Mixed,
+    appliesToVideoFormat: String
 }, {
     collection: 'priceSpecifications',
     id: true,
     read: 'primaryPreferred',
     writeConcern: writeConcern,
-    strict: false,
+    strict: true,
     useNestedStrict: true,
     timestamps: {
         createdAt: 'createdAt',
@@ -54,53 +49,25 @@ const schema = new mongoose.Schema({
 exports.schema = schema;
 schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
 schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
-schema.index({ price: 1 }, {
-    name: 'searchByPrice',
-    partialFilterExpression: {
-        price: { $exists: true }
-    }
-});
-schema.index({ 'priceComponent.typeOf': 1 }, {
-    name: 'searchByPriceComponentTypeOf',
-    partialFilterExpression: {
-        'priceComponent.typeOf': { $exists: true }
-    }
-});
-schema.index({ 'project.id': 1, price: 1 }, {
-    name: 'searchByProjectId-v20220721'
-});
-schema.index({ typeOf: 1, price: 1 }, {
-    name: 'searchByTypeOf-v2',
-    partialFilterExpression: {
-        price: { $exists: true }
-    }
-});
-schema.index({ appliesToSoundFormat: 1, price: 1 }, {
-    name: 'searchByAppliesToSoundFormat',
-    partialFilterExpression: {
-        appliesToSoundFormat: { $exists: true },
-        price: { $exists: true }
-    }
-});
+schema.index({ price: 1 }, { name: 'searchByPrice' });
+schema.index({ 'project.id': 1, price: 1 }, { name: 'searchByProjectId' });
+schema.index({ typeOf: 1, price: 1 }, { name: 'searchByTypeOf' });
 schema.index({ appliesToVideoFormat: 1, price: 1 }, {
     name: 'searchByAppliesToVideoFormat',
     partialFilterExpression: {
-        appliesToVideoFormat: { $exists: true },
-        price: { $exists: true }
+        appliesToVideoFormat: { $exists: true }
     }
 });
-schema.index({ appliesToMovieTicketType: 1, price: 1 }, {
-    name: 'searchByAppliesToMovieTicketType',
+schema.index({ 'appliesToMovieTicket.serviceType': 1, price: 1 }, {
+    name: 'searchByAppliesToMovieTicketServiceType',
     partialFilterExpression: {
-        appliesToMovieTicketType: { $exists: true },
-        price: { $exists: true }
+        'appliesToMovieTicket.serviceType': { $exists: true }
     }
 });
-schema.index({ 'appliesToMovieTicket.serviceType': 1, price: 1 }, {
-    name: 'searchByAppliesToMovieTicketServiceType',
+schema.index({ 'appliesToMovieTicket.serviceOutput.typeOf': 1, price: 1 }, {
+    name: 'searchByAppliesToMovieTicketServiceOutputTypeOf',
     partialFilterExpression: {
-        'appliesToMovieTicket.serviceType': { $exists: true },
-        price: { $exists: true }
+        'appliesToMovieTicket.serviceOutput.typeOf': { $exists: true }
     }
 });
 schema.index({ appliesToCategoryCode: 1, price: 1 }, {

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

@@ -13,13 +13,26 @@ const schema = new mongoose.Schema({
     typeOf: {
         type: String,
         required: true
-    }
+    },
+    additionalProperty: [mongoose.SchemaTypes.Mixed],
+    availableChannel: mongoose.SchemaTypes.Mixed,
+    description: mongoose.SchemaTypes.Mixed,
+    hasOfferCatalog: mongoose.SchemaTypes.Mixed,
+    name: mongoose.SchemaTypes.Mixed,
+    offers: [mongoose.SchemaTypes.Mixed],
+    productID: {
+        type: String,
+        required: true
+    },
+    provider: [mongoose.SchemaTypes.Mixed],
+    serviceOutput: mongoose.SchemaTypes.Mixed,
+    serviceType: mongoose.SchemaTypes.Mixed
 }, {
     collection: 'products',
     id: true,
     read: 'primaryPreferred',
     writeConcern: writeConcern,
-    strict: false,
+    strict: true,
     useNestedStrict: true,
     timestamps: {
         createdAt: 'createdAt',

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

@@ -1,5 +1,8 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
+interface IProjection {
+    [key: string]: 0 | 1;
+}
 /**
  * オファーリポジトリ
  */
@@ -23,15 +26,22 @@ export declare class MongoRepository {
         availableAtOrFrom?: {
             id?: string;
         };
+        unacceptedPaymentMethod?: string[];
+        excludeAppliesToMovieTicket: boolean;
+        onlyValid?: boolean;
         limit?: number;
         page?: number;
         sort: boolean;
-    }): Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;
+        projection?: IProjection;
+    }): Promise<{
+        offers: factory.unitPriceOffer.IUnitPriceOffer[];
+        sortedOfferIds: string[];
+    }>;
     findById(params: {
         id: string;
     }): Promise<factory.unitPriceOffer.IUnitPriceOffer>;
     count(params: factory.unitPriceOffer.ISearchConditions): Promise<number>;
-    search(params: factory.unitPriceOffer.ISearchConditions): Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;
+    search(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;
     save(params: factory.unitPriceOffer.IUnitPriceOffer): Promise<factory.unitPriceOffer.IUnitPriceOffer>;
     saveManyByIdentifier(params: {
         attributes: factory.unitPriceOffer.IUnitPriceOffer;
@@ -46,4 +56,9 @@ export declare class MongoRepository {
         };
     }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
+export {};

package/lib/chevre/repo/offer.js

@@ -35,7 +35,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_OFFER_MONGO_CONDITIONS(params) {
-        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;
+        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, _30, _31;
         // 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;
@@ -166,7 +166,15 @@ class MongoRepository {
                 }
             });
         }
-        const appliesToMovieTicketServiceTypeEq = (_w = (_v = (_u = params.priceSpecification) === null || _u === void 0 ? void 0 : _u.appliesToMovieTicket) === null || _v === void 0 ? void 0 : _v.serviceType) === null || _w === void 0 ? void 0 : _w.$eq;
+        const appliesToMovieTicketServiceTypeExist = (_w = (_v = (_u = params.priceSpecification) === null || _u === void 0 ? void 0 : _u.appliesToMovieTicket) === null || _v === void 0 ? void 0 : _v.serviceType) === null || _w === void 0 ? void 0 : _w.$exists;
+        if (typeof appliesToMovieTicketServiceTypeExist === 'boolean') {
+            andConditions.push({
+                'priceSpecification.appliesToMovieTicket.serviceType': {
+                    $exists: appliesToMovieTicketServiceTypeExist
+                }
+            });
+        }
+        const appliesToMovieTicketServiceTypeEq = (_z = (_y = (_x = params.priceSpecification) === null || _x === void 0 ? void 0 : _x.appliesToMovieTicket) === null || _y === void 0 ? void 0 : _y.serviceType) === null || _z === void 0 ? void 0 : _z.$eq;
         if (typeof appliesToMovieTicketServiceTypeEq === 'string') {
             andConditions.push({
                 'priceSpecification.appliesToMovieTicket.serviceType': {
@@ -175,7 +183,7 @@ class MongoRepository {
                 }
             });
         }
-        const appliesToMovieTicketServiceOutputTypeOfEq = (_0 = (_z = (_y = (_x = params.priceSpecification) === null || _x === void 0 ? void 0 : _x.appliesToMovieTicket) === null || _y === void 0 ? void 0 : _y.serviceOutput) === null || _z === void 0 ? void 0 : _z.typeOf) === null || _0 === void 0 ? void 0 : _0.$eq;
+        const appliesToMovieTicketServiceOutputTypeOfEq = (_3 = (_2 = (_1 = (_0 = params.priceSpecification) === null || _0 === void 0 ? void 0 : _0.appliesToMovieTicket) === null || _1 === void 0 ? void 0 : _1.serviceOutput) === null || _2 === void 0 ? void 0 : _2.typeOf) === null || _3 === void 0 ? void 0 : _3.$eq;
         if (typeof appliesToMovieTicketServiceOutputTypeOfEq === 'string') {
             andConditions.push({
                 'priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': {
@@ -184,8 +192,16 @@ class MongoRepository {
                 }
             });
         }
+        const appliesToMovieTicketServiceOutputTypeOfNin = (_7 = (_6 = (_5 = (_4 = params.priceSpecification) === null || _4 === void 0 ? void 0 : _4.appliesToMovieTicket) === null || _5 === void 0 ? void 0 : _5.serviceOutput) === null || _6 === void 0 ? void 0 : _6.typeOf) === null || _7 === void 0 ? void 0 : _7.$nin;
+        if (Array.isArray(appliesToMovieTicketServiceOutputTypeOfNin)) {
+            andConditions.push({
+                'priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': {
+                    $nin: appliesToMovieTicketServiceOutputTypeOfNin
+                }
+            });
+        }
         if (params.priceSpecification !== undefined && params.priceSpecification !== null) {
-            const priceSpecificationPriceGte = (_1 = params.priceSpecification.price) === null || _1 === void 0 ? void 0 : _1.$gte;
+            const priceSpecificationPriceGte = (_8 = params.priceSpecification.price) === null || _8 === void 0 ? void 0 : _8.$gte;
             if (typeof priceSpecificationPriceGte === 'number') {
                 andConditions.push({
                     'priceSpecification.price': {
@@ -194,7 +210,7 @@ class MongoRepository {
                     }
                 });
             }
-            const priceSpecificationPriceLte = (_2 = params.priceSpecification.price) === null || _2 === void 0 ? void 0 : _2.$lte;
+            const priceSpecificationPriceLte = (_9 = params.priceSpecification.price) === null || _9 === void 0 ? void 0 : _9.$lte;
             if (typeof priceSpecificationPriceLte === 'number') {
                 andConditions.push({
                     'priceSpecification.price': {
@@ -203,7 +219,7 @@ class MongoRepository {
                     }
                 });
             }
-            const accountsReceivableGte = (_4 = (_3 = params.priceSpecification.accounting) === null || _3 === void 0 ? void 0 : _3.accountsReceivable) === null || _4 === void 0 ? void 0 : _4.$gte;
+            const accountsReceivableGte = (_11 = (_10 = params.priceSpecification.accounting) === null || _10 === void 0 ? void 0 : _10.accountsReceivable) === null || _11 === void 0 ? void 0 : _11.$gte;
             if (typeof accountsReceivableGte === 'number') {
                 andConditions.push({
                     'priceSpecification.accounting.accountsReceivable': {
@@ -212,7 +228,7 @@ class MongoRepository {
                     }
                 });
             }
-            const accountsReceivableLte = (_6 = (_5 = params.priceSpecification.accounting) === null || _5 === void 0 ? void 0 : _5.accountsReceivable) === null || _6 === void 0 ? void 0 : _6.$lte;
+            const accountsReceivableLte = (_13 = (_12 = params.priceSpecification.accounting) === null || _12 === void 0 ? void 0 : _12.accountsReceivable) === null || _13 === void 0 ? void 0 : _13.$lte;
             if (typeof accountsReceivableLte === 'number') {
                 andConditions.push({
                     'priceSpecification.accounting.accountsReceivable': {
@@ -221,7 +237,7 @@ class MongoRepository {
                     }
                 });
             }
-            const accountingCodeValueEq = (_9 = (_8 = (_7 = params.priceSpecification.accounting) === null || _7 === void 0 ? void 0 : _7.operatingRevenue) === null || _8 === void 0 ? void 0 : _8.codeValue) === null || _9 === void 0 ? void 0 : _9.$eq;
+            const accountingCodeValueEq = (_16 = (_15 = (_14 = params.priceSpecification.accounting) === null || _14 === void 0 ? void 0 : _14.operatingRevenue) === null || _15 === void 0 ? void 0 : _15.codeValue) === null || _16 === void 0 ? void 0 : _16.$eq;
             if (typeof accountingCodeValueEq === 'string') {
                 andConditions.push({
                     'priceSpecification.accounting.operatingRevenue.codeValue': {
@@ -230,7 +246,7 @@ class MongoRepository {
                     }
                 });
             }
-            const accountingCodeValueIn = (_12 = (_11 = (_10 = params.priceSpecification.accounting) === null || _10 === void 0 ? void 0 : _10.operatingRevenue) === null || _11 === void 0 ? void 0 : _11.codeValue) === null || _12 === void 0 ? void 0 : _12.$in;
+            const accountingCodeValueIn = (_19 = (_18 = (_17 = params.priceSpecification.accounting) === null || _17 === void 0 ? void 0 : _17.operatingRevenue) === null || _18 === void 0 ? void 0 : _18.codeValue) === null || _19 === void 0 ? void 0 : _19.$in;
             if (Array.isArray(accountingCodeValueIn)) {
                 andConditions.push({
                     'priceSpecification.accounting.operatingRevenue.codeValue': {
@@ -239,7 +255,7 @@ class MongoRepository {
                     }
                 });
             }
-            const referenceQuantityValueEq = (_14 = (_13 = params.priceSpecification.referenceQuantity) === null || _13 === void 0 ? void 0 : _13.value) === null || _14 === void 0 ? void 0 : _14.$eq;
+            const referenceQuantityValueEq = (_21 = (_20 = params.priceSpecification.referenceQuantity) === null || _20 === void 0 ? void 0 : _20.value) === null || _21 === void 0 ? void 0 : _21.$eq;
             if (typeof referenceQuantityValueEq === 'number') {
                 andConditions.push({
                     'priceSpecification.referenceQuantity.value': {
@@ -249,7 +265,7 @@ class MongoRepository {
                 });
             }
         }
-        const availableAtOrFromIdEq = (_16 = (_15 = params.availableAtOrFrom) === null || _15 === void 0 ? void 0 : _15.id) === null || _16 === void 0 ? void 0 : _16.$eq;
+        const availableAtOrFromIdEq = (_23 = (_22 = params.availableAtOrFrom) === null || _22 === void 0 ? void 0 : _22.id) === null || _23 === void 0 ? void 0 : _23.$eq;
         if (typeof availableAtOrFromIdEq === 'string') {
             andConditions.push({
                 'availableAtOrFrom.id': {
@@ -258,7 +274,7 @@ class MongoRepository {
                 }
             });
         }
-        const availableAtOrFromIdIn = (_18 = (_17 = params.availableAtOrFrom) === null || _17 === void 0 ? void 0 : _17.id) === null || _18 === void 0 ? void 0 : _18.$in;
+        const availableAtOrFromIdIn = (_25 = (_24 = params.availableAtOrFrom) === null || _24 === void 0 ? void 0 : _24.id) === null || _25 === void 0 ? void 0 : _25.$in;
         if (Array.isArray(availableAtOrFromIdIn)) {
             andConditions.push({
                 'availableAtOrFrom.id': {
@@ -267,7 +283,7 @@ class MongoRepository {
                 }
             });
         }
-        const addOnItemOfferedIdEq = (_21 = (_20 = (_19 = params.addOn) === null || _19 === void 0 ? void 0 : _19.itemOffered) === null || _20 === void 0 ? void 0 : _20.id) === null || _21 === void 0 ? void 0 : _21.$eq;
+        const addOnItemOfferedIdEq = (_28 = (_27 = (_26 = params.addOn) === null || _26 === void 0 ? void 0 : _26.itemOffered) === null || _27 === void 0 ? void 0 : _27.id) === null || _28 === void 0 ? void 0 : _28.$eq;
         if (typeof addOnItemOfferedIdEq === 'string') {
             andConditions.push({
                 'addOn.itemOffered.id': {
@@ -276,7 +292,7 @@ class MongoRepository {
                 }
             });
         }
-        const hasMerchantReturnPolicyIdEq = (_23 = (_22 = params.hasMerchantReturnPolicy) === null || _22 === void 0 ? void 0 : _22.id) === null || _23 === void 0 ? void 0 : _23.$eq;
+        const hasMerchantReturnPolicyIdEq = (_30 = (_29 = params.hasMerchantReturnPolicy) === null || _29 === void 0 ? void 0 : _29.id) === null || _30 === void 0 ? void 0 : _30.$eq;
         if (typeof hasMerchantReturnPolicyIdEq === 'string') {
             andConditions.push({
                 'hasMerchantReturnPolicy.id': {
@@ -285,7 +301,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_24 = params.additionalProperty) === null || _24 === void 0 ? void 0 : _24.$elemMatch;
+        const additionalPropertyElemMatch = (_31 = params.additionalProperty) === null || _31 === void 0 ? void 0 : _31.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -294,6 +310,20 @@ class MongoRepository {
                 }
             });
         }
+        if (params.onlyValid === true) {
+            const now = new Date();
+            andConditions.push({
+                $or: [
+                    { validFrom: { $exists: false } },
+                    { validFrom: { $exists: true, $lte: now } }
+                ]
+            }, {
+                $or: [
+                    { validThrough: { $exists: false } },
+                    { validThrough: { $exists: true, $gte: now } }
+                ]
+            });
+        }
         return andConditions;
     }
     /**
@@ -324,37 +354,32 @@ class MongoRepository {
             const sortedOfferIds = (Array.isArray(itemListElements))
                 ? itemListElements.map((element) => element.id)
                 : [];
-            // const offerCatalog = await this.offerCatalogModel.findById(
-            //     params.offerCatalog.id,
-            //     {
-            //         itemListElement: 1
-            //     }
-            // )
-            //     .exec()
-            //     .then((doc) => {
-            //         if (doc === null) {
-            //             throw new factory.errors.NotFound(this.offerCatalogModel.modelName);
-            //         }
-            //         return <Pick<factory.offerCatalog.IOfferCatalog, 'itemListElement'>>doc.toObject();
-            //     });
-            // let sortedOfferIds: string[] = (Array.isArray(offerCatalog.itemListElement))
-            //     ? offerCatalog.itemListElement.map((element) => element.id)
-            //     : [];
-            // const filteredIds = params.ids;
-            // if (Array.isArray(filteredIds)) {
-            //     sortedOfferIds = sortedOfferIds.filter((id) => filteredIds.includes(id));
-            // }
             let offers = [];
             if (sortedOfferIds.length > 0) {
-                offers = yield this.search(Object.assign({ id: { $in: sortedOfferIds } }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                const searchOffersConditions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ id: { $in: sortedOfferIds } }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                     ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } }
-                    : undefined));
+                    : undefined), { priceSpecification: {
+                        appliesToMovieTicket: Object.assign(Object.assign({}, (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
+                            ? {
+                                serviceOutput: {
+                                    typeOf: { $nin: params.unacceptedPaymentMethod }
+                                }
+                            }
+                            : undefined), (params.excludeAppliesToMovieTicket)
+                            ? {
+                                serviceType: { $exists: false }
+                            }
+                            : undefined)
+                    }, onlyValid: params.onlyValid === true }), (typeof params.limit === 'number' && typeof params.page === 'number')
+                    ? { sort: { _id: 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);
                 if (params.sort) {
                     // sorting
                     offers = offers.sort((a, b) => sortedOfferIds.indexOf(String(a.id)) - sortedOfferIds.indexOf(String(b.id)));
                 }
             }
-            return offers;
+            return { offers, sortedOfferIds };
         });
     }
     findById(params) {
@@ -379,14 +404,16 @@ class MongoRepository {
                 .exec();
         });
     }
-    search(params) {
+    search(params, projection) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_OFFER_MONGO_CONDITIONS(params);
-            const query = this.offerModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            });
+            const positiveProjectionExists = (projection !== undefined && projection !== null)
+                ? Object.values(projection)
+                    .some((value) => value !== 0)
+                : false;
+            const query = this.offerModel.find((conditions.length > 0) ? { $and: conditions } : {}, (positiveProjectionExists)
+                ? projection
+                : Object.assign(Object.assign({}, projection), { __v: 0, createdAt: 0, updatedAt: 0 }));
             if (typeof params.limit === 'number') {
                 const page = (typeof params.page === 'number') ? params.page : 1;
                 query.limit(params.limit)
@@ -475,5 +502,11 @@ class MongoRepository {
             .sort({ 'priceSpecification.price': factory.sortType.Descending })
             .cursor();
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.offerModel.updateMany(params.filter, { $unset: params.$unset })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -28,11 +28,9 @@ export declare class MongoRepository {
             };
         };
     }): Promise<void>;
-    findById(params: {
-        id: string;
-    }): Promise<factory.offerCatalog.IOfferCatalog>;
-    count(params: factory.offerCatalog.ISearchConditions): Promise<number>;
-    search(params: factory.offerCatalog.ISearchConditions): Promise<factory.offerCatalog.IOfferCatalog[]>;
+    search(params: factory.offerCatalog.ISearchConditions): Promise<(Omit<factory.offerCatalog.IOfferCatalog, 'itemListElement'> & {
+        numberOfItems?: number;
+    })[]>;
     deleteById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/offerCatalog.js

@@ -178,51 +178,92 @@ class MongoRepository {
                 .exec();
         });
     }
-    findById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.offerCatalogModel.findOne({
-                _id: params.id
-            }, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.offerCatalogModel.modelName);
-            }
-            return doc.toObject();
-        });
-    }
-    count(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            return this.offerCatalogModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
-                .exec();
-        });
-    }
+    // public async findById(params: {
+    //     id: string;
+    // }): Promise<factory.offerCatalog.IOfferCatalog> {
+    //     const doc = await this.offerCatalogModel.findOne(
+    //         {
+    //             _id: params.id
+    //         },
+    //         {
+    //             __v: 0,
+    //             createdAt: 0,
+    //             updatedAt: 0
+    //         }
+    //     )
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.offerCatalogModel.modelName);
+    //     }
+    //     return doc.toObject();
+    // }
+    // public async count(
+    //     params: factory.offerCatalog.ISearchConditions
+    // ): Promise<number> {
+    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+    //     return this.offerCatalogModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
+    //         .setOptions({ maxTimeMS: 10000 })
+    //         .exec();
+    // }
     search(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const query = this.offerCatalogModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
+            const matchStages = conditions.map((condition) => {
+                return { $match: condition };
             });
+            // numberOfItems集計(2023-02-28~)
+            const aggregate = this.offerCatalogModel.aggregate([
+                ...(params.sort !== undefined) ? [{ $sort: params.sort }] : [],
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        name: '$name',
+                        description: '$description',
+                        project: '$project',
+                        typeOf: '$typeOf',
+                        id: '$_id',
+                        identifier: '$identifier',
+                        // itemListElement: '$itemListElement',
+                        itemOffered: '$itemOffered',
+                        additionalProperty: '$additionalProperty',
+                        numberOfItems: {
+                            $cond: {
+                                if: { $isArray: '$itemListElement' },
+                                then: { $size: '$itemListElement' },
+                                else: 0
+                            }
+                        }
+                    }
+                }
+            ]);
             if (typeof params.limit === 'number') {
                 const page = (typeof params.page === 'number') ? params.page : 1;
-                query.limit(params.limit)
+                aggregate.limit(params.limit * page)
                     .skip(params.limit * (page - 1));
             }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (params.sort !== undefined) {
-                query.sort(params.sort);
-            }
-            return query.setOptions({ maxTimeMS: 10000 })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+            return aggregate.exec();
+            // const query = this.offerCatalogModel.find(
+            //     (conditions.length > 0) ? { $and: conditions } : {},
+            //     {
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0
+            //     }
+            // );
+            // if (typeof params.limit === 'number') {
+            //     const page: number = (typeof params.page === 'number') ? params.page : 1;
+            //     query.limit(params.limit)
+            //         .skip(params.limit * (page - 1));
+            // }
+            // // tslint:disable-next-line:no-single-line-block-comment
+            // /* istanbul ignore else */
+            // if (params.sort !== undefined) {
+            //     query.sort(params.sort);
+            // }
+            // return query.setOptions({ maxTimeMS: 10000 })
+            //     .exec()
+            //     .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
     deleteById(params) {