@chevre/domain 20.2.0 → 20.3.0-alpha.0

package/example/src/chevre/aggregation/aggregateSystem.ts

@@ -25,7 +25,6 @@ async function main() {
         agregation: aggregationRepo,
         action: actionRepo
     });
-    return;
 
     await chevre.service.aggregation.system.aggregatePayTransaction({
         aggregationDays: AGGREGATE_DAYS,

package/example/src/chevre/searchOfferCatalogs.ts

@@ -0,0 +1,30 @@
+// tslint:disable:no-console
+// import * as redis from 'redis';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const offerCatalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
+
+    const catalogs = await offerCatalogRepo.search({
+        limit: 100,
+        page: 1,
+        id: { $in: ['0001'] },
+        itemListElement: {
+            id: {
+                // $in: ['1001'],
+                // $nin: ['1005']
+            }
+        },
+        itemOffered: { typeOf: { $eq: chevre.factory.product.ProductType.EventService } }
+    });
+    console.log(catalogs);
+    console.log(catalogs.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/repo/offerCatalog.js

@@ -31,8 +31,9 @@ class MongoRepository {
     constructor(connection) {
         this.offerCatalogModel = connection.model(offerCatalog_1.modelName);
     }
+    // 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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         // 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;
@@ -43,34 +44,23 @@ class MongoRepository {
                 }
             });
         }
-        if (typeof params.id === 'string') {
-            andConditions.push({ _id: new RegExp(params.id) });
+        const idIn = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$in;
+        if (Array.isArray(idIn)) {
+            andConditions.push({ _id: { $in: idIn } });
         }
-        else {
-            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) } });
         }
-        if (typeof params.identifier === 'string') {
-            if (params.identifier.length > 0) {
-                andConditions.push({
-                    identifier: {
-                        $exists: true,
-                        $regex: new RegExp(params.identifier)
-                    }
-                });
-            }
+        const identifierEq = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$eq;
+        if (typeof identifierEq === 'string') {
+            andConditions.push({
+                identifier: { $eq: identifierEq }
+            });
         }
-        else if (params.identifier !== undefined && params.identifier !== null) {
-            if (typeof params.identifier.$eq === 'string') {
-                andConditions.push({
-                    identifier: {
-                        $exists: true,
-                        $eq: params.identifier.$eq
-                    }
-                });
-            }
+        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({
@@ -80,7 +70,7 @@ class MongoRepository {
                 ]
             });
         }
-        const itemListElementIdIn = (_e = (_d = params.itemListElement) === null || _d === void 0 ? void 0 : _d.id) === null || _e === void 0 ? void 0 : _e.$in;
+        const itemListElementIdIn = (_h = (_g = params.itemListElement) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$in;
         if (Array.isArray(itemListElementIdIn)) {
             andConditions.push({
                 'itemListElement.id': {
@@ -89,7 +79,15 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedTypeOfEq = (_g = (_f = params.itemOffered) === null || _f === void 0 ? void 0 : _f.typeOf) === null || _g === void 0 ? void 0 : _g.$eq;
+        const itemListElementIdNin = (_k = (_j = params.itemListElement) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$nin;
+        if (Array.isArray(itemListElementIdNin)) {
+            andConditions.push({
+                'itemListElement.id': {
+                    $nin: itemListElementIdNin
+                }
+            });
+        }
+        const itemOfferedTypeOfEq = (_m = (_l = params.itemOffered) === null || _l === void 0 ? void 0 : _l.typeOf) === null || _m === void 0 ? void 0 : _m.$eq;
         if (typeof itemOfferedTypeOfEq === 'string') {
             andConditions.push({
                 'itemOffered.typeOf': {
@@ -98,7 +96,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedServiceTypeCodeValueEq = (_k = (_j = (_h = params.itemOffered) === null || _h === void 0 ? void 0 : _h.serviceType) === null || _j === void 0 ? void 0 : _j.codeValue) === null || _k === void 0 ? void 0 : _k.$eq;
+        const itemOfferedServiceTypeCodeValueEq = (_q = (_p = (_o = params.itemOffered) === null || _o === void 0 ? void 0 : _o.serviceType) === null || _p === void 0 ? void 0 : _p.codeValue) === null || _q === void 0 ? void 0 : _q.$eq;
         if (typeof itemOfferedServiceTypeCodeValueEq === 'string') {
             andConditions.push({
                 'itemOffered.serviceType.codeValue': {
@@ -107,7 +105,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_l = params.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
+        const additionalPropertyElemMatch = (_r = params.additionalProperty) === null || _r === void 0 ? void 0 : _r.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.286.0",
+    "@chevre/factory": "4.287.0",
     "@cinerino/sdk": "3.138.1",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0"
+  "version": "20.3.0-alpha.0"
 }