@things-factory/dataset 5.0.0-alpha.18 → 5.0.0-alpha.20
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/README.md +12 -0
- package/assets/data-samples.jpg +0 -0
- package/client/pages/data-item-list.js +3 -1
- package/client/pages/data-ooc-view.js +182 -0
- package/client/pages/data-ooc.js +95 -76
- package/client/pages/data-sample-view.js +97 -0
- package/client/pages/data-sample.js +19 -1
- package/client/pages/data-sensor.js +2 -0
- package/client/pages/data-set.js +3 -0
- package/dist-server/controllers/create-data-sample.js +25 -6
- package/dist-server/controllers/create-data-sample.js.map +1 -1
- package/dist-server/routes.js +1 -1
- package/dist-server/routes.js.map +1 -1
- package/dist-server/service/data-ooc/data-ooc-mutation.js +32 -70
- package/dist-server/service/data-ooc/data-ooc-mutation.js.map +1 -1
- package/dist-server/service/data-ooc/data-ooc.js +16 -7
- package/dist-server/service/data-ooc/data-ooc.js.map +1 -1
- package/dist-server/service/data-sample/data-sample.js +10 -3
- package/dist-server/service/data-sample/data-sample.js.map +1 -1
- package/package.json +14 -14
- package/server/controllers/create-data-sample.ts +29 -10
- package/server/routes.ts +1 -1
- package/server/service/data-ooc/data-ooc-mutation.ts +106 -73
- package/server/service/data-ooc/data-ooc.ts +11 -4
- package/server/service/data-sample/data-sample.ts +9 -4
- package/translations/en.json +6 -1
- package/translations/ko.json +6 -1
- package/translations/ms.json +5 -0
- package/translations/zh.json +5 -0
|
@@ -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/dist-server/routes.js
CHANGED
|
@@ -39,7 +39,7 @@ process.on('bootstrap-module-global-public-route', (app, globalPublicRouter) =>
|
|
|
39
39
|
}
|
|
40
40
|
const domain = sensor.domain;
|
|
41
41
|
const dataSet = sensor.dataSet;
|
|
42
|
-
const user = await
|
|
42
|
+
const user = await tx.getRepository(auth_base_1.User).findOne({
|
|
43
43
|
where: {
|
|
44
44
|
reference: sensor.appliance.id,
|
|
45
45
|
userType: 'appliance'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":";;AAAA,qCAAsD;AAEtD,yDAAgD;AAEhD,yEAAmE;AACnE,mEAA8D;AAE9D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,+BAA+B,CAAC,CAAA;AAE/D,OAAO,CAAC,EAAE,CAAC,sCAA6C,EAAE,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE;IACpF;;;;;OAKG;IAEH,kBAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC9D,SAAS;QACT,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAA;QAChF,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,YAAY,QAAQ,cAAc,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;SACpG;QAED,uBAAuB;QACvB,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC3C,+BAA+B;YAC/B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAU,CAAC,CAAC,OAAO,CAAC;gBACxD,KAAK,EAAE,EAAE,QAAQ,EAAE;gBACnB,SAAS,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,CAAC;aAC9C,CAAC,CAAA;YAEF,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,gCAAgC,QAAQ,aAAa,CAAC,CAAA;aACvE;YAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBAClB,MAAM,IAAI,KAAK,CAAC,sCAAsC,QAAQ,iBAAiB,CAAC,CAAA;aACjF;YAED,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;gBACrB,MAAM,IAAI,KAAK,CAAC,0CAA0C,QAAQ,iBAAiB,CAAC,CAAA;aACrF;YAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;gBACnB,MAAM,IAAI,KAAK,CAAC,wCAAwC,QAAQ,iBAAiB,CAAC,CAAA;aACnF;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;YAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;YAC9B,MAAM,IAAI,GAAS,MAAM,
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,13 +14,25 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.DataOocMutation = void 0;
|
|
16
16
|
const type_graphql_1 = require("type-graphql");
|
|
17
|
-
const typeorm_1 = require("typeorm");
|
|
18
17
|
const data_ooc_1 = require("./data-ooc");
|
|
19
18
|
const data_ooc_type_1 = require("./data-ooc-type");
|
|
20
19
|
let DataOocMutation = class DataOocMutation {
|
|
21
20
|
async createDataOoc(dataOoc, context) {
|
|
22
21
|
const { domain, user, tx } = context.state;
|
|
23
|
-
|
|
22
|
+
const state = dataOoc.state || data_ooc_1.DataOocStatus.CREATED;
|
|
23
|
+
const history = [
|
|
24
|
+
{
|
|
25
|
+
user: {
|
|
26
|
+
id: user.id,
|
|
27
|
+
name: user.name
|
|
28
|
+
},
|
|
29
|
+
state,
|
|
30
|
+
timestamp: Date.now()
|
|
31
|
+
}
|
|
32
|
+
];
|
|
33
|
+
return await tx.getRepository(data_ooc_1.DataOoc).save(Object.assign(Object.assign({}, dataOoc), { state,
|
|
34
|
+
domain,
|
|
35
|
+
history, creator: user, updater: user }));
|
|
24
36
|
}
|
|
25
37
|
async updateDataOoc(id, patch, context) {
|
|
26
38
|
const { domain, user, tx } = context.state;
|
|
@@ -28,48 +40,28 @@ let DataOocMutation = class DataOocMutation {
|
|
|
28
40
|
const dataOoc = await repository.findOne({
|
|
29
41
|
where: { domain, id }
|
|
30
42
|
});
|
|
43
|
+
const state = patch.state || dataOoc.state;
|
|
44
|
+
const history = dataOoc.history || [];
|
|
45
|
+
history.push({
|
|
46
|
+
user: {
|
|
47
|
+
id: user.id,
|
|
48
|
+
name: user.name
|
|
49
|
+
},
|
|
50
|
+
state,
|
|
51
|
+
comment: patch.correctiveAction || '',
|
|
52
|
+
timestamp: Date.now()
|
|
53
|
+
});
|
|
31
54
|
const more = {};
|
|
32
|
-
if (patch.
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
}
|
|
36
|
-
return await repository.save(Object.assign(Object.assign(Object.assign(Object.assign({}, dataOoc), patch), more), { updater: user }));
|
|
37
|
-
}
|
|
38
|
-
async updateMultipleDataOoc(patches, context) {
|
|
39
|
-
const { domain, user, tx } = context.state;
|
|
40
|
-
let results = [];
|
|
41
|
-
const _createRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === '+');
|
|
42
|
-
const _updateRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === 'M');
|
|
43
|
-
const dataOocRepo = tx.getRepository(data_ooc_1.DataOoc);
|
|
44
|
-
if (_createRecords.length > 0) {
|
|
45
|
-
for (let i = 0; i < _createRecords.length; i++) {
|
|
46
|
-
const newRecord = _createRecords[i];
|
|
47
|
-
const result = await dataOocRepo.save(Object.assign(Object.assign({}, newRecord), { domain, creator: user, updater: user }));
|
|
48
|
-
results.push(Object.assign(Object.assign({}, result), { cuFlag: '+' }));
|
|
55
|
+
if (dataOoc.state !== patch.state) {
|
|
56
|
+
if (patch.state === data_ooc_1.DataOocStatus.CORRECTED) {
|
|
57
|
+
more.corrector = user;
|
|
49
58
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
for (let i = 0; i < _updateRecords.length; i++) {
|
|
53
|
-
const newRecord = _updateRecords[i];
|
|
54
|
-
const dataOoc = await dataOocRepo.findOne(newRecord.id);
|
|
55
|
-
const result = await dataOocRepo.save(Object.assign(Object.assign(Object.assign({}, dataOoc), newRecord), { updater: user }));
|
|
56
|
-
results.push(Object.assign(Object.assign({}, result), { cuFlag: 'M' }));
|
|
59
|
+
else {
|
|
60
|
+
more.corrector = null;
|
|
57
61
|
}
|
|
58
62
|
}
|
|
59
|
-
return
|
|
60
|
-
|
|
61
|
-
async deleteDataOoc(id, context) {
|
|
62
|
-
const { domain, tx } = context.state;
|
|
63
|
-
await tx.getRepository(data_ooc_1.DataOoc).delete({ domain, id });
|
|
64
|
-
return true;
|
|
65
|
-
}
|
|
66
|
-
async deleteDataOocs(ids, context) {
|
|
67
|
-
const { domain, tx } = context.state;
|
|
68
|
-
await tx.getRepository(data_ooc_1.DataOoc).delete({
|
|
69
|
-
domain,
|
|
70
|
-
id: (0, typeorm_1.In)(ids)
|
|
71
|
-
});
|
|
72
|
-
return true;
|
|
63
|
+
return await repository.save(Object.assign(Object.assign(Object.assign(Object.assign({}, dataOoc), patch), more), { state,
|
|
64
|
+
history, updater: user }));
|
|
73
65
|
}
|
|
74
66
|
};
|
|
75
67
|
__decorate([
|
|
@@ -93,36 +85,6 @@ __decorate([
|
|
|
93
85
|
__metadata("design:paramtypes", [String, data_ooc_type_1.DataOocPatch, Object]),
|
|
94
86
|
__metadata("design:returntype", Promise)
|
|
95
87
|
], DataOocMutation.prototype, "updateDataOoc", null);
|
|
96
|
-
__decorate([
|
|
97
|
-
(0, type_graphql_1.Directive)('@privilege(category: "data-ooc", privilege: "mutation", domainOwnerGranted: true)'),
|
|
98
|
-
(0, type_graphql_1.Directive)('@transaction'),
|
|
99
|
-
(0, type_graphql_1.Mutation)(returns => [data_ooc_1.DataOoc], { description: "To modify multiple DataOoc' information" }),
|
|
100
|
-
__param(0, (0, type_graphql_1.Arg)('patches', type => [data_ooc_type_1.DataOocPatch])),
|
|
101
|
-
__param(1, (0, type_graphql_1.Ctx)()),
|
|
102
|
-
__metadata("design:type", Function),
|
|
103
|
-
__metadata("design:paramtypes", [Array, Object]),
|
|
104
|
-
__metadata("design:returntype", Promise)
|
|
105
|
-
], DataOocMutation.prototype, "updateMultipleDataOoc", null);
|
|
106
|
-
__decorate([
|
|
107
|
-
(0, type_graphql_1.Directive)('@privilege(category: "data-ooc", privilege: "mutation", domainOwnerGranted: true)'),
|
|
108
|
-
(0, type_graphql_1.Directive)('@transaction'),
|
|
109
|
-
(0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To delete DataOoc' }),
|
|
110
|
-
__param(0, (0, type_graphql_1.Arg)('id')),
|
|
111
|
-
__param(1, (0, type_graphql_1.Ctx)()),
|
|
112
|
-
__metadata("design:type", Function),
|
|
113
|
-
__metadata("design:paramtypes", [String, Object]),
|
|
114
|
-
__metadata("design:returntype", Promise)
|
|
115
|
-
], DataOocMutation.prototype, "deleteDataOoc", null);
|
|
116
|
-
__decorate([
|
|
117
|
-
(0, type_graphql_1.Directive)('@privilege(category: "data-ooc", privilege: "mutation", domainOwnerGranted: true)'),
|
|
118
|
-
(0, type_graphql_1.Directive)('@transaction'),
|
|
119
|
-
(0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To delete multiple dataOocs' }),
|
|
120
|
-
__param(0, (0, type_graphql_1.Arg)('ids', type => [String])),
|
|
121
|
-
__param(1, (0, type_graphql_1.Ctx)()),
|
|
122
|
-
__metadata("design:type", Function),
|
|
123
|
-
__metadata("design:paramtypes", [Array, Object]),
|
|
124
|
-
__metadata("design:returntype", Promise)
|
|
125
|
-
], DataOocMutation.prototype, "deleteDataOocs", null);
|
|
126
88
|
DataOocMutation = __decorate([
|
|
127
89
|
(0, type_graphql_1.Resolver)(data_ooc_1.DataOoc)
|
|
128
90
|
], DataOocMutation);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-ooc-mutation.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAsE;
|
|
1
|
+
{"version":3,"file":"data-ooc-mutation.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc-mutation.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
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
14
|
const typeorm_1 = require("typeorm");
|
|
@@ -25,9 +25,6 @@ var DataOocStatus;
|
|
|
25
25
|
DataOocStatus["CREATED"] = "CREATED";
|
|
26
26
|
DataOocStatus["REVIEWED"] = "REVIEWED";
|
|
27
27
|
DataOocStatus["CORRECTED"] = "CORRECTED";
|
|
28
|
-
DataOocStatus["SUBMITTED"] = "SUBMITTED";
|
|
29
|
-
DataOocStatus["APPROVED"] = "APPROVED";
|
|
30
|
-
DataOocStatus["REJECTED"] = "REJECTED";
|
|
31
28
|
})(DataOocStatus = exports.DataOocStatus || (exports.DataOocStatus = {}));
|
|
32
29
|
(0, type_graphql_1.registerEnumType)(DataOocStatus, {
|
|
33
30
|
name: 'DataOocStatus',
|
|
@@ -120,6 +117,13 @@ __decorate([
|
|
|
120
117
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
121
118
|
__metadata("design:type", String)
|
|
122
119
|
], DataOoc.prototype, "type", void 0);
|
|
120
|
+
__decorate([
|
|
121
|
+
(0, typeorm_1.Column)({
|
|
122
|
+
nullable: true
|
|
123
|
+
}),
|
|
124
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
125
|
+
__metadata("design:type", String)
|
|
126
|
+
], DataOoc.prototype, "useCase", void 0);
|
|
123
127
|
__decorate([
|
|
124
128
|
(0, typeorm_1.Column)('simple-json', { nullable: true }),
|
|
125
129
|
(0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
|
|
@@ -135,6 +139,11 @@ __decorate([
|
|
|
135
139
|
(0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
|
|
136
140
|
__metadata("design:type", typeof (_d = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _d : Object)
|
|
137
141
|
], DataOoc.prototype, "spec", void 0);
|
|
142
|
+
__decorate([
|
|
143
|
+
(0, typeorm_1.Column)('simple-json', { nullable: true }),
|
|
144
|
+
(0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
|
|
145
|
+
__metadata("design:type", typeof (_e = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _e : Object)
|
|
146
|
+
], DataOoc.prototype, "history", void 0);
|
|
138
147
|
__decorate([
|
|
139
148
|
(0, typeorm_1.Column)({
|
|
140
149
|
nullable: true,
|
|
@@ -179,7 +188,7 @@ __decorate([
|
|
|
179
188
|
nullable: true
|
|
180
189
|
}),
|
|
181
190
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
182
|
-
__metadata("design:type", typeof (
|
|
191
|
+
__metadata("design:type", typeof (_f = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _f : Object)
|
|
183
192
|
], DataOoc.prototype, "corrector", void 0);
|
|
184
193
|
__decorate([
|
|
185
194
|
(0, typeorm_1.RelationId)((dataOoc) => dataOoc.corrector),
|
|
@@ -190,7 +199,7 @@ __decorate([
|
|
|
190
199
|
nullable: true
|
|
191
200
|
}),
|
|
192
201
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
193
|
-
__metadata("design:type", typeof (
|
|
202
|
+
__metadata("design:type", typeof (_g = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _g : Object)
|
|
194
203
|
], DataOoc.prototype, "creator", void 0);
|
|
195
204
|
__decorate([
|
|
196
205
|
(0, typeorm_1.RelationId)((dataOoc) => dataOoc.creator),
|
|
@@ -201,7 +210,7 @@ __decorate([
|
|
|
201
210
|
nullable: true
|
|
202
211
|
}),
|
|
203
212
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
204
|
-
__metadata("design:type", typeof (
|
|
213
|
+
__metadata("design:type", typeof (_h = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _h : Object)
|
|
205
214
|
], DataOoc.prototype, "updater", void 0);
|
|
206
215
|
__decorate([
|
|
207
216
|
(0, typeorm_1.RelationId)((dataOoc) => dataOoc.creator),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-ooc.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAWgB;AAChB,iDAA4D;AAC5D,+CAA2E;AAE3E,4DAAuD;AACvD,mDAA8C;AAC9C,yDAAgD;AAChD,6CAA4C;AAE5C,MAAM,SAAS,GAAG,YAAM,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;AAC7C,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAA;AAEpC,IAAY,
|
|
1
|
+
{"version":3,"file":"data-ooc.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc.ts"],"names":[],"mappings":"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"}
|
|
@@ -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 type_graphql_1 = require("type-graphql");
|
|
15
14
|
const typeorm_1 = require("typeorm");
|
|
16
|
-
const auth_base_1 = require("@things-factory/auth-base");
|
|
17
|
-
const env_1 = require("@things-factory/env");
|
|
18
15
|
const shell_1 = require("@things-factory/shell");
|
|
16
|
+
const type_graphql_1 = require("type-graphql");
|
|
19
17
|
const data_set_1 = require("../data-set/data-set");
|
|
18
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
19
|
+
const env_1 = require("@things-factory/env");
|
|
20
20
|
const ORMCONFIG = env_1.config.get('ormconfig', {});
|
|
21
21
|
const DATABASE_TYPE = ORMCONFIG.type;
|
|
22
22
|
let DataSample = class DataSample {
|
|
@@ -54,6 +54,13 @@ __decorate([
|
|
|
54
54
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
55
55
|
__metadata("design:type", String)
|
|
56
56
|
], DataSample.prototype, "type", void 0);
|
|
57
|
+
__decorate([
|
|
58
|
+
(0, typeorm_1.Column)({
|
|
59
|
+
nullable: true
|
|
60
|
+
}),
|
|
61
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
62
|
+
__metadata("design:type", String)
|
|
63
|
+
], DataSample.prototype, "useCase", void 0);
|
|
57
64
|
__decorate([
|
|
58
65
|
(0, typeorm_1.Column)('simple-json', { nullable: true }),
|
|
59
66
|
(0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-sample.js","sourceRoot":"","sources":["../../../server/service/data-sample/data-sample.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoD;
|
|
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.20",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,19 +24,19 @@
|
|
|
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.41",
|
|
28
|
+
"@operato/data-grist": "1.0.0-alpha.41",
|
|
29
|
+
"@operato/dataset": "1.0.0-alpha.41",
|
|
30
|
+
"@operato/graphql": "1.0.0-alpha.41",
|
|
31
|
+
"@operato/i18n": "1.0.0-alpha.41",
|
|
32
|
+
"@operato/layout": "1.0.0-alpha.41",
|
|
33
|
+
"@operato/shell": "1.0.0-alpha.41",
|
|
34
|
+
"@operato/styles": "1.0.0-alpha.41",
|
|
35
|
+
"@operato/utils": "1.0.0-alpha.41",
|
|
36
|
+
"@things-factory/auth-base": "^5.0.0-alpha.20",
|
|
37
|
+
"@things-factory/env": "^5.0.0-alpha.20",
|
|
38
|
+
"@things-factory/shell": "^5.0.0-alpha.20",
|
|
39
39
|
"moment": "^2.29.1"
|
|
40
40
|
},
|
|
41
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "47487b293458170f7eeb97612dfa8bbb750f092f"
|
|
42
42
|
}
|
|
@@ -1,15 +1,14 @@
|
|
|
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 moment from 'moment'
|
|
13
12
|
|
|
14
13
|
const debug = require('debug')('things-factory:dataset:controller/save-data-sample')
|
|
15
14
|
|
|
@@ -73,15 +72,23 @@ export async function createDataSample(
|
|
|
73
72
|
return spec
|
|
74
73
|
}, {})
|
|
75
74
|
|
|
75
|
+
const collectedAt = dataSample.collectedAt || new Date()
|
|
76
|
+
const momentUtc = moment(collectedAt).utc()
|
|
77
|
+
const defaultPartitionKeys = {
|
|
78
|
+
domain: domain.subdomain,
|
|
79
|
+
dataSetId: dataSample.dataSet.id,
|
|
80
|
+
year: momentUtc.format('Y'),
|
|
81
|
+
month: momentUtc.format('M'),
|
|
82
|
+
day: momentUtc.format('D')
|
|
83
|
+
}
|
|
84
|
+
|
|
76
85
|
var partitionKeys = {
|
|
86
|
+
...defaultPartitionKeys,
|
|
77
87
|
...dataSet.partitionKeys
|
|
78
88
|
}
|
|
79
89
|
|
|
80
|
-
|
|
81
|
-
partitionKeys = formatDate(partitionKeys, moment(collectedAt).utc())
|
|
90
|
+
partitionKeys = formatDate(partitionKeys, momentUtc)
|
|
82
91
|
partitionKeys = replaceVariables(partitionKeys, {
|
|
83
|
-
domain: domain.subdomain,
|
|
84
|
-
dataSetId: dataSample.dataSet.id,
|
|
85
92
|
...dataSample.data
|
|
86
93
|
})
|
|
87
94
|
|
|
@@ -90,6 +97,7 @@ export async function createDataSample(
|
|
|
90
97
|
const result = await tx.getRepository(DataSample).save({
|
|
91
98
|
name: dataSet.name,
|
|
92
99
|
description: dataSet.description,
|
|
100
|
+
useCase: dataSet.useCase,
|
|
93
101
|
...dataSample,
|
|
94
102
|
domain,
|
|
95
103
|
partitionKeys,
|
|
@@ -105,6 +113,7 @@ export async function createDataSample(
|
|
|
105
113
|
const dataOoc = await tx.getRepository(DataOoc).save({
|
|
106
114
|
name: dataSet.name,
|
|
107
115
|
description: dataSet.description,
|
|
116
|
+
useCase: dataSet.useCase,
|
|
108
117
|
dataSet,
|
|
109
118
|
dataSample: result,
|
|
110
119
|
data: dataSample.data,
|
|
@@ -113,6 +122,16 @@ export async function createDataSample(
|
|
|
113
122
|
spec,
|
|
114
123
|
ooc,
|
|
115
124
|
oos,
|
|
125
|
+
history: [
|
|
126
|
+
{
|
|
127
|
+
user: {
|
|
128
|
+
id: user.id,
|
|
129
|
+
name: user.name
|
|
130
|
+
},
|
|
131
|
+
state: DataOocStatus.CREATED,
|
|
132
|
+
timestamp: Date.now()
|
|
133
|
+
}
|
|
134
|
+
],
|
|
116
135
|
state: DataOocStatus.CREATED,
|
|
117
136
|
collectedAt,
|
|
118
137
|
creator: user,
|
package/server/routes.ts
CHANGED
|
@@ -48,7 +48,7 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
|
|
|
48
48
|
|
|
49
49
|
const domain = sensor.domain
|
|
50
50
|
const dataSet = sensor.dataSet
|
|
51
|
-
const user: User = await getRepository(User).findOne({
|
|
51
|
+
const user: User = await tx.getRepository(User).findOne({
|
|
52
52
|
where: {
|
|
53
53
|
reference: sensor.appliance.id,
|
|
54
54
|
userType: 'appliance'
|