@dracul/audit-backend 1.16.8 → 1.16.10

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.
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
 
8
- var _AuditPermissions = require("../../../permissions/AuditPermissions.js");
8
+ var _AuditPermissions = require("../permissions/AuditPermissions.js");
9
9
 
10
- var _default = [_AuditPermissions.AUDIT_CREATE, _AuditPermissions.AUDIT_DELETE, _AuditPermissions.AUDIT_MENU, _AuditPermissions.AUDIT_SHOW, _AuditPermissions.AUDIT_UPDATE];
10
+ var _default = [_AuditPermissions.AUDIT_CREATE, _AuditPermissions.AUDIT_MENU, _AuditPermissions.AUDIT_SHOW];
11
11
  exports.default = _default;
@@ -1,6 +1,8 @@
1
1
  "use strict";
2
2
 
3
3
  const AUDIT_SHOW = "AUDIT_SHOW";
4
+ const AUDIT_MENU = "AUDIT_MENU";
4
5
  module.exports = {
5
- AUDIT_SHOW
6
+ AUDIT_SHOW,
7
+ AUDIT_MENU
6
8
  };
@@ -27,7 +27,7 @@ const paginateAudit = function (pageNumber = 1, itemsPerPage = 5, search = null,
27
27
  if (search) {
28
28
  qs = {
29
29
  $or: [{
30
- user: {
30
+ action: {
31
31
  $regex: search,
32
32
  $options: 'i'
33
33
  }
@@ -35,74 +35,53 @@ const paginateAudit = function (pageNumber = 1, itemsPerPage = 5, search = null,
35
35
  };
36
36
  }
37
37
 
38
- if (filters) {
39
- filters.forEach(filter => {
40
- switch (filter.operator) {
41
- case '=':
42
- case 'eq':
43
- qs[filter.field] = { ...qs[filter.field],
44
- $eq: filter.value
45
- };
46
- break;
47
-
48
- case 'contain':
49
- case 'regex':
50
- qs[filter.field] = { ...qs[filter.field],
51
- $regex: filter.value
52
- };
53
- break;
54
-
55
- case '>':
56
- case 'gt':
57
- qs[filter.field] = { ...qs[filter.field],
58
- $gt: filter.value
59
- };
60
- break;
38
+ return qs;
39
+ }
61
40
 
62
- case '<':
63
- case 'lt':
64
- qs[filter.field] = { ...qs[filter.field],
65
- $lt: filter.value
66
- };
41
+ function qsFilter(filters) {
42
+ if (filters) {
43
+ const qsFilter = {};
44
+ filters.forEach(({
45
+ field,
46
+ operator,
47
+ value
48
+ }) => {
49
+ switch (field) {
50
+ case 'user':
51
+ value && (qsFilter.user = {
52
+ [operator]: value
53
+ });
67
54
  break;
68
55
 
69
- case '>=':
70
- case 'gte':
71
- qs[filter.field] = { ...qs[filter.field],
72
- $gte: filter.value
73
- };
56
+ case 'action':
57
+ value && (qsFilter.action = {
58
+ [operator]: value,
59
+ $options: "i"
60
+ });
74
61
  break;
75
62
 
76
- case '<=':
77
- case 'lte':
78
- qs[filter.field] = { ...qs[filter.field],
79
- $lte: filter.value
80
- };
63
+ case 'resource':
64
+ value && (qsFilter.resource = {
65
+ [operator]: value,
66
+ $options: "i"
67
+ });
81
68
  break;
82
-
83
- default:
84
- qs[filter.field] = { ...qs[filter.field],
85
- $eq: filter.value
86
- };
87
69
  }
88
70
  });
71
+ return qsFilter;
89
72
  }
90
-
91
- return qs;
92
73
  }
93
74
 
94
75
  function getSort(orderBy, orderDesc) {
95
- if (orderBy) {
96
- return (orderDesc ? '-' : '') + orderBy;
97
- } else {
98
- return null;
99
- }
76
+ return orderBy ? (orderDesc ? '-' : '') + orderBy : null;
100
77
  }
101
78
 
102
- let query = qs(search, filters);
103
- let populate = ['user'];
104
- let sort = getSort(orderBy, orderDesc);
105
- let params = {
79
+ const populate = ['user'];
80
+ const sort = getSort(orderBy, orderDesc);
81
+ const query = { ...qs(search),
82
+ ...qsFilter(filters)
83
+ };
84
+ const params = {
106
85
  page: pageNumber,
107
86
  limit: itemsPerPage,
108
87
  populate,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dracul/audit-backend",
3
- "version": "1.16.8",
3
+ "version": "1.16.10",
4
4
  "description": "Audit Backend",
5
5
  "author": "Cristian Incarnato <cristian.cdi@gmail.com>",
6
6
  "homepage": "https://github.com/draculjs/modular-framework#readme",
@@ -28,8 +28,8 @@
28
28
  "@dracul/common-backend": "^1.16.3",
29
29
  "@dracul/logger-backend": "^1.16.3",
30
30
  "@dracul/notification-backend": "^1.16.3",
31
- "@dracul/settings-backend": "^1.16.8",
32
- "@dracul/user-backend": "^1.16.8",
31
+ "@dracul/settings-backend": "^1.16.10",
32
+ "@dracul/user-backend": "^1.16.10",
33
33
  "apollo-server-express": "^2.12.0",
34
34
  "dayjs": "^1.10.7",
35
35
  "dotenv": "^16.0.3",
@@ -64,5 +64,5 @@
64
64
  "mongoose-softdelete": "1.1.0",
65
65
  "mongoose-unique-validator": "^2.0.3"
66
66
  },
67
- "gitHead": "70934036b66fd5d8e5e3b8bedc83f84d1bf37169"
67
+ "gitHead": "99eb05eaeef2503ea88efedb13d8c778128f4808"
68
68
  }