@hedhog/prisma 0.0.8 → 0.0.10

Sign up to get free protection for your applications and to get access to all the features.
@@ -1 +1 @@
1
- {"version":3,"file":"prisma.service.d.ts","sourceRoot":"","sources":["../src/prisma.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,qBACa,aAAc,SAAQ,YAAa,YAAW,YAAY;IAC/D,YAAY;IAIlB,WAAW;IAIX,UAAU;IAIV,OAAO;IAIP,uBAAuB,CACrB,MAAM,EAAE,MAAM,EAAE,EAChB,gBAAgB,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GACnC,GAAG,EAAE;CAmBT"}
1
+ {"version":3,"file":"prisma.service.d.ts","sourceRoot":"","sources":["../src/prisma.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,qBACa,aAAc,SAAQ,YAAa,YAAW,YAAY;IAC/D,YAAY;IAIlB,WAAW;IAIX,UAAU;IAIV,OAAO;IAIP,uBAAuB,CACrB,MAAM,EAAE,MAAM,EAAE,EAChB,gBAAgB,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GACnC,GAAG,EAAE;CA+BT"}
@@ -23,18 +23,26 @@ let PrismaService = class PrismaService extends client_1.PrismaClient {
23
23
  return this.getProvider() === 'mysql';
24
24
  }
25
25
  createInsensitiveSearch(fields, paginationParams) {
26
- const OR = fields.map((field) => ({
27
- [field]: { contains: paginationParams.search },
28
- }));
29
- if (this.isPostgres()) {
30
- OR.forEach((condition) => {
31
- Object.keys(condition).forEach((key) => {
32
- condition[key].mode = 'insensitive';
33
- });
34
- });
35
- }
36
- if (!isNaN(+paginationParams.search)) {
37
- OR.push({ id: { equals: +paginationParams.search } });
26
+ const searchValue = paginationParams.search;
27
+ const OR = [];
28
+ fields.forEach((field) => {
29
+ if (field === 'id' && !isNaN(+searchValue) && +searchValue > 0) {
30
+ OR.push({ id: { equals: +searchValue } });
31
+ }
32
+ else if (field === 'method' &&
33
+ ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD'].includes(searchValue)) {
34
+ OR.push({ method: { equals: searchValue } });
35
+ }
36
+ else if (field !== 'method') {
37
+ const condition = { [field]: { contains: searchValue } };
38
+ if (this.isPostgres()) {
39
+ condition[field].mode = 'insensitive';
40
+ }
41
+ OR.push(condition);
42
+ }
43
+ });
44
+ if (!isNaN(+searchValue) && +searchValue > 0) {
45
+ OR.push({ id: { equals: +searchValue } });
38
46
  }
39
47
  return OR;
40
48
  }
@@ -1 +1 @@
1
- {"version":3,"file":"prisma.service.js","sourceRoot":"","sources":["../src/prisma.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA0D;AAC1D,2CAA8C;AAGvC,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,qBAAY;IAC7C,KAAK,CAAC,YAAY;QAChB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;IAED,WAAW;QACT,OAAQ,IAAY,CAAC,aAAa,CAAC,cAAc,CAAC;IACpD,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC;IAC7C,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC;IACxC,CAAC;IAED,uBAAuB,CACrB,MAAgB,EAChB,gBAAoC;QAEpC,MAAM,EAAE,GAAQ,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACrC,CAAC,KAAK,CAAC,EAAE,EAAE,QAAQ,EAAE,gBAAgB,CAAC,MAAM,EAAE;SAC/C,CAAC,CAAC,CAAC;QAEJ,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;YACtB,EAAE,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBACvB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACpC,SAAS,CAAC,GAAG,CAAS,CAAC,IAAI,GAAG,aAAa,CAAC;gBAC/C,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACxD,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAA;AAvCY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;GACA,aAAa,CAuCzB"}
1
+ {"version":3,"file":"prisma.service.js","sourceRoot":"","sources":["../src/prisma.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA0D;AAC1D,2CAA8C;AAGvC,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,qBAAY;IAC7C,KAAK,CAAC,YAAY;QAChB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;IAED,WAAW;QACT,OAAQ,IAAY,CAAC,aAAa,CAAC,cAAc,CAAC;IACpD,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC;IAC7C,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC;IACxC,CAAC;IAED,uBAAuB,CACrB,MAAgB,EAChB,gBAAoC;QAEpC,MAAM,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC;QAC5C,MAAM,EAAE,GAAU,EAAE,CAAC;QAErB,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACvB,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC;gBAC/D,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAC5C,CAAC;iBAAM,IACL,KAAK,KAAK,QAAQ;gBAClB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,QAAQ,CACnE,WAAW,CACZ,EACD,CAAC;gBACD,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;YAC/C,CAAC;iBAAM,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,MAAM,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,CAAC;gBAEzD,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;oBACrB,SAAS,CAAC,KAAK,CAAS,CAAC,IAAI,GAAG,aAAa,CAAC;gBACjD,CAAC;gBAED,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACrB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC;YAC7C,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAA;AAnDY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;GACA,aAAa,CAmDzB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hedhog/prisma",
3
- "version": "0.0.8",
3
+ "version": "0.0.10",
4
4
  "private": false,
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -23,20 +23,32 @@ export class PrismaService extends PrismaClient implements OnModuleInit {
23
23
  fields: string[],
24
24
  paginationParams: { search: string },
25
25
  ): any[] {
26
- const OR: any = fields.map((field) => ({
27
- [field]: { contains: paginationParams.search },
28
- }));
29
-
30
- if (this.isPostgres()) {
31
- OR.forEach((condition) => {
32
- Object.keys(condition).forEach((key) => {
33
- (condition[key] as any).mode = 'insensitive';
34
- });
35
- });
36
- }
37
-
38
- if (!isNaN(+paginationParams.search)) {
39
- OR.push({ id: { equals: +paginationParams.search } });
26
+ const searchValue = paginationParams.search;
27
+ const OR: any[] = [];
28
+
29
+ fields.forEach((field) => {
30
+ if (field === 'id' && !isNaN(+searchValue) && +searchValue > 0) {
31
+ OR.push({ id: { equals: +searchValue } });
32
+ } else if (
33
+ field === 'method' &&
34
+ ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD'].includes(
35
+ searchValue,
36
+ )
37
+ ) {
38
+ OR.push({ method: { equals: searchValue } });
39
+ } else if (field !== 'method') {
40
+ const condition = { [field]: { contains: searchValue } };
41
+
42
+ if (this.isPostgres()) {
43
+ (condition[field] as any).mode = 'insensitive';
44
+ }
45
+
46
+ OR.push(condition);
47
+ }
48
+ });
49
+
50
+ if (!isNaN(+searchValue) && +searchValue > 0) {
51
+ OR.push({ id: { equals: +searchValue } });
40
52
  }
41
53
 
42
54
  return OR;