@things-factory/geography 4.3.280 → 4.3.297
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -33,7 +33,21 @@ let GeoCountryQuery = class GeoCountryQuery {
|
|
|
33
33
|
return { items, total };
|
|
34
34
|
}
|
|
35
35
|
async geoCountriesWithoutParam(params, context) {
|
|
36
|
-
|
|
36
|
+
var _a, _b, _c;
|
|
37
|
+
const nameFilter = (_a = params.filters) === null || _a === void 0 ? void 0 : _a.find((param) => param.name == 'name');
|
|
38
|
+
const descFilter = (_b = params.filters) === null || _b === void 0 ? void 0 : _b.find((param) => param.name == 'description');
|
|
39
|
+
const qb = (0, typeorm_1.getRepository)(geo_country_1.GeoCountry).createQueryBuilder('gc');
|
|
40
|
+
if (((_c = params.filters) === null || _c === void 0 ? void 0 : _c.length) > 1) {
|
|
41
|
+
qb.where(`gc.name ilike :name`, { name: nameFilter.value });
|
|
42
|
+
qb.andWhere(`gc.description ilike :description`, { description: descFilter.value });
|
|
43
|
+
}
|
|
44
|
+
else if (nameFilter && nameFilter.value) {
|
|
45
|
+
qb.where(`gc.name ilike :name`, { name: nameFilter.value });
|
|
46
|
+
}
|
|
47
|
+
else if (descFilter && descFilter.value) {
|
|
48
|
+
qb.where(`gc.description ilike :description`, { description: descFilter.value });
|
|
49
|
+
}
|
|
50
|
+
const [items, total] = await qb.getManyAndCount();
|
|
37
51
|
return { items, total };
|
|
38
52
|
}
|
|
39
53
|
async geoContinent(geoCountry) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geo-country-query.js","sourceRoot":"","sources":["../../../server/service/geo-country/geo-country-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAgD;AAChD,iDAAoE;AACpE,+CAAmF;AACnF,qCAAuC;AACvC,kEAA6D;AAC7D,+CAA0C;AAC1C,yDAAmD;AAG5C,IAAM,eAAe,GAArB,MAAM,eAAe;IAEpB,AAAN,KAAK,CAAC,UAAU,CAAY,EAAU,EAAS,OAAY;QACzD,OAAO,MAAM,IAAA,uBAAa,EAAC,wBAAU,CAAC,CAAC,OAAO,CAAC;YAC7C,KAAK,EAAE,EAAE,EAAE,EAAE;SACd,CAAC,CAAA;IACJ,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CAAS,MAAiB,EAAS,OAAY;QAC/D,MAAM,eAAe,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,CAAA;QACjD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,uBAAa,EAAC,wBAAU,CAAC,CAAC,YAAY,CAAC,eAAe,CAAC,CAAA;QAEpF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;IAGK,AAAN,KAAK,CAAC,wBAAwB,CAAS,MAAiB,EAAS,OAAY
|
|
1
|
+
{"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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/geography",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.297",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@things-factory/auth-base": "^4.3.
|
|
27
|
-
"@things-factory/shell": "^4.3.
|
|
26
|
+
"@things-factory/auth-base": "^4.3.281",
|
|
27
|
+
"@things-factory/shell": "^4.3.281"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "fb6407be6c70643a203b2df665357900d9045516"
|
|
30
30
|
}
|
|
@@ -25,7 +25,21 @@ export class GeoCountryQuery {
|
|
|
25
25
|
|
|
26
26
|
@Query(returns => GeoCountryList, { description: 'To fetch multiple GeoCountries without params' })
|
|
27
27
|
async geoCountriesWithoutParam(@Args() params: ListParam, @Ctx() context: any): Promise<GeoCountryList> {
|
|
28
|
-
const
|
|
28
|
+
const nameFilter : any = params.filters?.find((param:any) => param.name =='name')
|
|
29
|
+
const descFilter : any = params.filters?.find((param:any) => param.name =='description')
|
|
30
|
+
const qb = getRepository (GeoCountry).createQueryBuilder('gc')
|
|
31
|
+
|
|
32
|
+
if(params.filters?.length>1){
|
|
33
|
+
qb.where(`gc.name ilike :name` , {name: nameFilter.value })
|
|
34
|
+
qb.andWhere(`gc.description ilike :description` , {description: descFilter.value })
|
|
35
|
+
}
|
|
36
|
+
else if(nameFilter && nameFilter.value){
|
|
37
|
+
qb.where(`gc.name ilike :name` , {name: nameFilter.value })
|
|
38
|
+
} else if (descFilter && descFilter.value){
|
|
39
|
+
qb.where(`gc.description ilike :description` , {description: descFilter.value })
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
const [items, total] = await qb.getManyAndCount()
|
|
29
43
|
|
|
30
44
|
return { items, total }
|
|
31
45
|
}
|