@things-factory/dataset 8.0.0-alpha.3 → 8.0.0-alpha.30

Sign up to get free protection for your applications and to get access to all the features.
Files changed (96) hide show
  1. package/client/activities/activity-data-collect-edit.ts +3 -1
  2. package/client/activities/activity-ooc-resolve-edit.ts +5 -3
  3. package/client/activities/activity-ooc-review-edit.ts +5 -3
  4. package/client/bootstrap.ts +11 -1
  5. package/client/components/data-entry-form.ts +3 -3
  6. package/client/pages/data-entry/data-entry-list-page.ts +72 -12
  7. package/client/pages/data-report/data-report-list-page.ts +9 -2
  8. package/client/pages/data-sensor/data-sensor-list-page.ts +1 -1
  9. package/client/pages/data-set/data-item-list.ts +1 -1
  10. package/client/pages/data-set/data-set-list-page.ts +29 -17
  11. package/dist-client/activities/activity-data-collect-edit.d.ts +1 -1
  12. package/dist-client/activities/activity-data-collect-edit.js +2 -1
  13. package/dist-client/activities/activity-data-collect-edit.js.map +1 -1
  14. package/dist-client/activities/activity-ooc-resolve-edit.js +5 -3
  15. package/dist-client/activities/activity-ooc-resolve-edit.js.map +1 -1
  16. package/dist-client/activities/activity-ooc-review-edit.js +5 -3
  17. package/dist-client/activities/activity-ooc-review-edit.js.map +1 -1
  18. package/dist-client/bootstrap.js +4 -0
  19. package/dist-client/bootstrap.js.map +1 -1
  20. package/dist-client/components/data-entry-form.js +3 -3
  21. package/dist-client/components/data-entry-form.js.map +1 -1
  22. package/dist-client/pages/data-entry/data-entry-list-page.js +68 -10
  23. package/dist-client/pages/data-entry/data-entry-list-page.js.map +1 -1
  24. package/dist-client/pages/data-ooc/data-ooc-view.d.ts +1 -1
  25. package/dist-client/pages/data-report/data-report-list-page.js +8 -2
  26. package/dist-client/pages/data-report/data-report-list-page.js.map +1 -1
  27. package/dist-client/pages/data-sample/data-sample-view.d.ts +1 -1
  28. package/dist-client/pages/data-sensor/data-sensor-list-page.js +1 -1
  29. package/dist-client/pages/data-sensor/data-sensor-list-page.js.map +1 -1
  30. package/dist-client/pages/data-set/data-item-list.js +1 -1
  31. package/dist-client/pages/data-set/data-item-list.js.map +1 -1
  32. package/dist-client/pages/data-set/data-set-list-page.js +29 -17
  33. package/dist-client/pages/data-set/data-set-list-page.js.map +1 -1
  34. package/dist-client/tsconfig.tsbuildinfo +1 -1
  35. package/dist-server/activities/activity-data-collect.js.map +1 -1
  36. package/dist-server/activities/activity-ooc-review.js +12 -4
  37. package/dist-server/activities/activity-ooc-review.js.map +1 -1
  38. package/dist-server/controllers/create-data-sample.js +16 -10
  39. package/dist-server/controllers/create-data-sample.js.map +1 -1
  40. package/dist-server/controllers/issue-data-collection-task.d.ts +2 -0
  41. package/dist-server/controllers/{issue-collect-data.js → issue-data-collection-task.js} +13 -9
  42. package/dist-server/controllers/issue-data-collection-task.js.map +1 -0
  43. package/dist-server/engine/task/issue-collect-data.js +2 -2
  44. package/dist-server/engine/task/issue-collect-data.js.map +1 -1
  45. package/dist-server/routes.js +5 -3
  46. package/dist-server/routes.js.map +1 -1
  47. package/dist-server/service/data-ooc/data-ooc.js +12 -3
  48. package/dist-server/service/data-ooc/data-ooc.js.map +1 -1
  49. package/dist-server/service/data-sample/data-sample.js +4 -1
  50. package/dist-server/service/data-sample/data-sample.js.map +1 -1
  51. package/dist-server/service/data-set/data-set-mutation.d.ts +1 -0
  52. package/dist-server/service/data-set/data-set-mutation.js +48 -45
  53. package/dist-server/service/data-set/data-set-mutation.js.map +1 -1
  54. package/dist-server/service/data-set/data-set-query.d.ts +3 -0
  55. package/dist-server/service/data-set/data-set-query.js +104 -29
  56. package/dist-server/service/data-set/data-set-query.js.map +1 -1
  57. package/dist-server/service/data-set/data-set-type.d.ts +2 -3
  58. package/dist-server/service/data-set/data-set-type.js +6 -6
  59. package/dist-server/service/data-set/data-set-type.js.map +1 -1
  60. package/dist-server/service/data-set/data-set.d.ts +2 -0
  61. package/dist-server/service/data-set/data-set.js +12 -0
  62. package/dist-server/service/data-set/data-set.js.map +1 -1
  63. package/dist-server/service/data-set-history/data-set-history.js +7 -2
  64. package/dist-server/service/data-set-history/data-set-history.js.map +1 -1
  65. package/dist-server/service/index.d.ts +1 -1
  66. package/dist-server/tsconfig.tsbuildinfo +1 -1
  67. package/helps/dataset/data-set.ja.md +55 -59
  68. package/helps/dataset/data-set.ko.md +9 -11
  69. package/helps/dataset/data-set.md +20 -24
  70. package/helps/dataset/data-set.zh.md +3 -11
  71. package/helps/dataset/task/issue-collect-data.ja.md +1 -1
  72. package/helps/dataset/task/issue-collect-data.ko.md +1 -1
  73. package/helps/dataset/task/issue-collect-data.md +1 -1
  74. package/helps/dataset/task/issue-collect-data.ms.md +1 -1
  75. package/helps/dataset/task/issue-collect-data.zh.md +1 -1
  76. package/package.json +13 -13
  77. package/server/activities/activity-data-collect.ts +11 -2
  78. package/server/activities/activity-ooc-review.ts +28 -7
  79. package/server/controllers/create-data-sample.ts +16 -10
  80. package/server/controllers/{issue-collect-data.ts → issue-data-collection-task.ts} +13 -7
  81. package/server/engine/task/issue-collect-data.ts +2 -2
  82. package/server/routes.ts +5 -3
  83. package/server/service/data-ooc/data-ooc.ts +12 -3
  84. package/server/service/data-sample/data-sample.ts +4 -1
  85. package/server/service/data-set/data-set-mutation.ts +44 -49
  86. package/server/service/data-set/data-set-query.ts +98 -30
  87. package/server/service/data-set/data-set-type.ts +4 -4
  88. package/server/service/data-set/data-set.ts +10 -0
  89. package/server/service/data-set-history/data-set-history.ts +8 -2
  90. package/translations/en.json +2 -0
  91. package/translations/ja.json +2 -0
  92. package/translations/ko.json +2 -0
  93. package/translations/ms.json +2 -0
  94. package/translations/zh.json +2 -0
  95. package/dist-server/controllers/issue-collect-data.d.ts +0 -2
  96. package/dist-server/controllers/issue-collect-data.js.map +0 -1
@@ -1,5 +1,5 @@
1
1
  import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
2
- import { In } from 'typeorm'
2
+ import { Brackets, In } from 'typeorm'
3
3
 
4
4
  import { Attachment } from '@things-factory/attachment-base'
5
5
  import { Role, User } from '@things-factory/auth-base'
@@ -19,6 +19,7 @@ var parser = require('cron-parser')
19
19
 
20
20
  @Resolver(DataSet)
21
21
  export class DataSetQuery {
22
+ // 데이터셋을 ID로 조회
22
23
  @Directive('@privilege(category: "data-set", privilege: "query", domainOwnerGranted: true)')
23
24
  @Query(returns => DataSet, { description: 'To fetch a DataSet' })
24
25
  async dataSet(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<DataSet> {
@@ -29,6 +30,7 @@ export class DataSetQuery {
29
30
  })
30
31
  }
31
32
 
33
+ // 데이터셋을 이름으로 조회
32
34
  @Directive('@privilege(category: "data-set", privilege: "query", domainOwnerGranted: true)')
33
35
  @Query(returns => DataSet, { description: 'To fetch a DataSet by name' })
34
36
  async dataSetByName(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<DataSet> {
@@ -39,6 +41,7 @@ export class DataSetQuery {
39
41
  })
40
42
  }
41
43
 
44
+ // 여러 데이터셋을 조회
42
45
  @Directive('@privilege(category: "data-set", privilege: "query", domainOwnerGranted: true)')
43
46
  @Query(returns => DataSetList, { description: 'To fetch multiple DataSets' })
44
47
  async dataSets(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<DataSetList> {
@@ -57,6 +60,7 @@ export class DataSetQuery {
57
60
  return { items, total }
58
61
  }
59
62
 
63
+ // 데이터 입력을 위한 데이터셋 조회
60
64
  @Query(returns => DataSetList, { description: 'To fetch multiple DataSets for data entry manually' })
61
65
  async dataSetsForEntry(
62
66
  @Args(type => ListParam) params: ListParam,
@@ -64,13 +68,15 @@ export class DataSetQuery {
64
68
  ): Promise<DataSetList> {
65
69
  var { domain, user } = context.state
66
70
 
67
- /* 조회한 사용자가 entry-role을 가진 data-set 리스트만 반환 */
71
+ // 조회한 사용자가 entry-role을 가진 data-set 리스트만 반환
68
72
  user = await getRepository(User).findOne({
69
73
  where: { id: user.id },
70
74
  relations: ['roles']
71
75
  })
72
76
 
73
- const roles = user.roles.filter(role => role.domainId === domain.id || (domain.parentId && role.domainId === domain.parentId)).map(role => role.id)
77
+ const roles = user.roles
78
+ .filter(role => role.domainId === domain.id || (domain.parentId && role.domainId === domain.parentId))
79
+ .map(role => role.id)
74
80
 
75
81
  if (!roles.length) {
76
82
  return { items: [], total: 0 }
@@ -83,13 +89,22 @@ export class DataSetQuery {
83
89
  alias: 'dataset',
84
90
  searchables: ['name', 'description']
85
91
  })
86
- .andWhere(`dataset.active = :active`, { active: true })
87
- .andWhere('dataset.entryRole IN (:...roles)', { roles })
92
+ .andWhere('dataset.active = :active', { active: true })
93
+ .andWhere(
94
+ new Brackets(qb => {
95
+ qb.where('dataset.supervisoryRole IN (:...roles)').orWhere('dataset.entryRole IN (:...roles)')
96
+ })
97
+ )
98
+ .setParameter('roles', roles)
88
99
  .getManyAndCount()
89
100
 
90
- return { items, total }
101
+ return {
102
+ items,
103
+ total
104
+ }
91
105
  }
92
106
 
107
+ // 데이터 보고를 위한 데이터셋 조회
93
108
  @Query(returns => DataSetList, { description: 'To fetch multiple DataSets to see data report' })
94
109
  async dataSetsForReport(
95
110
  @Args(type => ListParam) params: ListParam,
@@ -97,7 +112,7 @@ export class DataSetQuery {
97
112
  ): Promise<DataSetList> {
98
113
  var { domain, user } = context.state
99
114
 
100
- /* 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
115
+ // 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환
101
116
  user = await getRepository(User).findOne({
102
117
  where: { id: user.id },
103
118
  relations: ['roles']
@@ -122,9 +137,10 @@ export class DataSetQuery {
122
137
  return { items, total }
123
138
  }
124
139
 
140
+ // 데이터셋의 상태를 조회
125
141
  @FieldResolver(type => DataSetState)
126
142
  async status(@Root() dataSet: DataSet): Promise<DataSetState> {
127
- // get information from scheduler service
143
+ // 스케줄러 서비스에서 정보 가져오기
128
144
  return {
129
145
  id: '',
130
146
  scheduleId: '',
@@ -134,6 +150,7 @@ export class DataSetQuery {
134
150
  }
135
151
  }
136
152
 
153
+ // 데이터셋의 데이터 항목을 조회
137
154
  @FieldResolver(type => [DataItem])
138
155
  async dataItems(@Root() dataSet: DataSet): Promise<DataItem[]> {
139
156
  if (dataSet.dataItems instanceof Array) {
@@ -143,6 +160,7 @@ export class DataSetQuery {
143
160
  return []
144
161
  }
145
162
 
163
+ // 데이터셋의 entry 역할을 조회
146
164
  @FieldResolver(type => Role)
147
165
  async entryRole(@Root() dataSet: DataSet): Promise<Role> {
148
166
  return (
@@ -154,7 +172,8 @@ export class DataSetQuery {
154
172
  )
155
173
  }
156
174
 
157
- @FieldResolver(type => Role)
175
+ // 데이터셋의 supervisory 역할을 조회
176
+ @FieldResolver(type => Role, { description: 'Retrieves the supervisory role for the dataset' })
158
177
  async supervisoryRole(@Root() dataSet: DataSet): Promise<Role> {
159
178
  return (
160
179
  dataSet.supervisoryRole ||
@@ -165,7 +184,19 @@ export class DataSetQuery {
165
184
  )
166
185
  }
167
186
 
168
- @FieldResolver(type => [AssigneeItem])
187
+ // 데이터셋의 resolver 역할을 조회
188
+ @FieldResolver(type => Role, { description: 'Retrieves the resolver role for the dataset' })
189
+ async resolverRole(@Root() dataSet: DataSet): Promise<Role> {
190
+ return (
191
+ dataSet.resolverRole ||
192
+ (dataSet.resolverRoleId &&
193
+ (await getRepository(Role).findOneBy({
194
+ id: dataSet.resolverRoleId
195
+ })))
196
+ )
197
+ }
198
+
199
+ @FieldResolver(type => [AssigneeItem], { description: 'Retrieves the assignee items for the dataset' })
169
200
  async assignees(@Root() dataSet: DataSet, @Ctx() context: ResolverContext): Promise<AssigneeItem[]> {
170
201
  const { domain, user } = context.state
171
202
  const { assignees } = dataSet
@@ -206,7 +237,7 @@ export class DataSetQuery {
206
237
  return assigneeItemList
207
238
  }
208
239
 
209
- @FieldResolver(type => [ApprovalLineItem])
240
+ @FieldResolver(type => [ApprovalLineItem], { description: 'Retrieves the approval line items for the dataset' })
210
241
  async approvalLine(@Root() dataSet: DataSet, @Ctx() context: ResolverContext): Promise<ApprovalLineItem[]> {
211
242
  const { domain, user } = context.state
212
243
  const { reviewApprovalLine } = dataSet
@@ -248,21 +279,21 @@ export class DataSetQuery {
248
279
  return approvalLineItems
249
280
  }
250
281
 
251
- @FieldResolver(type => Board, { nullable: true })
282
+ @FieldResolver(type => Board, { nullable: true, description: 'Retrieves the entry board for the dataset' })
252
283
  async entryBoard(@Root() dataSet: DataSet): Promise<Board> {
253
284
  if (dataSet.entryType == 'board' && dataSet.entryView) {
254
285
  return await getRepository(Board).findOneBy({ id: dataSet.entryView })
255
286
  }
256
287
  }
257
288
 
258
- @FieldResolver(type => Board, { nullable: true })
289
+ @FieldResolver(type => Board, { nullable: true, description: 'Retrieves the monitor board for the dataset' })
259
290
  async monitorBoard(@Root() dataSet: DataSet): Promise<Board> {
260
291
  if (dataSet.monitorType == 'board' && dataSet.monitorView) {
261
292
  return await getRepository(Board).findOneBy({ id: dataSet.monitorView })
262
293
  }
263
294
  }
264
295
 
265
- @FieldResolver(type => DataKeySet, { nullable: true })
296
+ @FieldResolver(type => DataKeySet, { nullable: true, description: 'Retrieves the data key set for the dataset' })
266
297
  async dataKeySet(@Root() dataSet: DataSet): Promise<DataKeySet> {
267
298
  return (
268
299
  dataSet.dataKeySet ||
@@ -273,7 +304,7 @@ export class DataSetQuery {
273
304
  )
274
305
  }
275
306
 
276
- @FieldResolver(type => Scenario)
307
+ @FieldResolver(type => Scenario, { description: 'Retrieves the normal scenario for the dataset.' })
277
308
  async normalScenario(@Root() dataSet: DataSet): Promise<Scenario> {
278
309
  return (
279
310
  dataSet.normalScenario ||
@@ -284,7 +315,7 @@ export class DataSetQuery {
284
315
  )
285
316
  }
286
317
 
287
- @FieldResolver(type => Scenario)
318
+ @FieldResolver(type => Scenario, { description: 'Retrieves the outlier scenario for the dataset.' })
288
319
  async outlierScenario(@Root() dataSet: DataSet): Promise<Scenario> {
289
320
  return (
290
321
  dataSet.outlierScenario ||
@@ -295,22 +326,25 @@ export class DataSetQuery {
295
326
  )
296
327
  }
297
328
 
329
+ // 데이터셋의 도메인을 조회
298
330
  @FieldResolver(type => Domain)
299
331
  async domain(@Root() dataSet: DataSet): Promise<Domain> {
300
332
  return dataSet.domainId && (await getRepository(Domain).findOneBy({ id: dataSet.domainId }))
301
333
  }
302
334
 
335
+ // 데이터셋의 업데이트한 사용자를 조회
303
336
  @FieldResolver(type => User)
304
337
  async updater(@Root() dataSet: DataSet): Promise<User> {
305
338
  return dataSet.updaterId && (await getRepository(User).findOneBy({ id: dataSet.updaterId }))
306
339
  }
307
340
 
341
+ // 데이터셋의 생성자를 조회
308
342
  @FieldResolver(type => User)
309
343
  async creator(@Root() dataSet: DataSet): Promise<User> {
310
344
  return dataSet.creatorId && (await getRepository(User).findOneBy({ id: dataSet.creatorId }))
311
345
  }
312
346
 
313
- @FieldResolver(type => Date, { nullable: true })
347
+ @FieldResolver(type => Date, { nullable: true, description: 'Retrieves the latest collection time for the dataset.' })
314
348
  async latestCollectedAt(@Root() dataSet: DataSet): Promise<Date> {
315
349
  const sample = await getRepository(DataSample).findOne({
316
350
  select: ['id', 'collectedAt'],
@@ -321,7 +355,7 @@ export class DataSetQuery {
321
355
  return sample?.collectedAt
322
356
  }
323
357
 
324
- @FieldResolver(type => Date, { nullable: true })
358
+ @FieldResolver(type => Date, { nullable: true, description: 'Retrieves the next schedule time for the dataset.' })
325
359
  async nextSchedule(@Root() dataSet: DataSet): Promise<Date> {
326
360
  const { domainId, schedule, timezone } = dataSet
327
361
 
@@ -336,7 +370,7 @@ export class DataSetQuery {
336
370
  return interval.next().toDate()
337
371
  }
338
372
 
339
- @FieldResolver(type => Date, { nullable: true })
373
+ @FieldResolver(type => Date, { nullable: true, description: 'Retrieves the previous schedule time for the dataset.' })
340
374
  async prevSchedule(@Root() dataSet: DataSet): Promise<Date> {
341
375
  const { domainId, schedule, timezone } = dataSet
342
376
 
@@ -351,7 +385,10 @@ export class DataSetQuery {
351
385
  return interval.prev().toDate()
352
386
  }
353
387
 
354
- @FieldResolver(type => Date, { nullable: true })
388
+ @FieldResolver(type => Date, {
389
+ nullable: true,
390
+ description: 'Retrieves the next summary schedule time for the dataset.'
391
+ })
355
392
  async nextSummarySchedule(@Root() dataSet: DataSet): Promise<Date> {
356
393
  const { domainId, summarySchedule, timezone } = dataSet
357
394
 
@@ -365,20 +402,19 @@ export class DataSetQuery {
365
402
 
366
403
  return interval.next().toDate()
367
404
 
368
- // /* FIXME: getSchedules 의 파라미터를 수정해야한다. scheduler 가 없거나 커넥션이 끊겨있어서 오래걸리는 문제는 어떻게 ?? 비동기로 처리한다. 어떻게???
369
- // client: {
370
- // application: Application,
371
- // group: `${domain.id}`,
372
- // type: 'data-set',
373
- // key: dataSet.id,
374
- // operation: 'summary'
375
- // },
376
- // */
405
+ // FIXME: getSchedules 의 파라미터를 수정해야한다. scheduler 가 없거나 커넥션이 끊겨있어서 오래걸리는 문제는 어떻게 ?? 비동기로 처리한다. 어떻게???
406
+ // client: {
407
+ // application: Application,
408
+ // group: `${domain.id}`,
409
+ // type: 'data-set',
410
+ // key: dataSet.id,
411
+ // operation: 'summary'
412
+ // }
377
413
  // const schedule = getSchedules('name', 'group', false)
378
414
  // return schedule.nextSchedule
379
415
  }
380
416
 
381
- @FieldResolver(type => String)
417
+ @FieldResolver(type => String, { description: 'Retrieves the report template for the dataset.' })
382
418
  async reportTemplate(@Root() dataset: DataSet): Promise<string | undefined> {
383
419
  const attachment: Attachment = await getRepository(Attachment).findOne({
384
420
  where: {
@@ -390,4 +426,36 @@ export class DataSetQuery {
390
426
 
391
427
  return attachment?.path
392
428
  }
429
+
430
+ @FieldResolver(returns => Boolean, { description: 'Whether the user is a supervisor for this dataset' })
431
+ async isSupervisor(@Root() dataset: DataSet, @Ctx() context: ResolverContext): Promise<boolean> {
432
+ const { user, domain } = context.state
433
+
434
+ const foundUser = await getRepository(User).findOne({
435
+ where: { id: user.id },
436
+ relations: ['roles']
437
+ })
438
+
439
+ const roles = foundUser.roles
440
+ .filter(role => role.domainId === domain.id || (domain.parentId && role.domainId === domain.parentId))
441
+ .map(role => role.id)
442
+
443
+ return roles.includes(dataset.supervisoryRoleId)
444
+ }
445
+
446
+ @FieldResolver(returns => Boolean, { description: 'Whether the user is allowed to enter data for this dataset' })
447
+ async isEntryAllowed(@Root() dataset: DataSet, @Ctx() context: ResolverContext): Promise<boolean> {
448
+ const { user, domain } = context.state
449
+
450
+ const foundUser = await getRepository(User).findOne({
451
+ where: { id: user.id },
452
+ relations: ['roles']
453
+ })
454
+
455
+ const roles = foundUser.roles
456
+ .filter(role => role.domainId === domain.id || (domain.parentId && role.domainId === domain.parentId))
457
+ .map(role => role.id)
458
+
459
+ return roles.includes(dataset.entryRoleId)
460
+ }
393
461
  }
@@ -29,8 +29,8 @@ export class NewDataSet {
29
29
  @Field(type => ObjectRef, { nullable: true })
30
30
  supervisoryRole?: ObjectRef
31
31
 
32
- @Field(type => ScalarObject, { nullable: true })
33
- assignees?: AssigneeItem[]
32
+ @Field(type => ObjectRef, { nullable: true })
33
+ resolverRole?: ObjectRef
34
34
 
35
35
  @Field(type => ScalarObject, { nullable: true })
36
36
  reviewApprovalLine?: ApprovalLineItem[]
@@ -116,8 +116,8 @@ export class DataSetPatch {
116
116
  @Field(type => ObjectRef, { nullable: true })
117
117
  entryRole?: ObjectRef
118
118
 
119
- @Field(type => ScalarObject, { nullable: true })
120
- assignees?: AssigneeItem[]
119
+ @Field(type => ObjectRef, { nullable: true })
120
+ resolverRole?: ObjectRef
121
121
 
122
122
  @Field(type => ScalarObject, { nullable: true })
123
123
  reviewApprovalLine?: ApprovalLineItem[]
@@ -150,6 +150,16 @@ export class DataSet {
150
150
  @RelationId((dataSet: DataSet) => dataSet.supervisoryRole)
151
151
  supervisoryRoleId?: string
152
152
 
153
+ @ManyToOne(type => Role, { nullable: true })
154
+ @Field(type => Role, {
155
+ nullable: true,
156
+ description: 'The final authority on resolving outlier related to that dataset.'
157
+ })
158
+ resolverRole?: Role
159
+
160
+ @RelationId((dataSet: DataSet) => dataSet.resolverRole)
161
+ resolverRoleId?: string
162
+
153
163
  @Column('simple-json', { nullable: true })
154
164
  @Field(type => [AssigneeItem], { nullable: true, description: 'Who to contact for OOC issues' })
155
165
  assignees?: AssigneeItem[]
@@ -204,8 +204,14 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
204
204
  ? 'enum'
205
205
  : DATABASE_TYPE == 'oracle'
206
206
  ? 'varchar2'
207
- : 'smallint',
208
- enum: HistoryActionType
207
+ : DATABASE_TYPE == 'mssql'
208
+ ? 'nvarchar'
209
+ : 'varchar',
210
+ enum:
211
+ DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
212
+ ? HistoryActionType
213
+ : undefined,
214
+ length: DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? undefined : 10
209
215
  })
210
216
  public action!: HistoryActionType
211
217
  }
@@ -1,4 +1,5 @@
1
1
  {
2
+ "button.assign-data-collection": "assign data collection",
2
3
  "button.corrected": "corrected",
3
4
  "button.edit-model": "edit model",
4
5
  "button.enter-data": "enter data",
@@ -69,6 +70,7 @@
69
70
  "field.report-view": "report view",
70
71
  "field.request-params": "request parameters",
71
72
  "field.requires-review": "requires review",
73
+ "field.resolver-role": "resolver role",
72
74
  "field.review-approval-line": "review approval line",
73
75
  "field.role": "role",
74
76
  "field.serial-no": "serial #",
@@ -1,4 +1,5 @@
1
1
  {
2
+ "button.assign-data-collection": "データ収集を割り当てる",
2
3
  "button.corrected": "措置完了",
3
4
  "button.edit-model": "モデルを編集",
4
5
  "button.enter-data": "データを入力",
@@ -70,6 +71,7 @@
70
71
  "field.report-view": "レポート用画面",
71
72
  "field.request-params": "リクエスト パラメータ",
72
73
  "field.requires-review": "見直しが必要",
74
+ "field.resolver-role": "解決者役割",
73
75
  "field.review-approval-line": "決済ライン",
74
76
  "field.role": "ロール",
75
77
  "field.serial-no": "シリアル番号",
@@ -1,4 +1,5 @@
1
1
  {
2
+ "button.assign-data-collection": "데이타수집 작업할당",
2
3
  "button.corrected": "조치완료",
3
4
  "button.edit-model": "모델 편집",
4
5
  "button.enter-data": "데이타 입력",
@@ -70,6 +71,7 @@
70
71
  "field.report-view": "리포트용 화면",
71
72
  "field.request-params": "요청 매개변수",
72
73
  "field.requires-review": "검토 요청",
74
+ "field.resolver-role": "해결자 역할",
73
75
  "field.review-approval-line": "결재라인",
74
76
  "field.role": "역할",
75
77
  "field.serial-no": "시리얼번호",
@@ -1,4 +1,5 @@
1
1
  {
2
+ "button.assign-data-collection": "tetapkan pengumpulan data",
2
3
  "button.corrected": "diperbetulkan",
3
4
  "button.edit-model": "edit model",
4
5
  "button.enter-data": "enter data",
@@ -70,6 +71,7 @@
70
71
  "field.report-view": "paparan laporan",
71
72
  "field.request-params": "parameter permintaan",
72
73
  "field.requires-review": "memerlukan semakan",
74
+ "field.resolver-role": "peranan penyelesai",
73
75
  "field.review-approval-line": "baris kelulusan",
74
76
  "field.role": "peranan",
75
77
  "field.serial-no": "no. siri",
@@ -1,4 +1,5 @@
1
1
  {
2
+ "button.assign-data-collection": "分配数据收集",
2
3
  "button.corrected": "已处理",
3
4
  "button.edit-model": "编辑模型",
4
5
  "button.enter-data": "输入数据",
@@ -70,6 +71,7 @@
70
71
  "field.report-view": "报告界面",
71
72
  "field.request-params": "请求参数",
72
73
  "field.requires-review": "需要审查",
74
+ "field.resolver-role": "解决者角色",
73
75
  "field.review-approval-line": "审批线",
74
76
  "field.role": "角色",
75
77
  "field.serial-no": "序列号",
@@ -1,2 +0,0 @@
1
- import { ActivityInstance } from '@things-factory/worklist';
2
- export declare function issueCollectData(domainId: string, dataSetId: string, context: ResolverContext): Promise<ActivityInstance | void>;
@@ -1 +0,0 @@
1
- {"version":3,"file":"issue-collect-data.js","sourceRoot":"","sources":["../../server/controllers/issue-collect-data.ts"],"names":[],"mappings":";;AAOA,4CA2DC;AAlED,qCAA4B;AAE5B,iDAA6D;AAC7D,uDAA4E;AAE5E,2DAAsD;AAE/C,KAAK,UAAU,gBAAgB,CACpC,QAAgB,EAChB,SAAiB,EACjB,OAAwB;IAExB,MAAM,IAAA,qBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;QAC3C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,cAAM,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;QAEzE,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,UAAU,QAAQ,aAAa,CAAC,CAAA;QAClD,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,kBAAO,CAAC,CAAC,OAAO,CAAC;YACtD,KAAK,EAAE;gBACL,MAAM,EAAE;oBACN,EAAE,EAAE,IAAA,YAAE,EAAC,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;iBACrD;gBACD,EAAE,EAAE,SAAS;aACd;SACF,CAAC,CAAA;QAEF,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,SAAS,CAAC;YAC3D,MAAM,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE;YAChE,IAAI,EAAE,cAAc;SACrB,CAAC,CAAa,CAAA;QAEf,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;YAE7B,0DAA0D;YAC1D,IAAI,SAAS,IAAI,SAAS,YAAY,KAAK,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpE,MAAM,gBAAgB,GAAG;oBACvB,IAAI,EAAE,aAAa,OAAO,CAAC,IAAI,EAAE;oBACjC,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,UAAU,EAAE,QAAQ,CAAC,EAAE;oBACvB,KAAK,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;oBACjD,KAAK,EAAE;wBACL,SAAS,EAAE,OAAO,CAAC,EAAE;wBACrB,WAAW,EAAE,OAAO,CAAC,IAAI;qBAC1B;oBACD,SAAS;iBACV,CAAA;gBAED,OAAO,CAAC,KAAK,mCACR,OAAO,CAAC,KAAK,KAChB,MAAM;oBACN,EAAE,GACH,CAAA;gBAED,OAAO,MAAM,IAAA,gBAAK,EAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;YAC/C,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CACb,mDAAmD,OAAO,CAAC,IAAI,oCAAoC,CACpG,CAAA;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;QAC5D,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { In } from 'typeorm'\n\nimport { Domain, getDataSource } from '@things-factory/shell'\nimport { Activity, ActivityInstance, issue } from '@things-factory/worklist'\n\nimport { DataSet } from '../service/data-set/data-set'\n\nexport async function issueCollectData(\n domainId: string,\n dataSetId: string,\n context: ResolverContext\n): Promise<ActivityInstance | void> {\n await getDataSource().transaction(async tx => {\n const domain = await tx.getRepository(Domain).findOneBy({ id: domainId })\n\n if (!domain) {\n throw new Error(`domain(${domainId}) not found`)\n }\n\n const dataSet = await tx.getRepository(DataSet).findOne({\n where: {\n domain: {\n id: In([domain.id, domain.parentId].filter(Boolean))\n },\n id: dataSetId\n }\n })\n\n const activity = (await tx.getRepository(Activity).findOneBy({\n domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },\n name: 'Collect Data'\n })) as Activity\n\n if (activity) {\n const { assignees } = dataSet\n\n /* 해당 dataset에 대한 데이타 수집 태스크를 dataset assignees에게 할당한다. */\n if (assignees && assignees instanceof Array && assignees.length > 0) {\n const activityInstance = {\n name: `[Data 수집] ${dataSet.name}`,\n description: dataSet.description,\n activityId: activity.id,\n dueAt: new Date(Date.now() + 24 * 60 * 60 * 1000),\n input: {\n dataSetId: dataSet.id,\n dataSetName: dataSet.name\n },\n assignees\n }\n\n context.state = {\n ...context.state,\n domain,\n tx\n }\n\n return await issue(activityInstance, context)\n } else {\n throw new Error(\n `Assignees not set. So Data Collect Activity for ${dataSet.name}($dataSet.id) could not be issued.`\n )\n }\n } else {\n throw new Error(`Data Collect Activity is not installed.`)\n }\n })\n}\n"]}