@things-factory/operato-hub 4.3.237 → 4.3.238
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/synchronization/powrup-pack-order.js +121 -0
- package/dist-server/graphql/resolvers/synchronization/powrup-pack-order.js.map +1 -0
- package/dist-server/routers/internal/apis/create-bizplace.js +7 -6
- package/dist-server/routers/internal/apis/create-bizplace.js.map +1 -1
- package/dist-server/routers/internal/apis/create-company.js +5 -6
- package/dist-server/routers/internal/apis/create-company.js.map +1 -1
- package/dist-server/routers/internal/apis/create-partner.js +9 -9
- package/dist-server/routers/internal/apis/create-partner.js.map +1 -1
- package/dist-server/routers/internal/apis/create-user.js +2 -2
- package/dist-server/routers/internal/apis/create-user.js.map +1 -1
- package/dist-server/routers/internal/apis/invite-user.js +7 -7
- package/dist-server/routers/internal/apis/invite-user.js.map +1 -1
- package/dist-server/routers/internal/apis/terminate-partner.js +7 -7
- package/dist-server/routers/internal/apis/terminate-partner.js.map +1 -1
- package/dist-server/routers/internal/apis/terminate-user.js +7 -7
- package/dist-server/routers/internal/apis/terminate-user.js.map +1 -1
- package/dist-server/routers/internal/apis/update-bizplace.js +2 -2
- package/dist-server/routers/internal/apis/update-bizplace.js.map +1 -1
- package/dist-server/routers/internal/apis/update-company.js +4 -8
- package/dist-server/routers/internal/apis/update-company.js.map +1 -1
- package/dist-server/routers/internal/apis/update-user.js +1 -1
- package/dist-server/routers/internal/apis/update-user.js.map +1 -1
- package/dist-server/routers/internal/powrup-router.js +17 -17
- package/dist-server/routers/internal/powrup-router.js.map +1 -1
- package/dist-server/routers/internal/utils/params.js +34 -59
- package/dist-server/routers/internal/utils/params.js.map +1 -1
- package/package.json +14 -13
- package/server/graphql/resolvers/synchronization/powrup-pack-order.ts +156 -0
- package/server/routers/internal/apis/create-bizplace.ts +7 -6
- package/server/routers/internal/apis/create-company.ts +5 -6
- package/server/routers/internal/apis/create-partner.ts +9 -9
- package/server/routers/internal/apis/create-user.ts +2 -2
- package/server/routers/internal/apis/invite-user.ts +7 -7
- package/server/routers/internal/apis/terminate-partner.ts +7 -7
- package/server/routers/internal/apis/terminate-user.ts +7 -7
- package/server/routers/internal/apis/update-bizplace.ts +2 -2
- package/server/routers/internal/apis/update-company.ts +4 -9
- package/server/routers/internal/apis/update-user.ts +1 -1
- package/server/routers/internal/powrup-router.ts +17 -17
- package/server/routers/internal/utils/params.ts +34 -59
|
@@ -29,18 +29,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
29
29
|
exports.powrupRouter = void 0;
|
|
30
30
|
const koa_router_1 = __importDefault(require("koa-router"));
|
|
31
31
|
const typeorm_1 = require("typeorm");
|
|
32
|
-
const
|
|
32
|
+
const integration_powrup_1 = require("@things-factory/integration-powrup");
|
|
33
33
|
const shell_1 = require("@things-factory/shell");
|
|
34
34
|
const API = __importStar(require("./apis"));
|
|
35
35
|
const validation_middleware_1 = require("./middlewares/validation-middleware");
|
|
36
36
|
const error_util_1 = require("./utils/error-util");
|
|
37
|
-
const debug = require('debug')('things-factory:
|
|
37
|
+
const debug = require('debug')('things-factory:operato-hub:powrup-router');
|
|
38
38
|
exports.powrupRouter = new koa_router_1.default();
|
|
39
39
|
exports.powrupRouter.post('/internal/account/create-user', validation_middleware_1.validationMiddleware, async (context, next) => {
|
|
40
40
|
try {
|
|
41
41
|
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
42
42
|
const { body } = context.request;
|
|
43
|
-
await
|
|
43
|
+
await getPowrup(context, null, tx);
|
|
44
44
|
let data = await API.createUser(body, context, tx);
|
|
45
45
|
context.body = {
|
|
46
46
|
result: { data }
|
|
@@ -58,7 +58,7 @@ exports.powrupRouter.post('/internal/account/update-user', validation_middleware
|
|
|
58
58
|
try {
|
|
59
59
|
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
60
60
|
const { body } = context.request;
|
|
61
|
-
await
|
|
61
|
+
await getPowrup(context, null, tx);
|
|
62
62
|
let data = await API.updateUser(body, context, tx);
|
|
63
63
|
context.body = {
|
|
64
64
|
result: { data }
|
|
@@ -76,7 +76,7 @@ exports.powrupRouter.post('/internal/account/create-company', validation_middlew
|
|
|
76
76
|
try {
|
|
77
77
|
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
78
78
|
const { body } = context.request;
|
|
79
|
-
await
|
|
79
|
+
await getPowrup(context, null, tx);
|
|
80
80
|
let data = await API.createCompany(body, context, tx);
|
|
81
81
|
context.body = {
|
|
82
82
|
result: { data }
|
|
@@ -111,7 +111,7 @@ exports.powrupRouter.post('/internal/account/create-bizplace', validation_middle
|
|
|
111
111
|
try {
|
|
112
112
|
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
113
113
|
const { body } = context.request;
|
|
114
|
-
await
|
|
114
|
+
await getPowrup(context, null, tx);
|
|
115
115
|
let data = await API.createBizplace(body, context, tx);
|
|
116
116
|
context.body = {
|
|
117
117
|
result: { data }
|
|
@@ -129,7 +129,7 @@ exports.powrupRouter.post('/internal/account/update-bizplace', validation_middle
|
|
|
129
129
|
try {
|
|
130
130
|
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
131
131
|
const { body } = context.request;
|
|
132
|
-
await
|
|
132
|
+
await getPowrup(context, null, tx);
|
|
133
133
|
let data = await API.updateBizplace(body, context, tx);
|
|
134
134
|
context.body = {
|
|
135
135
|
result: { data }
|
|
@@ -147,7 +147,7 @@ exports.powrupRouter.post('/internal/account/create-partner', validation_middlew
|
|
|
147
147
|
try {
|
|
148
148
|
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
149
149
|
const { body } = context.request;
|
|
150
|
-
await
|
|
150
|
+
await getPowrup(context, null, tx);
|
|
151
151
|
let data = await API.createPartner(body, context, tx);
|
|
152
152
|
context.body = {
|
|
153
153
|
result: { data }
|
|
@@ -165,7 +165,7 @@ exports.powrupRouter.post('/internal/account/terminate-partner', validation_midd
|
|
|
165
165
|
try {
|
|
166
166
|
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
167
167
|
const { body } = context.request;
|
|
168
|
-
await
|
|
168
|
+
await getPowrup(context, null, tx);
|
|
169
169
|
let data = await API.terminatePartner(body, context, tx);
|
|
170
170
|
context.body = {
|
|
171
171
|
result: { data }
|
|
@@ -183,7 +183,7 @@ exports.powrupRouter.post('/internal/account/invite-user', validation_middleware
|
|
|
183
183
|
try {
|
|
184
184
|
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
185
185
|
const { body } = context.request;
|
|
186
|
-
await
|
|
186
|
+
await getPowrup(context, null, tx);
|
|
187
187
|
let data = await API.inviteUser(body, context, tx);
|
|
188
188
|
context.body = {
|
|
189
189
|
result: { data }
|
|
@@ -201,7 +201,7 @@ exports.powrupRouter.post('/internal/account/terminate-user', validation_middlew
|
|
|
201
201
|
try {
|
|
202
202
|
await (0, typeorm_1.getConnection)().transaction(async (tx) => {
|
|
203
203
|
const { body } = context.request;
|
|
204
|
-
await
|
|
204
|
+
await getPowrup(context, null, tx);
|
|
205
205
|
let data = await API.terminateUser(body, context, tx);
|
|
206
206
|
context.body = {
|
|
207
207
|
result: { data }
|
|
@@ -222,7 +222,7 @@ exports.powrupRouter.get('/warehouse/get', async (context, next) => {
|
|
|
222
222
|
if (!apiKey) {
|
|
223
223
|
throw new error_util_1.ApiError('E01', apiKey);
|
|
224
224
|
}
|
|
225
|
-
await
|
|
225
|
+
await getPowrup(context, apiKey, tx);
|
|
226
226
|
if (!subdomain) {
|
|
227
227
|
throw new error_util_1.ApiError('E01', subdomain);
|
|
228
228
|
}
|
|
@@ -246,12 +246,12 @@ exports.powrupRouter.get('/warehouse/get', async (context, next) => {
|
|
|
246
246
|
(0, error_util_1.throwInternalServerError)(context, e);
|
|
247
247
|
}
|
|
248
248
|
});
|
|
249
|
-
async function
|
|
250
|
-
const
|
|
251
|
-
where: {
|
|
249
|
+
async function getPowrup(context, apiKey, tx) {
|
|
250
|
+
const powrup = await tx.getRepository(integration_powrup_1.Powrup).findOne({
|
|
251
|
+
where: { apiKey: apiKey || context.request.body.apiKey }
|
|
252
252
|
});
|
|
253
|
-
if (
|
|
254
|
-
context.state.
|
|
253
|
+
if (powrup) {
|
|
254
|
+
context.state.powrup = powrup;
|
|
255
255
|
}
|
|
256
256
|
else {
|
|
257
257
|
throw new error_util_1.ApiError('E04', 'apiKey');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"powrup-router.js","sourceRoot":"","sources":["../../../server/routers/internal/powrup-router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA+B;AAC/B,qCAAsD;AAEtD,
|
|
1
|
+
{"version":3,"file":"powrup-router.js","sourceRoot":"","sources":["../../../server/routers/internal/powrup-router.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,49 +2,24 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.reqParams = exports.params = void 0;
|
|
4
4
|
exports.params = {
|
|
5
|
-
'create-user': ['
|
|
6
|
-
'update-user': ['
|
|
7
|
-
'create-company': [
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
'type',
|
|
16
|
-
'status'
|
|
17
|
-
],
|
|
18
|
-
'update-company': [
|
|
19
|
-
'userEmail',
|
|
20
|
-
'refCompanyId',
|
|
21
|
-
'name',
|
|
22
|
-
'description',
|
|
23
|
-
'brn',
|
|
24
|
-
'address',
|
|
25
|
-
'postalCode',
|
|
26
|
-
'type',
|
|
27
|
-
'status'
|
|
28
|
-
],
|
|
29
|
-
'create-bizplace': [
|
|
30
|
-
'refBizplaceId',
|
|
31
|
-
'name',
|
|
32
|
-
'description',
|
|
33
|
-
'address',
|
|
34
|
-
'postalCode',
|
|
35
|
-
'latlng',
|
|
36
|
-
'extType',
|
|
37
|
-
'refCompanyId',
|
|
38
|
-
'userEmail'
|
|
39
|
-
],
|
|
40
|
-
'update-bizplace': ['refBizplaceId', 'name', 'description', 'address', 'postalCode', 'latlng', 'extType'],
|
|
41
|
-
'create-partner': ['refBizplaceId', 'partnerRefBizplaceId', 'userEmail'],
|
|
42
|
-
'terminate-partner': ['refBizplaceId', 'partnerRefBizplaceId'],
|
|
43
|
-
'invite-user': ['userEmail', 'refBizplaceId'],
|
|
44
|
-
'terminate-user': ['userEmail', 'refBizplaceId']
|
|
5
|
+
'create-user': ['id', 'name', 'description', 'email', 'password', 'salt', 'status'],
|
|
6
|
+
'update-user': ['id', 'name', 'description', 'password', 'salt', 'status'],
|
|
7
|
+
'create-company': ['userId', 'id', 'name', 'description', 'brn', 'address', 'postalCode', 'type', 'status'],
|
|
8
|
+
'update-company': ['userId', 'id', 'name', 'description', 'brn', 'address', 'postalCode', 'type', 'status'],
|
|
9
|
+
'create-bizplace': ['id', 'name', 'description', 'address', 'postalCode', 'latlng', 'extType', 'companyId', 'userId'],
|
|
10
|
+
'update-bizplace': ['id', 'name', 'description', 'address', 'postalCode', 'latlng', 'extType'],
|
|
11
|
+
'create-partner': ['bizplaceId', 'partnerBizplaceId', 'userId'],
|
|
12
|
+
'terminate-partner': ['bizplaceId', 'partnerBizplaceId'],
|
|
13
|
+
'invite-user': ['userId', 'bizplaceId'],
|
|
14
|
+
'terminate-user': ['userId', 'bizplaceId']
|
|
45
15
|
};
|
|
46
16
|
exports.reqParams = {
|
|
47
17
|
'create-user': [
|
|
18
|
+
{
|
|
19
|
+
name: 'id',
|
|
20
|
+
required: true,
|
|
21
|
+
type: 'field'
|
|
22
|
+
},
|
|
48
23
|
{
|
|
49
24
|
name: 'name',
|
|
50
25
|
required: true,
|
|
@@ -63,113 +38,113 @@ exports.reqParams = {
|
|
|
63
38
|
],
|
|
64
39
|
'update-user': [
|
|
65
40
|
{
|
|
66
|
-
name: '
|
|
41
|
+
name: 'id',
|
|
67
42
|
required: true,
|
|
68
43
|
type: 'field'
|
|
69
44
|
}
|
|
70
45
|
],
|
|
71
46
|
'create-company': [
|
|
72
47
|
{
|
|
73
|
-
name: '
|
|
48
|
+
name: 'id',
|
|
74
49
|
required: true,
|
|
75
50
|
type: 'field'
|
|
76
51
|
},
|
|
77
52
|
{
|
|
78
|
-
name: '
|
|
53
|
+
name: 'name',
|
|
79
54
|
required: true,
|
|
80
55
|
type: 'field'
|
|
81
56
|
},
|
|
82
57
|
{
|
|
83
|
-
name: '
|
|
58
|
+
name: 'userId',
|
|
84
59
|
required: true,
|
|
85
60
|
type: 'field'
|
|
86
61
|
}
|
|
87
62
|
],
|
|
88
63
|
'update-company': [
|
|
89
64
|
{
|
|
90
|
-
name: '
|
|
65
|
+
name: 'userId',
|
|
91
66
|
required: true,
|
|
92
67
|
type: 'field'
|
|
93
68
|
},
|
|
94
69
|
{
|
|
95
|
-
name: '
|
|
70
|
+
name: 'id',
|
|
96
71
|
required: true,
|
|
97
72
|
type: 'field'
|
|
98
73
|
}
|
|
99
74
|
],
|
|
100
75
|
'create-bizplace': [
|
|
101
76
|
{
|
|
102
|
-
name: '
|
|
77
|
+
name: 'id',
|
|
103
78
|
required: true,
|
|
104
79
|
type: 'field'
|
|
105
80
|
},
|
|
106
81
|
{
|
|
107
|
-
name: '
|
|
82
|
+
name: 'name',
|
|
108
83
|
required: true,
|
|
109
84
|
type: 'field'
|
|
110
85
|
},
|
|
111
86
|
{
|
|
112
|
-
name: '
|
|
87
|
+
name: 'userId',
|
|
113
88
|
required: true,
|
|
114
89
|
type: 'field'
|
|
115
90
|
},
|
|
116
91
|
{
|
|
117
|
-
name: '
|
|
92
|
+
name: 'companyId',
|
|
118
93
|
required: true,
|
|
119
94
|
type: 'field'
|
|
120
95
|
}
|
|
121
96
|
],
|
|
122
97
|
'update-bizplace': [
|
|
123
98
|
{
|
|
124
|
-
name: '
|
|
99
|
+
name: 'id',
|
|
125
100
|
required: true,
|
|
126
101
|
type: 'field'
|
|
127
102
|
}
|
|
128
103
|
],
|
|
129
104
|
'create-partner': [
|
|
130
105
|
{
|
|
131
|
-
name: '
|
|
106
|
+
name: 'bizplaceId',
|
|
132
107
|
required: true,
|
|
133
108
|
type: 'field'
|
|
134
109
|
},
|
|
135
110
|
{
|
|
136
|
-
name: '
|
|
111
|
+
name: 'partnerBizplaceId',
|
|
137
112
|
required: true,
|
|
138
113
|
type: 'field'
|
|
139
114
|
}
|
|
140
115
|
],
|
|
141
116
|
'terminate-partner': [
|
|
142
117
|
{
|
|
143
|
-
name: '
|
|
118
|
+
name: 'bizplaceId',
|
|
144
119
|
required: true,
|
|
145
120
|
type: 'field'
|
|
146
121
|
},
|
|
147
122
|
{
|
|
148
|
-
name: '
|
|
123
|
+
name: 'partnerBizplaceId',
|
|
149
124
|
required: true,
|
|
150
125
|
type: 'field'
|
|
151
126
|
}
|
|
152
127
|
],
|
|
153
128
|
'invite-user': [
|
|
154
129
|
{
|
|
155
|
-
name: '
|
|
130
|
+
name: 'userId',
|
|
156
131
|
required: true,
|
|
157
132
|
type: 'field'
|
|
158
133
|
},
|
|
159
134
|
{
|
|
160
|
-
name: '
|
|
135
|
+
name: 'bizplaceId',
|
|
161
136
|
required: true,
|
|
162
137
|
type: 'field'
|
|
163
138
|
}
|
|
164
139
|
],
|
|
165
140
|
'terminate-user': [
|
|
166
141
|
{
|
|
167
|
-
name: '
|
|
142
|
+
name: 'userId',
|
|
168
143
|
required: true,
|
|
169
144
|
type: 'field'
|
|
170
145
|
},
|
|
171
146
|
{
|
|
172
|
-
name: '
|
|
147
|
+
name: 'bizplaceId',
|
|
173
148
|
required: true,
|
|
174
149
|
type: 'field'
|
|
175
150
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"params.js","sourceRoot":"","sources":["../../../../server/routers/internal/utils/params.ts"],"names":[],"mappings":";;;AAAa,QAAA,MAAM,GAAG;IACpB,aAAa,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"params.js","sourceRoot":"","sources":["../../../../server/routers/internal/utils/params.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.238",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -77,21 +77,22 @@
|
|
|
77
77
|
"@things-factory/i18n-base": "^4.3.237",
|
|
78
78
|
"@things-factory/import-ui": "^4.3.237",
|
|
79
79
|
"@things-factory/import-ui-excel": "^4.3.237",
|
|
80
|
-
"@things-factory/integration-accounting": "^4.3.
|
|
81
|
-
"@things-factory/integration-fulfillment": "^4.3.
|
|
82
|
-
"@things-factory/integration-lmd": "^4.3.
|
|
83
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
84
|
-
"@things-factory/integration-pos": "^4.3.
|
|
85
|
-
"@things-factory/integration-
|
|
86
|
-
"@things-factory/integration-
|
|
80
|
+
"@things-factory/integration-accounting": "^4.3.238",
|
|
81
|
+
"@things-factory/integration-fulfillment": "^4.3.238",
|
|
82
|
+
"@things-factory/integration-lmd": "^4.3.238",
|
|
83
|
+
"@things-factory/integration-marketplace": "^4.3.238",
|
|
84
|
+
"@things-factory/integration-pos": "^4.3.238",
|
|
85
|
+
"@things-factory/integration-powrup": "^4.3.238",
|
|
86
|
+
"@things-factory/integration-sellercraft": "^4.3.238",
|
|
87
|
+
"@things-factory/integration-sftp": "^4.3.238",
|
|
87
88
|
"@things-factory/lite-menu": "^4.3.237",
|
|
88
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
89
|
+
"@things-factory/marketplace-base": "^4.3.238",
|
|
89
90
|
"@things-factory/more-ui": "^4.3.237",
|
|
90
91
|
"@things-factory/notification": "^4.3.237",
|
|
91
92
|
"@things-factory/pdf": "^4.3.227",
|
|
92
93
|
"@things-factory/product-ui": "^4.3.237",
|
|
93
94
|
"@things-factory/resource-ui": "^4.3.237",
|
|
94
|
-
"@things-factory/sales-base": "^4.3.
|
|
95
|
+
"@things-factory/sales-base": "^4.3.238",
|
|
95
96
|
"@things-factory/scene-data-transform": "^4.3.237",
|
|
96
97
|
"@things-factory/scene-excel": "^4.3.237",
|
|
97
98
|
"@things-factory/scene-firebase": "^4.3.227",
|
|
@@ -106,8 +107,8 @@
|
|
|
106
107
|
"@things-factory/setting-ui": "^4.3.237",
|
|
107
108
|
"@things-factory/shell": "^4.3.237",
|
|
108
109
|
"@things-factory/system-ui": "^4.3.237",
|
|
109
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
110
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
110
|
+
"@things-factory/warehouse-base": "^4.3.238",
|
|
111
|
+
"@things-factory/worksheet-base": "^4.3.238",
|
|
111
112
|
"cron-parser": "^4.7.0",
|
|
112
113
|
"koa2-swagger-ui": "^5.0.2",
|
|
113
114
|
"swagger-jsdoc": "^5.0.0",
|
|
@@ -119,5 +120,5 @@
|
|
|
119
120
|
"resolutions": {
|
|
120
121
|
"core-js": "^3.16.0"
|
|
121
122
|
},
|
|
122
|
-
"gitHead": "
|
|
123
|
+
"gitHead": "926d659dd0e4d6c24c33ed7cf558779a51f5cba7"
|
|
123
124
|
}
|
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
import { getConnection, getRepository } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { logger } from '@things-factory/env'
|
|
4
|
+
import { createPayloadLog, PayloadType } from '@things-factory/integration-base'
|
|
5
|
+
import { Powrup, PowrupAPI } from '@things-factory/integration-powrup'
|
|
6
|
+
import {
|
|
7
|
+
ORDER_STATUS,
|
|
8
|
+
OrderNoGenerator,
|
|
9
|
+
OrderPackage,
|
|
10
|
+
OrderPackageItem,
|
|
11
|
+
OrderProduct,
|
|
12
|
+
ReleaseGood
|
|
13
|
+
} from '@things-factory/sales-base'
|
|
14
|
+
import { DateTimeDifference, Worksheet } from '@things-factory/worksheet-base'
|
|
15
|
+
|
|
16
|
+
export const powrupPackOrderResolver = {
|
|
17
|
+
async powrupPackOrder(_: void, {}, context: any): Promise<void> {
|
|
18
|
+
try {
|
|
19
|
+
await getConnection().transaction(async tx => {
|
|
20
|
+
try {
|
|
21
|
+
const powrup: Powrup = await tx.getRepository(Powrup).findOne({ where: { platform: 'powrup' } })
|
|
22
|
+
|
|
23
|
+
let releaseGoodQb = await tx
|
|
24
|
+
.getRepository(ReleaseGood)
|
|
25
|
+
.createQueryBuilder('rg')
|
|
26
|
+
.innerJoinAndSelect('rg.domain', 'domain')
|
|
27
|
+
.innerJoinAndSelect('rg.bizplace', 'bizplace')
|
|
28
|
+
.innerJoinAndSelect('rg.creator', 'creator')
|
|
29
|
+
.innerJoinAndSelect('rg.orderProducts', 'op')
|
|
30
|
+
.innerJoinAndSelect('op.product', 'prd')
|
|
31
|
+
.innerJoinAndSelect('op.productDetail', 'pd')
|
|
32
|
+
.where(`rg.source = :source`, { source: 'POWRUP' })
|
|
33
|
+
.andWhere(`rg.type = :rgType`, { rgType: 'b2c' })
|
|
34
|
+
.andWhere(`rg.status NOT IN(:...status) `, {
|
|
35
|
+
status: [ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL, ORDER_STATUS.DONE]
|
|
36
|
+
})
|
|
37
|
+
.andWhere(qb => {
|
|
38
|
+
const subQuery = qb
|
|
39
|
+
.subQuery()
|
|
40
|
+
.from(Worksheet, 'ws')
|
|
41
|
+
.innerJoin('ws.worksheetDetails', 'wsd')
|
|
42
|
+
.innerJoin('wsd.targetInventory', 'oi')
|
|
43
|
+
.where('rg.id = oi.release_good_id')
|
|
44
|
+
.andWhere('ws.type IN (:...wsType)', { wsType: ['PICKING', 'BATCH_PICKING'] })
|
|
45
|
+
.getQuery()
|
|
46
|
+
return 'EXISTS ' + subQuery
|
|
47
|
+
})
|
|
48
|
+
.andWhere(qb => {
|
|
49
|
+
const subQuery = qb.subQuery().from(OrderPackage, 'opk').where('rg.id = opk.release_good_id').getQuery()
|
|
50
|
+
return 'NOT EXISTS ' + subQuery
|
|
51
|
+
})
|
|
52
|
+
|
|
53
|
+
let releaseGoodsWithoutPackageId: ReleaseGood[] = await releaseGoodQb.getMany()
|
|
54
|
+
|
|
55
|
+
if (releaseGoodsWithoutPackageId?.length > 0) {
|
|
56
|
+
await Promise.all(
|
|
57
|
+
releaseGoodsWithoutPackageId.map(async releaseGood => {
|
|
58
|
+
const orderProducts: OrderProduct[] = releaseGood.orderProducts
|
|
59
|
+
if (
|
|
60
|
+
releaseGood?.lastMarketPackCall &&
|
|
61
|
+
DateTimeDifference.timeDifferenceInSeconds(releaseGood.lastMarketPackCall, new Date()) <= 5
|
|
62
|
+
) {
|
|
63
|
+
return false
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
await getRepository(ReleaseGood).update(
|
|
67
|
+
{ id: releaseGood.id },
|
|
68
|
+
{
|
|
69
|
+
lastMarketPackCall: new Date()
|
|
70
|
+
}
|
|
71
|
+
)
|
|
72
|
+
|
|
73
|
+
await getConnection().transaction(async tx2 => {
|
|
74
|
+
try {
|
|
75
|
+
const orderPack: any = await PowrupAPI.packOrder(powrup, {
|
|
76
|
+
context: { state: { domain: releaseGood?.domain, user: null } },
|
|
77
|
+
refOrderId: releaseGood.refOrderId
|
|
78
|
+
})
|
|
79
|
+
|
|
80
|
+
createPayloadLog(
|
|
81
|
+
releaseGood.bizplace.id,
|
|
82
|
+
`/order-pack`,
|
|
83
|
+
{ name: releaseGood.name, refNo: releaseGood.refNo, refOrderId: releaseGood.refOrderId },
|
|
84
|
+
JSON.stringify(orderPack),
|
|
85
|
+
{ state: { domain: releaseGood?.domain, user: null } },
|
|
86
|
+
PayloadType.EGESTION,
|
|
87
|
+
'scheduler'
|
|
88
|
+
)
|
|
89
|
+
|
|
90
|
+
if (orderPack?.packages) {
|
|
91
|
+
const packages: any[] = orderPack.packages
|
|
92
|
+
|
|
93
|
+
await tx2.getRepository(ReleaseGood).update(
|
|
94
|
+
{ id: releaseGood.id },
|
|
95
|
+
{
|
|
96
|
+
packageId: packages[0].packageId,
|
|
97
|
+
lastMarketPackCall: new Date(),
|
|
98
|
+
updatedAt: new Date()
|
|
99
|
+
}
|
|
100
|
+
)
|
|
101
|
+
|
|
102
|
+
for (let idx = 0; idx < packages.length; idx++) {
|
|
103
|
+
let pkg = packages[idx]
|
|
104
|
+
const items = pkg.items
|
|
105
|
+
const orderPackage: OrderPackage = {
|
|
106
|
+
name: OrderNoGenerator.orderPackage(),
|
|
107
|
+
packageId: pkg.packageId,
|
|
108
|
+
status: ORDER_STATUS.PROCESSING,
|
|
109
|
+
releaseGood,
|
|
110
|
+
domain: releaseGood.domain,
|
|
111
|
+
bizplace: releaseGood.bizplace,
|
|
112
|
+
creator: releaseGood.creator,
|
|
113
|
+
updater: releaseGood.updater
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
let savedOrderPackage: OrderPackage = await tx2.getRepository(OrderPackage).save(orderPackage)
|
|
117
|
+
|
|
118
|
+
const orderPackageItems: OrderPackageItem[] = items.map(itm => {
|
|
119
|
+
const { refCode, qty } = itm
|
|
120
|
+
const matchedOrderProduct: OrderProduct = orderProducts.find(
|
|
121
|
+
op => op.productDetail.refCode == refCode
|
|
122
|
+
)
|
|
123
|
+
|
|
124
|
+
return {
|
|
125
|
+
name: OrderNoGenerator.orderPackageItem(),
|
|
126
|
+
orderProduct: matchedOrderProduct,
|
|
127
|
+
status: ORDER_STATUS.PROCESSING,
|
|
128
|
+
releaseQty: qty,
|
|
129
|
+
orderPackage: savedOrderPackage,
|
|
130
|
+
domain: releaseGood.domain,
|
|
131
|
+
bizplace: releaseGood.bizplace,
|
|
132
|
+
creator: releaseGood.creator,
|
|
133
|
+
updater: releaseGood.updater
|
|
134
|
+
}
|
|
135
|
+
})
|
|
136
|
+
|
|
137
|
+
await tx2.getRepository(OrderPackageItem).save(orderPackageItems)
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
} catch (e) {
|
|
141
|
+
logger.error(`powrupPackOrder[PackOrder]: ${e}`)
|
|
142
|
+
await tx2.getRepository(ReleaseGood).update({ id: releaseGood.id }, { packOrderFail: true })
|
|
143
|
+
}
|
|
144
|
+
})
|
|
145
|
+
})
|
|
146
|
+
)
|
|
147
|
+
}
|
|
148
|
+
} catch (e) {
|
|
149
|
+
logger.error(`powrupPackOrder[ROSearch]: ${e}`)
|
|
150
|
+
}
|
|
151
|
+
})
|
|
152
|
+
} catch (e) {
|
|
153
|
+
logger.error(`powrupPackOrder[MainError]: ${e}`)
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}
|
|
@@ -16,24 +16,25 @@ import { ApiError } from '../utils/error-util'
|
|
|
16
16
|
|
|
17
17
|
export async function createBizplace(request, context, tx) {
|
|
18
18
|
const { data: bizplace } = request
|
|
19
|
-
const company: Company = await tx.getRepository(Company).findOne({ where: {
|
|
19
|
+
const company: Company = await tx.getRepository(Company).findOne({ where: { id: bizplace.companyId } })
|
|
20
20
|
|
|
21
21
|
if (!company) {
|
|
22
|
-
throw new ApiError('E04', `${bizplace.
|
|
22
|
+
throw new ApiError('E04', `${bizplace.companyId} not found`)
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
const oldBizplace = await tx.getRepository(Bizplace).findOne({
|
|
26
26
|
where: {
|
|
27
|
-
|
|
27
|
+
id: bizplace.id
|
|
28
28
|
}
|
|
29
29
|
})
|
|
30
30
|
if (oldBizplace) {
|
|
31
|
-
throw new ApiError('E04', `${bizplace.
|
|
31
|
+
throw new ApiError('E04', `${bizplace.id} is duplicated`)
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
let foundUser: User = await tx.getRepository(User).findOne({ where: {
|
|
34
|
+
let foundUser: User = await tx.getRepository(User).findOne({ where: { id: bizplace.userId } })
|
|
35
35
|
|
|
36
36
|
let createdBizplace: Bizplace = await tx.getRepository(Bizplace).save({
|
|
37
|
+
id: bizplace.id,
|
|
37
38
|
name: bizplace.name,
|
|
38
39
|
description: bizplace?.description || null,
|
|
39
40
|
address: bizplace?.address || '',
|
|
@@ -56,7 +57,7 @@ export async function createBizplace(request, context, tx) {
|
|
|
56
57
|
await initGroups(tx, domain)
|
|
57
58
|
|
|
58
59
|
const userRepo: Repository<User> = tx.getRepository(User)
|
|
59
|
-
const user: User = await userRepo.findOne({ where: {
|
|
60
|
+
const user: User = await userRepo.findOne({ where: { id: bizplace.userId }, relations: ['domains', 'roles'] })
|
|
60
61
|
const roleRepo: Repository<Role> = tx.getRepository(Role)
|
|
61
62
|
const role: Role = await roleRepo.findOne({ where: { domain } })
|
|
62
63
|
const privilegeRepo: Repository<Privilege> = tx.getRepository(Privilege)
|