exodus-framework 2.0.746 → 2.0.748
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.
package/lib/contracts/http.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/contracts/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAOzC,MAAM,CAAC,OAAO,MAAM,oBAAoB,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;AAO3E,MAAM,CAAC,OAAO,MAAM,aAAa,CAAC,CAAC,GAAG,OAAO,IAAI;IAC/C,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,oBAAoB,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,CAAC,CAAC;CACV,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,kBAAkB,CAAC,CAAC,GAAG,OAAO;IACrD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,CAAC,CAAC;CACV;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,oBAAoB,CAAC;IAC3B,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAQD,oBAAY,iBAAiB;IAE3B,QAAQ,MAAM;IACd,QAAQ,MAAM;IACd,OAAO,MAAM;IACb,gCAAgC,MAAM;IAEtC,yBAAyB,MAAM;IAC/B,sBAAsB,MAAM;IAG5B,iBAAiB,MAAM;IACvB,mBAAmB,MAAM;IACzB,wBAAwB,MAAM;IAC9B,oBAAoB,MAAM;IAG1B,WAAW,MAAM;IACjB,gBAAgB,MAAM;IACtB,kBAAkB,MAAM;IACxB,wBAAwB,MAAM;IAC9B,cAAc,MAAM;IACpB,uBAAuB,MAAM;IAC7B,kBAAkB,MAAM;CACzB;AACD,oBAAY,iBAAiB;IAC3B,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,KAAK,UAAU;CAChB;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;IACX,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/contracts/http.ts"],"names":[],"mappings":"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"}
|
package/lib/services/task.js
CHANGED
|
@@ -137,8 +137,8 @@ class QueueTask extends _singleton.default {
|
|
|
137
137
|
});
|
|
138
138
|
}
|
|
139
139
|
async addJob(data) {
|
|
140
|
-
this.log('adicionando à fila...');
|
|
141
140
|
await this.queue.add(this.getQueueName(), data);
|
|
141
|
+
this.log('Nova tarefa disponível.', 'comment');
|
|
142
142
|
}
|
|
143
143
|
getQueue() {
|
|
144
144
|
return this.queue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGzE,eAAO,MAAM,SAAS,WAYpB,CAAC;AAEH,eAAO,MAAM,QAAQ,WAYnB,CAAC;AAgFH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,GACnF,YAAY,CAAC,CAAC,CAAC,CAwCjB"}
|
package/lib/utils/database.js
CHANGED
|
@@ -49,31 +49,67 @@ function processCondition(cond) {
|
|
|
49
49
|
}
|
|
50
50
|
const simpleWhere = {};
|
|
51
51
|
if (cond.eq !== undefined) {
|
|
52
|
-
simpleWhere[_sequelize.Op.eq] = cond.eq;
|
|
52
|
+
simpleWhere[_sequelize.Op.eq] = cond.type === 'DATE' ? new Date(cond.eq) : cond.eq;
|
|
53
53
|
}
|
|
54
54
|
if (cond.gt !== undefined) {
|
|
55
|
-
simpleWhere[_sequelize.Op.gt] = cond.gt;
|
|
55
|
+
simpleWhere[_sequelize.Op.gt] = cond.type === 'DATE' ? new Date(cond.eq) : cond.gt;
|
|
56
56
|
}
|
|
57
57
|
if (cond.lt !== undefined) {
|
|
58
|
-
simpleWhere[_sequelize.Op.lt] = cond.lt;
|
|
58
|
+
simpleWhere[_sequelize.Op.lt] = cond.type === 'DATE' ? new Date(cond.lt) : cond.lt;
|
|
59
59
|
}
|
|
60
60
|
if (cond.between !== undefined) {
|
|
61
|
-
simpleWhere[_sequelize.Op.between] = cond.between;
|
|
61
|
+
simpleWhere[_sequelize.Op.between] = cond.type === 'DATE' ? cond.between.map(d => new Date(d)) : cond.between;
|
|
62
62
|
}
|
|
63
63
|
if (cond.notBetween !== undefined) {
|
|
64
|
-
simpleWhere[_sequelize.Op.notBetween] = cond.notBetween;
|
|
64
|
+
simpleWhere[_sequelize.Op.notBetween] = cond.type === 'DATE' ? cond.notBetween.map(d => new Date(d)) : cond.notBetween;
|
|
65
65
|
}
|
|
66
66
|
if (cond.like !== undefined) {
|
|
67
|
-
simpleWhere[_sequelize.Op.like] = cond.like;
|
|
67
|
+
simpleWhere[_sequelize.Op.like] = cond.type === 'DATE' ? new Date(cond.like) : cond.like;
|
|
68
68
|
}
|
|
69
69
|
if (cond.notLike !== undefined) {
|
|
70
|
-
simpleWhere[_sequelize.Op.notLike] = cond.notLike;
|
|
70
|
+
simpleWhere[_sequelize.Op.notLike] = cond.type === 'DATE' ? new Date(cond.notLike) : cond.notLike;
|
|
71
71
|
}
|
|
72
72
|
if (cond.in !== undefined) {
|
|
73
|
-
simpleWhere[_sequelize.Op.in] = cond.in;
|
|
73
|
+
simpleWhere[_sequelize.Op.in] = cond.type === 'DATE' ? cond.in.map(d => new Date(d)) : cond.in;
|
|
74
74
|
}
|
|
75
75
|
if (cond.notIn !== undefined) {
|
|
76
|
-
simpleWhere[_sequelize.Op.notIn] = cond.notIn;
|
|
76
|
+
simpleWhere[_sequelize.Op.notIn] = cond.type === 'DATE' ? cond.notIn.map(d => new Date(d)) : cond.notIn;
|
|
77
|
+
}
|
|
78
|
+
return simpleWhere;
|
|
79
|
+
}
|
|
80
|
+
function processDateCondition(key, cond) {
|
|
81
|
+
const simpleWhere = [key, undefined];
|
|
82
|
+
if (cond.eq !== undefined) {
|
|
83
|
+
simpleWhere[0] = _sequelize.Op.and;
|
|
84
|
+
simpleWhere[1] = [(0, _sequelize.literal)(`DATE(${key}) = '${cond.eq}'`)];
|
|
85
|
+
}
|
|
86
|
+
if (cond.gt !== undefined) {
|
|
87
|
+
simpleWhere[0] = _sequelize.Op.and;
|
|
88
|
+
simpleWhere[1] = [(0, _sequelize.literal)(`DATE(${key}) = '${cond.gt}'`)];
|
|
89
|
+
}
|
|
90
|
+
if (cond.lt !== undefined) {
|
|
91
|
+
simpleWhere[0] = _sequelize.Op.and;
|
|
92
|
+
simpleWhere[1] = [(0, _sequelize.literal)(`DATE(${key}) = '${cond.lt}'`)];
|
|
93
|
+
}
|
|
94
|
+
if (cond.between !== undefined) {
|
|
95
|
+
simpleWhere[1] = {
|
|
96
|
+
[_sequelize.Op.between]: cond.notBetween.map(d => new Date(d))
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
if (cond.notBetween !== undefined) {
|
|
100
|
+
simpleWhere[1] = {
|
|
101
|
+
[_sequelize.Op.notBetween]: cond.notBetween.map(d => new Date(d))
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
if (cond.in !== undefined) {
|
|
105
|
+
simpleWhere[1] = {
|
|
106
|
+
[_sequelize.Op.in]: cond.notBetween.map(d => new Date(d))
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
if (cond.notIn !== undefined) {
|
|
110
|
+
simpleWhere[1] = {
|
|
111
|
+
[_sequelize.Op.notIn]: cond.notBetween.map(d => new Date(d))
|
|
112
|
+
};
|
|
77
113
|
}
|
|
78
114
|
return simpleWhere;
|
|
79
115
|
}
|
|
@@ -98,14 +134,22 @@ function processFilters(filters) {
|
|
|
98
134
|
where[logicalOp].push(...t);
|
|
99
135
|
} else {
|
|
100
136
|
const field = key;
|
|
101
|
-
const
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
137
|
+
const isDate = condition.type && condition.type === 'DATE';
|
|
138
|
+
const isTime = condition.type && condition.type === 'TIME';
|
|
139
|
+
const isDateTime = condition.type && condition.type === 'DATETIME';
|
|
140
|
+
if (isDate) {
|
|
141
|
+
const [k, c] = processDateCondition(key, condition);
|
|
142
|
+
where[k] = c;
|
|
107
143
|
} else {
|
|
108
|
-
|
|
144
|
+
const processedCondition = processCondition(condition);
|
|
145
|
+
if (where[field]) {
|
|
146
|
+
where[field] = {
|
|
147
|
+
...where[field],
|
|
148
|
+
...processedCondition
|
|
149
|
+
};
|
|
150
|
+
} else {
|
|
151
|
+
where[field] = processedCondition;
|
|
152
|
+
}
|
|
109
153
|
}
|
|
110
154
|
}
|
|
111
155
|
});
|