@things-factory/dataset 5.0.0-zeta.8 → 5.0.0-zeta.9

package/dist-server/service/data-set-history/data-set-history-query.js

@@ -0,0 +1,173 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var _a, _b;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataSetHistoryQuery = void 0;
+const type_graphql_1 = require("type-graphql");
+const typeorm_1 = require("typeorm");
+const attachment_base_1 = require("@things-factory/attachment-base");
+const auth_base_1 = require("@things-factory/auth-base");
+const board_service_1 = require("@things-factory/board-service");
+const shell_1 = require("@things-factory/shell");
+const data_set_history_1 = require("./data-set-history");
+const data_set_history_type_1 = require("./data-set-history-type");
+let DataSetHistoryQuery = class DataSetHistoryQuery {
+    async dataSetHistory(id, timestamp, context) {
+        const { domain } = context.state;
+        return await (0, typeorm_1.getRepository)(data_set_history_1.DataSetHistory).findOne({
+            where: { domain, id, updatedAt: timestamp }
+        });
+    }
+    async dataSetHistories(params, context) {
+        const { domain } = context.state;
+        const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
+            repository: (0, typeorm_1.getRepository)(data_set_history_1.DataSetHistory),
+            params,
+            domain,
+            searchables: ['name', 'description', 'supervisoryRole']
+        });
+        const [items, total] = await queryBuilder.getManyAndCount();
+        return { items, total };
+    }
+    async entryRole(dataSetHistory) {
+        return (dataSetHistory.entryRole ||
+            (await (0, typeorm_1.getRepository)(auth_base_1.Role).findOne({
+                id: dataSetHistory.entryRoleId
+            })));
+    }
+    async supervisoryRole(dataSetHistory) {
+        return (dataSetHistory.supervisoryRole ||
+            (await (0, typeorm_1.getRepository)(auth_base_1.Role).findOne({
+                id: dataSetHistory.supervisoryRoleId
+            })));
+    }
+    async entryBoard(dataSetHistory) {
+        if (dataSetHistory.entryType == 'board' && dataSetHistory.entryView) {
+            return await (0, typeorm_1.getRepository)(board_service_1.Board).findOne({ id: dataSetHistory.entryView });
+        }
+    }
+    async monitorBoard(dataSetHistory) {
+        if (dataSetHistory.monitorType == 'board' && dataSetHistory.monitorView) {
+            return await (0, typeorm_1.getRepository)(board_service_1.Board).findOne({ id: dataSetHistory.monitorView });
+        }
+    }
+    async timestamp(dataSetHistory) {
+        return dataSetHistory.updatedAt;
+    }
+    async domain(dataSetHistory) {
+        return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(dataSetHistory.domainId);
+    }
+    async updater(dataSetHistory) {
+        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(dataSetHistory.updaterId);
+    }
+    async creator(dataSetHistory) {
+        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(dataSetHistory.creatorId);
+    }
+    async reportTemplate(dataSetHistory) {
+        const attachment = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
+            where: {
+                domain: dataSetHistory.domainId,
+                refBy: `report-${dataSetHistory.id}`
+            }
+        });
+        return attachment === null || attachment === void 0 ? void 0 : attachment.path;
+    }
+};
+__decorate([
+    (0, type_graphql_1.Directive)('@privilege(category: "data-set-history", privilege: "query", domainOwnerGranted: true)'),
+    (0, type_graphql_1.Query)(returns => data_set_history_1.DataSetHistory, { description: 'To fetch a DataSetHistory' }),
+    __param(0, (0, type_graphql_1.Arg)('id')),
+    __param(1, (0, type_graphql_1.Arg)('timestamp', type => shell_1.ScalarDate)),
+    __param(2, (0, type_graphql_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, typeof (_a = typeof shell_1.ScalarDate !== "undefined" && shell_1.ScalarDate) === "function" ? _a : Object, Object]),
+    __metadata("design:returntype", Promise)
+], DataSetHistoryQuery.prototype, "dataSetHistory", null);
+__decorate([
+    (0, type_graphql_1.Directive)('@privilege(category: "data-set-history", privilege: "query", domainOwnerGranted: true)'),
+    (0, type_graphql_1.Query)(returns => data_set_history_type_1.DataSetHistoryList, { description: 'To fetch multiple DataSetHistories' }),
+    __param(0, (0, type_graphql_1.Args)()),
+    __param(1, (0, type_graphql_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [typeof (_b = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _b : Object, Object]),
+    __metadata("design:returntype", Promise)
+], DataSetHistoryQuery.prototype, "dataSetHistories", null);
+__decorate([
+    (0, type_graphql_1.FieldResolver)(type => auth_base_1.Role),
+    __param(0, (0, type_graphql_1.Root)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [data_set_history_1.DataSetHistory]),
+    __metadata("design:returntype", Promise)
+], DataSetHistoryQuery.prototype, "entryRole", null);
+__decorate([
+    (0, type_graphql_1.FieldResolver)(type => auth_base_1.Role),
+    __param(0, (0, type_graphql_1.Root)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [data_set_history_1.DataSetHistory]),
+    __metadata("design:returntype", Promise)
+], DataSetHistoryQuery.prototype, "supervisoryRole", null);
+__decorate([
+    (0, type_graphql_1.FieldResolver)(type => board_service_1.Board, { nullable: true }),
+    __param(0, (0, type_graphql_1.Root)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [data_set_history_1.DataSetHistory]),
+    __metadata("design:returntype", Promise)
+], DataSetHistoryQuery.prototype, "entryBoard", null);
+__decorate([
+    (0, type_graphql_1.FieldResolver)(type => board_service_1.Board, { nullable: true }),
+    __param(0, (0, type_graphql_1.Root)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [data_set_history_1.DataSetHistory]),
+    __metadata("design:returntype", Promise)
+], DataSetHistoryQuery.prototype, "monitorBoard", null);
+__decorate([
+    (0, type_graphql_1.FieldResolver)(type => auth_base_1.User),
+    __param(0, (0, type_graphql_1.Root)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [data_set_history_1.DataSetHistory]),
+    __metadata("design:returntype", Promise)
+], DataSetHistoryQuery.prototype, "timestamp", null);
+__decorate([
+    (0, type_graphql_1.FieldResolver)(type => shell_1.Domain),
+    __param(0, (0, type_graphql_1.Root)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [data_set_history_1.DataSetHistory]),
+    __metadata("design:returntype", Promise)
+], DataSetHistoryQuery.prototype, "domain", null);
+__decorate([
+    (0, type_graphql_1.FieldResolver)(type => auth_base_1.User),
+    __param(0, (0, type_graphql_1.Root)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [data_set_history_1.DataSetHistory]),
+    __metadata("design:returntype", Promise)
+], DataSetHistoryQuery.prototype, "updater", null);
+__decorate([
+    (0, type_graphql_1.FieldResolver)(type => auth_base_1.User),
+    __param(0, (0, type_graphql_1.Root)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [data_set_history_1.DataSetHistory]),
+    __metadata("design:returntype", Promise)
+], DataSetHistoryQuery.prototype, "creator", null);
+__decorate([
+    (0, type_graphql_1.FieldResolver)(type => String),
+    __param(0, (0, type_graphql_1.Root)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [data_set_history_1.DataSetHistory]),
+    __metadata("design:returntype", Promise)
+], DataSetHistoryQuery.prototype, "reportTemplate", null);
+DataSetHistoryQuery = __decorate([
+    (0, type_graphql_1.Resolver)(data_set_history_1.DataSetHistory)
+], DataSetHistoryQuery);
+exports.DataSetHistoryQuery = DataSetHistoryQuery;
+//# sourceMappingURL=data-set-history-query.js.map

package/dist-server/service/data-set-history/data-set-history-query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-set-history-query.js","sourceRoot":"","sources":["../../../server/service/data-set-history/data-set-history-query.ts"],"names":[],"mappings":"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"}

package/dist-server/service/data-set-history/data-set-history-type.js

@@ -0,0 +1,29 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataSetHistoryList = void 0;
+const type_graphql_1 = require("type-graphql");
+const data_set_history_1 = require("../data-set-history/data-set-history");
+let DataSetHistoryList = class DataSetHistoryList {
+};
+__decorate([
+    (0, type_graphql_1.Field)(type => [data_set_history_1.DataSetHistory]),
+    __metadata("design:type", Array)
+], DataSetHistoryList.prototype, "items", void 0);
+__decorate([
+    (0, type_graphql_1.Field)(type => type_graphql_1.Int),
+    __metadata("design:type", Number)
+], DataSetHistoryList.prototype, "total", void 0);
+DataSetHistoryList = __decorate([
+    (0, type_graphql_1.ObjectType)()
+], DataSetHistoryList);
+exports.DataSetHistoryList = DataSetHistoryList;
+//# sourceMappingURL=data-set-history-type.js.map

package/dist-server/service/data-set-history/data-set-history-type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-set-history-type.js","sourceRoot":"","sources":["../../../server/service/data-set-history/data-set-history-type.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAqD;AAErD,2EAAqE;AAGrE,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;CAM9B,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,iCAAc,CAAC,CAAC;;iDACT;AAGvB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;iDACN;AALF,kBAAkB;IAD9B,IAAA,yBAAU,GAAE;GACA,kBAAkB,CAM9B;AANY,gDAAkB"}

package/dist-server/service/data-set-history/data-set-history.js

@@ -0,0 +1,205 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var _a, _b, _c, _d, _e, _f;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataSetHistory = void 0;
+const type_graphql_1 = require("type-graphql");
+const typeorm_1 = require("typeorm");
+const auth_base_1 = require("@things-factory/auth-base");
+const shell_1 = require("@things-factory/shell");
+const data_item_type_1 = require("../data-set/data-item-type");
+const data_set_1 = require("../data-set/data-set");
+let DataSetHistory = class DataSetHistory {
+};
+__decorate([
+    (0, typeorm_1.PrimaryColumn)(),
+    (0, type_graphql_1.Field)(type => type_graphql_1.ID),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.PrimaryColumn)(),
+    (0, type_graphql_1.Field)(),
+    __metadata("design:type", Number)
+], DataSetHistory.prototype, "version", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => shell_1.Domain),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", typeof (_a = typeof shell_1.Domain !== "undefined" && shell_1.Domain) === "function" ? _a : Object)
+], DataSetHistory.prototype, "domain", void 0);
+__decorate([
+    (0, typeorm_1.RelationId)((dataSetHistory) => dataSetHistory.domain),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "domainId", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    (0, type_graphql_1.Field)(),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", Boolean)
+], DataSetHistory.prototype, "active", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.Role, {
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)(type => auth_base_1.Role, { nullable: true }),
+    __metadata("design:type", typeof (_b = typeof auth_base_1.Role !== "undefined" && auth_base_1.Role) === "function" ? _b : Object)
+], DataSetHistory.prototype, "entryRole", void 0);
+__decorate([
+    (0, typeorm_1.RelationId)((dataSetHistory) => dataSetHistory.entryRole),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "entryRoleId", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.Role, {
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)(type => auth_base_1.Role, { nullable: true }),
+    __metadata("design:type", typeof (_c = typeof auth_base_1.Role !== "undefined" && auth_base_1.Role) === "function" ? _c : Object)
+], DataSetHistory.prototype, "supervisoryRole", void 0);
+__decorate([
+    (0, typeorm_1.RelationId)((dataSetHistory) => dataSetHistory.supervisoryRole),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "supervisoryRoleId", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "entryType", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "entryView", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "monitorType", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "monitorView", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "reportType", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "reportView", void 0);
+__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "reportTemplate", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "useCase", void 0);
+__decorate([
+    (0, typeorm_1.Column)('simple-json', { nullable: true }),
+    (0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
+    __metadata("design:type", typeof (_d = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _d : Object)
+], DataSetHistory.prototype, "partitionKeys", void 0);
+__decorate([
+    (0, typeorm_1.Column)('simple-json', { nullable: true }),
+    (0, type_graphql_1.Field)(type => [data_item_type_1.DataItem], { nullable: true }),
+    __metadata("design:type", Array)
+], DataSetHistory.prototype, "dataItems", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "schedule", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "timezone", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", Date)
+], DataSetHistory.prototype, "createdAt", void 0);
+__decorate([
+    (0, typeorm_1.PrimaryColumn)(),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", Date)
+], DataSetHistory.prototype, "updatedAt", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.User, {
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", typeof (_e = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _e : Object)
+], DataSetHistory.prototype, "creator", void 0);
+__decorate([
+    (0, typeorm_1.RelationId)((dataSetHistory) => dataSetHistory.creator),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "creatorId", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.User, {
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", typeof (_f = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _f : Object)
+], DataSetHistory.prototype, "updater", void 0);
+__decorate([
+    (0, typeorm_1.RelationId)((dataSetHistory) => dataSetHistory.creator),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "updaterId", void 0);
+DataSetHistory = __decorate([
+    (0, typeorm_1.Entity)(),
+    (0, type_graphql_1.ObjectType)({ description: 'Entity for DataSetHistory' })
+], DataSetHistory);
+exports.DataSetHistory = DataSetHistory;
+//# sourceMappingURL=data-set-history.js.map

package/dist-server/service/data-set-history/data-set-history.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-set-history.js","sourceRoot":"","sources":["../../../server/service/data-set-history/data-set-history.ts"],"names":[],"mappings":"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"}

package/dist-server/service/data-set-history/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolvers = exports.entities = void 0;
+const data_set_history_1 = require("./data-set-history");
+const data_set_history_query_1 = require("./data-set-history-query");
+exports.entities = [data_set_history_1.DataSetHistory];
+exports.resolvers = [data_set_history_query_1.DataSetHistoryQuery];
+//# sourceMappingURL=index.js.map

package/dist-server/service/data-set-history/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/service/data-set-history/index.ts"],"names":[],"mappings":";;;AAAA,yDAAmD;AACnD,qEAA8D;AAEjD,QAAA,QAAQ,GAAG,CAAC,iCAAc,CAAC,CAAA;AAC3B,QAAA,SAAS,GAAG,CAAC,4CAAmB,CAAC,CAAA"}

package/dist-server/service/index.js

@@ -21,21 +21,24 @@ const data_ooc_1 = require("./data-ooc");
 const data_sample_1 = require("./data-sample");
 const data_sensor_1 = require("./data-sensor");
 const data_set_1 = require("./data-set");
+const data_set_history_1 = require("./data-set-history");
 const data_spec_1 = require("./data-spec");
 /* EXPORT ENTITY TYPES */
 __exportStar(require("./data-ooc/data-ooc"), exports);
 __exportStar(require("./data-sensor/data-sensor"), exports);
 __exportStar(require("./data-sample/data-sample"), exports);
-__exportStar(require("./data-item/data-item"), exports);
 __exportStar(require("./data-set/data-set"), exports);
+__exportStar(require("./data-set-history/data-set-history"), exports);
+__exportStar(require("./data-set/data-item-type"), exports);
 __exportStar(require("./data-spec/data-spec"), exports);
 exports.entities = [
     /* ENTITIES */
+    ...data_item_1.entities,
     ...data_ooc_1.entities,
     ...data_sensor_1.entities,
     ...data_sample_1.entities,
-    ...data_item_1.entities,
     ...data_set_1.entities,
+    ...data_set_history_1.entities,
     ...data_spec_1.entities
 ];
 exports.schema = {
@@ -44,8 +47,8 @@ exports.schema = {
         ...data_ooc_1.resolvers,
         ...data_sensor_1.resolvers,
         ...data_sample_1.resolvers,
-        ...data_item_1.resolvers,
         ...data_set_1.resolvers,
+        ...data_set_history_1.resolvers,
         ...data_spec_1.resolvers
     ]
 };

package/dist-server/service/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA0F;AAC1F,mCAAmC;AACnC,yCAAuF;AACvF,+CAAgG;AAChG,+CAAgG;AAChG,yCAAuF;AACvF,2CAA0F;AAE1F,yBAAyB;AACzB,sDAAmC;AACnC,4DAAyC;AACzC,4DAAyC;AACzC,wDAAqC;AACrC,sDAAmC;AACnC,wDAAqC;AAExB,QAAA,QAAQ,GAAG;IACtB,cAAc;IACd,GAAG,mBAAe;IAClB,GAAG,sBAAkB;IACrB,GAAG,sBAAkB;IACrB,GAAG,oBAAgB;IACnB,GAAG,mBAAe;IAClB,GAAG,oBAAgB;CACpB,CAAA;AAEY,QAAA,MAAM,GAAG;IACpB,eAAe,EAAE;QACf,sBAAsB;QACtB,GAAG,oBAAgB;QACnB,GAAG,uBAAmB;QACtB,GAAG,uBAAmB;QACtB,GAAG,qBAAiB;QACpB,GAAG,oBAAgB;QACnB,GAAG,qBAAiB;KACrB;CACF,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA0D;AAC1D,mCAAmC;AACnC,yCAAuF;AACvF,+CAAgG;AAChG,+CAAgG;AAChG,yCAAuF;AACvF,yDAA6G;AAC7G,2CAA0F;AAE1F,yBAAyB;AACzB,sDAAmC;AACnC,4DAAyC;AACzC,4DAAyC;AACzC,sDAAmC;AACnC,sEAAmD;AACnD,4DAAyC;AACzC,wDAAqC;AAExB,QAAA,QAAQ,GAAG;IACtB,cAAc;IACd,GAAG,oBAAgB;IACnB,GAAG,mBAAe;IAClB,GAAG,sBAAkB;IACrB,GAAG,sBAAkB;IACrB,GAAG,mBAAe;IAClB,GAAG,2BAAsB;IACzB,GAAG,oBAAgB;CACpB,CAAA;AAEY,QAAA,MAAM,GAAG;IACpB,eAAe,EAAE;QACf,sBAAsB;QACtB,GAAG,oBAAgB;QACnB,GAAG,uBAAmB;QACtB,GAAG,uBAAmB;QACtB,GAAG,oBAAgB;QACnB,GAAG,4BAAuB;QAC1B,GAAG,qBAAiB;KACrB;CACF,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "5.0.0-zeta.8",
+  "version": "5.0.0-zeta.9",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,23 +24,24 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@operato/app": "^1.0.0-beta.39",
-    "@operato/data-grist": "^1.0.0-beta.39",
-    "@operato/dataset": "^1.0.0-beta.39",
-    "@operato/graphql": "^1.0.0-beta.39",
-    "@operato/i18n": "^1.0.0-beta.39",
-    "@operato/layout": "^1.0.0-beta.39",
-    "@operato/shell": "^1.0.0-beta.39",
-    "@operato/styles": "^1.0.0-beta.39",
-    "@operato/utils": "^1.0.0-beta.39",
-    "@things-factory/auth-base": "^5.0.0-zeta.8",
-    "@things-factory/aws-base": "^5.0.0-zeta.8",
-    "@things-factory/board-service": "^5.0.0-zeta.8",
-    "@things-factory/env": "^5.0.0-zeta.8",
-    "@things-factory/shell": "^5.0.0-zeta.8",
-    "@things-factory/work-shift": "^5.0.0-zeta.8",
+    "@operato/app": "^1.0.0-beta.40",
+    "@operato/data-grist": "^1.0.0-beta.40",
+    "@operato/dataset": "^1.0.0-beta.40",
+    "@operato/graphql": "^1.0.0-beta.40",
+    "@operato/grist-editor": "^1.0.0-beta.40",
+    "@operato/i18n": "^1.0.0-beta.40",
+    "@operato/layout": "^1.0.0-beta.40",
+    "@operato/shell": "^1.0.0-beta.40",
+    "@operato/styles": "^1.0.0-beta.40",
+    "@operato/utils": "^1.0.0-beta.40",
+    "@things-factory/auth-base": "^5.0.0-zeta.9",
+    "@things-factory/aws-base": "^5.0.0-zeta.9",
+    "@things-factory/board-service": "^5.0.0-zeta.9",
+    "@things-factory/env": "^5.0.0-zeta.9",
+    "@things-factory/shell": "^5.0.0-zeta.9",
+    "@things-factory/work-shift": "^5.0.0-zeta.9",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.34"
   },
-  "gitHead": "486693b3774b872157c83b623579ac63da1ed53c"
+  "gitHead": "af1562aba5cd179a7d10fc252b791e0a78049283"
 }

package/server/controllers/create-data-sample.ts

@@ -3,15 +3,13 @@ import { EntityManager } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Domain, getRedirectSubdomainPath, pubsub } from '@things-factory/shell'
+import { getWorkDateAndShift } from '@things-factory/work-shift'
 
-import { DataItem } from '../service/data-item/data-item'
 import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
 import { DataSample } from '../service/data-sample/data-sample'
 import { NewDataSample } from '../service/data-sample/data-sample-type'
 import { DataSet } from '../service/data-set/data-set'
 import { DataUseCase } from './data-use-case'
-import { getWorkDateAndShift } from '@things-factory/work-shift'
-
 
 const debug = require('debug')('things-factory:dataset:controller/save-data-sample')
 
@@ -56,25 +54,20 @@ export async function createDataSample(
     where: { id: dataSample.dataSet.id }
   })
 
-  const dataItems = await tx.getRepository(DataItem).find({
-    where: {
-      domain,
-      dataSet
-    },
-    order: {
-      sequence: 'DESC'
-    }
-  })
+  const dataItems = dataSet.dataItems
 
-  const spec = dataItems.reduce((spec, dataItem) => {
-    spec[dataItem.tag] = {
-      ...dataItem.spec,
-      name: dataItem.name, /* do we need ? */
-      hidden: dataItem.hidden
-    }
+  // TODO spec should be removed
+  // const spec = dataItems.reduce((spec, dataItem) => {
+  //   spec[dataItem.tag] = {
+  //     spec: dataItem.spec,
+  //     name: dataItem.name,
+  //     description: dataItem.description,
+  //     unit: dataItem.unit,
+  //     hidden: dataItem.hidden
+  //   }
 
-    return spec
-  }, {})
+  //   return spec
+  // }, {})
 
   const collectedAt = dataSample.collectedAt || new Date()
 
@@ -83,16 +76,16 @@ export async function createDataSample(
 
   // workDate ex) 2022-04-04
   const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt, { timezone, format })
-  
+
   // local time dataSet timezone or domain timezone or default 'UTC'
-  
+
   // const collectedAt = dataSample.collectedAt || new Date()
   const localDateTz = moment(collectedAt).tz(timezone)
   const defaultPartitionKeys = {
     domain: domain.subdomain,
-    datasetid: dataSample.dataSet.id, /* It should not be 'data_set_id' as column name duplicated for Glue */
-    date: localDateTz.format(format), /* local time date */
-    workdate: workDate, /* working date */
+    datasetid: dataSample.dataSet.id /* It should not be 'data_set_id' as column name duplicated for Glue */,
+    date: localDateTz.format(format) /* local time date */,
+    workdate: workDate /* working date */,
     workshift: workShift
   }
 
@@ -112,9 +105,10 @@ export async function createDataSample(
     description: dataSet.description,
     useCase: dataSet.useCase,
     ...dataSample,
+    dataSetVersion: dataSet.version,
     domain,
     partitionKeys,
-    spec,
+    // spec, // TODO spec should be removed
     ooc,
     oos,
     collectedAt,
@@ -130,12 +124,13 @@ export async function createDataSample(
       description: dataSet.description,
       useCase: dataSet.useCase,
       dataSet,
+      dataSetVersion: dataSet.version,
       dataSample: result,
       data: dataSample.data,
       rawData: dataSample.rawData,
       domain,
       partitionKeys,
-      spec,
+      // spec, // TODO spec should be removed
       ooc,
       oos,
       history: [

package/server/controllers/data-use-case.ts

@@ -1,4 +1,5 @@
-import { DataItem, DataSet } from 'server/service'
+import { DataItem } from '../service/data-set/data-item-type'
+import { DataSet } from '../service/data-set/data-set'
 
 export type DataItemSpec = {
   type: string

package/server/controllers/index.ts

@@ -1,2 +1,2 @@
-export * from './data-use-case'
 export * from './create-data-sample'
+export * from './data-use-case'