@chevre/domain 20.4.0-alpha.25 → 20.4.0-alpha.27

package/example/src/chevre/reIndex.ts

@@ -0,0 +1,25 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const priceSpecificationRepo = new chevre.repository.PriceSpecification(mongoose.connection);
+    const result = await priceSpecificationRepo.reIndex();
+    console.log(result);
+}
+
+main()
+    .then()
+    .catch(console.error);
+// setInterval(
+//     () => {
+//         main()
+//             .then()
+//             .catch(console.error);
+//     },
+//     // tslint:disable-next-line:no-magic-numbers
+//     60000
+// );

package/example/src/chevre/searchOfferCatalogs.ts

@@ -0,0 +1,29 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const PROJECT_ID = process.env.PROJECT_ID;
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const catalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
+
+    console.log('searching...');
+    const catalogs = await catalogRepo.search(
+        {
+            project: { id: { $eq: PROJECT_ID } },
+            identifier: { $eq: '0001' },
+            sort: { identifier: chevre.factory.sortType.Descending },
+            limit: 2,
+            page: 1
+        }
+    );
+    console.log('catalogs found', catalogs.map((catalog) => `${catalog.identifier} ${catalog.numberOfItems}`));
+    console.log(catalogs.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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/offerCatalog.d.ts

@@ -32,7 +32,9 @@ export declare class MongoRepository {
         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

@@ -205,24 +205,62 @@ class MongoRepository {
     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) {

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

@@ -41,4 +41,5 @@ export declare class MongoRepository {
         deletedCount?: number | undefined;
     }>;
     getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
+    reIndex(): Promise<any>;
 }

package/lib/chevre/repo/priceSpecification.js

@@ -32,37 +32,23 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
+        var _a, _b, _c, _d, _e, _f, _g;
         const andConditions = [];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.project !== undefined && params.project !== null) {
-            if (params.project.id !== undefined && params.project.id !== null) {
-                if (typeof params.project.id.$eq === 'string') {
-                    andConditions.push({
-                        'project.id': {
-                            $eq: params.project.id.$eq
-                        }
-                    });
-                }
-            }
+        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 } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.id !== undefined && params.id !== null) {
             if (typeof params.id.$eq === 'string') {
-                andConditions.push({
-                    _id: {
-                        $eq: params.id.$eq
-                    }
-                });
+                andConditions.push({ _id: { $eq: params.id.$eq } });
             }
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.typeOf !== undefined) {
-            andConditions.push({
-                typeOf: params.typeOf
-            });
+            andConditions.push({ typeOf: params.typeOf });
         }
         if (params.appliesToCategoryCode !== undefined && params.appliesToCategoryCode !== null) {
             if (params.appliesToCategoryCode.$elemMatch !== undefined && params.appliesToCategoryCode.$elemMatch !== null) {
@@ -122,15 +108,23 @@ class MongoRepository {
                 }
             });
         }
-        if (params.appliesToMovieTicket !== undefined) {
-            if (Array.isArray(params.appliesToMovieTicket.serviceTypes)) {
-                andConditions.push({
-                    'appliesToMovieTicket.serviceType': {
-                        $exists: true,
-                        $in: params.appliesToMovieTicket.serviceTypes
-                    }
-                });
-            }
+        const appliesToMovieTicketServiceTypeIn = (_c = params.appliesToMovieTicket) === null || _c === void 0 ? void 0 : _c.serviceTypes;
+        if (Array.isArray(appliesToMovieTicketServiceTypeIn)) {
+            andConditions.push({
+                'appliesToMovieTicket.serviceType': {
+                    $exists: true,
+                    $in: appliesToMovieTicketServiceTypeIn
+                }
+            });
+        }
+        const appliesToMovieTicketServiceOutputTypeOfEq = (_f = (_e = (_d = params.appliesToMovieTicket) === null || _d === void 0 ? void 0 : _d.serviceOutput) === null || _e === void 0 ? void 0 : _e.typeOf) === null || _f === void 0 ? void 0 : _f.$eq;
+        if (typeof appliesToMovieTicketServiceOutputTypeOfEq === 'string') {
+            andConditions.push({
+                'appliesToMovieTicket.serviceOutput.typeOf': {
+                    $exists: true,
+                    $eq: appliesToMovieTicketServiceOutputTypeOfEq
+                }
+            });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -152,45 +146,12 @@ class MongoRepository {
                 }
             });
         }
+        const priceEq = (_g = params.price) === null || _g === void 0 ? void 0 : _g.$eq;
+        if (typeof priceEq === 'number') {
+            andConditions.push({ price: { $eq: priceEq } });
+        }
         return andConditions;
     }
-    // public async countCompoundPriceSpecifications<T extends factory.priceSpecificationType>(
-    //     params: factory.compoundPriceSpecification.ISearchConditions<T>
-    // ): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_COMPOUND_PRICE_SPECIFICATION_MONGO_CONDITIONS(params);
-    //     return this.priceSpecificationModel.countDocuments(
-    //         { $and: conditions }
-    //     )
-    //         .setOptions({ maxTimeMS: 10000 })
-    //         .exec();
-    // }
-    // public async searchCompoundPriceSpecifications<T extends factory.priceSpecificationType>(
-    //     params: factory.compoundPriceSpecification.ISearchConditions<T>
-    // ): Promise<factory.compoundPriceSpecification.IPriceSpecification<T>[]> {
-    //     const conditions = MongoRepository.CREATE_COMPOUND_PRICE_SPECIFICATION_MONGO_CONDITIONS(params);
-    //     const query = this.priceSpecificationModel.find(
-    //         { $and: conditions },
-    //         {
-    //             __v: 0,
-    //             createdAt: 0,
-    //             updatedAt: 0
-    //         }
-    //     );
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (params.limit !== undefined && params.page !== undefined) {
-    //         query.limit(params.limit)
-    //             .skip(params.limit * (params.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()));
-    // }
     count(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
@@ -291,5 +252,13 @@ class MongoRepository {
             .sort({ price: factory.sortType.Ascending })
             .cursor();
     }
+    reIndex() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // return this.priceSpecificationModel.collection.name;
+            return this.priceSpecificationModel.db.db.command({
+                reIndex: this.priceSpecificationModel.collection.name
+            });
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.290.1",
-    "@cinerino/sdk": "3.140.0-alpha.19",
+    "@chevre/factory": "4.291.0",
+    "@cinerino/sdk": "3.141.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.4.0-alpha.25"
+  "version": "20.4.0-alpha.27"
 }