@things-factory/dataset 5.0.0-alpha.25 → 5.0.0-alpha.28

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

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var _a;
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataSetQuery = void 0;
 const type_graphql_1 = require("type-graphql");
@@ -21,6 +21,8 @@ const shell_1 = require("@things-factory/shell");
 const data_item_1 = require("../data-item/data-item");
 const data_set_1 = require("./data-set");
 const data_set_type_1 = require("./data-set-type");
+const data_sample_1 = require("../data-sample/data-sample");
+var parser = require('cron-parser');
 let DataSetQuery = class DataSetQuery {
     async dataSet(id, context) {
         const { domain } = context.state;
@@ -34,6 +36,13 @@ let DataSetQuery = class DataSetQuery {
         const [items, total] = await (0, typeorm_1.getRepository)(data_set_1.DataSet).findAndCount(convertedParams);
         return { items, total };
     }
+    async dataSetsForEntry(params, context) {
+        const { domain } = context.state;
+        /* TODO. 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
+        const convertedParams = (0, shell_1.convertListParams)(params, domain.id);
+        const [items, total] = await (0, typeorm_1.getRepository)(data_set_1.DataSet).findAndCount(convertedParams);
+        return { items, total };
+    }
     async dataItems(dataSet) {
         return await (0, typeorm_1.getRepository)(data_item_1.DataItem).find({
             dataSet
@@ -53,6 +62,34 @@ let DataSetQuery = class DataSetQuery {
     async creator(dataSet) {
         return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(dataSet.creatorId);
     }
+    async latestCollectedAt(dataSet) {
+        const sample = await (0, typeorm_1.getRepository)(data_sample_1.DataSample).findOne({
+            select: ['collectedAt'],
+            where: { dataSet },
+            order: { collectedAt: 'DESC' }
+        });
+        return sample === null || sample === void 0 ? void 0 : sample.collectedAt;
+    }
+    async nextSchedule(dataSet) {
+        const { timezone, schedule } = dataSet;
+        if (!schedule) {
+            return;
+        }
+        var interval = parser.parseExpression(schedule, {
+            tz: timezone
+        });
+        return interval.next().toDate();
+    }
+    async prevSchedule(dataSet) {
+        const { timezone, schedule } = dataSet;
+        if (!schedule) {
+            return;
+        }
+        var interval = parser.parseExpression(schedule, {
+            tz: timezone
+        });
+        return interval.prev().toDate();
+    }
 };
 __decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "data-set", privilege: "query", domainOwnerGranted: true)'),
@@ -72,6 +109,14 @@ __decorate([
     __metadata("design:paramtypes", [typeof (_a = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _a : Object, Object]),
     __metadata("design:returntype", Promise)
 ], DataSetQuery.prototype, "dataSets", null);
+__decorate([
+    (0, type_graphql_1.Query)(returns => data_set_type_1.DataSetList, { description: 'To fetch multiple DataSets for data entry manually' }),
+    __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)
+], DataSetQuery.prototype, "dataSetsForEntry", null);
 __decorate([
     (0, type_graphql_1.FieldResolver)(type => [data_item_1.DataItem]),
     __param(0, (0, type_graphql_1.Root)()),
@@ -107,6 +152,27 @@ __decorate([
     __metadata("design:paramtypes", [data_set_1.DataSet]),
     __metadata("design:returntype", Promise)
 ], DataSetQuery.prototype, "creator", null);
+__decorate([
+    (0, type_graphql_1.FieldResolver)(type => Date, { nullable: true }),
+    __param(0, (0, type_graphql_1.Root)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [data_set_1.DataSet]),
+    __metadata("design:returntype", Promise)
+], DataSetQuery.prototype, "latestCollectedAt", null);
+__decorate([
+    (0, type_graphql_1.FieldResolver)(type => Date, { nullable: true }),
+    __param(0, (0, type_graphql_1.Root)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [data_set_1.DataSet]),
+    __metadata("design:returntype", Promise)
+], DataSetQuery.prototype, "nextSchedule", null);
+__decorate([
+    (0, type_graphql_1.FieldResolver)(type => Date, { nullable: true }),
+    __param(0, (0, type_graphql_1.Root)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [data_set_1.DataSet]),
+    __metadata("design:returntype", Promise)
+], DataSetQuery.prototype, "prevSchedule", null);
 DataSetQuery = __decorate([
     (0, type_graphql_1.Resolver)(data_set_1.DataSet)
 ], DataSetQuery);

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "5.0.0-alpha.25",
+  "version": "5.0.0-alpha.28",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,20 +24,21 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@operato/app": "1.0.0-alpha.47",
-    "@operato/data-grist": "1.0.0-alpha.47",
-    "@operato/dataset": "1.0.0-alpha.47",
-    "@operato/graphql": "1.0.0-alpha.47",
-    "@operato/i18n": "1.0.0-alpha.47",
-    "@operato/layout": "1.0.0-alpha.47",
-    "@operato/shell": "1.0.0-alpha.47",
-    "@operato/styles": "1.0.0-alpha.47",
-    "@operato/utils": "1.0.0-alpha.47",
-    "@things-factory/auth-base": "^5.0.0-alpha.25",
-    "@things-factory/env": "^5.0.0-alpha.25",
-    "@things-factory/shell": "^5.0.0-alpha.25",
-    "@things-factory/work-shift": "^5.0.0-alpha.25",
-    "moment": "^2.29.1"
+    "@operato/app": "1.0.0-alpha.51",
+    "@operato/data-grist": "1.0.0-alpha.51",
+    "@operato/dataset": "1.0.0-alpha.51",
+    "@operato/graphql": "1.0.0-alpha.51",
+    "@operato/i18n": "1.0.0-alpha.51",
+    "@operato/layout": "1.0.0-alpha.51",
+    "@operato/shell": "1.0.0-alpha.51",
+    "@operato/styles": "1.0.0-alpha.51",
+    "@operato/utils": "1.0.0-alpha.51",
+    "@things-factory/auth-base": "^5.0.0-alpha.28",
+    "@things-factory/env": "^5.0.0-alpha.28",
+    "@things-factory/shell": "^5.0.0-alpha.28",
+    "@things-factory/work-shift": "^5.0.0-alpha.28",
+    "cron-parser": "^4.3.0",
+    "moment-timezone": "^0.5.34"
   },
-  "gitHead": "d4307f6a23ea8be3555a06f17182558b2b00c74d"
+  "gitHead": "9adb6cdfd07c7730800f84a2d532d96f0f436288"
 }

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

@@ -1,15 +1,17 @@
-import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
+import moment from 'moment-timezone'
+import { EntityManager } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
 import { Domain, getRedirectSubdomainPath, pubsub } from '@things-factory/shell'
 
 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 { EntityManager } from 'typeorm'
-import { NewDataSample } from '../service/data-sample/data-sample-type'
-import { User } from '@things-factory/auth-base'
 import { getWorkDateAndShift } from '@things-factory/work-shift'
-import moment from 'moment'
+
 
 const debug = require('debug')('things-factory:dataset:controller/save-data-sample')
 
@@ -74,13 +76,21 @@ export async function createDataSample(
   }, {})
 
   const collectedAt = dataSample.collectedAt || new Date()
-  const momentUtc = moment(collectedAt).utc()
+  // workDate ex) 2022-04-04
+  const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt)
+
+  const dateFormat = 'YYYY-MM-DD'
+  // local time
+  const timezone = 'Asia/Seoul'
+  
+  // 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 */,
-    year: momentUtc.format('Y'),
-    month: momentUtc.format('M'),
-    day: momentUtc.format('D')
+    datasetid: dataSample.dataSet.id, /* It should not be 'data_set_id' as column name duplicated for Glue */
+    date: localDateTz.format(dateFormat), /* local time date */
+    workdate: workDate, /* working date */
+    workshift: workShift
   }
 
   var partitionKeys = {
@@ -88,14 +98,12 @@ export async function createDataSample(
     ...dataSet.partitionKeys
   }
 
-  partitionKeys = formatDate(partitionKeys, momentUtc)
+  partitionKeys = formatDate(partitionKeys, localDateTz)
   partitionKeys = replaceVariables(partitionKeys, {
     ...dataSample.data
   })
 
   const { ooc, oos } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}
-  const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt)
-
   const result = await tx.getRepository(DataSample).save({
     name: dataSet.name,
     description: dataSet.description,

package/server/service/data-set/data-set-query.ts

@@ -7,6 +7,9 @@ import { convertListParams, Domain, ListParam } from '@things-factory/shell'
 import { DataItem } from '../data-item/data-item'
 import { DataSet } from './data-set'
 import { DataSetList } from './data-set-type'
+import { DataSample } from '../data-sample/data-sample'
+
+var parser = require('cron-parser')
 
 @Resolver(DataSet)
 export class DataSetQuery {
@@ -31,6 +34,18 @@ export class DataSetQuery {
     return { items, total }
   }
 
+  @Query(returns => DataSetList, { description: 'To fetch multiple DataSets for data entry manually' })
+  async dataSetsForEntry(@Args() params: ListParam, @Ctx() context: any): Promise<DataSetList> {
+    const { domain } = context.state
+
+    /* TODO. 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
+
+    const convertedParams = convertListParams(params, domain.id)
+    const [items, total] = await getRepository(DataSet).findAndCount(convertedParams)
+
+    return { items, total }
+  }
+
   @FieldResolver(type => [DataItem])
   async dataItems(@Root() dataSet: DataSet): Promise<DataItem[]> {
     return await getRepository(DataItem).find({
@@ -59,4 +74,45 @@ export class DataSetQuery {
   async creator(@Root() dataSet: DataSet): Promise<User> {
     return await getRepository(User).findOne(dataSet.creatorId)
   }
+
+  @FieldResolver(type => Date, { nullable: true })
+  async latestCollectedAt(@Root() dataSet: DataSet): Promise<Date> {
+    const sample = await getRepository(DataSample).findOne({
+      select: ['collectedAt'],
+      where: { dataSet },
+      order: { collectedAt: 'DESC' }
+    })
+
+    return sample?.collectedAt
+  }
+
+  @FieldResolver(type => Date, { nullable: true })
+  async nextSchedule(@Root() dataSet: DataSet): Promise<Date> {
+    const { timezone, schedule } = dataSet
+
+    if (!schedule) {
+      return
+    }
+
+    var interval = parser.parseExpression(schedule, {
+      tz: timezone
+    })
+
+    return interval.next().toDate()
+  }
+
+  @FieldResolver(type => Date, { nullable: true })
+  async prevSchedule(@Root() dataSet: DataSet): Promise<Date> {
+    const { timezone, schedule } = dataSet
+
+    if (!schedule) {
+      return
+    }
+
+    var interval = parser.parseExpression(schedule, {
+      tz: timezone
+    })
+
+    return interval.prev().toDate()
+  }
 }

package/things-factory.config.js

@@ -5,20 +5,24 @@ export default {
   route,
   routes: [
     {
-      tagname: 'data-set-page',
-      page: 'data-set'
+      tagname: 'data-set-list-page',
+      page: 'data-set-list'
     },
     {
-      tagname: 'data-sensor-page',
-      page: 'data-sensor'
+      tagname: 'data-sensor-list-page',
+      page: 'data-sensor-list'
     },
     {
-      tagname: 'data-sample-page',
-      page: 'data-sample'
+      tagname: 'data-sample-list-page',
+      page: 'data-sample-list'
     },
     {
-      tagname: 'data-ooc-page',
-      page: 'data-ooc'
+      tagname: 'data-ooc-list-page',
+      page: 'data-ooc-list'
+    },
+    {
+      tagname: 'data-entry-list-page',
+      page: 'data-entry-list'
     }
   ],
   bootstrap

package/translations/en.json

@@ -10,11 +10,14 @@
   "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
+  "field.latest-collected-at": "latest collected at",
   "field.netmask": "network mask",
+  "field.next-schedule": "next schedule",
   "field.oos": "out of critical limit",
   "field.ooc": "out of control limit",
   "field.options": "options",
   "field.partition-keys": "partition keys",
+  "field.prev-schedule": "previous schedule",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
@@ -30,6 +33,7 @@
   "text.data sample created successfully": "a data sample created successfully",
   "text.data ooc updated successfully": "a data ooc updated successfully",
   "title.data-entry-form": "data entry form",
+  "title.data-entry list": "data entry list",
   "title.data-item list": "data item list",
   "title.data-ooc list": "data OOC list",
   "title.data-ooc view": "data OOC view",
@@ -37,4 +41,4 @@
   "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list"
-}
+}

package/translations/ko.json

@@ -10,11 +10,14 @@
   "field.data-sample": "데이타 샘플",
   "field.data-set": "데이타셋",
   "field.device-id": "디바이스 아이디",
+  "field.latest-collected-at": "최근 수집 시간",
   "field.netmask": "네트워크마스크",
+  "field.next-schedule": "다음 수집계획",
   "field.oos": "허용한계 이탈여부",
   "field.ooc": "관리한계 이탈여부",
   "field.options": "선택옵션",
   "field.partition-keys": "파티션 키",
+  "field.prev-schedule": "이전 수집계획",
   "field.quota": "샘플수",
   "field.raw-data": "데이타 원본",
   "field.ref-by": "참조아이템",
@@ -37,4 +40,4 @@
   "title.data-sample view": "데이타 샘플 상세",
   "title.data-sensor list": "데이타 센서 조회",
   "title.data-set list": "데이타 셋 조회"
-}
+}

package/translations/ms.json

@@ -10,11 +10,14 @@
   "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
+  "field.latest-collected-at": "latest collected at",
   "field.netmask": "network mask",
+  "field.next-schedule": "next schedule",
   "field.oos": "out of critical limit",
   "field.ooc": "out of control limit",
   "field.options": "options",
   "field.partition-keys": "partition keys",
+  "field.prev-schedule": "previous schedule",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
@@ -37,4 +40,4 @@
   "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list"
-}
+}

package/translations/zh.json

@@ -10,11 +10,14 @@
   "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
+  "field.latest-collected-at": "latest collected at",
   "field.netmask": "network mask",
+  "field.next-schedule": "next schedule",
   "field.oos": "out of critical limit",
   "field.ooc": "out of control limit",
   "field.options": "options",
   "field.partition-keys": "partition keys",
+  "field.prev-schedule": "previous schedule",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
@@ -37,4 +40,4 @@
   "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list"
-}
+}