@chevre/domain 20.4.0-alpha.19 → 20.4.0-alpha.20

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -6,31 +6,14 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
-    // const accountRepo = new chevre.repository.Account(mongoose.connection);
-    // const permitRepo = new chevre.repository.ServiceOutput(mongoose.connection);
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
+    const offerRepo = new chevre.repository.Offer(mongoose.connection);
 
     let updateResult: any;
-    // updateResult = await accountRepo.unsetUnnecessaryFields({
-    //     filter: { status: { $exists: true } },
-    //     $unset: { status: 1 }
-    // });
-    // console.log('accounts unset.', updateResult);
-    // updateResult = await permitRepo.unsetUnnecessaryFields({
-    //     filter: { 'paymentAccount.project': { $exists: true } },
-    //     $unset: { 'paymentAccount.project': 1 }
-    // });
-    // console.log('permits unset', updateResult);
-    // updateResult = await permitRepo.unsetUnnecessaryFields({
-    //     filter: { 'issuedThrough.project': { $exists: true } },
-    //     $unset: { 'issuedThrough.project': 1 }
-    // });
-    // console.log('permits unset', updateResult);
-    updateResult = await eventRepo.unsetUnnecessaryFields({
-        filter: { hasOfferCatalog: { $exists: true } },
-        $unset: { hasOfferCatalog: 1 }
+    updateResult = await offerRepo.unsetUnnecessaryFields({
+        filter: { 'category.project': { $exists: true } },
+        $unset: { 'category.project': 1 }
     });
-    console.log('events unset', updateResult);
+    console.log('offers unset', updateResult);
 }
 
 main()

package/lib/chevre/repo/event.js

@@ -638,14 +638,14 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             const positiveProjectionExists = (projection !== undefined && projection !== null)
-                ? Object.keys(projection)
-                    .some((key) => projection[key] !== 0)
+                ? Object.values(projection)
+                    .some((value) => value !== 0)
                 : false;
             const query = this.eventModel.find({ $and: conditions }, 
             // :1対応(2023-01-25~)
             (positiveProjectionExists)
                 ? projection
-                : Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, 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)
@@ -680,14 +680,14 @@ class MongoRepository {
     findById(params, projection) {
         return __awaiter(this, void 0, void 0, function* () {
             const positiveProjectionExists = (projection !== undefined && projection !== null)
-                ? Object.keys(projection)
-                    .some((key) => projection[key] !== 0)
+                ? Object.values(projection)
+                    .some((value) => value !== 0)
                 : false;
             const doc = yield this.eventModel.findOne({ _id: params.id }, 
             // :1対応(2023-01-25~)
             (positiveProjectionExists)
                 ? projection
-                : Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+                : Object.assign(Object.assign({}, projection), { __v: 0, createdAt: 0, updatedAt: 0 }))
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);

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

@@ -1,7 +1,7 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 interface IProjection {
-    [key: string]: 0;
+    [key: string]: 0 | 1;
 }
 /**
  * オファーリポジトリ
@@ -56,5 +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

@@ -407,7 +407,13 @@ class MongoRepository {
     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 } : {}, Object.assign(Object.assign({}, projection), { __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)
@@ -496,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/package.json

@@ -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.19"
+  "version": "20.4.0-alpha.20"
 }