@things-factory/dataset 5.0.0-alpha.18 → 5.0.0-alpha.20

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

@@ -11,9 +11,23 @@ export class DataOocMutation {
   async createDataOoc(@Arg('dataOoc') dataOoc: NewDataOoc, @Ctx() context: any): Promise<DataOoc> {
     const { domain, user, tx } = context.state
 
+    const state = dataOoc.state || DataOocStatus.CREATED
+    const history = [
+      {
+        user: {
+          id: user.id,
+          name: user.name
+        },
+        state,
+        timestamp: Date.now()
+      }
+    ]
+
     return await tx.getRepository(DataOoc).save({
       ...dataOoc,
+      state,
       domain,
+      history,
       creator: user,
       updater: user
     })
@@ -30,88 +44,107 @@ export class DataOocMutation {
       where: { domain, id }
     })
 
+    const state = patch.state || dataOoc.state
+
+    const history = dataOoc.history || []
+    history.push({
+      user: {
+        id: user.id,
+        name: user.name
+      },
+      state,
+      comment: patch.correctiveAction || '',
+      timestamp: Date.now()
+    })
+
     const more = {} as any
-    if (patch.correctiveAction) {
-      more.corrector = user
-      more.state = DataOocStatus.CORRECTED
+
+    if (dataOoc.state !== patch.state) {
+      if (patch.state === DataOocStatus.CORRECTED) {
+        more.corrector = user
+      } else {
+        more.corrector = null
+      }
     }
 
     return await repository.save({
       ...dataOoc,
       ...patch,
       ...more,
+      state,
+      history,
       updater: user
     })
   }
 
-  @Directive('@privilege(category: "data-ooc", privilege: "mutation", domainOwnerGranted: true)')
-  @Directive('@transaction')
-  @Mutation(returns => [DataOoc], { description: "To modify multiple DataOoc' information" })
-  async updateMultipleDataOoc(
-    @Arg('patches', type => [DataOocPatch]) patches: DataOocPatch[],
-    @Ctx() context: any
-  ): Promise<DataOoc[]> {
-    const { domain, user, tx } = context.state
-
-    let results = []
-    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
-    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
-    const dataOocRepo = tx.getRepository(DataOoc)
-
-    if (_createRecords.length > 0) {
-      for (let i = 0; i < _createRecords.length; i++) {
-        const newRecord = _createRecords[i]
-
-        const result = await dataOocRepo.save({
-          ...newRecord,
-          domain,
-          creator: user,
-          updater: user
-        })
-
-        results.push({ ...result, cuFlag: '+' })
-      }
-    }
-
-    if (_updateRecords.length > 0) {
-      for (let i = 0; i < _updateRecords.length; i++) {
-        const newRecord = _updateRecords[i]
-        const dataOoc = await dataOocRepo.findOne(newRecord.id)
-
-        const result = await dataOocRepo.save({
-          ...dataOoc,
-          ...newRecord,
-          updater: user
-        })
-
-        results.push({ ...result, cuFlag: 'M' })
-      }
-    }
-
-    return results
-  }
-
-  @Directive('@privilege(category: "data-ooc", privilege: "mutation", domainOwnerGranted: true)')
-  @Directive('@transaction')
-  @Mutation(returns => Boolean, { description: 'To delete DataOoc' })
-  async deleteDataOoc(@Arg('id') id: string, @Ctx() context: any): Promise<boolean> {
-    const { domain, tx } = context.state
-
-    await tx.getRepository(DataOoc).delete({ domain, id })
-    return true
-  }
-
-  @Directive('@privilege(category: "data-ooc", privilege: "mutation", domainOwnerGranted: true)')
-  @Directive('@transaction')
-  @Mutation(returns => Boolean, { description: 'To delete multiple dataOocs' })
-  async deleteDataOocs(@Arg('ids', type => [String]) ids: string[], @Ctx() context: any): Promise<boolean> {
-    const { domain, tx } = context.state
-
-    await tx.getRepository(DataOoc).delete({
-      domain,
-      id: In(ids)
-    })
-
-    return true
-  }
+  // @Directive('@privilege(category: "data-ooc", privilege: "mutation", domainOwnerGranted: true)')
+  // @Directive('@transaction')
+  // @Mutation(returns => [DataOoc], { description: "To modify multiple DataOoc' information" })
+  // async updateMultipleDataOoc(
+  //   @Arg('patches', type => [DataOocPatch]) patches: DataOocPatch[],
+  //   @Ctx() context: any
+  // ): Promise<DataOoc[]> {
+  //   const { domain, user, tx } = context.state
+
+  //   let results = []
+  //   const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
+  //   const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
+  //   const dataOocRepo = tx.getRepository(DataOoc)
+
+  //   if (_createRecords.length > 0) {
+  //     for (let i = 0; i < _createRecords.length; i++) {
+  //       const newRecord = _createRecords[i]
+
+  //       const result = await dataOocRepo.save({
+  //         ...newRecord,
+  //         domain,
+  //         creator: user,
+  //         updater: user
+  //       })
+
+  //       results.push({ ...result, cuFlag: '+' })
+  //     }
+  //   }
+
+  //   if (_updateRecords.length > 0) {
+  //     for (let i = 0; i < _updateRecords.length; i++) {
+  //       const newRecord = _updateRecords[i]
+  //       const dataOoc = await dataOocRepo.findOne(newRecord.id)
+
+  //       const result = await dataOocRepo.save({
+  //         ...dataOoc,
+  //         ...newRecord,
+  //         updater: user
+  //       })
+
+  //       results.push({ ...result, cuFlag: 'M' })
+  //     }
+  //   }
+
+  //   return results
+  // }
+
+  // @Directive('@privilege(category: "data-ooc", privilege: "mutation", domainOwnerGranted: true)')
+  // @Directive('@transaction')
+  // @Mutation(returns => Boolean, { description: 'To delete DataOoc' })
+  // async deleteDataOoc(@Arg('id') id: string, @Ctx() context: any): Promise<boolean> {
+  //   const { domain, tx } = context.state
+
+  //   await tx.getRepository(DataOoc).delete({ domain, id })
+  //   return true
+  // }
+
+  // @Directive('@privilege(category: "data-ooc", privilege: "mutation", domainOwnerGranted: true)')
+  // @Directive('@transaction')
+  // @Mutation(returns => Boolean, { description: 'To delete multiple dataOocs' })
+  // async deleteDataOocs(@Arg('ids', type => [String]) ids: string[], @Ctx() context: any): Promise<boolean> {
+  //   const { domain, tx } = context.state
+
+  //   await tx.getRepository(DataOoc).delete({
+  //     domain,
+  //     id: In(ids)
+  //   })
+
+  //   return true
+  // }
 }

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

@@ -24,10 +24,7 @@ const DATABASE_TYPE = ORMCONFIG.type
 export enum DataOocStatus {
   CREATED = 'CREATED',
   REVIEWED = 'REVIEWED',
-  CORRECTED = 'CORRECTED',
-  SUBMITTED = 'SUBMITTED',
-  APPROVED = 'APPROVED',
-  REJECTED = 'REJECTED'
+  CORRECTED = 'CORRECTED'
 }
 
 registerEnumType(DataOocStatus, {
@@ -113,6 +110,12 @@ export class DataOoc {
   @Field({ nullable: true })
   type?: string
 
+  @Column({
+    nullable: true
+  })
+  @Field({ nullable: true })
+  useCase?: string
+
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
   partitionKeys?: ScalarObject
@@ -125,6 +128,10 @@ export class DataOoc {
   @Field(type => ScalarObject, { nullable: true })
   spec?: ScalarObject
 
+  @Column('simple-json', { nullable: true })
+  @Field(type => ScalarObject, { nullable: true })
+  history?: ScalarObject
+
   @Column({
     nullable: true,
     type:

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

@@ -1,4 +1,3 @@
-import { Field, ID, ObjectType } from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -9,12 +8,12 @@ import {
   RelationId,
   UpdateDateColumn
 } from 'typeorm'
-
-import { User } from '@things-factory/auth-base'
-import { config } from '@things-factory/env'
 import { Domain, ScalarObject } from '@things-factory/shell'
+import { Field, ID, ObjectType } from 'type-graphql'
 
 import { DataSet } from '../data-set/data-set'
+import { User } from '@things-factory/auth-base'
+import { config } from '@things-factory/env'
 
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
@@ -54,6 +53,12 @@ export class DataSample {
   @Field({ nullable: true })
   type?: string
 
+  @Column({
+    nullable: true
+  })
+  @Field({ nullable: true })
+  useCase?: string
+
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
   partitionKeys?: ScalarObject

package/translations/en.json

@@ -1,4 +1,6 @@
 {
+  "button.corrected": "corrected",
+  "button.reviewed": "reviewed",
   "field.appliance": "appliance",
   "field.collected_at": "collected at",
   "field.corrective-action": "corrective action",
@@ -24,10 +26,13 @@
   "field.unit": "unit",
   "field.use-case": "use case",
   "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-item list": "data item list",
   "title.data-ooc list": "data OOC list",
+  "title.data-ooc view": "data OOC view",
   "title.data-sample list": "data sample list",
+  "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

@@ -1,4 +1,6 @@
 {
+  "button.corrected": "조치완료",
+  "button.reviewed": "검토완료",
   "field.appliance": "어플라이언스",
   "field.collected_at": "수집일시",
   "field.corrective-action": "조치 활동",
@@ -24,10 +26,13 @@
   "field.unit": "단위",
   "field.use-case": "사용 사례",
   "text.data sample created successfully": "데이타 샘플이 성공적으로 생성되었습니다",
+  "text.data ooc updated successfully": "이탈데이타 내용이 수정되었습니다",
   "title.data-entry-form": "데이타 입력",
   "title.data-item list": "데이타 아이템 조회",
   "title.data-ooc list": "데이타 이탈점 조회",
+  "title.data-ooc view": "데이타 이탈점 상세",
   "title.data-sample list": "데이타 샘플 조회",
+  "title.data-sample view": "데이타 샘플 상세",
   "title.data-sensor list": "데이타 센서 조회",
   "title.data-set list": "데이타 셋 조회"
-}
+}

package/translations/ms.json

@@ -1,4 +1,6 @@
 {
+  "button.corrected": "corrected",
+  "button.reviewed": "reviewed",
   "field.appliance": "appliance",
   "field.collected_at": "collected at",
   "field.corrective-action": "corrective action",
@@ -24,10 +26,13 @@
   "field.unit": "unit",
   "field.use-case": "use case",
   "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-item list": "data item list",
   "title.data-ooc list": "data OOC list",
+  "title.data-ooc view": "data OOC view",
   "title.data-sample list": "data sample list",
+  "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

@@ -1,4 +1,6 @@
 {
+  "button.corrected": "corrected",
+  "button.reviewed": "reviewed",
   "field.appliance": "appliance",
   "field.collected_at": "collected at",
   "field.corrective-action": "corrective action",
@@ -24,10 +26,13 @@
   "field.unit": "unit",
   "field.use-case": "use case",
   "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-item list": "data item list",
   "title.data-ooc list": "data OOC list",
+  "title.data-ooc view": "data OOC view",
   "title.data-sample list": "data sample list",
+  "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list"
 }