@things-factory/geography 4.3.281 → 4.3.378

package/dist-server/index 2.js

@@ -0,0 +1,21 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./migrations"), exports);
+__exportStar(require("./middlewares"), exports);
+__exportStar(require("./service"), exports);
+require("./routes");
+//# sourceMappingURL=index.js.map

package/dist-server/index.js 2.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,gDAA6B;AAC7B,4CAAyB;AAEzB,oBAAiB"}

package/dist-server/routes 2.js

@@ -0,0 +1,25 @@
+const debug = require('debug')('things-factory:geography:routes');
+process.on('bootstrap-module-global-public-route', (app, globalPublicRouter) => {
+    /*
+     * can add global public routes to application (auth not required, tenancy not required)
+     *
+     * ex) routes.get('/path', async(context, next) => {})
+     * ex) routes.post('/path', async(context, next) => {})
+     */
+});
+process.on('bootstrap-module-global-private-route', (app, globalPrivateRouter) => {
+    /*
+     * can add global private routes to application (auth required, tenancy not required)
+     */
+});
+process.on('bootstrap-module-domain-public-route', (app, domainPublicRouter) => {
+    /*
+     * can add domain public routes to application (auth not required, tenancy required)
+     */
+});
+process.on('bootstrap-module-domain-private-route', (app, domainPrivateRouter) => {
+    /*
+     * can add domain private routes to application (auth required, tenancy required)
+     */
+});
+//# sourceMappingURL=routes.js.map

package/dist-server/routes.js 2.map

@@ -0,0 +1 @@
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":"AAAA,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,iCAAiC,CAAC,CAAA;AAEjE,OAAO,CAAC,EAAE,CAAC,sCAA6C,EAAE,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE;IACpF;;;;;OAKG;AACL,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,uCAA8C,EAAE,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;IACtF;;OAEG;AACL,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,sCAA6C,EAAE,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE;IACpF;;OAEG;AACL,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,uCAA8C,EAAE,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;IACtF;;OAEG;AACL,CAAC,CAAC,CAAA"}

package/dist-server/service/geo-country/geo-country-query.js

@@ -33,7 +33,21 @@ let GeoCountryQuery = class GeoCountryQuery {
         return { items, total };
     }
     async geoCountriesWithoutParam(params, context) {
-        const [items, total] = await (0, typeorm_1.getRepository)(geo_country_1.GeoCountry).findAndCount();
+        var _a, _b, _c;
+        const nameFilter = (_a = params.filters) === null || _a === void 0 ? void 0 : _a.find((param) => param.name == 'name');
+        const descFilter = (_b = params.filters) === null || _b === void 0 ? void 0 : _b.find((param) => param.name == 'description');
+        const qb = (0, typeorm_1.getRepository)(geo_country_1.GeoCountry).createQueryBuilder('gc');
+        if (((_c = params.filters) === null || _c === void 0 ? void 0 : _c.length) > 1) {
+            qb.where(`gc.name ilike :name`, { name: nameFilter.value });
+            qb.andWhere(`gc.description ilike :description`, { description: descFilter.value });
+        }
+        else if (nameFilter && nameFilter.value) {
+            qb.where(`gc.name ilike :name`, { name: nameFilter.value });
+        }
+        else if (descFilter && descFilter.value) {
+            qb.where(`gc.description ilike :description`, { description: descFilter.value });
+        }
+        const [items, total] = await qb.getManyAndCount();
         return { items, total };
     }
     async geoContinent(geoCountry) {

package/dist-server/service/geo-country/geo-country-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"geo-country-query.js","sourceRoot":"","sources":["../../../server/service/geo-country/geo-country-query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"geo-country-query.js","sourceRoot":"","sources":["../../../server/service/geo-country/geo-country-query.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/geography",
-  "version": "4.3.281",
+  "version": "4.3.378",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -23,8 +23,8 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^4.3.281",
-    "@things-factory/shell": "^4.3.281"
+    "@things-factory/auth-base": "^4.3.378",
+    "@things-factory/shell": "^4.3.378"
   },
-  "gitHead": "188bb788d3bf0de2e9ae82ac0433e8f08b979bfc"
+  "gitHead": "9de7af5e7b61574cdb4773876a41e1b9b77c1689"
 }

package/server/service/geo-country/geo-country-query.ts

@@ -25,7 +25,21 @@ export class GeoCountryQuery {
 
   @Query(returns => GeoCountryList, { description: 'To fetch multiple GeoCountries without params' })
   async geoCountriesWithoutParam(@Args() params: ListParam, @Ctx() context: any): Promise<GeoCountryList> {
-    const [items, total] = await getRepository(GeoCountry).findAndCount()
+    const nameFilter : any = params.filters?.find((param:any) => param.name =='name')
+    const descFilter : any = params.filters?.find((param:any) => param.name =='description')
+    const qb = getRepository (GeoCountry).createQueryBuilder('gc')
+
+    if(params.filters?.length>1){
+      qb.where(`gc.name ilike :name` , {name: nameFilter.value })
+      qb.andWhere(`gc.description ilike :description` , {description: descFilter.value })
+    }
+    else if(nameFilter && nameFilter.value){
+      qb.where(`gc.name ilike :name` , {name: nameFilter.value })
+    } else if (descFilter && descFilter.value){
+      qb.where(`gc.description ilike :description` , {description: descFilter.value })
+    }
+
+    const [items, total] = await qb.getManyAndCount()
 
     return { items, total }
   }