@things-factory/dataset 5.0.0-alpha.22 → 5.0.0-alpha.25
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
CHANGED
|
@@ -4,13 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.createDataSample = void 0;
|
|
7
|
-
const
|
|
7
|
+
const data_ooc_1 = require("../service/data-ooc/data-ooc");
|
|
8
8
|
const shell_1 = require("@things-factory/shell");
|
|
9
9
|
const data_item_1 = require("../service/data-item/data-item");
|
|
10
|
-
const data_ooc_1 = require("../service/data-ooc/data-ooc");
|
|
11
10
|
const data_sample_1 = require("../service/data-sample/data-sample");
|
|
12
11
|
const data_set_1 = require("../service/data-set/data-set");
|
|
13
12
|
const data_use_case_1 = require("./data-use-case");
|
|
13
|
+
const work_shift_1 = require("@things-factory/work-shift");
|
|
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
|
|
16
17
|
const replaceVariables = (keys, dic) => {
|
|
@@ -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 } = await (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,13 +101,12 @@ async function createDataSample(dataSample, context) {
|
|
|
96
101
|
}
|
|
97
102
|
],
|
|
98
103
|
state: data_ooc_1.DataOocStatus.CREATED,
|
|
99
|
-
workDate
|
|
100
|
-
workShift
|
|
104
|
+
workDate,
|
|
105
|
+
workShift,
|
|
101
106
|
collectedAt,
|
|
102
107
|
creator: user,
|
|
103
108
|
updater: user
|
|
104
109
|
});
|
|
105
|
-
debug('dataOoc is about to publish...', dataOoc);
|
|
106
110
|
shell_1.pubsub.publish('data-ooc', {
|
|
107
111
|
dataOoc,
|
|
108
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,
|
|
1
|
+
{"version":3,"file":"create-data-sample.js","sourceRoot":"","sources":["../../server/controllers/create-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.25",
|
|
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.47",
|
|
28
|
+
"@operato/data-grist": "1.0.0-alpha.47",
|
|
29
|
+
"@operato/dataset": "1.0.0-alpha.47",
|
|
30
|
+
"@operato/graphql": "1.0.0-alpha.47",
|
|
31
|
+
"@operato/i18n": "1.0.0-alpha.47",
|
|
32
|
+
"@operato/layout": "1.0.0-alpha.47",
|
|
33
|
+
"@operato/shell": "1.0.0-alpha.47",
|
|
34
|
+
"@operato/styles": "1.0.0-alpha.47",
|
|
35
|
+
"@operato/utils": "1.0.0-alpha.47",
|
|
36
|
+
"@things-factory/auth-base": "^5.0.0-alpha.25",
|
|
37
|
+
"@things-factory/env": "^5.0.0-alpha.25",
|
|
38
|
+
"@things-factory/shell": "^5.0.0-alpha.25",
|
|
39
|
+
"@things-factory/work-shift": "^5.0.0-alpha.25",
|
|
39
40
|
"moment": "^2.29.1"
|
|
40
41
|
},
|
|
41
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "d4307f6a23ea8be3555a06f17182558b2b00c74d"
|
|
42
43
|
}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { EntityManager } from 'typeorm'
|
|
3
|
-
|
|
4
|
-
import { User } from '@things-factory/auth-base'
|
|
1
|
+
import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
|
|
5
2
|
import { Domain, getRedirectSubdomainPath, pubsub } from '@things-factory/shell'
|
|
6
3
|
|
|
7
4
|
import { DataItem } from '../service/data-item/data-item'
|
|
8
|
-
import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
|
|
9
5
|
import { DataSample } from '../service/data-sample/data-sample'
|
|
10
|
-
import { NewDataSample } from '../service/data-sample/data-sample-type'
|
|
11
6
|
import { DataSet } from '../service/data-set/data-set'
|
|
12
7
|
import { DataUseCase } from './data-use-case'
|
|
8
|
+
import { EntityManager } from 'typeorm'
|
|
9
|
+
import { NewDataSample } from '../service/data-sample/data-sample-type'
|
|
10
|
+
import { User } from '@things-factory/auth-base'
|
|
11
|
+
import { getWorkDateAndShift } from '@things-factory/work-shift'
|
|
12
|
+
import moment from 'moment'
|
|
13
13
|
|
|
14
14
|
const debug = require('debug')('things-factory:dataset:controller/save-data-sample')
|
|
15
15
|
|
|
@@ -94,6 +94,7 @@ export async function createDataSample(
|
|
|
94
94
|
})
|
|
95
95
|
|
|
96
96
|
const { ooc, oos } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}
|
|
97
|
+
const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt)
|
|
97
98
|
|
|
98
99
|
const result = await tx.getRepository(DataSample).save({
|
|
99
100
|
name: dataSet.name,
|
|
@@ -106,8 +107,8 @@ export async function createDataSample(
|
|
|
106
107
|
ooc,
|
|
107
108
|
oos,
|
|
108
109
|
collectedAt,
|
|
109
|
-
workDate
|
|
110
|
-
workShift
|
|
110
|
+
workDate,
|
|
111
|
+
workShift,
|
|
111
112
|
creator: user,
|
|
112
113
|
updater: user
|
|
113
114
|
})
|
|
@@ -120,6 +121,7 @@ export async function createDataSample(
|
|
|
120
121
|
dataSet,
|
|
121
122
|
dataSample: result,
|
|
122
123
|
data: dataSample.data,
|
|
124
|
+
rawData: dataSample.rawData,
|
|
123
125
|
domain,
|
|
124
126
|
partitionKeys,
|
|
125
127
|
spec,
|
|
@@ -136,15 +138,13 @@ export async function createDataSample(
|
|
|
136
138
|
}
|
|
137
139
|
],
|
|
138
140
|
state: DataOocStatus.CREATED,
|
|
139
|
-
workDate
|
|
140
|
-
workShift
|
|
141
|
+
workDate,
|
|
142
|
+
workShift,
|
|
141
143
|
collectedAt,
|
|
142
144
|
creator: user,
|
|
143
145
|
updater: user
|
|
144
146
|
})
|
|
145
147
|
|
|
146
|
-
debug('dataOoc is about to publish...', dataOoc)
|
|
147
|
-
|
|
148
148
|
pubsub.publish('data-ooc', {
|
|
149
149
|
dataOoc,
|
|
150
150
|
supervisoryRoleId: dataSet.supervisoryRoleId
|