@things-factory/organization 10.1.181 → 10.1.183
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-client/tsconfig.tsbuildinfo +1 -1
- package/dist-server/controllers/register-employee-as-system-user.js +9 -1
- package/dist-server/controllers/register-employee-as-system-user.js.map +1 -1
- package/dist-server/service/employee/employee-history.js +2 -0
- package/dist-server/service/employee/employee-history.js.map +1 -1
- package/dist-server/service/employee/employee-mutation.js +5 -0
- package/dist-server/service/employee/employee-mutation.js.map +1 -1
- package/dist-server/service/employee/employee-private.d.ts +9 -0
- package/dist-server/service/employee/employee-private.js +26 -0
- package/dist-server/service/employee/employee-private.js.map +1 -0
- package/dist-server/service/employee/employee.js +2 -0
- package/dist-server/service/employee/employee.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -5
- package/tests/employee-private.test.ts +26 -0
- package/tests/register-employee-role.test.ts +97 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/organization",
|
|
3
|
-
"version": "10.1.
|
|
3
|
+
"version": "10.1.183",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "dist-client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -36,10 +36,10 @@
|
|
|
36
36
|
"@operato/p13n": "^10.0.0",
|
|
37
37
|
"@operato/popup": "^10.15.0",
|
|
38
38
|
"@operato/shell": "^10.0.0",
|
|
39
|
-
"@things-factory/auth-base": "^10.1.
|
|
40
|
-
"@things-factory/code-ui": "^10.1.
|
|
41
|
-
"@things-factory/contact": "^10.1.
|
|
39
|
+
"@things-factory/auth-base": "^10.1.183",
|
|
40
|
+
"@things-factory/code-ui": "^10.1.183",
|
|
41
|
+
"@things-factory/contact": "^10.1.183",
|
|
42
42
|
"@things-factory/shell": "^10.1.179"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "c36684e0db8353f5f4523ed55111df3154bae19e"
|
|
45
45
|
}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { readFileSync } from 'fs'
|
|
2
|
+
import { join } from 'path'
|
|
3
|
+
|
|
4
|
+
import { EMPLOYEE_PRIVATE_FIELDS, privateFieldsOf } from '../server/service/employee/employee-private'
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* An employee's pay account is HR-payroll's (ADR-0139): read under `employee-private`, apart from the roster every
|
|
8
|
+
* seat reads, and written only by whoever may change it.
|
|
9
|
+
*/
|
|
10
|
+
describe("an employee's pay account", () => {
|
|
11
|
+
it('★ is declared under employee-private on the employee and its history - the declaration, not a resolver', () => {
|
|
12
|
+
for (const file of ['employee.ts', 'employee-history.ts']) {
|
|
13
|
+
const source = readFileSync(join(__dirname, '..', 'server', 'service', 'employee', file), 'utf8')
|
|
14
|
+
for (const field of EMPLOYEE_PRIVATE_FIELDS) {
|
|
15
|
+
expect([file, field, new RegExp(`@privilege\\(category: "employee-private", privilege: "query"[^\\n]*\\n @Field\\(\\{ nullable: true \\}\\)\\n ${field}\\?:`).test(source)]).toEqual([file, field, true])
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
})
|
|
19
|
+
|
|
20
|
+
it('★ a patch that writes it is told apart from one that leaves it alone', () => {
|
|
21
|
+
expect(privateFieldsOf({ name: '홍길동', bankAccount: '123', bankName: undefined })).toEqual(['bankAccount'])
|
|
22
|
+
expect(privateFieldsOf({ name: '홍길동' })).toEqual([])
|
|
23
|
+
expect(privateFieldsOf({ bankName: '' })).toEqual(['bankName'])
|
|
24
|
+
expect(privateFieldsOf(null)).toEqual([])
|
|
25
|
+
})
|
|
26
|
+
})
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Registering an employee as a system user gives the role named as their job responsibility when the domain has one.
|
|
3
|
+
*
|
|
4
|
+
* A domain's roles need not follow its job titles (hatiolab: roles 직원 · 팀장 · 경영지원 …, job responsibilities
|
|
5
|
+
* 연구원 · 실장 · FDE …). Registering a 연구원 there was refused outright — 「'{name}'라는 이름의 역할이 정의되어
|
|
6
|
+
* 있지 않습니다」 — so most employees could not be registered at all. The employee is registered; the role comes
|
|
7
|
+
* along only when it exists, as a job change already swaps it.
|
|
8
|
+
*
|
|
9
|
+
* Runs the real controller on sqlite. The account already exists by the contact's work email, so no initial
|
|
10
|
+
* password is needed.
|
|
11
|
+
*/
|
|
12
|
+
import 'reflect-metadata'
|
|
13
|
+
|
|
14
|
+
const { existsSync } = require('fs')
|
|
15
|
+
const { join } = require('path')
|
|
16
|
+
const { DataSource } = require('typeorm')
|
|
17
|
+
|
|
18
|
+
const shell = require('@things-factory/shell')
|
|
19
|
+
const authBase = require('@things-factory/auth-base')
|
|
20
|
+
const contact = require('@things-factory/contact')
|
|
21
|
+
const bizBase = require('@things-factory/biz-base')
|
|
22
|
+
|
|
23
|
+
function loadCompiled(modulePath: string): any {
|
|
24
|
+
const resolved = join(__dirname, '..', 'dist-server', `${modulePath}.js`)
|
|
25
|
+
if (!existsSync(resolved)) {
|
|
26
|
+
throw new Error(`organization build output is missing: ${resolved}\nBuild it first: npm run build:server`)
|
|
27
|
+
}
|
|
28
|
+
return require(resolved)
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
let dataSource: any
|
|
32
|
+
let organization: any
|
|
33
|
+
let register: any
|
|
34
|
+
let domain: any
|
|
35
|
+
let admin: any
|
|
36
|
+
|
|
37
|
+
beforeAll(async () => {
|
|
38
|
+
organization = loadCompiled('service/index')
|
|
39
|
+
register = loadCompiled('controllers/register-employee-as-system-user').registerEmployeeAsSystemUser
|
|
40
|
+
dataSource = new DataSource({
|
|
41
|
+
type: 'sqlite',
|
|
42
|
+
database: ':memory:',
|
|
43
|
+
synchronize: true,
|
|
44
|
+
dropSchema: true,
|
|
45
|
+
namingStrategy: new shell.NamingStrategy(),
|
|
46
|
+
entities: [...shell.entities, ...authBase.entities, ...bizBase.entities, ...contact.entities, ...organization.entities],
|
|
47
|
+
logging: false
|
|
48
|
+
})
|
|
49
|
+
await dataSource.initialize()
|
|
50
|
+
shell.addDataSource('default', dataSource)
|
|
51
|
+
shell.addDataSource('tx', dataSource)
|
|
52
|
+
})
|
|
53
|
+
|
|
54
|
+
beforeEach(async () => {
|
|
55
|
+
await dataSource.synchronize(true)
|
|
56
|
+
domain = await dataSource.getRepository(shell.Domain).save({ name: 'register-role', subdomain: 'register-role' })
|
|
57
|
+
admin = await dataSource.getRepository(authBase.User).save({ name: 'admin', email: 'admin@register-role.test' })
|
|
58
|
+
await dataSource.getRepository(authBase.Role).save({ name: '팀장', domain })
|
|
59
|
+
})
|
|
60
|
+
|
|
61
|
+
afterAll(async () => {
|
|
62
|
+
if (!dataSource) return
|
|
63
|
+
shell.removeDataSource('default')
|
|
64
|
+
shell.removeDataSource('tx')
|
|
65
|
+
await dataSource.destroy()
|
|
66
|
+
})
|
|
67
|
+
|
|
68
|
+
async function employeeAs(jobResponsibility: string, email: string) {
|
|
69
|
+
await dataSource.getRepository(authBase.User).save({ name: email, email, domains: [domain] })
|
|
70
|
+
const card = await dataSource
|
|
71
|
+
.getRepository(contact.Contact)
|
|
72
|
+
.save({ domain, name: email, items: [{ type: 'email', label: 'work', value: email }] })
|
|
73
|
+
return await dataSource
|
|
74
|
+
.getRepository(organization.Employee)
|
|
75
|
+
.save({ domain, controlNo: email, name: email, active: true, jobResponsibility, contact: card })
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
async function registered(employeeId: string) {
|
|
79
|
+
await dataSource.transaction((tx: any) => register(employeeId, { state: { domain, user: admin, tx }, t: (key: string) => key }))
|
|
80
|
+
const employee = await dataSource.getRepository(organization.Employee).findOne({ where: { id: employeeId }, relations: ['user'] })
|
|
81
|
+
return await dataSource.getRepository(authBase.User).findOne({ where: { id: employee.user.id }, relations: ['roles'] })
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
describe('an employee is registered as a system user whether or not a role is named as their job', () => {
|
|
85
|
+
it('a job responsibility with no role of its name registers the employee with no role', async () => {
|
|
86
|
+
const researcher = await employeeAs('연구원', 'researcher@register-role.test')
|
|
87
|
+
const user = await registered(researcher.id)
|
|
88
|
+
expect(user.email).toBe('researcher@register-role.test')
|
|
89
|
+
expect(user.roles.map((one: any) => one.name)).toEqual([])
|
|
90
|
+
})
|
|
91
|
+
|
|
92
|
+
it('a job responsibility with a role of its name registers the employee with that role', async () => {
|
|
93
|
+
const lead = await employeeAs('팀장', 'lead@register-role.test')
|
|
94
|
+
const user = await registered(lead.id)
|
|
95
|
+
expect(user.roles.map((one: any) => one.name)).toEqual(['팀장'])
|
|
96
|
+
})
|
|
97
|
+
})
|