@things-factory/dataset 5.0.0-alpha.21 → 5.0.0-alpha.24
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/client/pages/data-ooc.js +33 -14
- package/client/pages/data-sample.js +33 -14
- package/dist-server/controllers/create-data-sample.js +9 -3
- package/dist-server/controllers/create-data-sample.js.map +1 -1
- package/dist-server/service/data-ooc/data-ooc-type.js +9 -1
- package/dist-server/service/data-ooc/data-ooc-type.js.map +1 -1
- package/dist-server/service/data-ooc/data-ooc.js +13 -3
- package/dist-server/service/data-ooc/data-ooc.js.map +1 -1
- package/dist-server/service/data-sample/data-sample-type.js +8 -0
- package/dist-server/service/data-sample/data-sample-type.js.map +1 -1
- package/dist-server/service/data-sample/data-sample.js +13 -3
- package/dist-server/service/data-sample/data-sample.js.map +1 -1
- package/package.json +15 -14
- package/server/controllers/create-data-sample.ts +8 -3
- package/server/service/data-ooc/data-ooc-mutation.ts +3 -3
- package/server/service/data-ooc/data-ooc-type.ts +9 -3
- package/server/service/data-ooc/data-ooc.ts +12 -3
- package/server/service/data-sample/data-sample-type.ts +8 -1
- package/server/service/data-sample/data-sample.ts +12 -3
- package/translations/en.json +3 -1
- package/translations/ko.json +3 -1
- package/translations/ms.json +3 -1
- package/translations/zh.json +3 -1
package/client/pages/data-ooc.js
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
import '@operato/data-grist'
|
2
2
|
import './data-ooc-view.js'
|
3
3
|
|
4
|
-
import
|
5
|
-
import { PageView, store } from '@operato/shell'
|
4
|
+
import gql from 'graphql-tag'
|
6
5
|
import { css, html } from 'lit'
|
7
|
-
import {
|
8
|
-
import { notify, openPopup } from '@operato/layout'
|
6
|
+
import { connect } from 'pwa-helpers/connect-mixin'
|
9
7
|
|
10
8
|
import { client } from '@operato/graphql'
|
11
|
-
import {
|
12
|
-
import
|
9
|
+
import { i18next, localize } from '@operato/i18n'
|
10
|
+
import { openPopup } from '@operato/layout'
|
11
|
+
import { PageView, store } from '@operato/shell'
|
12
|
+
import { ScrollbarStyles } from '@operato/styles'
|
13
13
|
import { isMobileDevice } from '@operato/utils'
|
14
14
|
|
15
15
|
export class DataOoc extends connect(store)(localize(i18next)(PageView)) {
|
@@ -262,19 +262,19 @@ export class DataOoc extends connect(store)(localize(i18next)(PageView)) {
|
|
262
262
|
imex: true
|
263
263
|
},
|
264
264
|
{
|
265
|
-
type: '
|
266
|
-
name: '
|
267
|
-
header: i18next.t('field.
|
265
|
+
type: 'string',
|
266
|
+
name: 'workDate',
|
267
|
+
header: i18next.t('field.work-date'),
|
268
268
|
sortable: true,
|
269
|
-
width:
|
269
|
+
width: 80,
|
270
270
|
imex: true
|
271
271
|
},
|
272
272
|
{
|
273
|
-
type: '
|
274
|
-
name: '
|
275
|
-
header: i18next.t('field.
|
273
|
+
type: 'string',
|
274
|
+
name: 'workShift',
|
275
|
+
header: i18next.t('field.work-shift'),
|
276
276
|
sortable: true,
|
277
|
-
width:
|
277
|
+
width: 40,
|
278
278
|
imex: true
|
279
279
|
},
|
280
280
|
{
|
@@ -284,6 +284,22 @@ export class DataOoc extends connect(store)(localize(i18next)(PageView)) {
|
|
284
284
|
sortable: true,
|
285
285
|
width: 180,
|
286
286
|
imex: true
|
287
|
+
},
|
288
|
+
{
|
289
|
+
type: 'resource-object',
|
290
|
+
name: 'updater',
|
291
|
+
header: i18next.t('field.updater'),
|
292
|
+
sortable: true,
|
293
|
+
width: 120,
|
294
|
+
imex: true
|
295
|
+
},
|
296
|
+
{
|
297
|
+
type: 'datetime',
|
298
|
+
name: 'updatedAt',
|
299
|
+
header: i18next.t('field.updated_at'),
|
300
|
+
sortable: true,
|
301
|
+
width: 180,
|
302
|
+
imex: true
|
287
303
|
}
|
288
304
|
],
|
289
305
|
rows: {
|
@@ -334,11 +350,14 @@ export class DataOoc extends connect(store)(localize(i18next)(PageView)) {
|
|
334
350
|
}
|
335
351
|
partitionKeys
|
336
352
|
data
|
353
|
+
rawData
|
337
354
|
state
|
338
355
|
spec
|
339
356
|
ooc
|
340
357
|
oos
|
341
358
|
history
|
359
|
+
workDate
|
360
|
+
workShift
|
342
361
|
correctiveAction
|
343
362
|
correctedAt
|
344
363
|
corrector {
|
@@ -1,15 +1,15 @@
|
|
1
1
|
import '@operato/data-grist'
|
2
2
|
import './data-sample-view.js'
|
3
3
|
|
4
|
-
import
|
4
|
+
import gql from 'graphql-tag'
|
5
5
|
import { css, html } from 'lit'
|
6
|
-
import {
|
7
|
-
import { notify, openPopup } from '@operato/layout'
|
6
|
+
import { connect } from 'pwa-helpers/connect-mixin'
|
8
7
|
|
9
|
-
import { ScrollbarStyles } from '@operato/styles'
|
10
8
|
import { client } from '@operato/graphql'
|
11
|
-
import {
|
12
|
-
import
|
9
|
+
import { i18next, localize } from '@operato/i18n'
|
10
|
+
import { openPopup } from '@operato/layout'
|
11
|
+
import { PageView, store } from '@operato/shell'
|
12
|
+
import { ScrollbarStyles } from '@operato/styles'
|
13
13
|
import { isMobileDevice } from '@operato/utils'
|
14
14
|
|
15
15
|
export class DataSample extends connect(store)(localize(i18next)(PageView)) {
|
@@ -221,19 +221,19 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
|
|
221
221
|
imex: true
|
222
222
|
},
|
223
223
|
{
|
224
|
-
type: '
|
225
|
-
name: '
|
226
|
-
header: i18next.t('field.
|
224
|
+
type: 'string',
|
225
|
+
name: 'workDate',
|
226
|
+
header: i18next.t('field.work-date'),
|
227
227
|
sortable: true,
|
228
|
-
width:
|
228
|
+
width: 80,
|
229
229
|
imex: true
|
230
230
|
},
|
231
231
|
{
|
232
|
-
type: '
|
233
|
-
name: '
|
234
|
-
header: i18next.t('field.
|
232
|
+
type: 'string',
|
233
|
+
name: 'workShift',
|
234
|
+
header: i18next.t('field.work-shift'),
|
235
235
|
sortable: true,
|
236
|
-
width:
|
236
|
+
width: 40,
|
237
237
|
imex: true
|
238
238
|
},
|
239
239
|
{
|
@@ -243,6 +243,22 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
|
|
243
243
|
sortable: true,
|
244
244
|
width: 180,
|
245
245
|
imex: true
|
246
|
+
},
|
247
|
+
{
|
248
|
+
type: 'resource-object',
|
249
|
+
name: 'updater',
|
250
|
+
header: i18next.t('field.updater'),
|
251
|
+
sortable: true,
|
252
|
+
width: 120,
|
253
|
+
imex: true
|
254
|
+
},
|
255
|
+
{
|
256
|
+
type: 'datetime',
|
257
|
+
name: 'updatedAt',
|
258
|
+
header: i18next.t('field.updated_at'),
|
259
|
+
sortable: true,
|
260
|
+
width: 180,
|
261
|
+
imex: true
|
246
262
|
}
|
247
263
|
],
|
248
264
|
rows: {
|
@@ -302,9 +318,12 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
|
|
302
318
|
}
|
303
319
|
partitionKeys
|
304
320
|
data
|
321
|
+
rawData
|
305
322
|
spec
|
306
323
|
ooc
|
307
324
|
oos
|
325
|
+
workDate
|
326
|
+
workShift
|
308
327
|
updater {
|
309
328
|
id
|
310
329
|
name
|
@@ -10,6 +10,7 @@ const data_item_1 = require("../service/data-item/data-item");
|
|
10
10
|
const data_sample_1 = require("../service/data-sample/data-sample");
|
11
11
|
const data_set_1 = require("../service/data-set/data-set");
|
12
12
|
const data_use_case_1 = require("./data-use-case");
|
13
|
+
const work_shift_1 = require("@things-factory/work-shift");
|
13
14
|
const moment_1 = __importDefault(require("moment"));
|
14
15
|
const debug = require('debug')('things-factory:dataset:controller/save-data-sample');
|
15
16
|
// parse variable javascript string pattern
|
@@ -57,7 +58,7 @@ async function createDataSample(dataSample, context) {
|
|
57
58
|
const momentUtc = (0, moment_1.default)(collectedAt).utc();
|
58
59
|
const defaultPartitionKeys = {
|
59
60
|
domain: domain.subdomain,
|
60
|
-
datasetid: dataSample.dataSet.id
|
61
|
+
datasetid: dataSample.dataSet.id /* It should not be 'data_set_id' as column name duplicated for Glue */,
|
61
62
|
year: momentUtc.format('Y'),
|
62
63
|
month: momentUtc.format('M'),
|
63
64
|
day: momentUtc.format('D')
|
@@ -66,12 +67,15 @@ async function createDataSample(dataSample, context) {
|
|
66
67
|
partitionKeys = formatDate(partitionKeys, momentUtc);
|
67
68
|
partitionKeys = replaceVariables(partitionKeys, Object.assign({}, dataSample.data));
|
68
69
|
const { ooc, oos } = data_use_case_1.DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {};
|
70
|
+
const { workDate, workShift } = (0, work_shift_1.getWorkDateAndShift)(domain, collectedAt);
|
69
71
|
const result = await tx.getRepository(data_sample_1.DataSample).save(Object.assign(Object.assign({ name: dataSet.name, description: dataSet.description, useCase: dataSet.useCase }, dataSample), { domain,
|
70
72
|
partitionKeys,
|
71
73
|
spec,
|
72
74
|
ooc,
|
73
75
|
oos,
|
74
|
-
collectedAt,
|
76
|
+
collectedAt,
|
77
|
+
workDate,
|
78
|
+
workShift, creator: user, updater: user }));
|
75
79
|
if (ooc || oos) {
|
76
80
|
const dataOoc = await tx.getRepository(data_ooc_1.DataOoc).save({
|
77
81
|
name: dataSet.name,
|
@@ -80,6 +84,7 @@ async function createDataSample(dataSample, context) {
|
|
80
84
|
dataSet,
|
81
85
|
dataSample: result,
|
82
86
|
data: dataSample.data,
|
87
|
+
rawData: dataSample.rawData,
|
83
88
|
domain,
|
84
89
|
partitionKeys,
|
85
90
|
spec,
|
@@ -96,11 +101,12 @@ async function createDataSample(dataSample, context) {
|
|
96
101
|
}
|
97
102
|
],
|
98
103
|
state: data_ooc_1.DataOocStatus.CREATED,
|
104
|
+
workDate,
|
105
|
+
workShift,
|
99
106
|
collectedAt,
|
100
107
|
creator: user,
|
101
108
|
updater: user
|
102
109
|
});
|
103
|
-
debug('dataOoc is about to publish...', dataOoc);
|
104
110
|
shell_1.pubsub.publish('data-ooc', {
|
105
111
|
dataOoc,
|
106
112
|
supervisoryRoleId: dataSet.supervisoryRoleId
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"create-data-sample.js","sourceRoot":"","sources":["../../server/controllers/create-data-sample.ts"],"names":[],"mappings":";;;;;;AAAA,2DAAqE;AACrE,iDAAgF;AAEhF,8DAAyD;AACzD,oEAA+D;AAC/D,2DAAsD;AACtD,mDAA6C;AAI7C,oDAA2B;AAE3B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,oDAAoD,CAAC,CAAA;AAEpF,2CAA2C;AAC3C,MAAM,gBAAgB,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;IACrC,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC3C,OAAO;YACL,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAClB,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACnD,CAAC,CAAC,CAAA;KACL;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,gFAAgF;AAChF,sBAAsB;AACtB,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;IACnC,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACtC,OAAO;YACL,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAClB,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAC3D,CAAC,CAAC,CAAA;KACL;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAEM,KAAK,UAAU,gBAAgB,CACpC,UAAyB,EACzB,OAMC;IAED,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAE1C,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,kBAAO,CAAC,CAAC,OAAO,CAAC;QACtD,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE;KACrC,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAQ,CAAC,CAAC,IAAI,CAAC;QACtD,KAAK,EAAE;YACL,MAAM;YACN,OAAO;SACR;QACD,KAAK,EAAE;YACL,QAAQ,EAAE,MAAM;SACjB;KACF,CAAC,CAAA;IAEF,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;QAC/C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,mCACb,QAAQ,CAAC,IAAI,KAChB,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,kBAAkB,GACvC,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,WAAW,GAAG,UAAU,CAAC,WAAW,IAAI,IAAI,IAAI,EAAE,CAAA;IACxD,MAAM,SAAS,GAAG,IAAA,gBAAM,EAAC,WAAW,CAAC,CAAC,GAAG,EAAE,CAAA;IAC3C,MAAM,oBAAoB,GAAG;QAC3B,MAAM,EAAE,MAAM,CAAC,SAAS;QACxB,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE;
|
1
|
+
{"version":3,"file":"create-data-sample.js","sourceRoot":"","sources":["../../server/controllers/create-data-sample.ts"],"names":[],"mappings":"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"}
|
@@ -11,9 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
11
11
|
var _a, _b, _c;
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
13
13
|
exports.DataOocList = exports.DataOocPatch = exports.NewDataOoc = void 0;
|
14
|
-
const data_ooc_1 = require("./data-ooc");
|
15
14
|
const type_graphql_1 = require("type-graphql");
|
16
15
|
const shell_1 = require("@things-factory/shell");
|
16
|
+
const data_ooc_1 = require("./data-ooc");
|
17
17
|
let NewDataOoc = class NewDataOoc {
|
18
18
|
};
|
19
19
|
__decorate([
|
@@ -56,6 +56,14 @@ __decorate([
|
|
56
56
|
(0, type_graphql_1.Field)({ nullable: true }),
|
57
57
|
__metadata("design:type", Boolean)
|
58
58
|
], NewDataOoc.prototype, "oos", void 0);
|
59
|
+
__decorate([
|
60
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
61
|
+
__metadata("design:type", String)
|
62
|
+
], NewDataOoc.prototype, "workDate", void 0);
|
63
|
+
__decorate([
|
64
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
65
|
+
__metadata("design:type", String)
|
66
|
+
], NewDataOoc.prototype, "workShift", void 0);
|
59
67
|
__decorate([
|
60
68
|
(0, type_graphql_1.Field)({ nullable: true }),
|
61
69
|
__metadata("design:type", Date)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"data-ooc-type.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc-type.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA
|
1
|
+
{"version":3,"file":"data-ooc-type.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc-type.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoE;AAEpE,iDAA+D;AAE/D,yCAAmD;AAGnD,IAAa,UAAU,GAAvB,MAAa,UAAU;CAuCtB,CAAA;AArCC;IADC,IAAA,oBAAK,GAAE;;wCACI;AAGZ;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACN;AAGpB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACnC,iBAAS,oBAAT,iBAAS;2CAAA;AAGnB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDAChC,iBAAS,oBAAT,iBAAS;8CAAA;AAGtB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC5B;AAGrB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,oBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACzC,oBAAY,oBAAZ,oBAAY;wCAAA;AAGnB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACV;AAGhB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACX;AAGf;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACT;AAGjB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACR;AAGlB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACZ,IAAI;+CAAA;AAtCP,UAAU;IADtB,IAAA,wBAAS,GAAE;GACC,UAAU,CAuCtB;AAvCY,gCAAU;AA0CvB,IAAa,YAAY,GAAzB,MAAa,YAAY;CASxB,CAAA;AAPC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC3B;AAGX;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC5B;AAGrB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sDACD;AARd,YAAY;IADxB,IAAA,wBAAS,GAAE;GACC,YAAY,CASxB;AATY,oCAAY;AAYzB,IAAa,WAAW,GAAxB,MAAa,WAAW;CAMvB,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,kBAAO,CAAC,CAAC;;0CACT;AAGhB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;0CACN;AALF,WAAW;IADvB,IAAA,yBAAU,GAAE;GACA,WAAW,CAMvB;AANY,kCAAW"}
|
@@ -11,13 +11,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
11
11
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
13
13
|
exports.DataOoc = exports.DataOocStatus = void 0;
|
14
|
+
const type_graphql_1 = require("type-graphql");
|
14
15
|
const typeorm_1 = require("typeorm");
|
16
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
17
|
+
const env_1 = require("@things-factory/env");
|
15
18
|
const shell_1 = require("@things-factory/shell");
|
16
|
-
const type_graphql_1 = require("type-graphql");
|
17
19
|
const data_sample_1 = require("../data-sample/data-sample");
|
18
20
|
const data_set_1 = require("../data-set/data-set");
|
19
|
-
const auth_base_1 = require("@things-factory/auth-base");
|
20
|
-
const env_1 = require("@things-factory/env");
|
21
21
|
const ORMCONFIG = env_1.config.get('ormconfig', {});
|
22
22
|
const DATABASE_TYPE = ORMCONFIG.type;
|
23
23
|
var DataOocStatus;
|
@@ -163,6 +163,16 @@ __decorate([
|
|
163
163
|
(0, type_graphql_1.Field)({ nullable: true }),
|
164
164
|
__metadata("design:type", String)
|
165
165
|
], DataOoc.prototype, "source", void 0);
|
166
|
+
__decorate([
|
167
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
168
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
169
|
+
__metadata("design:type", String)
|
170
|
+
], DataOoc.prototype, "workDate", void 0);
|
171
|
+
__decorate([
|
172
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
173
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
174
|
+
__metadata("design:type", String)
|
175
|
+
], DataOoc.prototype, "workShift", void 0);
|
166
176
|
__decorate([
|
167
177
|
(0, typeorm_1.Column)({ nullable: true }),
|
168
178
|
(0, type_graphql_1.Field)({ nullable: true }),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"data-ooc.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAWgB;
|
1
|
+
{"version":3,"file":"data-ooc.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc.ts"],"names":[],"mappings":"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"}
|
@@ -40,6 +40,14 @@ __decorate([
|
|
40
40
|
(0, type_graphql_1.Field)({ nullable: true }),
|
41
41
|
__metadata("design:type", String)
|
42
42
|
], NewDataSample.prototype, "source", void 0);
|
43
|
+
__decorate([
|
44
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
45
|
+
__metadata("design:type", String)
|
46
|
+
], NewDataSample.prototype, "workDate", void 0);
|
47
|
+
__decorate([
|
48
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
49
|
+
__metadata("design:type", String)
|
50
|
+
], NewDataSample.prototype, "workShift", void 0);
|
43
51
|
__decorate([
|
44
52
|
(0, type_graphql_1.Field)({ nullable: true }),
|
45
53
|
__metadata("design:type", Date)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"data-sample-type.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample-type.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+
|
1
|
+
{"version":3,"file":"data-sample-type.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample-type.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAgE;AAEhE,iDAA+D;AAE/D,+CAA0C;AAG1C,IAAa,aAAa,GAA1B,MAAa,aAAa;CA2BzB,CAAA;AAzBC;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACnC,iBAAS,oBAAT,iBAAS;8CAAA;AAGnB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,oBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACzC,oBAAY,oBAAZ,oBAAY;2CAAA;AAGnB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACV;AAGhB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACX;AAGf;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACT;AAGjB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACR;AAGlB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACZ,IAAI;kDAAA;AA1BP,aAAa;IADzB,IAAA,wBAAS,GAAE;GACC,aAAa,CA2BzB;AA3BY,sCAAa;AA8B1B,IAAa,cAAc,GAA3B,MAAa,cAAc;CAM1B,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,wBAAU,CAAC,CAAC;;6CACT;AAGnB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;6CACN;AALF,cAAc;IAD1B,IAAA,yBAAU,GAAE;GACA,cAAc,CAM1B;AANY,wCAAc"}
|
@@ -11,12 +11,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
11
11
|
var _a, _b, _c, _d, _e, _f;
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
13
13
|
exports.DataSample = void 0;
|
14
|
-
const typeorm_1 = require("typeorm");
|
15
|
-
const shell_1 = require("@things-factory/shell");
|
16
14
|
const type_graphql_1 = require("type-graphql");
|
17
|
-
const
|
15
|
+
const typeorm_1 = require("typeorm");
|
18
16
|
const auth_base_1 = require("@things-factory/auth-base");
|
19
17
|
const env_1 = require("@things-factory/env");
|
18
|
+
const shell_1 = require("@things-factory/shell");
|
19
|
+
const data_set_1 = require("../data-set/data-set");
|
20
20
|
const ORMCONFIG = env_1.config.get('ormconfig', {});
|
21
21
|
const DATABASE_TYPE = ORMCONFIG.type;
|
22
22
|
let DataSample = class DataSample {
|
@@ -118,6 +118,16 @@ __decorate([
|
|
118
118
|
(0, type_graphql_1.Field)({ nullable: true }),
|
119
119
|
__metadata("design:type", Boolean)
|
120
120
|
], DataSample.prototype, "oos", void 0);
|
121
|
+
__decorate([
|
122
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
123
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
124
|
+
__metadata("design:type", String)
|
125
|
+
], DataSample.prototype, "workDate", void 0);
|
126
|
+
__decorate([
|
127
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
128
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
129
|
+
__metadata("design:type", String)
|
130
|
+
], DataSample.prototype, "workShift", void 0);
|
121
131
|
__decorate([
|
122
132
|
(0, typeorm_1.Column)({ nullable: true }),
|
123
133
|
(0, type_graphql_1.Field)({ nullable: true }),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"data-sample.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA
|
1
|
+
{"version":3,"file":"data-sample.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@things-factory/dataset",
|
3
|
-
"version": "5.0.0-alpha.
|
3
|
+
"version": "5.0.0-alpha.24",
|
4
4
|
"main": "dist-server/index.js",
|
5
5
|
"browser": "client/index.js",
|
6
6
|
"things-factory": true,
|
@@ -24,19 +24,20 @@
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
25
25
|
},
|
26
26
|
"dependencies": {
|
27
|
-
"@operato/app": "1.0.0-alpha.
|
28
|
-
"@operato/data-grist": "1.0.0-alpha.
|
29
|
-
"@operato/dataset": "1.0.0-alpha.
|
30
|
-
"@operato/graphql": "1.0.0-alpha.
|
31
|
-
"@operato/i18n": "1.0.0-alpha.
|
32
|
-
"@operato/layout": "1.0.0-alpha.
|
33
|
-
"@operato/shell": "1.0.0-alpha.
|
34
|
-
"@operato/styles": "1.0.0-alpha.
|
35
|
-
"@operato/utils": "1.0.0-alpha.
|
36
|
-
"@things-factory/auth-base": "^5.0.0-alpha.
|
37
|
-
"@things-factory/env": "^5.0.0-alpha.
|
38
|
-
"@things-factory/shell": "^5.0.0-alpha.
|
27
|
+
"@operato/app": "1.0.0-alpha.46",
|
28
|
+
"@operato/data-grist": "1.0.0-alpha.46",
|
29
|
+
"@operato/dataset": "1.0.0-alpha.46",
|
30
|
+
"@operato/graphql": "1.0.0-alpha.46",
|
31
|
+
"@operato/i18n": "1.0.0-alpha.46",
|
32
|
+
"@operato/layout": "1.0.0-alpha.46",
|
33
|
+
"@operato/shell": "1.0.0-alpha.46",
|
34
|
+
"@operato/styles": "1.0.0-alpha.46",
|
35
|
+
"@operato/utils": "1.0.0-alpha.46",
|
36
|
+
"@things-factory/auth-base": "^5.0.0-alpha.24",
|
37
|
+
"@things-factory/env": "^5.0.0-alpha.24",
|
38
|
+
"@things-factory/shell": "^5.0.0-alpha.24",
|
39
|
+
"@things-factory/work-shift": "^5.0.0-alpha.24",
|
39
40
|
"moment": "^2.29.1"
|
40
41
|
},
|
41
|
-
"gitHead": "
|
42
|
+
"gitHead": "077d90d32fa548afd4925ce07f8f7f27c6b3399a"
|
42
43
|
}
|
@@ -8,6 +8,7 @@ import { DataUseCase } from './data-use-case'
|
|
8
8
|
import { EntityManager } from 'typeorm'
|
9
9
|
import { NewDataSample } from '../service/data-sample/data-sample-type'
|
10
10
|
import { User } from '@things-factory/auth-base'
|
11
|
+
import { getWorkDateAndShift } from '@things-factory/work-shift'
|
11
12
|
import moment from 'moment'
|
12
13
|
|
13
14
|
const debug = require('debug')('things-factory:dataset:controller/save-data-sample')
|
@@ -76,7 +77,7 @@ export async function createDataSample(
|
|
76
77
|
const momentUtc = moment(collectedAt).utc()
|
77
78
|
const defaultPartitionKeys = {
|
78
79
|
domain: domain.subdomain,
|
79
|
-
datasetid: dataSample.dataSet.id
|
80
|
+
datasetid: dataSample.dataSet.id /* It should not be 'data_set_id' as column name duplicated for Glue */,
|
80
81
|
year: momentUtc.format('Y'),
|
81
82
|
month: momentUtc.format('M'),
|
82
83
|
day: momentUtc.format('D')
|
@@ -93,6 +94,7 @@ export async function createDataSample(
|
|
93
94
|
})
|
94
95
|
|
95
96
|
const { ooc, oos } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}
|
97
|
+
const { workDate, workShift } = getWorkDateAndShift(domain, collectedAt)
|
96
98
|
|
97
99
|
const result = await tx.getRepository(DataSample).save({
|
98
100
|
name: dataSet.name,
|
@@ -105,6 +107,8 @@ export async function createDataSample(
|
|
105
107
|
ooc,
|
106
108
|
oos,
|
107
109
|
collectedAt,
|
110
|
+
workDate,
|
111
|
+
workShift,
|
108
112
|
creator: user,
|
109
113
|
updater: user
|
110
114
|
})
|
@@ -117,6 +121,7 @@ export async function createDataSample(
|
|
117
121
|
dataSet,
|
118
122
|
dataSample: result,
|
119
123
|
data: dataSample.data,
|
124
|
+
rawData: dataSample.rawData,
|
120
125
|
domain,
|
121
126
|
partitionKeys,
|
122
127
|
spec,
|
@@ -133,13 +138,13 @@ export async function createDataSample(
|
|
133
138
|
}
|
134
139
|
],
|
135
140
|
state: DataOocStatus.CREATED,
|
141
|
+
workDate,
|
142
|
+
workShift,
|
136
143
|
collectedAt,
|
137
144
|
creator: user,
|
138
145
|
updater: user
|
139
146
|
})
|
140
147
|
|
141
|
-
debug('dataOoc is about to publish...', dataOoc)
|
142
|
-
|
143
148
|
pubsub.publish('data-ooc', {
|
144
149
|
dataOoc,
|
145
150
|
supervisoryRoleId: dataSet.supervisoryRoleId
|
@@ -1,7 +1,7 @@
|
|
1
|
-
import {
|
2
|
-
|
1
|
+
import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
|
2
|
+
|
3
3
|
import { DataOoc, DataOocStatus } from './data-ooc'
|
4
|
-
import {
|
4
|
+
import { DataOocPatch, NewDataOoc } from './data-ooc-type'
|
5
5
|
|
6
6
|
@Resolver(DataOoc)
|
7
7
|
export class DataOocMutation {
|
@@ -1,8 +1,8 @@
|
|
1
|
-
import {
|
2
|
-
|
1
|
+
import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
|
2
|
+
|
3
3
|
import { ObjectRef, ScalarObject } from '@things-factory/shell'
|
4
4
|
|
5
|
-
import {
|
5
|
+
import { DataOoc, DataOocStatus } from './data-ooc'
|
6
6
|
|
7
7
|
@InputType()
|
8
8
|
export class NewDataOoc {
|
@@ -36,6 +36,12 @@ export class NewDataOoc {
|
|
36
36
|
@Field({ nullable: true })
|
37
37
|
oos?: boolean
|
38
38
|
|
39
|
+
@Field({ nullable: true })
|
40
|
+
workDate?: string
|
41
|
+
|
42
|
+
@Field({ nullable: true })
|
43
|
+
workShift?: string
|
44
|
+
|
39
45
|
@Field({ nullable: true })
|
40
46
|
collectedAt?: Date
|
41
47
|
}
|
@@ -1,3 +1,4 @@
|
|
1
|
+
import { Field, ID, ObjectType, registerEnumType } from 'type-graphql'
|
1
2
|
import {
|
2
3
|
Column,
|
3
4
|
CreateDateColumn,
|
@@ -10,13 +11,13 @@ import {
|
|
10
11
|
RelationId,
|
11
12
|
UpdateDateColumn
|
12
13
|
} from 'typeorm'
|
14
|
+
|
15
|
+
import { User } from '@things-factory/auth-base'
|
16
|
+
import { config } from '@things-factory/env'
|
13
17
|
import { Domain, ScalarObject } from '@things-factory/shell'
|
14
|
-
import { Field, ID, Int, ObjectType, registerEnumType } from 'type-graphql'
|
15
18
|
|
16
19
|
import { DataSample } from '../data-sample/data-sample'
|
17
20
|
import { DataSet } from '../data-set/data-set'
|
18
|
-
import { User } from '@things-factory/auth-base'
|
19
|
-
import { config } from '@things-factory/env'
|
20
21
|
|
21
22
|
const ORMCONFIG = config.get('ormconfig', {})
|
22
23
|
const DATABASE_TYPE = ORMCONFIG.type
|
@@ -150,6 +151,14 @@ export class DataOoc {
|
|
150
151
|
@Field({ nullable: true })
|
151
152
|
source?: string
|
152
153
|
|
154
|
+
@Column({ nullable: true })
|
155
|
+
@Field({ nullable: true })
|
156
|
+
workDate?: string
|
157
|
+
|
158
|
+
@Column({ nullable: true })
|
159
|
+
@Field({ nullable: true })
|
160
|
+
workShift?: string
|
161
|
+
|
153
162
|
@Column({ nullable: true })
|
154
163
|
@Field({ nullable: true })
|
155
164
|
collectedAt?: Date
|
@@ -1,4 +1,5 @@
|
|
1
|
-
import { Field,
|
1
|
+
import { Field, InputType, Int, ObjectType } from 'type-graphql'
|
2
|
+
|
2
3
|
import { ObjectRef, ScalarObject } from '@things-factory/shell'
|
3
4
|
|
4
5
|
import { DataSample } from './data-sample'
|
@@ -23,6 +24,12 @@ export class NewDataSample {
|
|
23
24
|
@Field({ nullable: true })
|
24
25
|
source?: string
|
25
26
|
|
27
|
+
@Field({ nullable: true })
|
28
|
+
workDate?: string
|
29
|
+
|
30
|
+
@Field({ nullable: true })
|
31
|
+
workShift?: string
|
32
|
+
|
26
33
|
@Field({ nullable: true })
|
27
34
|
collectedAt?: Date
|
28
35
|
}
|
@@ -1,3 +1,4 @@
|
|
1
|
+
import { Field, ID, ObjectType } from 'type-graphql'
|
1
2
|
import {
|
2
3
|
Column,
|
3
4
|
CreateDateColumn,
|
@@ -8,12 +9,12 @@ import {
|
|
8
9
|
RelationId,
|
9
10
|
UpdateDateColumn
|
10
11
|
} from 'typeorm'
|
11
|
-
import { Domain, ScalarObject } from '@things-factory/shell'
|
12
|
-
import { Field, ID, ObjectType } from 'type-graphql'
|
13
12
|
|
14
|
-
import { DataSet } from '../data-set/data-set'
|
15
13
|
import { User } from '@things-factory/auth-base'
|
16
14
|
import { config } from '@things-factory/env'
|
15
|
+
import { Domain, ScalarObject } from '@things-factory/shell'
|
16
|
+
|
17
|
+
import { DataSet } from '../data-set/data-set'
|
17
18
|
|
18
19
|
const ORMCONFIG = config.get('ormconfig', {})
|
19
20
|
const DATABASE_TYPE = ORMCONFIG.type
|
@@ -108,6 +109,14 @@ export class DataSample {
|
|
108
109
|
@Field({ nullable: true })
|
109
110
|
oos?: boolean
|
110
111
|
|
112
|
+
@Column({ nullable: true })
|
113
|
+
@Field({ nullable: true })
|
114
|
+
workDate?: string
|
115
|
+
|
116
|
+
@Column({ nullable: true })
|
117
|
+
@Field({ nullable: true })
|
118
|
+
workShift?: string
|
119
|
+
|
111
120
|
@Column({ nullable: true })
|
112
121
|
@Field({ nullable: true })
|
113
122
|
collectedAt?: Date
|
package/translations/en.json
CHANGED
@@ -25,6 +25,8 @@
|
|
25
25
|
"field.tag": "tag name",
|
26
26
|
"field.unit": "unit",
|
27
27
|
"field.use-case": "use case",
|
28
|
+
"field.work-date": "work date",
|
29
|
+
"field.work-shift": "work shift",
|
28
30
|
"text.data sample created successfully": "a data sample created successfully",
|
29
31
|
"text.data ooc updated successfully": "a data ooc updated successfully",
|
30
32
|
"title.data-entry-form": "data entry form",
|
@@ -35,4 +37,4 @@
|
|
35
37
|
"title.data-sample view": "data sample view",
|
36
38
|
"title.data-sensor list": "data sensor list",
|
37
39
|
"title.data-set list": "data set list"
|
38
|
-
}
|
40
|
+
}
|
package/translations/ko.json
CHANGED
@@ -25,6 +25,8 @@
|
|
25
25
|
"field.tag": "태그이름",
|
26
26
|
"field.unit": "단위",
|
27
27
|
"field.use-case": "사용 사례",
|
28
|
+
"field.work-date": "작업기준일",
|
29
|
+
"field.work-shift": "교대근무조",
|
28
30
|
"text.data sample created successfully": "데이타 샘플이 성공적으로 생성되었습니다",
|
29
31
|
"text.data ooc updated successfully": "이탈데이타 내용이 수정되었습니다",
|
30
32
|
"title.data-entry-form": "데이타 입력",
|
@@ -35,4 +37,4 @@
|
|
35
37
|
"title.data-sample view": "데이타 샘플 상세",
|
36
38
|
"title.data-sensor list": "데이타 센서 조회",
|
37
39
|
"title.data-set list": "데이타 셋 조회"
|
38
|
-
}
|
40
|
+
}
|
package/translations/ms.json
CHANGED
@@ -25,6 +25,8 @@
|
|
25
25
|
"field.tag": "tag name",
|
26
26
|
"field.unit": "unit",
|
27
27
|
"field.use-case": "use case",
|
28
|
+
"field.work-date": "work date",
|
29
|
+
"field.work-shift": "work shift",
|
28
30
|
"text.data sample created successfully": "a data sample created successfully",
|
29
31
|
"text.data ooc updated successfully": "a data ooc updated successfully",
|
30
32
|
"title.data-entry-form": "data entry form",
|
@@ -35,4 +37,4 @@
|
|
35
37
|
"title.data-sample view": "data sample view",
|
36
38
|
"title.data-sensor list": "data sensor list",
|
37
39
|
"title.data-set list": "data set list"
|
38
|
-
}
|
40
|
+
}
|
package/translations/zh.json
CHANGED
@@ -25,6 +25,8 @@
|
|
25
25
|
"field.tag": "tag name",
|
26
26
|
"field.unit": "unit",
|
27
27
|
"field.use-case": "use case",
|
28
|
+
"field.work-date": "work date",
|
29
|
+
"field.work-shift": "work shift",
|
28
30
|
"text.data sample created successfully": "a data sample created successfully",
|
29
31
|
"text.data ooc updated successfully": "a data ooc updated successfully",
|
30
32
|
"title.data-entry-form": "data entry form",
|
@@ -35,4 +37,4 @@
|
|
35
37
|
"title.data-sample view": "data sample view",
|
36
38
|
"title.data-sensor list": "data sensor list",
|
37
39
|
"title.data-set list": "data set list"
|
38
|
-
}
|
40
|
+
}
|