@chevre/domain 22.1.0-alpha.7 → 22.1.0-alpha.8

package/example/src/chevre/searchPriceSpecifications.ts

@@ -0,0 +1,56 @@
+// tslint:disable:no-implicit-dependencies 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, { autoIndex: false });
+
+    const priceSpecificationRepo = await chevre.repository.PriceSpecification.createInstance(mongoose.connection);
+
+    // const saveResult = await priceSpecificationRepo.save({
+    //     id: '5e3cdce826c69900127e9d79',
+    //     attributes: {
+    //         project: {
+    //             typeOf: chevre.factory.organizationType.Project,
+    //             id: project.id
+    //         },
+    //         typeOf: chevre.factory.priceSpecificationType.CategoryCodeChargeSpecification,
+    //         price: 50,
+    //         priceCurrency: chevre.factory.priceCurrency.JPY,
+    //         name: {
+    //             ja: 'ミールクーポン加算料金'
+    //         },
+    //         appliesToCategoryCode: [{
+    //             typeOf: 'CategoryCode',
+    //             codeValue: 'Meal',
+    //             inCodeSet: {
+    //                 typeOf: 'CategoryCodeSet',
+    //                 identifier: chevre.factory.categoryCode.CategorySetIdentifier.SeatingType
+    //             }
+    //         }],
+    //         valueAddedTaxIncluded: true
+    //     }
+    // });
+    // console.dir(saveResult, { depth: null });
+    // console.log('saved');
+
+    const limit = 10;
+    const page = 1;
+    const priceSpecs = await priceSpecificationRepo.search({
+        limit,
+        page,
+        project: { id: { $eq: project.id } },
+        typeOf: chevre.factory.priceSpecificationType.CategoryCodeChargeSpecification
+    });
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(priceSpecs, { depth: null });
+    console.log(priceSpecs.length, 'aggregations found');
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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

@@ -30,10 +30,12 @@ const schemaOptions = {
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,
-    timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
-    },
+    // timestamps: {
+    //     createdAt: 'createdAt',
+    //     updatedAt: 'updatedAt'
+    // },
+    timestamps: false,
+    versionKey: false,
     toJSON: {
         getters: false,
         virtuals: false,

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

@@ -39,7 +39,7 @@ export declare class PriceSpecificationRepo {
     save<T extends factory.priceSpecificationType>(params: {
         id?: string;
         attributes: factory.priceSpecification.IPriceSpecification<T>;
-    }): Promise<factory.priceSpecification.IPriceSpecification<T>>;
+    }): Promise<Pick<factory.priceSpecification.IPriceSpecification<T>, 'id'>>;
     /**
      * 削除する
      */

package/lib/chevre/repo/priceSpecification.js

@@ -166,9 +166,22 @@ class PriceSpecificationRepo {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = PriceSpecificationRepo.CREATE_MONGO_CONDITIONS(params);
             const query = this.priceSpecificationModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
+                _id: 0,
+                id: { $toString: '$_id' },
+                project: 1,
+                typeOf: 1,
+                name: 1,
+                price: 1,
+                priceCurrency: 1,
+                validFrom: 1,
+                validThrough: 1,
+                valueAddedTaxIncluded: 1,
+                appliesToCategoryCode: 1,
+                appliesToMovieTicket: 1,
+                appliesToVideoFormat: 1
+                // __v: 0,
+                // createdAt: 0,
+                // updatedAt: 0
             });
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
@@ -184,25 +197,41 @@ class PriceSpecificationRepo {
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
             // return;
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // lean(2024-08-06~)
+                .exec();
         });
     }
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.priceSpecificationModel.findOne({ _id: params.id }, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
+            const doc = yield this.priceSpecificationModel.findOne({ _id: { $eq: params.id } }, {
+                _id: 0,
+                id: { $toString: '$_id' },
+                project: 1,
+                typeOf: 1,
+                name: 1,
+                price: 1,
+                priceCurrency: 1,
+                validFrom: 1,
+                validThrough: 1,
+                valueAddedTaxIncluded: 1,
+                appliesToCategoryCode: 1,
+                appliesToMovieTicket: 1,
+                appliesToVideoFormat: 1
+                // __v: 0,
+                // createdAt: 0,
+                // updatedAt: 0
             })
+                .lean() // lean(2024-08-06~)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.priceSpecificationModel.modelName);
             }
-            return doc.toObject();
+            return doc;
+            // return doc.toObject();
         });
     }
     save(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let doc;
             if (typeof params.id !== 'string') {
@@ -210,14 +239,15 @@ class PriceSpecificationRepo {
             }
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
-                const _a = params.attributes, { id, project, typeOf } = _a, updateFields = __rest(_a, ["id", "project", "typeOf"]);
-                doc = yield this.priceSpecificationModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                const _b = params.attributes, { id, project, typeOf } = _b, updateFields = __rest(_b, ["id", "project", "typeOf"]);
+                doc = yield this.priceSpecificationModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
+                    .lean() // lean(2024-08-06~)
                     .exec();
             }
             if (doc === null) {
                 throw new factory.errors.NotFound(this.priceSpecificationModel.modelName);
             }
-            return doc.toObject();
+            return { id: (_a = doc._id) === null || _a === void 0 ? void 0 : _a.toString() };
         });
     }
     /**
@@ -225,7 +255,7 @@ class PriceSpecificationRepo {
      */
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.priceSpecificationModel.findOneAndRemove({ _id: params.id })
+            yield this.priceSpecificationModel.findOneAndRemove({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
                 .exec();
         });
     }

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.1.0-alpha.7"
+  "version": "22.1.0-alpha.8"
 }