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

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

@@ -13,20 +13,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataSetHistory = void 0;
 const type_graphql_1 = require("type-graphql");
 const typeorm_1 = require("typeorm");
+const typeorm_history_1 = require("@anchan828/typeorm-history");
 const auth_base_1 = require("@things-factory/auth-base");
+const env_1 = require("@things-factory/env");
 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");
+const ORMCONFIG = env_1.config.get('ormconfig', {});
+const DATABASE_TYPE = ORMCONFIG.type;
 let DataSetHistory = class DataSetHistory {
+    constructor() {
+        this.version = 1;
+    }
 };
 __decorate([
-    (0, typeorm_1.PrimaryColumn)(),
+    (0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
     (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)(),
+    (0, typeorm_1.Column)({ default: 1 }),
+    (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", Number)
 ], DataSetHistory.prototype, "version", void 0);
 __decorate([
@@ -44,23 +51,17 @@ __decorate([
     __metadata("design:type", String)
 ], DataSetHistory.prototype, "name", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (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, 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, 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);
@@ -69,9 +70,7 @@ __decorate([
     __metadata("design:type", String)
 ], DataSetHistory.prototype, "entryRoleId", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(type => auth_base_1.Role, {
-        nullable: true
-    }),
+    (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);
@@ -80,51 +79,37 @@ __decorate([
     __metadata("design:type", String)
 ], DataSetHistory.prototype, "supervisoryRoleId", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (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, 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, 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, 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, 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, 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, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataSetHistory.prototype, "reportView", void 0);
@@ -133,9 +118,7 @@ __decorate([
     __metadata("design:type", String)
 ], DataSetHistory.prototype, "reportTemplate", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataSetHistory.prototype, "useCase", void 0);
@@ -150,35 +133,27 @@ __decorate([
     __metadata("design:type", Array)
 ], DataSetHistory.prototype, "dataItems", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (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, 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, 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, typeorm_1.Column)({ nullable: true }),
     (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, 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);
@@ -187,9 +162,7 @@ __decorate([
     __metadata("design:type", String)
 ], DataSetHistory.prototype, "creatorId", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(type => auth_base_1.User, {
-        nullable: true
-    }),
+    (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);
@@ -197,8 +170,26 @@ __decorate([
     (0, typeorm_1.RelationId)((dataSetHistory) => dataSetHistory.creator),
     __metadata("design:type", String)
 ], DataSetHistory.prototype, "updaterId", void 0);
+__decorate([
+    (0, typeorm_history_1.HistoryOriginalIdColumn)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "originalId", void 0);
+__decorate([
+    (0, typeorm_history_1.HistoryActionColumn)({
+        nullable: false,
+        type: DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+            ? 'enum'
+            : DATABASE_TYPE == 'oracle'
+                ? 'varchar2'
+                : 'smallint',
+        enum: typeorm_history_1.HistoryActionType
+    }),
+    __metadata("design:type", String)
+], DataSetHistory.prototype, "action", void 0);
 DataSetHistory = __decorate([
     (0, typeorm_1.Entity)(),
+    (0, typeorm_1.Index)('ix_data_set_history_0', (dataSetHistory) => [dataSetHistory.originalId, dataSetHistory.version], { unique: true }),
+    (0, typeorm_1.Index)('ix_data_set_history_1', (dataSetHistory) => [dataSetHistory.domain, dataSetHistory.originalId, dataSetHistory.version], { unique: true }),
     (0, type_graphql_1.ObjectType)({ description: 'Entity for DataSetHistory' })
 ], DataSetHistory);
 exports.DataSetHistory = DataSetHistory;

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

@@ -1 +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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"}
+{"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/event-subscriber.js

@@ -0,0 +1,26 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataSetHistoryEntitySubscriber = void 0;
+const typeorm_1 = require("typeorm");
+const typeorm_history_1 = require("@anchan828/typeorm-history");
+const data_set_1 = require("../data-set/data-set");
+const data_set_history_1 = require("./data-set-history");
+let DataSetHistoryEntitySubscriber = class DataSetHistoryEntitySubscriber extends typeorm_history_1.HistoryEntitySubscriber {
+    get entity() {
+        return data_set_1.DataSet;
+    }
+    get historyEntity() {
+        return data_set_history_1.DataSetHistory;
+    }
+};
+DataSetHistoryEntitySubscriber = __decorate([
+    (0, typeorm_1.EventSubscriber)()
+], DataSetHistoryEntitySubscriber);
+exports.DataSetHistoryEntitySubscriber = DataSetHistoryEntitySubscriber;
+//# sourceMappingURL=event-subscriber.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"event-subscriber.js","sourceRoot":"","sources":["../../../server/service/data-set-history/event-subscriber.ts"],"names":[],"mappings":";;;;;;;;;AAAA,qCAAyC;AAEzC,gEAAoE;AAEpE,mDAA8C;AAC9C,yDAAmD;AAGnD,IAAa,8BAA8B,GAA3C,MAAa,8BAA+B,SAAQ,yCAAgD;IAClG,IAAW,MAAM;QACf,OAAO,kBAAO,CAAA;IAChB,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,iCAAc,CAAA;IACvB,CAAC;CACF,CAAA;AARY,8BAA8B;IAD1C,IAAA,yBAAe,GAAE;GACL,8BAA8B,CAQ1C;AARY,wEAA8B"}

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

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvers = exports.entities = void 0;
+exports.subscribers = 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");
+const event_subscriber_1 = require("./event-subscriber");
 exports.entities = [data_set_history_1.DataSetHistory];
 exports.resolvers = [data_set_history_query_1.DataSetHistoryQuery];
+exports.subscribers = [event_subscriber_1.DataSetHistoryEntitySubscriber];
 //# sourceMappingURL=index.js.map

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

@@ -1 +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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/service/data-set-history/index.ts"],"names":[],"mappings":";;;AAAA,yDAAmD;AACnD,qEAA8D;AAC9D,yDAAmE;AAEtD,QAAA,QAAQ,GAAG,CAAC,iCAAc,CAAC,CAAA;AAC3B,QAAA,SAAS,GAAG,CAAC,4CAAmB,CAAC,CAAA;AACjC,QAAA,WAAW,GAAG,CAAC,iDAA8B,CAAC,CAAA"}

package/dist-server/service/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.schema = exports.entities = void 0;
+exports.schema = exports.subscribers = exports.entities = void 0;
 const data_item_1 = require("./data-item");
 /* IMPORT ENTITIES AND RESOLVERS */
 const data_ooc_1 = require("./data-ooc");
@@ -41,6 +41,10 @@ exports.entities = [
     ...data_set_history_1.entities,
     ...data_spec_1.entities
 ];
+exports.subscribers = [
+    /* SUBSCRIBERS */
+    ...data_set_history_1.subscribers
+];
 exports.schema = {
     resolverClasses: [
         /* RESOLVER CLASSES */

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

@@ -1 +1 @@
-{"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"}
+{"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,yDAI2B;AAC3B,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,WAAW,GAAG;IACzB,iBAAiB;IACjB,GAAG,8BAAyB;CAC7B,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.9",
+  "version": "5.0.2",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,24 +24,24 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@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",
+    "@operato/app": "^1.0.1",
+    "@operato/data-grist": "^1.0.1",
+    "@operato/dataset": "^1.0.0",
+    "@operato/graphql": "^1.0.0",
+    "@operato/grist-editor": "^1.0.0",
+    "@operato/i18n": "^1.0.0",
+    "@operato/layout": "^1.0.1",
+    "@operato/shell": "^1.0.1",
+    "@operato/styles": "^1.0.0",
+    "@operato/utils": "^1.0.1",
+    "@things-factory/auth-base": "^5.0.1",
+    "@things-factory/aws-base": "^5.0.1",
+    "@things-factory/board-service": "^5.0.2",
+    "@things-factory/env": "^5.0.0",
+    "@things-factory/shell": "^5.0.1",
+    "@things-factory/work-shift": "^5.0.1",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.34"
   },
-  "gitHead": "af1562aba5cd179a7d10fc252b791e0a78049283"
+  "gitHead": "009cda6cb65e0930988fb2b1c1a309b9a7973383"
 }

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

@@ -55,20 +55,6 @@ export async function createDataSample(
   })
 
   const dataItems = dataSet.dataItems
-
-  // 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
-  // }, {})
-
   const collectedAt = dataSample.collectedAt || new Date()
 
   const timezone = dataSet.timezone || domain.timezone || 'UTC'
@@ -79,7 +65,6 @@ export async function createDataSample(
 
   // 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,
@@ -99,7 +84,7 @@ export async function createDataSample(
     ...dataSample.data
   })
 
-  const { ooc, oos } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}
+  const { ooc, oos, judgment } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}
   const result = await tx.getRepository(DataSample).save({
     name: dataSet.name,
     description: dataSet.description,
@@ -108,9 +93,9 @@ export async function createDataSample(
     dataSetVersion: dataSet.version,
     domain,
     partitionKeys,
-    // spec, // TODO spec should be removed
     ooc,
     oos,
+    judgment,
     collectedAt,
     workDate,
     workShift,
@@ -120,19 +105,7 @@ export async function createDataSample(
 
   if (ooc || oos) {
     const dataOoc = await tx.getRepository(DataOoc).save({
-      name: dataSet.name,
-      description: dataSet.description,
-      useCase: dataSet.useCase,
-      dataSet,
-      dataSetVersion: dataSet.version,
-      dataSample: result,
-      data: dataSample.data,
-      rawData: dataSample.rawData,
-      domain,
-      partitionKeys,
-      // spec, // TODO spec should be removed
-      ooc,
-      oos,
+      ...result,
       history: [
         {
           user: {
@@ -143,12 +116,7 @@ export async function createDataSample(
           timestamp: Date.now()
         }
       ],
-      state: DataOocStatus.CREATED,
-      workDate,
-      workShift,
-      collectedAt,
-      creator: user,
-      updater: user
+      state: DataOocStatus.CREATED
     })
 
     pubsub.publish('data-ooc', {
@@ -169,4 +137,4 @@ export async function createDataSample(
   }
 
   return result
-}
+}

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

@@ -14,7 +14,11 @@ export type DataItemSpecSet = {
   specs: DataItemSpec[]
 }
 
-export type EvaluationResult = { oos: boolean; ooc: boolean }
+export type EvaluationResult = {
+  oos: boolean
+  ooc: boolean
+  judgment?: { [tag: string]: { ooc: boolean; oos: boolean } }
+}
 
 export abstract class DataUseCase {
   static registry: { [name: string]: DataUseCase } = {}
@@ -34,6 +38,7 @@ export abstract class DataUseCase {
   public static evaluate(dataSet: DataSet, dataItems: DataItem[], data: any): EvaluationResult {
     var ooc = false
     var oos = false
+    var judgment: { [tag: string]: { ooc: boolean; oos: boolean } } = {}
 
     if (!dataSet.useCase) {
       return { ooc, oos }
@@ -50,7 +55,7 @@ export abstract class DataUseCase {
       }
 
       let values: any | any[] = data[tag]
-      if (typeof values === 'undefined') {
+      if (values == null) {
         continue // TODO what if in case no value ?
       }
 
@@ -58,6 +63,9 @@ export abstract class DataUseCase {
         values = [values]
       }
 
+      let oocForTag = false
+      let oosForTag = false
+
       for (let j = 0; j < useCases.length; j++) {
         const useCase = useCases[j]
 
@@ -69,17 +77,20 @@ export abstract class DataUseCase {
         const result = useCase.evaluate(specs, values)
 
         if (result) {
+          oocForTag ||= result.ooc
+          oosForTag ||= result.oos
           ooc ||= result.ooc
           oos ||= result.oos
         }
+      }
 
-        // if (ooc && oos) {
-        //   return { ooc, oos }
-        // }
+      judgment[tag] = {
+        ooc: oocForTag,
+        oos: oosForTag
       }
     }
 
-    return { ooc, oos }
+    return { ooc, oos, judgment }
   }
 
   public abstract evaluate(specs: any, values: any[]): EvaluationResult