@things-factory/operato-hub 4.3.163 → 4.3.166
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.
|
@@ -27,15 +27,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.sendEmailsResolver = void 0;
|
|
30
|
+
const cronParser = __importStar(require("cron-parser"));
|
|
31
|
+
const graphql_tag_1 = __importDefault(require("graphql-tag"));
|
|
30
32
|
const typeorm_1 = require("typeorm");
|
|
31
|
-
const entities_1 = require("../../../entities");
|
|
32
33
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
33
34
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
34
|
-
const shell_1 = require("@things-factory/shell");
|
|
35
|
-
const graphql_tag_1 = __importDefault(require("graphql-tag"));
|
|
36
35
|
const email_base_1 = require("@things-factory/email-base");
|
|
37
36
|
const env_1 = require("@things-factory/env");
|
|
38
|
-
const
|
|
37
|
+
const shell_1 = require("@things-factory/shell");
|
|
38
|
+
const entities_1 = require("../../../entities");
|
|
39
39
|
exports.sendEmailsResolver = {
|
|
40
40
|
async sendEmails(_, {}, context) {
|
|
41
41
|
const emails = await (0, typeorm_1.getRepository)(entities_1.Email).find({
|
|
@@ -116,17 +116,34 @@ async function processEmailCronJob(email, fromDate, toDate) {
|
|
|
116
116
|
// yesterdayBegin.setHours(0, 0, 0, 0)
|
|
117
117
|
// yesterdayEnd.setHours(23, 59, 59, 999)
|
|
118
118
|
let timezoneOffset = (email === null || email === void 0 ? void 0 : email.timezoneOffset) || 0;
|
|
119
|
+
let curDate = new Date();
|
|
120
|
+
let prevMonth = curDate.getMonth() - 1;
|
|
121
|
+
let prevMonthBegin = new Date(curDate.setDate(prevMonth));
|
|
122
|
+
prevMonthBegin.setHours(0, 0, 0, 0);
|
|
123
|
+
let prevMonthBeginDateTime = new Date(prevMonthBegin - timezoneOffset * 60000).toISOString();
|
|
124
|
+
let prevWeek = curDate.getDate() - 7; // subtract 1 week
|
|
125
|
+
let prevWeekBegin = new Date(curDate.setDate(prevWeek));
|
|
126
|
+
prevWeekBegin.setHours(0, 0, 0, 0);
|
|
127
|
+
let prevWeekBeginDateTime = new Date(prevWeekBegin - timezoneOffset * 60000).toISOString();
|
|
128
|
+
let prevDay = curDate.getDate() - 1; // subtract 1 day
|
|
129
|
+
let prevDayBegin = new Date(curDate.setDate(prevDay));
|
|
130
|
+
prevDayBegin.setHours(0, 0, 0, 0);
|
|
131
|
+
let prevDayBeginDateTime = new Date(prevDayBegin - timezoneOffset * 60000).toISOString();
|
|
132
|
+
let endDate = curDate;
|
|
133
|
+
endDate.setHours(23, 59, 59, 999);
|
|
134
|
+
let endDateTime = new Date(endDate - timezoneOffset * 60000).toISOString();
|
|
119
135
|
// let fromDate = new Date(yesterdayBegin - timezoneOffset * 60000).toISOString()
|
|
120
136
|
// let toDate = new Date(yesterdayEnd - timezoneOffset * 60000).toISOString()
|
|
121
|
-
//
|
|
122
137
|
// to trace UTC conversion in production
|
|
123
138
|
env_1.logger.info(`[email_utc_conversion] fromDate: ${fromDate}, toDate: ${toDate}`);
|
|
124
|
-
//
|
|
125
139
|
let variables = replaceValues(attachment.variables, [
|
|
126
|
-
{ name: '{{
|
|
127
|
-
{ name: '{{
|
|
128
|
-
{ name: '{{
|
|
129
|
-
{ name: '{{
|
|
140
|
+
{ name: '{{bizplaceId}}', value: `"${bizplace.id}"` },
|
|
141
|
+
{ name: '{{timezoneOffset}}', value: `${timezoneOffset}` },
|
|
142
|
+
{ name: '{{lastRunDateTime}}', value: `"${fromDate}"` },
|
|
143
|
+
{ name: '{{toDateTime}}', value: `"${endDateTime}"` },
|
|
144
|
+
{ name: '{{prevMonthBeginDateTime}}', value: `"${prevMonthBeginDateTime}"` },
|
|
145
|
+
{ name: '{{prevWeekBeginDateTime}}', value: `"${prevWeekBeginDateTime}"` },
|
|
146
|
+
{ name: '{{prevDayBeginDateTime}}', value: `"${prevDayBeginDateTime}"` }
|
|
130
147
|
]);
|
|
131
148
|
let user = email.creator;
|
|
132
149
|
delete user.creatorId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-emails.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/email/send-emails.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"send-emails.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/email/send-emails.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.166",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"@things-factory/i18n-base": "^4.3.159",
|
|
78
78
|
"@things-factory/import-ui": "^4.3.159",
|
|
79
79
|
"@things-factory/import-ui-excel": "^4.3.159",
|
|
80
|
-
"@things-factory/integration-accounting": "^4.3.
|
|
80
|
+
"@things-factory/integration-accounting": "^4.3.166",
|
|
81
81
|
"@things-factory/integration-fulfillment": "^4.3.163",
|
|
82
82
|
"@things-factory/integration-lmd": "^4.3.163",
|
|
83
83
|
"@things-factory/integration-marketplace": "^4.3.163",
|
|
@@ -88,9 +88,9 @@
|
|
|
88
88
|
"@things-factory/more-ui": "^4.3.159",
|
|
89
89
|
"@things-factory/notification": "^4.3.163",
|
|
90
90
|
"@things-factory/pdf": "^4.3.159",
|
|
91
|
-
"@things-factory/product-ui": "^4.3.
|
|
91
|
+
"@things-factory/product-ui": "^4.3.166",
|
|
92
92
|
"@things-factory/resource-ui": "^4.3.163",
|
|
93
|
-
"@things-factory/sales-base": "^4.3.
|
|
93
|
+
"@things-factory/sales-base": "^4.3.166",
|
|
94
94
|
"@things-factory/scene-data-transform": "^4.3.159",
|
|
95
95
|
"@things-factory/scene-excel": "^4.3.159",
|
|
96
96
|
"@things-factory/scene-firebase": "^4.3.159",
|
|
@@ -105,8 +105,8 @@
|
|
|
105
105
|
"@things-factory/setting-ui": "^4.3.163",
|
|
106
106
|
"@things-factory/shell": "^4.3.159",
|
|
107
107
|
"@things-factory/system-ui": "^4.3.159",
|
|
108
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
109
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
108
|
+
"@things-factory/warehouse-base": "^4.3.166",
|
|
109
|
+
"@things-factory/worksheet-base": "^4.3.166",
|
|
110
110
|
"cron-parser": "^4.7.0",
|
|
111
111
|
"koa2-swagger-ui": "^5.0.2",
|
|
112
112
|
"swagger-jsdoc": "^5.0.0",
|
|
@@ -118,5 +118,5 @@
|
|
|
118
118
|
"resolutions": {
|
|
119
119
|
"core-js": "^3.16.0"
|
|
120
120
|
},
|
|
121
|
-
"gitHead": "
|
|
121
|
+
"gitHead": "d4bb11771262388658225e7101b474a0211c8a1a"
|
|
122
122
|
}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { Email, EmailRecipient, EmailAttachment } from '../../../entities'
|
|
3
|
-
import { Partner } from '@things-factory/auth-base'
|
|
4
|
-
import { Bizplace } from '@things-factory/biz-base'
|
|
5
|
-
import { GraphqlLocalClient } from '@things-factory/shell'
|
|
1
|
+
import * as cronParser from 'cron-parser'
|
|
6
2
|
import gql from 'graphql-tag'
|
|
3
|
+
import { getRepository, In, Not } from 'typeorm'
|
|
4
|
+
|
|
5
|
+
import { Partner, User } from '@things-factory/auth-base'
|
|
6
|
+
import { Bizplace } from '@things-factory/biz-base'
|
|
7
7
|
import { objDataToExcel, sendEmailSes } from '@things-factory/email-base'
|
|
8
|
-
import { User } from '@things-factory/auth-base'
|
|
9
8
|
import { logger } from '@things-factory/env'
|
|
10
|
-
import
|
|
9
|
+
import { GraphqlLocalClient } from '@things-factory/shell'
|
|
10
|
+
|
|
11
|
+
import { Email } from '../../../entities'
|
|
11
12
|
|
|
12
13
|
export const sendEmailsResolver = {
|
|
13
14
|
async sendEmails(_: any, {}, context: any) {
|
|
@@ -99,19 +100,41 @@ async function processEmailCronJob(email, fromDate, toDate) {
|
|
|
99
100
|
|
|
100
101
|
let timezoneOffset = email?.timezoneOffset || 0
|
|
101
102
|
|
|
103
|
+
let curDate = new Date()
|
|
104
|
+
|
|
105
|
+
let prevMonth = curDate.getMonth() - 1
|
|
106
|
+
let prevMonthBegin: any = new Date(curDate.setDate(prevMonth))
|
|
107
|
+
prevMonthBegin.setHours(0, 0, 0, 0)
|
|
108
|
+
let prevMonthBeginDateTime = new Date(prevMonthBegin - timezoneOffset * 60000).toISOString()
|
|
109
|
+
|
|
110
|
+
let prevWeek = curDate.getDate() - 7 // subtract 1 week
|
|
111
|
+
let prevWeekBegin: any = new Date(curDate.setDate(prevWeek))
|
|
112
|
+
prevWeekBegin.setHours(0, 0, 0, 0)
|
|
113
|
+
let prevWeekBeginDateTime = new Date(prevWeekBegin - timezoneOffset * 60000).toISOString()
|
|
114
|
+
|
|
115
|
+
let prevDay = curDate.getDate() - 1 // subtract 1 day
|
|
116
|
+
let prevDayBegin: any = new Date(curDate.setDate(prevDay))
|
|
117
|
+
prevDayBegin.setHours(0, 0, 0, 0)
|
|
118
|
+
let prevDayBeginDateTime = new Date(prevDayBegin - timezoneOffset * 60000).toISOString()
|
|
119
|
+
|
|
120
|
+
let endDate: any = curDate
|
|
121
|
+
endDate.setHours(23, 59, 59, 999)
|
|
122
|
+
let endDateTime = new Date(endDate - timezoneOffset * 60000).toISOString()
|
|
123
|
+
|
|
102
124
|
// let fromDate = new Date(yesterdayBegin - timezoneOffset * 60000).toISOString()
|
|
103
125
|
// let toDate = new Date(yesterdayEnd - timezoneOffset * 60000).toISOString()
|
|
104
|
-
//
|
|
105
126
|
|
|
106
127
|
// to trace UTC conversion in production
|
|
107
128
|
logger.info(`[email_utc_conversion] fromDate: ${fromDate}, toDate: ${toDate}`)
|
|
108
|
-
//
|
|
109
129
|
|
|
110
130
|
let variables = replaceValues(attachment.variables, [
|
|
111
|
-
{ name: '{{
|
|
112
|
-
{ name: '{{
|
|
113
|
-
{ name: '{{
|
|
114
|
-
{ name: '{{
|
|
131
|
+
{ name: '{{bizplaceId}}', value: `"${bizplace.id}"` },
|
|
132
|
+
{ name: '{{timezoneOffset}}', value: `${timezoneOffset}` },
|
|
133
|
+
{ name: '{{lastRunDateTime}}', value: `"${fromDate}"` },
|
|
134
|
+
{ name: '{{toDateTime}}', value: `"${endDateTime}"` },
|
|
135
|
+
{ name: '{{prevMonthBeginDateTime}}', value: `"${prevMonthBeginDateTime}"` },
|
|
136
|
+
{ name: '{{prevWeekBeginDateTime}}', value: `"${prevWeekBeginDateTime}"` },
|
|
137
|
+
{ name: '{{prevDayBeginDateTime}}', value: `"${prevDayBeginDateTime}"` }
|
|
115
138
|
])
|
|
116
139
|
|
|
117
140
|
let user: User = email.creator
|