@things-factory/dataset 5.0.0-alpha.3 → 5.0.0-alpha.4

package/client/pages/data-entry-form.js

@@ -0,0 +1,74 @@
+import gql from 'graphql-tag'
+import { css, html, LitElement } from 'lit'
+
+import { client } from '@operato/graphql'
+import { i18next, localize } from '@operato/i18n'
+import '@operato/dataset/ox-data-entry-form.js'
+
+class DataEntryForm extends localize(i18next)(LitElement) {
+  static get properties() {
+    return {
+      dataSet: Object
+    }
+  }
+
+  static get styles() {
+    return [
+      css`
+        :host {
+          display: flex;
+          flex-direction: column;
+
+          background-color: #fff;
+        }
+
+        ox-data-entry-form {
+          flex: 1;
+        }
+
+        .button-container {
+          display: flex;
+          margin-left: auto;
+          padding: var(--padding-default);
+        }
+      `
+    ]
+  }
+
+  get entryForm() {
+    return this.renderRoot.querySelector('ox-data-entry-form')
+  }
+
+  render() {
+    return html`
+      <ox-data-entry-form .dataSet=${this.dataSet}></ox-data-entry-form>
+      <div class="button-container">
+        <mwc-button raised @click=${this._updateDataItems.bind(this)}>${i18next.t('button.save')}</mwc-button>
+      </div>
+    `
+  }
+
+  async _updateDataItems() {
+    const data = this.entryForm.buildValue()
+    const dataSample = {
+      dataSetId: this.dataSet.id,
+      data
+    }
+
+    const response = await client.mutate({
+      mutation: gql`
+        mutation ($dataSample: NewDataSample!) {
+          createDataSample(dataSample: $dataSample) {
+            id
+            collectedAt
+          }
+        }
+      `,
+      variables: {
+        dataSample
+      }
+    })
+  }
+}
+
+window.customElements.define('data-entry-form', DataEntryForm)

package/client/pages/data-item-list.js

@@ -33,9 +33,6 @@ class DataItemList extends localize(i18next)(LitElement) {
           padding: var(--padding-default);
         }
 
-        form {
-          position: relative;
-        }
         [danger] {
           --mdc-theme-primary: var(--mdc-danger-button-primary-color);
         }
@@ -46,7 +43,7 @@ class DataItemList extends localize(i18next)(LitElement) {
     ]
   }
 
-  get dataGrist() {
+  get grist() {
     return this.renderRoot.querySelector('ox-grist')
   }
 
@@ -149,11 +146,41 @@ class DataItemList extends localize(i18next)(LitElement) {
           name: 'type',
           header: i18next.t('field.type'),
           record: {
-            options: ['number', 'text', 'select', 'boolean'],
+            options: ['', 'number', 'text', 'select', 'boolean', 'file'],
             editable: true
           },
           width: 120
         },
+        {
+          type: 'parameters',
+          name: 'options',
+          header: i18next.t('field.options'),
+          record: {
+            editable: true,
+            renderer: (value, column, record, rowIndex, field) => {
+              return typeof value === 'string' ? value : typeof value === 'object' ? JSON.stringify(value) : ''
+            },
+            options: async (value, column, record, row, field) => {
+              return {
+                name: record.type,
+                help: '',
+                spec:
+                  record.type === 'select'
+                    ? [
+                        {
+                          type: 'options',
+                          name: 'options',
+                          label: 'options'
+                        }
+                      ]
+                    : [],
+                context: this.grist,
+                objectified: true
+              }
+            }
+          },
+          width: 120
+        },
         {
           type: 'number',
           name: 'quota',
@@ -207,7 +234,9 @@ class DataItemList extends localize(i18next)(LitElement) {
               description
               sequence
               active
+              tag
               type
+              options
               quota
               spec
             }
@@ -224,7 +253,7 @@ class DataItemList extends localize(i18next)(LitElement) {
   }
 
   async _updateDataItems() {
-    let patches = this.dataGrist._data.records
+    let patches = this.grist._data.records
     if (patches && patches.length) {
       patches = patches.map(patch => {
         var patchField = {}
@@ -250,14 +279,14 @@ class DataItemList extends localize(i18next)(LitElement) {
         }
       })
 
-      if (!response.errors) this.dataGrist.fetch()
+      if (!response.errors) this.grist.fetch()
     }
   }
 
   async _deleteDataItems() {
     if (!confirm(i18next.t('text.sure_to_x', { x: i18next.t('text.delete') }))) return
 
-    const ids = this.dataGrist.selected.map(record => record.id)
+    const ids = this.grist.selected.map(record => record.id)
     if (!(ids && ids.length > 0)) return
 
     const response = await client.mutate({
@@ -273,7 +302,7 @@ class DataItemList extends localize(i18next)(LitElement) {
 
     if (response.errors) return
 
-    this.dataGrist.fetch()
+    this.grist.fetch()
     await document.dispatchEvent(
       new CustomEvent('notify', {
         detail: {

package/client/pages/data-sample.js

@@ -121,7 +121,7 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
           },
           filter: 'search',
           sortable: true,
-          width: 150
+          width: 120
         },
         {
           type: 'string',
@@ -132,24 +132,39 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
             editable: true
           },
           filter: 'search',
-          width: 200
+          width: 150
         },
         {
           type: 'object',
           name: 'dataSet',
-          header: i18next.t('field.data-set'),
+          header: i18next.t('field.dataSet'),
           record: {
             editable: false
           },
           sortable: true,
           width: 120
         },
+        {
+          type: 'json',
+          name: 'partitionKeys',
+          header: i18next.t('field.partitionKeys'),
+          record: {
+            editable: false,
+            renderer: (value, column, record, rowIndex, field) => {
+              return typeof value === 'string' ? value : typeof value === 'object' ? JSON.stringify(value) : ''
+            }
+          },
+          width: 200
+        },
         {
           type: 'json',
           name: 'data',
           header: i18next.t('field.data'),
           record: {
-            editable: false
+            editable: false,
+            renderer: (value, column, record, rowIndex, field) => {
+              return typeof value === 'string' ? value : typeof value === 'object' ? JSON.stringify(value) : ''
+            }
           },
           width: 200
         },
@@ -158,7 +173,10 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
           name: 'spec',
           header: i18next.t('field.spec'),
           record: {
-            editable: false
+            editable: false,
+            renderer: (value, column, record, rowIndex, field) => {
+              return typeof value === 'string' ? value : typeof value === 'object' ? JSON.stringify(value) : ''
+            }
           },
           width: 200
         },
@@ -235,6 +253,7 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
                 name
                 description
               }
+              partitionKeys
               data
               spec
               updater {

package/client/pages/data-sensor.js

@@ -194,7 +194,7 @@ export class DataSensor extends connect(store)(localize(i18next)(PageView)) {
         {
           type: 'object',
           name: 'dataSet',
-          header: i18next.t('field.data-set'),
+          header: i18next.t('field.dataSet'),
           record: {
             editable: true,
             options: {

package/client/pages/data-set.js

@@ -1,6 +1,7 @@
 import '@operato/data-grist'
 import './data-item-list'
 import './data-set-importer'
+import './data-entry-form'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit'
@@ -147,6 +148,23 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
             }
           }
         },
+        {
+          type: 'gutter',
+          gutterName: 'button',
+          icon: 'fact_check',
+          handlers: {
+            click: (columns, data, column, record, rowIndex) => {
+              openPopup(
+                html` <data-entry-form .dataSet=${record} style="background-color: white;"></data-entry-form> `,
+                {
+                  backdrop: true,
+                  size: 'large',
+                  title: i18next.t('title.data-entry-form')
+                }
+              )
+            }
+          }
+        },
         {
           type: 'string',
           name: 'name',
@@ -184,7 +202,7 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
         {
           type: 'json',
           name: 'partitionKeys',
-          header: i18next.t('field.partition-keys'),
+          header: i18next.t('field.partitionKeys'),
           record: {
             editable: true
           },
@@ -283,7 +301,9 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
                 description
                 sequence
                 active
+                tag
                 type
+                options
                 quota
                 spec
               }
@@ -392,7 +412,17 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
 
   async exportHandler() {
     const exportTargets = this.grist.selected.length ? this.grist.selected : this.grist.dirtyData.records
-    const targetFieldSet = new Set(['id', 'name', 'type', 'description', 'schedule', 'timezone', 'active', 'dataItems'])
+    const targetFieldSet = new Set([
+      'id',
+      'name',
+      'type',
+      'description',
+      'tag',
+      'schedule',
+      'timezone',
+      'active',
+      'dataItems'
+    ])
 
     return exportTargets.map(dataSet => {
       let tempObj = {}
@@ -408,11 +438,11 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
     openPopup(
       html`
         <data-set-importer
-          .dataSets="${records}"
-          @imported="${() => {
+          .dataSets=${records}
+          @imported=${() => {
             history.back()
             this.grist.fetch()
-          }}"
+          }}
         ></data-set-importer>
       `,
       {

package/dist-server/index.js

@@ -18,4 +18,5 @@ require("./routes");
 __exportStar(require("./migrations"), exports);
 __exportStar(require("./middlewares"), exports);
 __exportStar(require("./service"), exports);
+__exportStar(require("./service/data-spec/data-spec-manager"), exports);
 //# sourceMappingURL=index.js.map

package/dist-server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAiB;AAEjB,+CAA4B;AAC5B,gDAA6B;AAC7B,4CAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAiB;AAEjB,+CAA4B;AAC5B,gDAA6B;AAC7B,4CAAyB;AAEzB,wEAAqD"}

package/dist-server/service/data-item/data-item-type.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var _a;
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataItemList = exports.DataItemPatch = void 0;
 const type_graphql_1 = require("type-graphql");
@@ -44,6 +44,10 @@ __decorate([
     (0, type_graphql_1.Field)(type => data_item_1.DataItemType, { nullable: true }),
     __metadata("design:type", String)
 ], DataItemPatch.prototype, "type", void 0);
+__decorate([
+    (0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
+    __metadata("design:type", typeof (_a = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _a : Object)
+], DataItemPatch.prototype, "options", void 0);
 __decorate([
     (0, type_graphql_1.Field)(type => type_graphql_1.Int, { nullable: true }),
     __metadata("design:type", Number)
@@ -54,7 +58,7 @@ __decorate([
 ], DataItemPatch.prototype, "active", void 0);
 __decorate([
     (0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
-    __metadata("design:type", typeof (_a = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _a : Object)
+    __metadata("design:type", typeof (_b = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _b : Object)
 ], DataItemPatch.prototype, "spec", void 0);
 __decorate([
     (0, type_graphql_1.Field)({ nullable: true }),

package/dist-server/service/data-item/data-item-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-item-type.js","sourceRoot":"","sources":["../../../server/service/data-item/data-item-type.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoE;AAEpE,iDAAoD;AAEpD,2CAAoD;AAGpD,IAAa,aAAa,GAA1B,MAAa,aAAa;CAiCzB,CAAA;AA/BC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC3B;AAGX;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACR;AAGlB;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,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACtB;AAGjB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACd;AAGZ;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC7B;AAGnB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACzB;AAGd;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACV;AAGhB;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;;6CACX;AAhCJ,aAAa;IADzB,IAAA,wBAAS,GAAE;GACC,aAAa,CAiCzB;AAjCY,sCAAa;AAoC1B,IAAa,YAAY,GAAzB,MAAa,YAAY;CAMxB,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,oBAAQ,CAAC,CAAC;;2CACT;AAGjB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;2CACN;AALF,YAAY;IADxB,IAAA,yBAAU,GAAE;GACA,YAAY,CAMxB;AANY,oCAAY"}
+{"version":3,"file":"data-item-type.js","sourceRoot":"","sources":["../../../server/service/data-item/data-item-type.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoE;AAEpE,iDAAoD;AAEpD,2CAAoD;AAGpD,IAAa,aAAa,GAA1B,MAAa,aAAa;CAoCzB,CAAA;AAlCC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC3B;AAGX;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACR;AAGlB;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,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACtB;AAGjB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACd;AAGZ;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC7B;AAGnB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,oBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACtC,oBAAY,oBAAZ,oBAAY;8CAAA;AAGtB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACzB;AAGd;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACV;AAGhB;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;;6CACX;AAnCJ,aAAa;IADzB,IAAA,wBAAS,GAAE;GACC,aAAa,CAoCzB;AApCY,sCAAa;AAuC1B,IAAa,YAAY,GAAzB,MAAa,YAAY;CAMxB,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,oBAAQ,CAAC,CAAC;;2CACT;AAGjB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;2CACN;AALF,YAAY;IADxB,IAAA,yBAAU,GAAE;GACA,YAAY,CAMxB;AANY,oCAAY"}

package/dist-server/service/data-item/data-item.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 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;
+var _a, _b, _c, _d, _e;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataItem = exports.DataItemType = void 0;
 const type_graphql_1 = require("type-graphql");
@@ -22,6 +22,7 @@ var DataItemType;
     DataItemType["text"] = "text";
     DataItemType["boolean"] = "boolean";
     DataItemType["select"] = "select";
+    DataItemType["file"] = "file";
 })(DataItemType = exports.DataItemType || (exports.DataItemType = {}));
 (0, type_graphql_1.registerEnumType)(DataItemType, {
     name: 'DataItemType',
@@ -90,6 +91,11 @@ __decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataItem.prototype, "type", 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 (_b = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _b : Object)
+], DataItem.prototype, "options", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         nullable: true
@@ -100,7 +106,7 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)('simple-json', { nullable: true }),
     (0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
-    __metadata("design:type", typeof (_b = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _b : Object)
+    __metadata("design:type", typeof (_c = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _c : Object)
 ], DataItem.prototype, "spec", void 0);
 __decorate([
     (0, typeorm_1.CreateDateColumn)(),
@@ -117,7 +123,7 @@ __decorate([
         nullable: true
     }),
     (0, type_graphql_1.Field)({ nullable: true }),
-    __metadata("design:type", typeof (_c = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _c : Object)
+    __metadata("design:type", typeof (_d = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _d : Object)
 ], DataItem.prototype, "creator", void 0);
 __decorate([
     (0, typeorm_1.RelationId)((dataItem) => dataItem.creator),
@@ -128,7 +134,7 @@ __decorate([
         nullable: true
     }),
     (0, type_graphql_1.Field)({ nullable: true }),
-    __metadata("design:type", typeof (_d = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _d : Object)
+    __metadata("design:type", typeof (_e = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _e : Object)
 ], DataItem.prototype, "updater", void 0);
 __decorate([
     (0, typeorm_1.RelationId)((dataItem) => dataItem.creator),

package/dist-server/service/data-item/data-item.js.map

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

package/dist-server/service/data-sample/data-sample-mutation.js

@@ -11,6 +11,9 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataSampleMutation = void 0;
 const type_graphql_1 = require("type-graphql");
@@ -19,6 +22,31 @@ const data_item_1 = require("../data-item/data-item");
 const data_set_1 = require("../data-set/data-set");
 const data_sample_1 = require("./data-sample");
 const data_sample_type_1 = require("./data-sample-type");
+const moment_1 = __importDefault(require("moment"));
+const debug = require('debug')('things-factory:dataset:data-sample:data-sample-mutation');
+// parse variable javascript string pattern
+const replaceVariables = (keys, dic) => {
+    for (const k in keys) {
+        const matches = keys[k].match(/\$\{\w*\}/g);
+        matches &&
+            matches.forEach(m => {
+                keys[k] = keys[k].replace(m, dic[m.slice(2, -1)]);
+            });
+    }
+    return keys;
+};
+// It is required UTC date for Partitioning File System like AWS S3.
+// ex) %YYYY, %MM, %DD
+const formatDate = (keys, _moment) => {
+    for (const k in keys) {
+        const matches = keys[k].match(/%\w*/g);
+        matches &&
+            matches.forEach(m => {
+                keys[k] = keys[k].replace(m, _moment.format(m.substr(1)));
+            });
+    }
+    return keys;
+};
 let DataSampleMutation = class DataSampleMutation {
     async createDataSample(dataSample, context) {
         const { domain, user, tx } = context.state;
@@ -32,12 +60,18 @@ let DataSampleMutation = class DataSampleMutation {
                 sequence: 'DESC'
             }
         });
-        var spec = {};
-        dataItems.forEach(dataItem => {
-            spec[dataItem.name] = dataItem.spec;
-            // TODO 변수형 스펙값은 처리 결과값을 spec의 아이템 value로 반영하여야 한다.
-        });
-        return await tx.getRepository(data_sample_1.DataSample).save(Object.assign(Object.assign({ name: dataSet.name, description: dataSet.description, collectedAt: new Date() }, dataSample), { domain, partitionKeys: dataSet.partitionKeys, spec, creator: user, updater: user }));
+        const spec = dataItems.reduce((spec, dataItem) => {
+            spec[dataItem.tag] = Object.assign(Object.assign({}, dataItem.spec), { name: dataItem.name /* do we need ? */ });
+            return spec;
+        }, {});
+        var partitionKeys = Object.assign(Object.assign({}, dataSet.partitionKeys), { year: '%YYYY', month: '%MM', date: '%DD', variableX: '${x}', variableDataSetId: '${dataSetId}' });
+        const collectedAt = dataSample.collectedAt || new Date();
+        partitionKeys = formatDate(partitionKeys, (0, moment_1.default)(collectedAt).utc());
+        partitionKeys = replaceVariables(partitionKeys, Object.assign({ dataSetId: dataSample.dataSetId }, dataSample.data));
+        return await tx.getRepository(data_sample_1.DataSample).save(Object.assign(Object.assign({ name: dataSet.name, description: dataSet.description }, dataSample), { domain,
+            partitionKeys,
+            spec,
+            collectedAt, creator: user, updater: user }));
     }
     async updateDataSample(id, patch, context) {
         const { domain, user, tx } = context.state;

package/dist-server/service/data-sample/data-sample-mutation.js.map

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

package/dist-server/service/data-spec/data-spec-manager.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataSpecManager = void 0;
+class DataSpecManager {
+    static getDataSpec(type) {
+        return DataSpecManager.specRegistry[type];
+    }
+    static registerDataSpec(type, dataSpec) {
+        DataSpecManager.specRegistry[type] = dataSpec;
+    }
+    static unregisterDataSpec(type) {
+        delete DataSpecManager.specRegistry[type];
+    }
+    static getDataSpecs() {
+        return Object.values(DataSpecManager.specRegistry);
+    }
+}
+exports.DataSpecManager = DataSpecManager;
+DataSpecManager.specRegistry = {};
+//# sourceMappingURL=data-spec-manager.js.map

package/dist-server/service/data-spec/data-spec-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-spec-manager.js","sourceRoot":"","sources":["../../../server/service/data-spec/data-spec-manager.ts"],"names":[],"mappings":";;;AAEA,MAAa,eAAe;IAG1B,MAAM,CAAC,WAAW,CAAC,IAAY;QAC7B,OAAO,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,IAAY,EAAE,QAAkB;QACtD,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAA;IAC/C,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,IAAY;QACpC,OAAO,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC;IAED,MAAM,CAAC,YAAY;QACjB,OAAO,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,YAAY,CAAC,CAAA;IACpD,CAAC;;AAjBH,0CAkBC;AAjBQ,4BAAY,GAAiC,EAAE,CAAA"}

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

@@ -0,0 +1,48 @@
+"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); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataSpecQuery = void 0;
+const type_graphql_1 = require("type-graphql");
+const data_spec_1 = require("./data-spec");
+const data_spec_manager_1 = require("./data-spec-manager");
+let DataSpecQuery = class DataSpecQuery {
+    dataSpec(name) {
+        return data_spec_manager_1.DataSpecManager.getDataSpec(name);
+    }
+    dataSpecs() {
+        const items = data_spec_manager_1.DataSpecManager.getDataSpecs();
+        return {
+            items,
+            total: items.length
+        };
+    }
+};
+__decorate([
+    (0, type_graphql_1.Query)(returns => data_spec_1.DataSpec, { description: 'To fetch a data-spec' }),
+    __param(0, (0, type_graphql_1.Arg)('name')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", data_spec_1.DataSpec)
+], DataSpecQuery.prototype, "dataSpec", null);
+__decorate([
+    (0, type_graphql_1.Query)(returns => data_spec_1.DataSpecList, { description: 'To fetch all data-specs' }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", data_spec_1.DataSpecList)
+], DataSpecQuery.prototype, "dataSpecs", null);
+DataSpecQuery = __decorate([
+    (0, type_graphql_1.Resolver)(data_spec_1.DataSpec)
+], DataSpecQuery);
+exports.DataSpecQuery = DataSpecQuery;
+//# sourceMappingURL=data-spec-query.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"data-spec-query.js","sourceRoot":"","sources":["../../../server/service/data-spec/data-spec-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAmD;AACnD,2CAAoD;AACpD,2DAAqD;AAGrD,IAAa,aAAa,GAA1B,MAAa,aAAa;IAExB,QAAQ,CAAc,IAAY;QAChC,OAAO,mCAAe,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;IAC1C,CAAC;IAGD,SAAS;QACP,MAAM,KAAK,GAAG,mCAAe,CAAC,YAAY,EAAE,CAAA;QAE5C,OAAO;YACL,KAAK;YACL,KAAK,EAAE,KAAK,CAAC,MAAM;SACpB,CAAA;IACH,CAAC;CACF,CAAA;AAbC;IADC,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,oBAAQ,EAAE,EAAE,WAAW,EAAE,sBAAsB,EAAE,CAAC;IAC1D,WAAA,IAAA,kBAAG,EAAC,MAAM,CAAC,CAAA;;;oCAAgB,oBAAQ;6CAE5C;AAGD;IADC,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,wBAAY,EAAE,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC;;;oCAC9D,wBAAY;8CAOxB;AAdU,aAAa;IADzB,IAAA,uBAAQ,EAAC,oBAAQ,CAAC;GACN,aAAa,CAezB;AAfY,sCAAa"}

package/dist-server/service/data-spec/data-spec.js

@@ -0,0 +1,78 @@
+"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;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataSpecList = exports.DataSpec = exports.DataSpecItem = void 0;
+const type_graphql_1 = require("type-graphql");
+const shell_1 = require("@things-factory/shell");
+let DataSpecItem = class DataSpecItem {
+};
+__decorate([
+    (0, type_graphql_1.Field)(),
+    __metadata("design:type", String)
+], DataSpecItem.prototype, "type", void 0);
+__decorate([
+    (0, type_graphql_1.Field)(),
+    __metadata("design:type", String)
+], DataSpecItem.prototype, "label", void 0);
+__decorate([
+    (0, type_graphql_1.Field)(),
+    __metadata("design:type", String)
+], DataSpecItem.prototype, "name", void 0);
+__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSpecItem.prototype, "placeholder", void 0);
+__decorate([
+    (0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
+    __metadata("design:type", typeof (_a = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _a : Object)
+], DataSpecItem.prototype, "property", void 0);
+DataSpecItem = __decorate([
+    (0, type_graphql_1.ObjectType)()
+], DataSpecItem);
+exports.DataSpecItem = DataSpecItem;
+let DataSpec = class DataSpec {
+};
+__decorate([
+    (0, type_graphql_1.Field)(),
+    __metadata("design:type", String)
+], DataSpec.prototype, "name", void 0);
+__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSpec.prototype, "description", void 0);
+__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSpec.prototype, "help", void 0);
+__decorate([
+    (0, type_graphql_1.Field)(type => [DataSpecItem], { nullable: true }),
+    __metadata("design:type", Array)
+], DataSpec.prototype, "specItems", void 0);
+DataSpec = __decorate([
+    (0, type_graphql_1.ObjectType)()
+], DataSpec);
+exports.DataSpec = DataSpec;
+let DataSpecList = class DataSpecList {
+};
+__decorate([
+    (0, type_graphql_1.Field)(type => [DataSpec]),
+    __metadata("design:type", Array)
+], DataSpecList.prototype, "items", void 0);
+__decorate([
+    (0, type_graphql_1.Field)(type => type_graphql_1.Int),
+    __metadata("design:type", Number)
+], DataSpecList.prototype, "total", void 0);
+DataSpecList = __decorate([
+    (0, type_graphql_1.ObjectType)()
+], DataSpecList);
+exports.DataSpecList = DataSpecList;
+//# sourceMappingURL=data-spec.js.map

package/dist-server/service/data-spec/data-spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-spec.js","sourceRoot":"","sources":["../../../server/service/data-spec/data-spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAqD;AACrD,iDAAoD;AAGpD,IAAa,YAAY,GAAzB,MAAa,YAAY;CAexB,CAAA;AAbC;IADC,IAAA,oBAAK,GAAE;;0CACI;AAGZ;IADC,IAAA,oBAAK,GAAE;;2CACK;AAGb;IADC,IAAA,oBAAK,GAAE;;0CACI;AAGZ;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,oBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACrC,oBAAY,oBAAZ,oBAAY;8CAAA;AAdZ,YAAY;IADxB,IAAA,yBAAU,GAAE;GACA,YAAY,CAexB;AAfY,oCAAY;AAkBzB,IAAa,QAAQ,GAArB,MAAa,QAAQ;CAYpB,CAAA;AAVC;IADC,IAAA,oBAAK,GAAE;;sCACI;AAGZ;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACP;AAGnB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCACd;AAGZ;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACzB;AAXd,QAAQ;IADpB,IAAA,yBAAU,GAAE;GACA,QAAQ,CAYpB;AAZY,4BAAQ;AAerB,IAAa,YAAY,GAAzB,MAAa,YAAY;CAMxB,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;;2CACT;AAGjB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;2CACN;AALF,YAAY;IADxB,IAAA,yBAAU,GAAE;GACA,YAAY,CAMxB;AANY,oCAAY"}

package/dist-server/service/data-spec/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolvers = exports.entities = void 0;
+const data_spec_1 = require("./data-spec");
+const data_spec_query_1 = require("./data-spec-query");
+exports.entities = [data_spec_1.DataSpec];
+exports.resolvers = [data_spec_query_1.DataSpecQuery];
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/service/data-spec/index.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AACtC,uDAAiD;AAEpC,QAAA,QAAQ,GAAG,CAAC,oBAAQ,CAAC,CAAA;AACrB,QAAA,SAAS,GAAG,CAAC,+BAAa,CAAC,CAAA"}

package/dist-server/service/index.js

@@ -20,17 +20,20 @@ const data_sensor_1 = require("./data-sensor");
 const data_sample_1 = require("./data-sample");
 const data_item_1 = require("./data-item");
 const data_set_1 = require("./data-set");
+const data_spec_1 = require("./data-spec");
 /* EXPORT ENTITY TYPES */
 __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-spec/data-spec"), exports);
 exports.entities = [
     /* ENTITIES */
     ...data_sensor_1.entities,
     ...data_sample_1.entities,
     ...data_item_1.entities,
-    ...data_set_1.entities
+    ...data_set_1.entities,
+    ...data_spec_1.entities
 ];
 exports.schema = {
     resolverClasses: [
@@ -38,7 +41,8 @@ exports.schema = {
         ...data_sensor_1.resolvers,
         ...data_sample_1.resolvers,
         ...data_item_1.resolvers,
-        ...data_set_1.resolvers
+        ...data_set_1.resolvers,
+        ...data_spec_1.resolvers
     ]
 };
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mCAAmC;AACnC,+CAAgG;AAChG,+CAAgG;AAChG,2CAA0F;AAC1F,yCAAuF;AAEvF,yBAAyB;AACzB,4DAAyC;AACzC,4DAAyC;AACzC,wDAAqC;AACrC,sDAAmC;AAEtB,QAAA,QAAQ,GAAG;IACtB,cAAc;IACf,GAAG,sBAAkB;IACrB,GAAG,sBAAkB;IACpB,GAAG,oBAAgB;IACnB,GAAG,mBAAe;CACnB,CAAA;AAEY,QAAA,MAAM,GAAG;IACpB,eAAe,EAAE;QACf,sBAAsB;QACxB,GAAG,uBAAmB;QACtB,GAAG,uBAAmB;QACpB,GAAG,qBAAiB;QACpB,GAAG,oBAAgB;KACpB;CACF,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mCAAmC;AACnC,+CAAgG;AAChG,+CAAgG;AAChG,2CAA0F;AAC1F,yCAAuF;AACvF,2CAA0F;AAE1F,yBAAyB;AACzB,4DAAyC;AACzC,4DAAyC;AACzC,wDAAqC;AACrC,sDAAmC;AACnC,wDAAqC;AAExB,QAAA,QAAQ,GAAG;IACtB,cAAc;IACd,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,uBAAmB;QACtB,GAAG,uBAAmB;QACtB,GAAG,qBAAiB;QACpB,GAAG,oBAAgB;QACnB,GAAG,qBAAiB;KACrB;CACF,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "5.0.0-alpha.3",
+  "version": "5.0.0-alpha.4",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,16 +24,17 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@operato/data-grist": "^0.4.3",
-    "@operato/graphql": "^0.4.3",
-    "@operato/i18n": "^0.4.3",
-    "@operato/layout": "^0.4.3",
-    "@operato/shell": "^0.4.3",
-    "@operato/styles": "^0.4.3",
-    "@operato/utils": "^0.4.3",
-    "@things-factory/auth-base": "^5.0.0-alpha.3",
-    "@things-factory/env": "^5.0.0-alpha.3",
-    "@things-factory/shell": "^5.0.0-alpha.3"
+    "@operato/data-grist": "1.0.0-alpha.4",
+    "@operato/dataset": "1.0.0-alpha.4",
+    "@operato/graphql": "1.0.0-alpha.4",
+    "@operato/i18n": "1.0.0-alpha.4",
+    "@operato/layout": "1.0.0-alpha.4",
+    "@operato/shell": "1.0.0-alpha.4",
+    "@operato/styles": "1.0.0-alpha.4",
+    "@operato/utils": "1.0.0-alpha.4",
+    "@things-factory/auth-base": "^5.0.0-alpha.4",
+    "@things-factory/env": "^5.0.0-alpha.4",
+    "@things-factory/shell": "^5.0.0-alpha.4"
   },
-  "gitHead": "0584a36ba889ff0b426cc87c0d9c8f14ffa2f677"
+  "gitHead": "77253f86954dc6f5c14356ea85887c323fd2511a"
 }

package/server/index.ts

@@ -3,3 +3,5 @@ import './routes'
 export * from './migrations'
 export * from './middlewares'
 export * from './service'
+
+export * from './service/data-spec/data-spec-manager'

package/server/service/data-item/data-item-type.ts

@@ -27,6 +27,9 @@ export class DataItemPatch {
   @Field(type => DataItemType, { nullable: true })
   type?: DataItemType
 
+  @Field(type => ScalarObject, { nullable: true })
+  options?: ScalarObject
+
   @Field(type => Int, { nullable: true })
   quota?: number
 

package/server/service/data-item/data-item.ts

@@ -19,7 +19,8 @@ export enum DataItemType {
   number = 'number',
   text = 'text',
   boolean = 'boolean',
-  select = 'select'
+  select = 'select',
+  file = 'file'
 }
 
 registerEnumType(DataItemType, {
@@ -81,6 +82,10 @@ export class DataItem {
   @Field({ nullable: true })
   type?: DataItemType
 
+  @Column('simple-json', { nullable: true })
+  @Field(type => ScalarObject, { nullable: true })
+  options?: ScalarObject
+
   @Column({
     nullable: true
   })

package/server/service/data-sample/data-sample-mutation.ts

@@ -6,6 +6,35 @@ import { DataSet } from '../data-set/data-set'
 import { DataSample } from './data-sample'
 import { DataSamplePatch, NewDataSample } from './data-sample-type'
 
+import moment from 'moment'
+
+const debug = require('debug')('things-factory:dataset:data-sample:data-sample-mutation')
+
+// parse variable javascript string pattern
+const replaceVariables = (keys, dic) => {
+  for (const k in keys) {
+    const matches = keys[k].match(/\$\{\w*\}/g)
+    matches &&
+      matches.forEach(m => {
+        keys[k] = keys[k].replace(m, dic[m.slice(2, -1)])
+      })
+  }
+  return keys
+}
+
+// It is required UTC date for Partitioning File System like AWS S3.
+// ex) %YYYY, %MM, %DD
+const formatDate = (keys, _moment) => {
+  for (const k in keys) {
+    const matches = keys[k].match(/%\w*/g)
+    matches &&
+      matches.forEach(m => {
+        keys[k] = keys[k].replace(m, _moment.format(m.substr(1)))
+      })
+  }
+  return keys
+}
+
 @Resolver(DataSample)
 export class DataSampleMutation {
   @Directive('@privilege(category: "data-sample", privilege: "mutation", domainOwnerGranted: true)')
@@ -25,21 +54,39 @@ export class DataSampleMutation {
       }
     })
 
-    var spec = {} as any
+    const spec = dataItems.reduce((spec, dataItem) => {
+      spec[dataItem.tag] = {
+        ...dataItem.spec,
+        name: dataItem.name /* do we need ? */
+      }
+
+      return spec
+    }, {})
+
+    var partitionKeys = {
+      ...dataSet.partitionKeys,
+      year: '%YYYY',
+      month: '%MM',
+      date: '%DD',
+      variableX: '${x}',
+      variableDataSetId: '${dataSetId}'
+    }
 
-    dataItems.forEach(dataItem => {
-      spec[dataItem.name] = dataItem.spec
-      // TODO 변수형 스펙값은 처리 결과값을 spec의 아이템 value로 반영하여야 한다.
+    const collectedAt = dataSample.collectedAt || new Date()
+    partitionKeys = formatDate(partitionKeys, moment(collectedAt).utc())
+    partitionKeys = replaceVariables(partitionKeys, {
+      dataSetId: dataSample.dataSetId,
+      ...dataSample.data
     })
 
     return await tx.getRepository(DataSample).save({
       name: dataSet.name,
       description: dataSet.description,
-      collectedAt: new Date(),
       ...dataSample,
       domain,
-      partitionKeys: dataSet.partitionKeys,
+      partitionKeys,
       spec,
+      collectedAt,
       creator: user,
       updater: user
     })

package/server/service/data-spec/data-spec-manager.ts

@@ -0,0 +1,21 @@
+import { DataSpec } from './data-spec'
+
+export class DataSpecManager {
+  static specRegistry: { [type: string]: DataSpec } = {}
+
+  static getDataSpec(type: string): DataSpec {
+    return DataSpecManager.specRegistry[type]
+  }
+
+  static registerDataSpec(type: string, dataSpec: DataSpec) {
+    DataSpecManager.specRegistry[type] = dataSpec
+  }
+
+  static unregisterDataSpec(type: string) {
+    delete DataSpecManager.specRegistry[type]
+  }
+
+  static getDataSpecs(): DataSpec[] {
+    return Object.values(DataSpecManager.specRegistry)
+  }
+}

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

@@ -0,0 +1,21 @@
+import { Resolver, Query, Arg } from 'type-graphql'
+import { DataSpec, DataSpecList } from './data-spec'
+import { DataSpecManager } from './data-spec-manager'
+
+@Resolver(DataSpec)
+export class DataSpecQuery {
+  @Query(returns => DataSpec, { description: 'To fetch a data-spec' })
+  dataSpec(@Arg('name') name: string): DataSpec {
+    return DataSpecManager.getDataSpec(name)
+  }
+
+  @Query(returns => DataSpecList, { description: 'To fetch all data-specs' })
+  dataSpecs(): DataSpecList {
+    const items = DataSpecManager.getDataSpecs()
+
+    return {
+      items,
+      total: items.length
+    }
+  }
+}

package/server/service/data-spec/data-spec.ts

@@ -0,0 +1,44 @@
+import { ObjectType, Field, Int } from 'type-graphql'
+import { ScalarObject } from '@things-factory/shell'
+
+@ObjectType()
+export class DataSpecItem {
+  @Field()
+  type: string
+
+  @Field()
+  label: string
+
+  @Field()
+  name: string
+
+  @Field({ nullable: true })
+  placeholder?: string
+
+  @Field(type => ScalarObject, { nullable: true })
+  property?: ScalarObject
+}
+
+@ObjectType()
+export class DataSpec {
+  @Field()
+  name: string
+
+  @Field({ nullable: true })
+  description: string
+
+  @Field({ nullable: true })
+  help: string
+
+  @Field(type => [DataSpecItem], { nullable: true })
+  specItems: DataSpecItem[]
+}
+
+@ObjectType()
+export class DataSpecList {
+  @Field(type => [DataSpec])
+  items: DataSpec[]
+
+  @Field(type => Int)
+  total: number
+}

package/server/service/data-spec/index.ts

@@ -0,0 +1,5 @@
+import { DataSpec } from './data-spec'
+import { DataSpecQuery } from './data-spec-query'
+
+export const entities = [DataSpec]
+export const resolvers = [DataSpecQuery]

package/server/service/index.ts

@@ -3,27 +3,31 @@ import { entities as DataSensorEntities, resolvers as DataSensorResolvers } from
 import { entities as DataSampleEntities, resolvers as DataSampleResolvers } from './data-sample'
 import { entities as DataItemEntities, resolvers as DataItemResolvers } from './data-item'
 import { entities as DataSetEntities, resolvers as DataSetResolvers } from './data-set'
+import { entities as DataSpecEntities, resolvers as DataSpecResolvers } from './data-spec'
 
 /* EXPORT ENTITY TYPES */
 export * from './data-sensor/data-sensor'
 export * from './data-sample/data-sample'
 export * from './data-item/data-item'
 export * from './data-set/data-set'
+export * from './data-spec/data-spec'
 
 export const entities = [
   /* ENTITIES */
-	...DataSensorEntities,
-	...DataSampleEntities,
+  ...DataSensorEntities,
+  ...DataSampleEntities,
   ...DataItemEntities,
-  ...DataSetEntities
+  ...DataSetEntities,
+  ...DataSpecEntities
 ]
 
 export const schema = {
   resolverClasses: [
     /* RESOLVER CLASSES */
-		...DataSensorResolvers,
-		...DataSampleResolvers,
+    ...DataSensorResolvers,
+    ...DataSampleResolvers,
     ...DataItemResolvers,
-    ...DataSetResolvers
+    ...DataSetResolvers,
+    ...DataSpecResolvers
   ]
 }

package/translations/en.json

@@ -2,18 +2,20 @@
   "field.appliance": "appliance",
   "field.collected_at": "collected at",
   "field.data": "data",
-  "field.data-set": "data set",
+  "field.dataSet": "data set",
   "field.device-id": "device id",
   "field.netmask": "network mask",
-  "field.partition-keys": "partition keys",
+  "field.options": "options",
+  "field.partitionKeys": "partition keys",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
   "field.serial-no": "serial #",
   "field.spec": "spec",
   "field.tag": "tag name",
+  "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
   "title.data-sample list": "data sample list",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list"
-}
+}

package/translations/ko.json

@@ -2,18 +2,20 @@
   "field.appliance": "어플라이언스",
   "field.collected_at": "수집일시",
   "field.data": "데이타",
-  "field.data-set": "데이타셋",
+  "field.dataSet": "데이타셋",
   "field.device-id": "디바이스 아이디",
   "field.netmask": "네트워크마스크",
-  "field.partition-keys": "파티션 키",
+  "field.options": "선택옵션",
+  "field.partitionKeys": "파티션 키",
   "field.quota": "샘플수",
   "field.raw-data": "데이타 원본",
   "field.ref-by": "참조아이템",
   "field.serial-no": "시리얼번호",
   "field.spec": "명세",
-  "field.tag": "태크이름",
+  "field.tag": "태그이름",
+  "title.data-entry-form": "데이타 입력",
   "title.data-item list": "데이타 아이템 조회",
   "title.data-sample list": "데이타 샘플 조회",
   "title.data-sensor list": "데이타 센서 조회",
   "title.data-set list": "데이타 셋 조회"
-}
+}

package/translations/ms.json

@@ -2,18 +2,20 @@
   "field.appliance": "appliance",
   "field.collected_at": "collected at",
   "field.data": "data",
-  "field.data-set": "data set",
+  "field.dataSet": "data set",
   "field.device-id": "device id",
   "field.netmask": "network mask",
-  "field.partition-keys": "partition keys",
+  "field.options": "options",
+  "field.partitionKeys": "partition keys",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
   "field.serial-no": "serial #",
   "field.spec": "spec",
   "field.tag": "tag name",
+  "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
   "title.data-sample list": "data sample list",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list"
-}
+}

package/translations/zh.json

@@ -2,18 +2,20 @@
   "field.appliance": "appliance",
   "field.collected_at": "collected at",
   "field.data": "data",
-  "field.data-set": "data set",
+  "field.dataSet": "data set",
   "field.device-id": "device id",
   "field.netmask": "network mask",
-  "field.partition-keys": "partition keys",
+  "field.options": "options",
+  "field.partitionKeys": "partition keys",
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
   "field.serial-no": "serial #",
   "field.spec": "spec",
   "field.tag": "tag name",
+  "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
   "title.data-sample list": "data sample list",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list"
-}
+}