@things-factory/operato-hub 4.3.485 → 4.3.487
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/dist-server/graphql/resolvers/email/send-emails.js +1 -1
- package/dist-server/graphql/resolvers/email/send-emails.js.map +1 -1
- package/dist-server/routers/api/restful-apis/v1/utils/validate-util.js +7 -5
- package/dist-server/routers/api/restful-apis/v1/utils/validate-util.js.map +1 -1
- package/package.json +2 -2
- package/server/graphql/resolvers/email/send-emails.ts +33 -39
- package/server/routers/api/restful-apis/v1/utils/validate-util.ts +5 -4
|
@@ -42,7 +42,7 @@ exports.sendEmailsResolver = {
|
|
|
42
42
|
async sendEmails(_, {}, context) {
|
|
43
43
|
const emails = await (0, typeorm_1.getRepository)(entities_1.Email).find({
|
|
44
44
|
where: { active: true },
|
|
45
|
-
relations: ['domain', 'creator', '
|
|
45
|
+
relations: ['domain', 'creator', 'emailRecipients', 'emailAttachments']
|
|
46
46
|
});
|
|
47
47
|
try {
|
|
48
48
|
let now = new Date();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-emails.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/email/send-emails.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAyC;AACzC,8DAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"send-emails.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/email/send-emails.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,16 +9,18 @@ function validateLimitOffset(limit, offset) {
|
|
|
9
9
|
limit = 100;
|
|
10
10
|
limit = parseInt(limit);
|
|
11
11
|
if (isNaN(limit))
|
|
12
|
-
throw new error_util_1.ApiError('E01', 'limit');
|
|
13
|
-
if (limit >
|
|
14
|
-
throw new error_util_1.ApiError('E01', 'limit');
|
|
12
|
+
throw new error_util_1.ApiError('E01', 'limit is not a number');
|
|
13
|
+
if (limit > 200 || limit < 1)
|
|
14
|
+
throw new error_util_1.ApiError('E01', 'limit cannot exceed 200');
|
|
15
|
+
if (limit < 1)
|
|
16
|
+
throw new error_util_1.ApiError('E01', 'limit cannot less than 0');
|
|
15
17
|
if (!offset)
|
|
16
18
|
offset = 0;
|
|
17
19
|
offset = parseInt(offset);
|
|
18
20
|
if (isNaN(offset))
|
|
19
|
-
throw new error_util_1.ApiError('E01', 'offset');
|
|
21
|
+
throw new error_util_1.ApiError('E01', 'offset is not a number');
|
|
20
22
|
if (offset < 0)
|
|
21
|
-
throw new error_util_1.ApiError('E01', 'offset');
|
|
23
|
+
throw new error_util_1.ApiError('E01', 'offset cannot less than 0');
|
|
22
24
|
return { limit, offset };
|
|
23
25
|
}
|
|
24
26
|
exports.validateLimitOffset = validateLimitOffset;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-util.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/utils/validate-util.ts"],"names":[],"mappings":";;;AAEA,6CAAuC;AAEvC,6EAA6E;AAC7E,qBAAqB;AACrB,SAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM;IAC/C,IAAI,CAAC,KAAK;QAAE,KAAK,GAAG,GAAG,CAAA;IACvB,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACvB,IAAI,KAAK,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"validate-util.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/utils/validate-util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-hub",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.487",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -121,5 +121,5 @@
|
|
|
121
121
|
"resolutions": {
|
|
122
122
|
"core-js": "^3.16.0"
|
|
123
123
|
},
|
|
124
|
-
"gitHead": "
|
|
124
|
+
"gitHead": "4410dc61e7735c2943d97aed695a26a843f827cf"
|
|
125
125
|
}
|
|
@@ -1,19 +1,10 @@
|
|
|
1
1
|
import * as cronParser from 'cron-parser'
|
|
2
2
|
import gql from 'graphql-tag'
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
} from 'typeorm'
|
|
7
|
-
|
|
8
|
-
import {
|
|
9
|
-
Partner,
|
|
10
|
-
User
|
|
11
|
-
} from '@things-factory/auth-base'
|
|
3
|
+
import { getRepository, In } from 'typeorm'
|
|
4
|
+
|
|
5
|
+
import { Partner, User } from '@things-factory/auth-base'
|
|
12
6
|
import { Bizplace } from '@things-factory/biz-base'
|
|
13
|
-
import {
|
|
14
|
-
objDataToExcel,
|
|
15
|
-
sendEmailSes
|
|
16
|
-
} from '@things-factory/email-base'
|
|
7
|
+
import { objDataToExcel, sendEmailSes } from '@things-factory/email-base'
|
|
17
8
|
import { logger } from '@things-factory/env'
|
|
18
9
|
import { GraphqlLocalClient } from '@things-factory/shell'
|
|
19
10
|
|
|
@@ -27,7 +18,7 @@ export const sendEmailsResolver = {
|
|
|
27
18
|
async sendEmails(_: any, {}, context: any) {
|
|
28
19
|
const emails: Email[] = await getRepository(Email).find({
|
|
29
20
|
where: { active: true },
|
|
30
|
-
relations: ['domain', 'creator', '
|
|
21
|
+
relations: ['domain', 'creator', 'emailRecipients', 'emailAttachments']
|
|
31
22
|
})
|
|
32
23
|
|
|
33
24
|
try {
|
|
@@ -41,7 +32,7 @@ export const sendEmailsResolver = {
|
|
|
41
32
|
|
|
42
33
|
if (dag < now && dag > thirtyMinsAgo) {
|
|
43
34
|
try {
|
|
44
|
-
|
|
35
|
+
processEmailCronJob(email, startDate.toISOString(), now.toISOString()) // removed await
|
|
45
36
|
} catch (e) {
|
|
46
37
|
logger.error(`[auto_email_log_by_id(${email.id})] ${e}`)
|
|
47
38
|
}
|
|
@@ -55,37 +46,33 @@ export const sendEmailsResolver = {
|
|
|
55
46
|
}
|
|
56
47
|
|
|
57
48
|
function replaceValues(variablesString: string, values: any = []) {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
return JSON.parse(variablesString)
|
|
63
|
-
|
|
49
|
+
for (let obj of values) {
|
|
50
|
+
variablesString = variablesString.replace(obj.name, obj.value)
|
|
51
|
+
}
|
|
52
|
+
return JSON.parse(variablesString)
|
|
64
53
|
}
|
|
65
54
|
|
|
66
55
|
// NOTE: might show unused because of usage in eval function
|
|
67
56
|
function flattenObject(obj, delimiter = '|') {
|
|
57
|
+
var objResult = {}
|
|
58
|
+
for (var items in obj) {
|
|
59
|
+
if (!Object.hasOwnProperty.bind(obj)(items)) continue
|
|
68
60
|
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
if (!!obj[items] && typeof obj[items] == 'object') {
|
|
74
|
-
var flatObject = flattenObject(obj[items], delimiter)
|
|
75
|
-
for (var x in flatObject) {
|
|
76
|
-
if (!Object.hasOwnProperty.bind(flatObject)(x)) continue
|
|
61
|
+
if (!!obj[items] && typeof obj[items] == 'object') {
|
|
62
|
+
var flatObject = flattenObject(obj[items], delimiter)
|
|
63
|
+
for (var x in flatObject) {
|
|
64
|
+
if (!Object.hasOwnProperty.bind(flatObject)(x)) continue
|
|
77
65
|
|
|
78
|
-
|
|
79
|
-
}
|
|
80
|
-
} else {
|
|
81
|
-
objResult[items] = obj[items]
|
|
66
|
+
objResult[items + delimiter + x] = flatObject[x]
|
|
82
67
|
}
|
|
68
|
+
} else {
|
|
69
|
+
objResult[items] = obj[items]
|
|
83
70
|
}
|
|
84
|
-
|
|
71
|
+
}
|
|
72
|
+
return objResult
|
|
85
73
|
}
|
|
86
74
|
|
|
87
75
|
async function processEmailCronJob(email, fromDate, toDate) {
|
|
88
|
-
|
|
89
76
|
try {
|
|
90
77
|
performance.mark(`processEmailCronJob start:(${email.id})`)
|
|
91
78
|
// processEmailStartTime = performance.now()
|
|
@@ -189,12 +176,15 @@ async function processEmailCronJob(email, fromDate, toDate) {
|
|
|
189
176
|
excelResponse = await objDataToExcel({ name: 'name', data: { header, data: mappedResponse } })
|
|
190
177
|
|
|
191
178
|
performance.mark(`objDataToExcel end:${email.id}`)
|
|
192
|
-
|
|
193
179
|
} catch (e) {
|
|
194
|
-
performance.mark(`objDataToExcel end:${email.id}`)
|
|
180
|
+
performance.mark(`objDataToExcel end:${email.id}`)
|
|
195
181
|
logger.error(`[send-email] objDataToExcel(${email.id}): ${e}`)
|
|
196
182
|
} finally {
|
|
197
|
-
let perf = performance.measure(
|
|
183
|
+
let perf = performance.measure(
|
|
184
|
+
`emailId:${email.id}`,
|
|
185
|
+
`objDataToExcel start:${email.id}`,
|
|
186
|
+
`objDataToExcel end:${email.id}`
|
|
187
|
+
)
|
|
198
188
|
logger.info(`objDataToExcel performance: ${perf.toJSON()}`)
|
|
199
189
|
}
|
|
200
190
|
|
|
@@ -240,7 +230,11 @@ async function processEmailCronJob(email, fromDate, toDate) {
|
|
|
240
230
|
performance.mark(`processEmailCronJob end:(${email.id})`)
|
|
241
231
|
logger.error(`[send-email] processEmailCronJob(${email.id}): ${e}`)
|
|
242
232
|
} finally {
|
|
243
|
-
let perf = performance.measure(
|
|
233
|
+
let perf = performance.measure(
|
|
234
|
+
`emailId:${email.id}`,
|
|
235
|
+
`processEmailCronJob start:(${email.id})`,
|
|
236
|
+
`processEmailCronJob end:(${email.id})`
|
|
237
|
+
)
|
|
244
238
|
logger.info(`processEmailCronJob performance: ${perf.toJSON()}`)
|
|
245
239
|
}
|
|
246
240
|
}
|
|
@@ -7,13 +7,14 @@ import { ApiError } from './error-util'
|
|
|
7
7
|
export function validateLimitOffset(limit, offset) {
|
|
8
8
|
if (!limit) limit = 100
|
|
9
9
|
limit = parseInt(limit)
|
|
10
|
-
if (isNaN(limit)) throw new ApiError('E01', 'limit')
|
|
11
|
-
if (limit >
|
|
10
|
+
if (isNaN(limit)) throw new ApiError('E01', 'limit is not a number')
|
|
11
|
+
if (limit > 200 || limit < 1) throw new ApiError('E01', 'limit cannot exceed 200')
|
|
12
|
+
if (limit < 1) throw new ApiError('E01', 'limit cannot less than 0')
|
|
12
13
|
|
|
13
14
|
if (!offset) offset = 0
|
|
14
15
|
offset = parseInt(offset)
|
|
15
|
-
if (isNaN(offset)) throw new ApiError('E01', 'offset')
|
|
16
|
-
if (offset < 0) throw new ApiError('E01', 'offset')
|
|
16
|
+
if (isNaN(offset)) throw new ApiError('E01', 'offset is not a number')
|
|
17
|
+
if (offset < 0) throw new ApiError('E01', 'offset cannot less than 0')
|
|
17
18
|
|
|
18
19
|
return { limit, offset }
|
|
19
20
|
}
|