storemw-core-api 1.0.140 → 1.0.142
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/controllers/user/userController.js +8 -4
- package/dist/controllers/user/userController.js.map +1 -1
- package/dist/middlewares/index.d.ts +3 -0
- package/dist/middlewares/index.js +40 -0
- package/dist/middlewares/index.js.map +1 -0
- package/dist/models/account/AccountModel.d.ts +13 -13
- package/dist/models/branch_user/BranchUserModel.d.ts +13 -13
- package/dist/models/user/AgentModel.d.ts +2 -24
- package/dist/models/user/MemberModel.d.ts +2 -24
- package/dist/models/user/UserModel.d.ts +13 -2
- package/dist/schema/index.d.ts +3 -0
- package/dist/schema/index.js +40 -0
- package/dist/schema/index.js.map +1 -0
- package/dist/schema/middleware/index.d.ts +2 -0
- package/dist/schema/middleware/index.js +19 -0
- package/dist/schema/middleware/index.js.map +1 -0
- package/dist/schema/middleware/route/index.d.ts +27 -27
- package/dist/schema/middleware/route/index.js +14 -14
- package/dist/schema/middleware/route/index.js.map +1 -1
- package/dist/schema/payload/account/schemaAccount.d.ts +7 -0
- package/dist/schema/payload/index.d.ts +74 -74
- package/dist/schema/payload/index.js +39 -39
- package/dist/schema/payload/index.js.map +1 -1
- package/dist/schema/payload/user/schemaUser.d.ts +3 -0
- package/dist/schema/payload/user/schemaUser.js +1 -0
- package/dist/schema/payload/user/schemaUser.js.map +1 -1
- package/dist/schema/payload/user/schemaUserAdministrator.d.ts +14 -0
- package/dist/schema/payload/user/schemaUserAgent.d.ts +15 -12
- package/dist/schema/payload/user/schemaUserAgent.js +2 -2
- package/dist/schema/payload/user/schemaUserAgent.js.map +1 -1
- package/dist/schema/payload/user/schemaUserCustomer.d.ts +14 -0
- package/dist/schema/payload/user/schemaUserDriver.d.ts +14 -0
- package/dist/schema/payload/user/schemaUserMember.d.ts +15 -12
- package/dist/schema/payload/user/schemaUserMember.js +2 -2
- package/dist/schema/payload/user/schemaUserMember.js.map +1 -1
- package/dist/schema/payload/user/schemaUserOperator.d.ts +14 -0
- package/dist/schema/payload/user/schemaUserRetailer.d.ts +14 -0
- package/dist/schema/payload/user/schemaUserWorker.d.ts +14 -0
- package/dist/services/account/AccountService.js +17 -7
- package/dist/services/account/AccountService.js.map +1 -1
- package/dist/services/index.d.ts +1 -1
- package/dist/services/index.js +2 -1
- package/dist/services/index.js.map +1 -1
- package/dist/services/user/AdministratorService.d.ts +1 -0
- package/dist/services/user/AdministratorService.js +7 -0
- package/dist/services/user/AdministratorService.js.map +1 -1
- package/dist/services/user/AgentService.d.ts +2 -12
- package/dist/services/user/AgentService.js +35 -26
- package/dist/services/user/AgentService.js.map +1 -1
- package/dist/services/user/CustomerService.d.ts +1 -0
- package/dist/services/user/CustomerService.js +7 -0
- package/dist/services/user/CustomerService.js.map +1 -1
- package/dist/services/user/DriverService.d.ts +1 -0
- package/dist/services/user/DriverService.js +7 -0
- package/dist/services/user/DriverService.js.map +1 -1
- package/dist/services/user/MemberService.d.ts +2 -12
- package/dist/services/user/MemberService.js +35 -26
- package/dist/services/user/MemberService.js.map +1 -1
- package/dist/services/user/OperatorService.d.ts +4 -2
- package/dist/services/user/OperatorService.js +11 -3
- package/dist/services/user/OperatorService.js.map +1 -1
- package/dist/services/user/RetailerService.d.ts +1 -0
- package/dist/services/user/RetailerService.js +7 -0
- package/dist/services/user/RetailerService.js.map +1 -1
- package/dist/services/user/UserMeService.d.ts +1 -0
- package/dist/services/user/UserService.d.ts +5 -0
- package/dist/services/user/UserService.js +34 -17
- package/dist/services/user/UserService.js.map +1 -1
- package/dist/services/user/WorkerService.d.ts +1 -0
- package/dist/services/user/WorkerService.js +52 -44
- package/dist/services/user/WorkerService.js.map +1 -1
- package/package.json +19 -9
- package/prisma/schema.prisma +44 -47
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
2
|
export declare const memberSchema: z.ZodObject<{
|
|
3
|
-
ownerUserId: z.ZodNumber;
|
|
4
3
|
code: z.ZodOptional<z.ZodString>;
|
|
5
4
|
companyName: z.ZodString;
|
|
6
5
|
identityNo: z.ZodString;
|
|
@@ -17,7 +16,6 @@ export declare const memberSchema: z.ZodObject<{
|
|
|
17
16
|
postcode: string;
|
|
18
17
|
gender: "male" | "female" | "other";
|
|
19
18
|
dob: string;
|
|
20
|
-
ownerUserId: number;
|
|
21
19
|
companyName: string;
|
|
22
20
|
address1: string;
|
|
23
21
|
stateId: number;
|
|
@@ -31,7 +29,6 @@ export declare const memberSchema: z.ZodObject<{
|
|
|
31
29
|
postcode: string;
|
|
32
30
|
gender: "male" | "female" | "other";
|
|
33
31
|
dob: string;
|
|
34
|
-
ownerUserId: number;
|
|
35
32
|
companyName: string;
|
|
36
33
|
address1: string;
|
|
37
34
|
stateId: number;
|
|
@@ -72,6 +69,7 @@ export declare const schemaUserMemberCreatePayload: z.ZodObject<{
|
|
|
72
69
|
}>;
|
|
73
70
|
address: z.ZodOptional<z.ZodString>;
|
|
74
71
|
email: z.ZodUnion<[z.ZodString, z.ZodLiteral<"">]>;
|
|
72
|
+
parentUserId: z.ZodOptional<z.ZodNumber>;
|
|
75
73
|
status: z.ZodBoolean;
|
|
76
74
|
}, "strip", z.ZodTypeAny, {
|
|
77
75
|
status: boolean;
|
|
@@ -85,6 +83,7 @@ export declare const schemaUserMemberCreatePayload: z.ZodObject<{
|
|
|
85
83
|
username: string;
|
|
86
84
|
password: string;
|
|
87
85
|
address?: string | undefined;
|
|
86
|
+
parentUserId?: number | undefined;
|
|
88
87
|
}, {
|
|
89
88
|
status: boolean;
|
|
90
89
|
firstname: string;
|
|
@@ -97,9 +96,9 @@ export declare const schemaUserMemberCreatePayload: z.ZodObject<{
|
|
|
97
96
|
username: string;
|
|
98
97
|
password: string;
|
|
99
98
|
address?: string | undefined;
|
|
99
|
+
parentUserId?: number | undefined;
|
|
100
100
|
}>;
|
|
101
101
|
member: z.ZodObject<{
|
|
102
|
-
ownerUserId: z.ZodNumber;
|
|
103
102
|
code: z.ZodOptional<z.ZodString>;
|
|
104
103
|
companyName: z.ZodString;
|
|
105
104
|
identityNo: z.ZodString;
|
|
@@ -116,7 +115,6 @@ export declare const schemaUserMemberCreatePayload: z.ZodObject<{
|
|
|
116
115
|
postcode: string;
|
|
117
116
|
gender: "male" | "female" | "other";
|
|
118
117
|
dob: string;
|
|
119
|
-
ownerUserId: number;
|
|
120
118
|
companyName: string;
|
|
121
119
|
address1: string;
|
|
122
120
|
stateId: number;
|
|
@@ -130,7 +128,6 @@ export declare const schemaUserMemberCreatePayload: z.ZodObject<{
|
|
|
130
128
|
postcode: string;
|
|
131
129
|
gender: "male" | "female" | "other";
|
|
132
130
|
dob: string;
|
|
133
|
-
ownerUserId: number;
|
|
134
131
|
companyName: string;
|
|
135
132
|
address1: string;
|
|
136
133
|
stateId: number;
|
|
@@ -147,7 +144,6 @@ export declare const schemaUserMemberCreatePayload: z.ZodObject<{
|
|
|
147
144
|
postcode: string;
|
|
148
145
|
gender: "male" | "female" | "other";
|
|
149
146
|
dob: string;
|
|
150
|
-
ownerUserId: number;
|
|
151
147
|
companyName: string;
|
|
152
148
|
address1: string;
|
|
153
149
|
stateId: number;
|
|
@@ -171,13 +167,13 @@ export declare const schemaUserMemberCreatePayload: z.ZodObject<{
|
|
|
171
167
|
username: string;
|
|
172
168
|
password: string;
|
|
173
169
|
address?: string | undefined;
|
|
170
|
+
parentUserId?: number | undefined;
|
|
174
171
|
};
|
|
175
172
|
}, {
|
|
176
173
|
member: {
|
|
177
174
|
postcode: string;
|
|
178
175
|
gender: "male" | "female" | "other";
|
|
179
176
|
dob: string;
|
|
180
|
-
ownerUserId: number;
|
|
181
177
|
companyName: string;
|
|
182
178
|
address1: string;
|
|
183
179
|
stateId: number;
|
|
@@ -201,6 +197,7 @@ export declare const schemaUserMemberCreatePayload: z.ZodObject<{
|
|
|
201
197
|
username: string;
|
|
202
198
|
password: string;
|
|
203
199
|
address?: string | undefined;
|
|
200
|
+
parentUserId?: number | undefined;
|
|
204
201
|
};
|
|
205
202
|
}>;
|
|
206
203
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -213,7 +210,6 @@ export declare const schemaUserMemberCreatePayload: z.ZodObject<{
|
|
|
213
210
|
postcode: string;
|
|
214
211
|
gender: "male" | "female" | "other";
|
|
215
212
|
dob: string;
|
|
216
|
-
ownerUserId: number;
|
|
217
213
|
companyName: string;
|
|
218
214
|
address1: string;
|
|
219
215
|
stateId: number;
|
|
@@ -237,6 +233,7 @@ export declare const schemaUserMemberCreatePayload: z.ZodObject<{
|
|
|
237
233
|
username: string;
|
|
238
234
|
password: string;
|
|
239
235
|
address?: string | undefined;
|
|
236
|
+
parentUserId?: number | undefined;
|
|
240
237
|
};
|
|
241
238
|
};
|
|
242
239
|
}, {
|
|
@@ -249,7 +246,6 @@ export declare const schemaUserMemberCreatePayload: z.ZodObject<{
|
|
|
249
246
|
postcode: string;
|
|
250
247
|
gender: "male" | "female" | "other";
|
|
251
248
|
dob: string;
|
|
252
|
-
ownerUserId: number;
|
|
253
249
|
companyName: string;
|
|
254
250
|
address1: string;
|
|
255
251
|
stateId: number;
|
|
@@ -273,6 +269,7 @@ export declare const schemaUserMemberCreatePayload: z.ZodObject<{
|
|
|
273
269
|
username: string;
|
|
274
270
|
password: string;
|
|
275
271
|
address?: string | undefined;
|
|
272
|
+
parentUserId?: number | undefined;
|
|
276
273
|
};
|
|
277
274
|
};
|
|
278
275
|
}>;
|
|
@@ -307,6 +304,7 @@ export declare const schemaUserMemberUpdatePayload: z.ZodObject<{
|
|
|
307
304
|
phoneNumber: string;
|
|
308
305
|
}>;
|
|
309
306
|
username: z.ZodString;
|
|
307
|
+
parentUserId: z.ZodOptional<z.ZodNumber>;
|
|
310
308
|
password: z.ZodOptional<z.ZodString>;
|
|
311
309
|
}, "strip", z.ZodTypeAny, {
|
|
312
310
|
status: boolean;
|
|
@@ -319,6 +317,7 @@ export declare const schemaUserMemberUpdatePayload: z.ZodObject<{
|
|
|
319
317
|
};
|
|
320
318
|
username: string;
|
|
321
319
|
address?: string | undefined;
|
|
320
|
+
parentUserId?: number | undefined;
|
|
322
321
|
password?: string | undefined;
|
|
323
322
|
}, {
|
|
324
323
|
status: boolean;
|
|
@@ -331,10 +330,10 @@ export declare const schemaUserMemberUpdatePayload: z.ZodObject<{
|
|
|
331
330
|
};
|
|
332
331
|
username: string;
|
|
333
332
|
address?: string | undefined;
|
|
333
|
+
parentUserId?: number | undefined;
|
|
334
334
|
password?: string | undefined;
|
|
335
335
|
}>;
|
|
336
336
|
member: z.ZodObject<Omit<{
|
|
337
|
-
ownerUserId: z.ZodNumber;
|
|
338
337
|
code: z.ZodOptional<z.ZodString>;
|
|
339
338
|
companyName: z.ZodString;
|
|
340
339
|
identityNo: z.ZodString;
|
|
@@ -347,7 +346,7 @@ export declare const schemaUserMemberUpdatePayload: z.ZodObject<{
|
|
|
347
346
|
areaId: z.ZodNumber;
|
|
348
347
|
postcode: z.ZodString;
|
|
349
348
|
remark: z.ZodOptional<z.ZodString>;
|
|
350
|
-
}, "code"
|
|
349
|
+
}, "code">, "strip", z.ZodTypeAny, {
|
|
351
350
|
postcode: string;
|
|
352
351
|
gender: "male" | "female" | "other";
|
|
353
352
|
dob: string;
|
|
@@ -399,6 +398,7 @@ export declare const schemaUserMemberUpdatePayload: z.ZodObject<{
|
|
|
399
398
|
};
|
|
400
399
|
username: string;
|
|
401
400
|
address?: string | undefined;
|
|
401
|
+
parentUserId?: number | undefined;
|
|
402
402
|
password?: string | undefined;
|
|
403
403
|
};
|
|
404
404
|
}, {
|
|
@@ -427,6 +427,7 @@ export declare const schemaUserMemberUpdatePayload: z.ZodObject<{
|
|
|
427
427
|
};
|
|
428
428
|
username: string;
|
|
429
429
|
address?: string | undefined;
|
|
430
|
+
parentUserId?: number | undefined;
|
|
430
431
|
password?: string | undefined;
|
|
431
432
|
};
|
|
432
433
|
}>;
|
|
@@ -461,6 +462,7 @@ export declare const schemaUserMemberUpdatePayload: z.ZodObject<{
|
|
|
461
462
|
};
|
|
462
463
|
username: string;
|
|
463
464
|
address?: string | undefined;
|
|
465
|
+
parentUserId?: number | undefined;
|
|
464
466
|
password?: string | undefined;
|
|
465
467
|
};
|
|
466
468
|
};
|
|
@@ -495,6 +497,7 @@ export declare const schemaUserMemberUpdatePayload: z.ZodObject<{
|
|
|
495
497
|
};
|
|
496
498
|
username: string;
|
|
497
499
|
address?: string | undefined;
|
|
500
|
+
parentUserId?: number | undefined;
|
|
498
501
|
password?: string | undefined;
|
|
499
502
|
};
|
|
500
503
|
};
|
|
@@ -4,7 +4,7 @@ exports.schemaUserMemberUpdatePayload = exports.schemaUserMemberCreatePayload =
|
|
|
4
4
|
const zod_1 = require("zod");
|
|
5
5
|
const schemaUser_1 = require("./schemaUser");
|
|
6
6
|
exports.memberSchema = zod_1.z.object({
|
|
7
|
-
ownerUserId:
|
|
7
|
+
// ownerUserId: z.number(),
|
|
8
8
|
code: zod_1.z.string().optional(),
|
|
9
9
|
companyName: zod_1.z.string().min(1),
|
|
10
10
|
identityNo: zod_1.z.string().min(1),
|
|
@@ -43,7 +43,7 @@ exports.schemaUserMemberUpdatePayload = zod_1.z.object({
|
|
|
43
43
|
}),
|
|
44
44
|
member: exports.memberSchema.omit({
|
|
45
45
|
code: true,
|
|
46
|
-
ownerUserId: true
|
|
46
|
+
// ownerUserId: true
|
|
47
47
|
}),
|
|
48
48
|
props: memberPropsSchema
|
|
49
49
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaUserMember.js","sourceRoot":"","sources":["../../../../src/schema/payload/user/schemaUserMember.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAIxB,6CAAmD;AAEtC,QAAA,YAAY,GAAG,OAAC,CAAC,MAAM,CAAC;IACjC,
|
|
1
|
+
{"version":3,"file":"schemaUserMember.js","sourceRoot":"","sources":["../../../../src/schema/payload/user/schemaUserMember.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAIxB,6CAAmD;AAEtC,QAAA,YAAY,GAAG,OAAC,CAAC,MAAM,CAAC;IACjC,2BAA2B;IAC3B,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9B,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,MAAM,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3C,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CACjB,qBAAqB,EACrB,kCAAkC,CACrC;IACD,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE;IACrB,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE;IACnB,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;IAClB,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAChC,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,OAAC,CAAC,MAAM,CAAC,EAClC,CAAC,CAAA;AAEF,aAAa;AACA,QAAA,6BAA6B,GAAG,OAAC,CAAC,MAAM,CAAC;IAClD,KAAK,EAAE,OAAC,CAAC,MAAM,CAAC;QACZ,MAAM,EAAE,OAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC3B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;KACrB,CAAC;IACF,OAAO,EAAE,OAAC,CAAC,MAAM,CAAC;QACd,UAAU,EAAE,iCAAoB;QAChC,MAAM,EAAE,oBAAY;QACpB,KAAK,EAAE,iBAAiB;KAC3B,CAAC;CACL,CAAC,CAAC;AAIH,aAAa;AACA,QAAA,6BAA6B,GAAG,OAAC,CAAC,MAAM,CAAC;IAClD,KAAK,EAAE,OAAC,CAAC,MAAM,CAAC;QACZ,MAAM,EAAE,OAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC3B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;KACrB,CAAC;IACF,OAAO,EAAE,OAAC,CAAC,MAAM,CAAC;QACd,UAAU,EAAE,iCAAoB,CAAC,OAAO,CAAC;YACrC,QAAQ,EAAE,IAAI;SACjB,CAAC;QACF,MAAM,EAAE,oBAAY,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE,IAAI;YACV,oBAAoB;SACvB,CAAC;QACF,KAAK,EAAE,iBAAiB;KAC3B,CAAC;CACL,CAAC,CAAC","sourcesContent":["import { z } from \"zod\";\n\nimport { _, dayjs } from \"@/utils\";\n\nimport { schemaUserCredential } from \"./schemaUser\"\n\nexport const memberSchema = z.object({\n // ownerUserId: z.number(),\n code: z.string().optional(),\n companyName: z.string().min(1),\n identityNo: z.string().min(1),\n gender: z.enum([\"male\", \"female\", \"other\"]),\n dob: z.string().regex(\n /^\\d{4}-\\d{2}-\\d{2}$/,\n \"dob must be in YYYY-MM-DD format\"\n ),\n address1: z.string().min(1),\n address2: z.string().optional(),\n countryId: z.number(),\n stateId: z.number(),\n areaId: z.number(),\n postcode: z.string().min(4),\n remark: z.string().optional(),\n});\n\nconst memberPropsSchema = z.object({\n})\n\n/** Create */\nexport const schemaUserMemberCreatePayload = z.object({\n scope: z.object({\n target: z.literal(\"member\"),\n action: z.string(),\n }),\n payload: z.object({\n credential: schemaUserCredential,\n member: memberSchema,\n props: memberPropsSchema\n }),\n});\n\nexport type SchemaUserMemberCreatePayload = z.infer<typeof schemaUserMemberCreatePayload>;\n\n/** Update */\nexport const schemaUserMemberUpdatePayload = z.object({\n scope: z.object({\n target: z.literal(\"member\"),\n action: z.string(),\n }),\n payload: z.object({\n credential: schemaUserCredential.partial({\n password: true\n }),\n member: memberSchema.omit({\n code: true,\n // ownerUserId: true\n }),\n props: memberPropsSchema\n })\n});\n\nexport type SchemaUserMemberUpdatePayload = z.infer<typeof schemaUserMemberUpdatePayload>;"]}
|
|
@@ -30,6 +30,7 @@ export declare const schemaUserOperatorCreatePayload: z.ZodObject<{
|
|
|
30
30
|
}>;
|
|
31
31
|
address: z.ZodOptional<z.ZodString>;
|
|
32
32
|
email: z.ZodUnion<[z.ZodString, z.ZodLiteral<"">]>;
|
|
33
|
+
parentUserId: z.ZodOptional<z.ZodNumber>;
|
|
33
34
|
status: z.ZodBoolean;
|
|
34
35
|
}, "strip", z.ZodTypeAny, {
|
|
35
36
|
status: boolean;
|
|
@@ -43,6 +44,7 @@ export declare const schemaUserOperatorCreatePayload: z.ZodObject<{
|
|
|
43
44
|
username: string;
|
|
44
45
|
password: string;
|
|
45
46
|
address?: string | undefined;
|
|
47
|
+
parentUserId?: number | undefined;
|
|
46
48
|
}, {
|
|
47
49
|
status: boolean;
|
|
48
50
|
firstname: string;
|
|
@@ -55,6 +57,7 @@ export declare const schemaUserOperatorCreatePayload: z.ZodObject<{
|
|
|
55
57
|
username: string;
|
|
56
58
|
password: string;
|
|
57
59
|
address?: string | undefined;
|
|
60
|
+
parentUserId?: number | undefined;
|
|
58
61
|
}>;
|
|
59
62
|
operator: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
|
|
60
63
|
props: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
|
|
@@ -73,6 +76,7 @@ export declare const schemaUserOperatorCreatePayload: z.ZodObject<{
|
|
|
73
76
|
username: string;
|
|
74
77
|
password: string;
|
|
75
78
|
address?: string | undefined;
|
|
79
|
+
parentUserId?: number | undefined;
|
|
76
80
|
};
|
|
77
81
|
}, {
|
|
78
82
|
operator: {};
|
|
@@ -89,6 +93,7 @@ export declare const schemaUserOperatorCreatePayload: z.ZodObject<{
|
|
|
89
93
|
username: string;
|
|
90
94
|
password: string;
|
|
91
95
|
address?: string | undefined;
|
|
96
|
+
parentUserId?: number | undefined;
|
|
92
97
|
};
|
|
93
98
|
}>;
|
|
94
99
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -111,6 +116,7 @@ export declare const schemaUserOperatorCreatePayload: z.ZodObject<{
|
|
|
111
116
|
username: string;
|
|
112
117
|
password: string;
|
|
113
118
|
address?: string | undefined;
|
|
119
|
+
parentUserId?: number | undefined;
|
|
114
120
|
};
|
|
115
121
|
};
|
|
116
122
|
}, {
|
|
@@ -133,6 +139,7 @@ export declare const schemaUserOperatorCreatePayload: z.ZodObject<{
|
|
|
133
139
|
username: string;
|
|
134
140
|
password: string;
|
|
135
141
|
address?: string | undefined;
|
|
142
|
+
parentUserId?: number | undefined;
|
|
136
143
|
};
|
|
137
144
|
};
|
|
138
145
|
}>;
|
|
@@ -167,6 +174,7 @@ export declare const schemaUserOperatorUpdatePayload: z.ZodObject<{
|
|
|
167
174
|
phoneNumber: string;
|
|
168
175
|
}>;
|
|
169
176
|
username: z.ZodString;
|
|
177
|
+
parentUserId: z.ZodOptional<z.ZodNumber>;
|
|
170
178
|
password: z.ZodOptional<z.ZodString>;
|
|
171
179
|
}, "strip", z.ZodTypeAny, {
|
|
172
180
|
status: boolean;
|
|
@@ -179,6 +187,7 @@ export declare const schemaUserOperatorUpdatePayload: z.ZodObject<{
|
|
|
179
187
|
};
|
|
180
188
|
username: string;
|
|
181
189
|
address?: string | undefined;
|
|
190
|
+
parentUserId?: number | undefined;
|
|
182
191
|
password?: string | undefined;
|
|
183
192
|
}, {
|
|
184
193
|
status: boolean;
|
|
@@ -191,6 +200,7 @@ export declare const schemaUserOperatorUpdatePayload: z.ZodObject<{
|
|
|
191
200
|
};
|
|
192
201
|
username: string;
|
|
193
202
|
address?: string | undefined;
|
|
203
|
+
parentUserId?: number | undefined;
|
|
194
204
|
password?: string | undefined;
|
|
195
205
|
}>;
|
|
196
206
|
operator: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
|
|
@@ -209,6 +219,7 @@ export declare const schemaUserOperatorUpdatePayload: z.ZodObject<{
|
|
|
209
219
|
};
|
|
210
220
|
username: string;
|
|
211
221
|
address?: string | undefined;
|
|
222
|
+
parentUserId?: number | undefined;
|
|
212
223
|
password?: string | undefined;
|
|
213
224
|
};
|
|
214
225
|
}, {
|
|
@@ -225,6 +236,7 @@ export declare const schemaUserOperatorUpdatePayload: z.ZodObject<{
|
|
|
225
236
|
};
|
|
226
237
|
username: string;
|
|
227
238
|
address?: string | undefined;
|
|
239
|
+
parentUserId?: number | undefined;
|
|
228
240
|
password?: string | undefined;
|
|
229
241
|
};
|
|
230
242
|
}>;
|
|
@@ -247,6 +259,7 @@ export declare const schemaUserOperatorUpdatePayload: z.ZodObject<{
|
|
|
247
259
|
};
|
|
248
260
|
username: string;
|
|
249
261
|
address?: string | undefined;
|
|
262
|
+
parentUserId?: number | undefined;
|
|
250
263
|
password?: string | undefined;
|
|
251
264
|
};
|
|
252
265
|
};
|
|
@@ -269,6 +282,7 @@ export declare const schemaUserOperatorUpdatePayload: z.ZodObject<{
|
|
|
269
282
|
};
|
|
270
283
|
username: string;
|
|
271
284
|
address?: string | undefined;
|
|
285
|
+
parentUserId?: number | undefined;
|
|
272
286
|
password?: string | undefined;
|
|
273
287
|
};
|
|
274
288
|
};
|
|
@@ -29,6 +29,7 @@ export declare const schemaUserRetailerCreatePayload: z.ZodObject<{
|
|
|
29
29
|
}>;
|
|
30
30
|
address: z.ZodOptional<z.ZodString>;
|
|
31
31
|
email: z.ZodUnion<[z.ZodString, z.ZodLiteral<"">]>;
|
|
32
|
+
parentUserId: z.ZodOptional<z.ZodNumber>;
|
|
32
33
|
status: z.ZodBoolean;
|
|
33
34
|
}, "strip", z.ZodTypeAny, {
|
|
34
35
|
status: boolean;
|
|
@@ -42,6 +43,7 @@ export declare const schemaUserRetailerCreatePayload: z.ZodObject<{
|
|
|
42
43
|
username: string;
|
|
43
44
|
password: string;
|
|
44
45
|
address?: string | undefined;
|
|
46
|
+
parentUserId?: number | undefined;
|
|
45
47
|
}, {
|
|
46
48
|
status: boolean;
|
|
47
49
|
firstname: string;
|
|
@@ -54,6 +56,7 @@ export declare const schemaUserRetailerCreatePayload: z.ZodObject<{
|
|
|
54
56
|
username: string;
|
|
55
57
|
password: string;
|
|
56
58
|
address?: string | undefined;
|
|
59
|
+
parentUserId?: number | undefined;
|
|
57
60
|
}>;
|
|
58
61
|
retailer: z.ZodObject<{
|
|
59
62
|
code: z.ZodString;
|
|
@@ -108,6 +111,7 @@ export declare const schemaUserRetailerCreatePayload: z.ZodObject<{
|
|
|
108
111
|
username: string;
|
|
109
112
|
password: string;
|
|
110
113
|
address?: string | undefined;
|
|
114
|
+
parentUserId?: number | undefined;
|
|
111
115
|
};
|
|
112
116
|
}, {
|
|
113
117
|
retailer: {
|
|
@@ -133,6 +137,7 @@ export declare const schemaUserRetailerCreatePayload: z.ZodObject<{
|
|
|
133
137
|
username: string;
|
|
134
138
|
password: string;
|
|
135
139
|
address?: string | undefined;
|
|
140
|
+
parentUserId?: number | undefined;
|
|
136
141
|
};
|
|
137
142
|
}>;
|
|
138
143
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -164,6 +169,7 @@ export declare const schemaUserRetailerCreatePayload: z.ZodObject<{
|
|
|
164
169
|
username: string;
|
|
165
170
|
password: string;
|
|
166
171
|
address?: string | undefined;
|
|
172
|
+
parentUserId?: number | undefined;
|
|
167
173
|
};
|
|
168
174
|
};
|
|
169
175
|
}, {
|
|
@@ -195,6 +201,7 @@ export declare const schemaUserRetailerCreatePayload: z.ZodObject<{
|
|
|
195
201
|
username: string;
|
|
196
202
|
password: string;
|
|
197
203
|
address?: string | undefined;
|
|
204
|
+
parentUserId?: number | undefined;
|
|
198
205
|
};
|
|
199
206
|
};
|
|
200
207
|
}>;
|
|
@@ -229,6 +236,7 @@ export declare const schemaUserRetailerUpdatePayload: z.ZodObject<{
|
|
|
229
236
|
phoneNumber: string;
|
|
230
237
|
}>;
|
|
231
238
|
username: z.ZodString;
|
|
239
|
+
parentUserId: z.ZodOptional<z.ZodNumber>;
|
|
232
240
|
password: z.ZodOptional<z.ZodString>;
|
|
233
241
|
}, "strip", z.ZodTypeAny, {
|
|
234
242
|
status: boolean;
|
|
@@ -241,6 +249,7 @@ export declare const schemaUserRetailerUpdatePayload: z.ZodObject<{
|
|
|
241
249
|
};
|
|
242
250
|
username: string;
|
|
243
251
|
address?: string | undefined;
|
|
252
|
+
parentUserId?: number | undefined;
|
|
244
253
|
password?: string | undefined;
|
|
245
254
|
}, {
|
|
246
255
|
status: boolean;
|
|
@@ -253,6 +262,7 @@ export declare const schemaUserRetailerUpdatePayload: z.ZodObject<{
|
|
|
253
262
|
};
|
|
254
263
|
username: string;
|
|
255
264
|
address?: string | undefined;
|
|
265
|
+
parentUserId?: number | undefined;
|
|
256
266
|
password?: string | undefined;
|
|
257
267
|
}>;
|
|
258
268
|
retailer: z.ZodObject<{
|
|
@@ -307,6 +317,7 @@ export declare const schemaUserRetailerUpdatePayload: z.ZodObject<{
|
|
|
307
317
|
};
|
|
308
318
|
username: string;
|
|
309
319
|
address?: string | undefined;
|
|
320
|
+
parentUserId?: number | undefined;
|
|
310
321
|
password?: string | undefined;
|
|
311
322
|
};
|
|
312
323
|
}, {
|
|
@@ -332,6 +343,7 @@ export declare const schemaUserRetailerUpdatePayload: z.ZodObject<{
|
|
|
332
343
|
};
|
|
333
344
|
username: string;
|
|
334
345
|
address?: string | undefined;
|
|
346
|
+
parentUserId?: number | undefined;
|
|
335
347
|
password?: string | undefined;
|
|
336
348
|
};
|
|
337
349
|
}>;
|
|
@@ -363,6 +375,7 @@ export declare const schemaUserRetailerUpdatePayload: z.ZodObject<{
|
|
|
363
375
|
};
|
|
364
376
|
username: string;
|
|
365
377
|
address?: string | undefined;
|
|
378
|
+
parentUserId?: number | undefined;
|
|
366
379
|
password?: string | undefined;
|
|
367
380
|
};
|
|
368
381
|
};
|
|
@@ -394,6 +407,7 @@ export declare const schemaUserRetailerUpdatePayload: z.ZodObject<{
|
|
|
394
407
|
};
|
|
395
408
|
username: string;
|
|
396
409
|
address?: string | undefined;
|
|
410
|
+
parentUserId?: number | undefined;
|
|
397
411
|
password?: string | undefined;
|
|
398
412
|
};
|
|
399
413
|
};
|
|
@@ -29,6 +29,7 @@ export declare const schemaUserWorkerCreatePayload: z.ZodObject<{
|
|
|
29
29
|
}>;
|
|
30
30
|
address: z.ZodOptional<z.ZodString>;
|
|
31
31
|
email: z.ZodUnion<[z.ZodString, z.ZodLiteral<"">]>;
|
|
32
|
+
parentUserId: z.ZodOptional<z.ZodNumber>;
|
|
32
33
|
status: z.ZodBoolean;
|
|
33
34
|
}, "strip", z.ZodTypeAny, {
|
|
34
35
|
status: boolean;
|
|
@@ -42,6 +43,7 @@ export declare const schemaUserWorkerCreatePayload: z.ZodObject<{
|
|
|
42
43
|
username: string;
|
|
43
44
|
password: string;
|
|
44
45
|
address?: string | undefined;
|
|
46
|
+
parentUserId?: number | undefined;
|
|
45
47
|
}, {
|
|
46
48
|
status: boolean;
|
|
47
49
|
firstname: string;
|
|
@@ -54,6 +56,7 @@ export declare const schemaUserWorkerCreatePayload: z.ZodObject<{
|
|
|
54
56
|
username: string;
|
|
55
57
|
password: string;
|
|
56
58
|
address?: string | undefined;
|
|
59
|
+
parentUserId?: number | undefined;
|
|
57
60
|
}>;
|
|
58
61
|
worker: z.ZodObject<{
|
|
59
62
|
remark: z.ZodString;
|
|
@@ -88,6 +91,7 @@ export declare const schemaUserWorkerCreatePayload: z.ZodObject<{
|
|
|
88
91
|
username: string;
|
|
89
92
|
password: string;
|
|
90
93
|
address?: string | undefined;
|
|
94
|
+
parentUserId?: number | undefined;
|
|
91
95
|
};
|
|
92
96
|
}, {
|
|
93
97
|
worker: {
|
|
@@ -108,6 +112,7 @@ export declare const schemaUserWorkerCreatePayload: z.ZodObject<{
|
|
|
108
112
|
username: string;
|
|
109
113
|
password: string;
|
|
110
114
|
address?: string | undefined;
|
|
115
|
+
parentUserId?: number | undefined;
|
|
111
116
|
};
|
|
112
117
|
}>;
|
|
113
118
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -134,6 +139,7 @@ export declare const schemaUserWorkerCreatePayload: z.ZodObject<{
|
|
|
134
139
|
username: string;
|
|
135
140
|
password: string;
|
|
136
141
|
address?: string | undefined;
|
|
142
|
+
parentUserId?: number | undefined;
|
|
137
143
|
};
|
|
138
144
|
};
|
|
139
145
|
}, {
|
|
@@ -160,6 +166,7 @@ export declare const schemaUserWorkerCreatePayload: z.ZodObject<{
|
|
|
160
166
|
username: string;
|
|
161
167
|
password: string;
|
|
162
168
|
address?: string | undefined;
|
|
169
|
+
parentUserId?: number | undefined;
|
|
163
170
|
};
|
|
164
171
|
};
|
|
165
172
|
}>;
|
|
@@ -194,6 +201,7 @@ export declare const schemaUserWorkerUpdatePayload: z.ZodObject<{
|
|
|
194
201
|
phoneNumber: string;
|
|
195
202
|
}>;
|
|
196
203
|
username: z.ZodString;
|
|
204
|
+
parentUserId: z.ZodOptional<z.ZodNumber>;
|
|
197
205
|
password: z.ZodOptional<z.ZodString>;
|
|
198
206
|
}, "strip", z.ZodTypeAny, {
|
|
199
207
|
status: boolean;
|
|
@@ -206,6 +214,7 @@ export declare const schemaUserWorkerUpdatePayload: z.ZodObject<{
|
|
|
206
214
|
};
|
|
207
215
|
username: string;
|
|
208
216
|
address?: string | undefined;
|
|
217
|
+
parentUserId?: number | undefined;
|
|
209
218
|
password?: string | undefined;
|
|
210
219
|
}, {
|
|
211
220
|
status: boolean;
|
|
@@ -218,6 +227,7 @@ export declare const schemaUserWorkerUpdatePayload: z.ZodObject<{
|
|
|
218
227
|
};
|
|
219
228
|
username: string;
|
|
220
229
|
address?: string | undefined;
|
|
230
|
+
parentUserId?: number | undefined;
|
|
221
231
|
password?: string | undefined;
|
|
222
232
|
}>;
|
|
223
233
|
worker: z.ZodObject<{
|
|
@@ -252,6 +262,7 @@ export declare const schemaUserWorkerUpdatePayload: z.ZodObject<{
|
|
|
252
262
|
};
|
|
253
263
|
username: string;
|
|
254
264
|
address?: string | undefined;
|
|
265
|
+
parentUserId?: number | undefined;
|
|
255
266
|
password?: string | undefined;
|
|
256
267
|
};
|
|
257
268
|
}, {
|
|
@@ -272,6 +283,7 @@ export declare const schemaUserWorkerUpdatePayload: z.ZodObject<{
|
|
|
272
283
|
};
|
|
273
284
|
username: string;
|
|
274
285
|
address?: string | undefined;
|
|
286
|
+
parentUserId?: number | undefined;
|
|
275
287
|
password?: string | undefined;
|
|
276
288
|
};
|
|
277
289
|
}>;
|
|
@@ -298,6 +310,7 @@ export declare const schemaUserWorkerUpdatePayload: z.ZodObject<{
|
|
|
298
310
|
};
|
|
299
311
|
username: string;
|
|
300
312
|
address?: string | undefined;
|
|
313
|
+
parentUserId?: number | undefined;
|
|
301
314
|
password?: string | undefined;
|
|
302
315
|
};
|
|
303
316
|
};
|
|
@@ -324,6 +337,7 @@ export declare const schemaUserWorkerUpdatePayload: z.ZodObject<{
|
|
|
324
337
|
};
|
|
325
338
|
username: string;
|
|
326
339
|
address?: string | undefined;
|
|
340
|
+
parentUserId?: number | undefined;
|
|
327
341
|
password?: string | undefined;
|
|
328
342
|
};
|
|
329
343
|
};
|
|
@@ -364,24 +364,34 @@ const AccountService = (props) => {
|
|
|
364
364
|
let response = [];
|
|
365
365
|
await Promise.all(accountResponse.map(async (item) => {
|
|
366
366
|
const accountId = item?.account_id ?? 0;
|
|
367
|
-
const ownerUserId = item?.owner_user_id ?? 0;
|
|
367
|
+
// const ownerUserId = item?.owner_user_id ?? 0;
|
|
368
368
|
const businessId = item?.business_id ?? 0;
|
|
369
369
|
const businessService = (0, services_1.BusinessService)({ ...rest, accountId: Number(accountId) });
|
|
370
|
-
const userService =
|
|
370
|
+
// const userService = UserService({ ...rest, accountId: Number(accountId), userType: "administrator" })
|
|
371
|
+
const userModel = (0, models_1.UserModel)({ ...rest });
|
|
371
372
|
let responseBusiness = [];
|
|
372
373
|
let responseUser = [];
|
|
373
374
|
// remove business
|
|
374
375
|
if (businessId) {
|
|
375
376
|
responseBusiness = await businessService.removeBusinesses({ businessIds: [BigInt(businessId)] });
|
|
376
377
|
}
|
|
377
|
-
// remove
|
|
378
|
-
if (ownerUserId) {
|
|
379
|
-
|
|
380
|
-
|
|
378
|
+
// remove all users (administrator, etc...)
|
|
379
|
+
// if (ownerUserId) {
|
|
380
|
+
const responseUsers = await userModel.remove({
|
|
381
|
+
// ids: [Number(ownerUserId)]
|
|
382
|
+
where: {
|
|
383
|
+
[`${models_1.ModelUserFields.accountid}`]: accountId
|
|
384
|
+
}
|
|
385
|
+
});
|
|
386
|
+
responseUser = responseUsers.map((i) => {
|
|
387
|
+
delete i.login_password;
|
|
388
|
+
return i;
|
|
389
|
+
});
|
|
390
|
+
// }
|
|
381
391
|
response.push({
|
|
382
392
|
...item,
|
|
383
393
|
business: responseBusiness.length > 0 ? responseBusiness[0] : {},
|
|
384
|
-
|
|
394
|
+
users: responseUser
|
|
385
395
|
});
|
|
386
396
|
}));
|
|
387
397
|
return response;
|