phx-node 1.0.100 → 1.0.102
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/lib/helper.d.ts +1 -0
- package/dist/lib/helper.js +5 -0
- package/dist/lib/helper.js.map +1 -1
- package/dist/module/department-manager/user-manager.service.d.ts +2 -0
- package/dist/module/department-manager/user-manager.service.js +11 -4
- package/dist/module/department-manager/user-manager.service.js.map +1 -1
- package/dist/query/department-manager/query.d.ts +1 -1
- package/dist/query/department-manager/query.js +5 -0
- package/dist/query/department-manager/query.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
package/dist/lib/helper.d.ts
CHANGED
package/dist/lib/helper.js
CHANGED
|
@@ -69,6 +69,10 @@ const generateValue = (value) => {
|
|
|
69
69
|
return Math.abs(value);
|
|
70
70
|
};
|
|
71
71
|
exports.generateValue = generateValue;
|
|
72
|
+
const extractAppVersion = (userAgent) => {
|
|
73
|
+
const match = userAgent.match(/(\d+\.\d+\.\d+)/);
|
|
74
|
+
return match ? match[1] : null;
|
|
75
|
+
};
|
|
72
76
|
const PHXConvertHeadersRequest = (headers) => {
|
|
73
77
|
const parseSchoolsHeader = (data) => {
|
|
74
78
|
if (!data || data === "{null: null}")
|
|
@@ -97,6 +101,7 @@ const PHXConvertHeadersRequest = (headers) => {
|
|
|
97
101
|
deviceId: headers["device-id"],
|
|
98
102
|
listUserSchool: parseSchoolsHeader(headers["hostnames-and-parents-ids"]),
|
|
99
103
|
userId: Number(headers["x-user-id"]),
|
|
104
|
+
currentVersion: extractAppVersion(headers["user-agent"])
|
|
100
105
|
};
|
|
101
106
|
};
|
|
102
107
|
exports.PHXConvertHeadersRequest = PHXConvertHeadersRequest;
|
package/dist/lib/helper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/lib/helper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/lib/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,11 +12,13 @@ export declare class PHXGetUserManagerByUserId {
|
|
|
12
12
|
user_id: any;
|
|
13
13
|
user_name: any;
|
|
14
14
|
email: any;
|
|
15
|
+
is_skip: any;
|
|
15
16
|
stop?: undefined;
|
|
16
17
|
} | {
|
|
17
18
|
user_id: any;
|
|
18
19
|
stop: any;
|
|
19
20
|
user_name: any;
|
|
20
21
|
email: any;
|
|
22
|
+
is_skip: boolean;
|
|
21
23
|
}>;
|
|
22
24
|
}
|
|
@@ -28,7 +28,7 @@ let PHXGetUserManagerByUserId = class PHXGetUserManagerByUserId {
|
|
|
28
28
|
}
|
|
29
29
|
get(payload) {
|
|
30
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
|
-
var _a, _b, _c, _d, _e, _f;
|
|
31
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
32
32
|
try {
|
|
33
33
|
const { userId, userLoginId, isGetMaster, hostname } = payload;
|
|
34
34
|
const isHasFullData = Boolean(userId && userLoginId && hostname);
|
|
@@ -49,12 +49,16 @@ let PHXGetUserManagerByUserId = class PHXGetUserManagerByUserId {
|
|
|
49
49
|
const userManagerLv1 = department_user_lv_1 === null || department_user_lv_1 === void 0 ? void 0 : department_user_lv_1.find((u) => (u === null || u === void 0 ? void 0 : u.user_manager_id) != null);
|
|
50
50
|
if (userManagerLv1) {
|
|
51
51
|
const userInfo = userManagerLv1.userByUserManagerId || {};
|
|
52
|
+
const listDepartmentManagers = (_a = userInfo.department_users) !== null && _a !== void 0 ? _a : [];
|
|
53
|
+
const isSkip = listDepartmentManagers.some((departmentItem) => departmentItem.department_id === userManagerLv1.department_id &&
|
|
54
|
+
departmentItem.user_manager_id);
|
|
52
55
|
return {
|
|
53
|
-
user_id: (
|
|
56
|
+
user_id: (_b = userManagerLv1.user_manager_id) !== null && _b !== void 0 ? _b : null,
|
|
54
57
|
user_name: userInfo.full_name,
|
|
55
58
|
email: userInfo.is_use_email_secondary
|
|
56
59
|
? userInfo.email_secondary
|
|
57
60
|
: userInfo.email,
|
|
61
|
+
is_skip: isSkip,
|
|
58
62
|
};
|
|
59
63
|
}
|
|
60
64
|
const { department_user: department_user_lv_2 } = yield this.grpcClientSystemService.query({
|
|
@@ -62,8 +66,8 @@ let PHXGetUserManagerByUserId = class PHXGetUserManagerByUserId {
|
|
|
62
66
|
variables: { user_id: userId },
|
|
63
67
|
hostname,
|
|
64
68
|
});
|
|
65
|
-
const userManagerLv2 = ((
|
|
66
|
-
const listRoleOfManager = ((
|
|
69
|
+
const userManagerLv2 = ((_f = (_e = (_d = (_c = department_user_lv_2 === null || department_user_lv_2 === void 0 ? void 0 : department_user_lv_2[0]) === null || _c === void 0 ? void 0 : _c.department) === null || _d === void 0 ? void 0 : _d.department) === null || _e === void 0 ? void 0 : _e.department_users) === null || _f === void 0 ? void 0 : _f[0]) || {};
|
|
70
|
+
const listRoleOfManager = ((_g = userManagerLv2 === null || userManagerLv2 === void 0 ? void 0 : userManagerLv2.user) === null || _g === void 0 ? void 0 : _g.user_roles) || [];
|
|
67
71
|
const userManagerIdLv2 = userManagerLv2 === null || userManagerLv2 === void 0 ? void 0 : userManagerLv2.user_id;
|
|
68
72
|
if (!userManagerIdLv2)
|
|
69
73
|
return null;
|
|
@@ -79,6 +83,7 @@ let PHXGetUserManagerByUserId = class PHXGetUserManagerByUserId {
|
|
|
79
83
|
stop: isHasRoleMaster,
|
|
80
84
|
user_name: userNameManagerLv2,
|
|
81
85
|
email,
|
|
86
|
+
is_skip: false,
|
|
82
87
|
};
|
|
83
88
|
}
|
|
84
89
|
else {
|
|
@@ -89,6 +94,7 @@ let PHXGetUserManagerByUserId = class PHXGetUserManagerByUserId {
|
|
|
89
94
|
stop: true,
|
|
90
95
|
user_name: userNameManagerLv2,
|
|
91
96
|
email,
|
|
97
|
+
is_skip: false,
|
|
92
98
|
}
|
|
93
99
|
: null;
|
|
94
100
|
}
|
|
@@ -98,6 +104,7 @@ let PHXGetUserManagerByUserId = class PHXGetUserManagerByUserId {
|
|
|
98
104
|
stop: false,
|
|
99
105
|
user_name: userNameManagerLv2,
|
|
100
106
|
email,
|
|
107
|
+
is_skip: false,
|
|
101
108
|
};
|
|
102
109
|
}
|
|
103
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-manager.service.js","sourceRoot":"","sources":["../../../src/module/department-manager/user-manager.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,0FAAuF;AACvF,gEAG4C;AAUrC,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IACpC,YACmB,uBAAmD;QAAnD,4BAAuB,GAAvB,uBAAuB,CAA4B;IACnE,CAAC;IAES,GAAG,CAAC,OAAgC;;;YAC/C,IAAI,CAAC;gBACH,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;gBAE/D,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,IAAI,WAAW,IAAI,QAAQ,CAAC,CAAC;gBACjE,IAAI,CAAC,aAAa;oBAAE,OAAO,IAAI,CAAC;gBAIhC,MAAM,EAAE,eAAe,EAAE,qBAAqB,EAAE,GAC9C,MAAM,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC;oBACvC,KAAK,EAAE,uCAA+B;oBACtC,SAAS,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE;oBACnC,QAAQ;iBACT,CAAC,CAAC;gBAEL,MAAM,aAAa,GACjB,qBAAqB;oBACrB,qBAAqB,CAAC,IAAI,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBAGnE,MAAM,EAAE,eAAe,EAAE,oBAAoB,EAAE,GAC7C,MAAM,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC;oBACvC,KAAK,EAAE,uCAA+B;oBACtC,SAAS,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;oBAC9B,QAAQ;iBACT,CAAC,CAAC;gBAEL,MAAM,cAAc,GAAG,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,IAAI,CAC/C,CAAC,CAAqC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,eAAe,KAAI,IAAI,CACtE,CAAC;gBAEF,IAAI,cAAc,EAAE,CAAC;oBACnB,MAAM,QAAQ,GAAG,cAAc,CAAC,mBAAmB,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"user-manager.service.js","sourceRoot":"","sources":["../../../src/module/department-manager/user-manager.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export declare const queryDepartmentByUserId = "\n query MyQuery($user_id: Int!) {\n department_user(\n where: { deleted_at: { _is_null: true }, user_id: { _eq: $user_id } }\n ) {\n department_id\n department {\n id\n name\n code\n department_manager_id\n department_users(where: {deleted_at: {_is_null: true}}) {\n user_id\n user_manager_id\n }\n }\n }\n }\n";
|
|
2
2
|
export declare const queryDepartmentIsManager = "\n query MyQuery($department_manager_id: _int4!) {\n find_department(\n args: { manager_id: $department_manager_id }\n where: { deleted_at: { _is_null: true } }\n ) {\n department_id: id\n department_manager_id\n department {\n id\n name\n code\n department_manager_id\n department_users(where: {deleted_at: {_is_null: true}}) {\n user_id\n user_manager_id\n }\n }\n }\n }\n";
|
|
3
|
-
export declare const queryUserManageOfUserLevelFirst = "\n query queryUserManageOfUserLevelFirst($user_id: Int!) {\n department_user(\n where: {deleted_at: {_is_null: true}, user_id: {_eq: $user_id}}\n ) {\n user_manager_id\n userByUserManagerId {\n full_name\n email\n email_secondary\n is_use_email_secondary\n }\n }\n }\n";
|
|
3
|
+
export declare const queryUserManageOfUserLevelFirst = "\n query queryUserManageOfUserLevelFirst($user_id: Int!) {\n department_user(\n where: {deleted_at: {_is_null: true}, user_id: {_eq: $user_id}}\n ) {\n user_manager_id\n department_id\n userByUserManagerId {\n full_name\n email\n email_secondary\n is_use_email_secondary\n department_users(where: {deleted_at: {_is_null: true}}) {\n user_manager_id\n department_id\n }\n }\n }\n }\n";
|
|
4
4
|
export declare const queryUserManageOfUserLevelSecond = "\n query queryUserManageOfUserLevelSecond($user_id: Int!) {\n department_user(where: {deleted_at: {_is_null: true}, user_id: {_eq: $user_id}}) {\n department {\n name\n department {\n name\n department_users(where: {deleted_at: {_is_null: true}}) {\n user_id\n user {\n full_name\n email\n email_secondary\n is_use_email_secondary\n user_roles(where: {deleted_at: {_is_null: true}}) {\n role {\n is_master_role\n }\n }\n }\n }\n }\n }\n }\n }\n";
|
|
@@ -47,11 +47,16 @@ exports.queryUserManageOfUserLevelFirst = `
|
|
|
47
47
|
where: {deleted_at: {_is_null: true}, user_id: {_eq: $user_id}}
|
|
48
48
|
) {
|
|
49
49
|
user_manager_id
|
|
50
|
+
department_id
|
|
50
51
|
userByUserManagerId {
|
|
51
52
|
full_name
|
|
52
53
|
email
|
|
53
54
|
email_secondary
|
|
54
55
|
is_use_email_secondary
|
|
56
|
+
department_users(where: {deleted_at: {_is_null: true}}) {
|
|
57
|
+
user_manager_id
|
|
58
|
+
department_id
|
|
59
|
+
}
|
|
55
60
|
}
|
|
56
61
|
}
|
|
57
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/query/department-manager/query.ts"],"names":[],"mappings":";;;AAAa,QAAA,uBAAuB,GAAG;;;;;;;;;;;;;;;;;;CAkBtC,CAAC;AAEW,QAAA,wBAAwB,GAAG;;;;;;;;;;;;;;;;;;;;CAoBvC,CAAC;AAEW,QAAA,+BAA+B,GAAG
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/query/department-manager/query.ts"],"names":[],"mappings":";;;AAAa,QAAA,uBAAuB,GAAG;;;;;;;;;;;;;;;;;;CAkBtC,CAAC;AAEW,QAAA,wBAAwB,GAAG;;;;;;;;;;;;;;;;;;;;CAoBvC,CAAC;AAEW,QAAA,+BAA+B,GAAG;;;;;;;;;;;;;;;;;;;CAmB9C,CAAC;AAEW,QAAA,gCAAgC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;CAyB/C,CAAC"}
|