@things-factory/dataset 5.0.2 → 5.0.5

package/server/service/data-key-set/data-key-set-type.ts

@@ -0,0 +1,57 @@
+import type { FileUpload } from 'graphql-upload/GraphQLUpload.js'
+import GraphQLUpload from 'graphql-upload/GraphQLUpload.js'
+import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
+
+import { DataKeyItemPatch } from './data-key-item-type'
+import { DataKeySet } from './data-key-set'
+
+@InputType()
+export class NewDataKeySet {
+  @Field()
+  name: string
+
+  @Field({ nullable: true })
+  description?: string
+
+  @Field({ nullable: true })
+  active?: boolean
+
+  @Field(type => [DataKeyItemPatch], { nullable: true })
+  dataKeyItems?: DataKeyItemPatch[]
+
+  @Field(type => GraphQLUpload, { nullable: true })
+  thumbnail?: FileUpload
+}
+
+@InputType()
+export class DataKeySetPatch {
+  @Field(type => ID, { nullable: true })
+  id?: string
+
+  @Field({ nullable: true })
+  name?: string
+
+  @Field({ nullable: true })
+  description?: string
+
+  @Field({ nullable: true })
+  active?: boolean
+
+  @Field(type => [DataKeyItemPatch], { nullable: true })
+  dataKeyItems?: DataKeyItemPatch[]
+
+  @Field(type => GraphQLUpload, { nullable: true })
+  thumbnail?: FileUpload
+
+  @Field({ nullable: true })
+  cuFlag?: string
+}
+
+@ObjectType()
+export class DataKeySetList {
+  @Field(type => [DataKeySet])
+  items: DataKeySet[]
+
+  @Field(type => Int)
+  total: number
+}

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

@@ -0,0 +1,81 @@
+import { Field, ID, ObjectType } from 'type-graphql'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+
+import { DataKeyItem } from './data-key-item-type'
+
+@Entity()
+@Index('ix_data_key_set_0', (dataKeySet: DataKeySet) => [dataKeySet.domain, dataKeySet.name], { unique: true })
+@ObjectType({ description: 'Entity for DataKeySet' })
+export class DataKeySet {
+  @PrimaryGeneratedColumn('uuid')
+  @Field(type => ID)
+  readonly id: string
+
+  @ManyToOne(type => Domain)
+  @Field({ nullable: true })
+  domain?: Domain
+
+  @RelationId((dataKeySet: DataKeySet) => dataKeySet.domain)
+  domainId?: string
+
+  @Column()
+  @Field()
+  name: string
+
+  @Column({
+    nullable: true
+  })
+  @Field({ nullable: true })
+  description?: string
+
+  @Column({
+    nullable: true
+  })
+  @Field({ nullable: true })
+  active?: boolean
+
+  @Column('simple-json', { nullable: true })
+  @Field(type => [DataKeyItem], { nullable: true })
+  dataKeyItems: DataKeyItem[]
+
+  @CreateDateColumn()
+  @Field({ nullable: true })
+  createdAt?: Date
+
+  @UpdateDateColumn()
+  @Field({ nullable: true })
+  updatedAt?: Date
+
+  @ManyToOne(type => User, {
+    nullable: true
+  })
+  @Field({ nullable: true })
+  creator?: User
+
+  @RelationId((dataKeySet: DataKeySet) => dataKeySet.creator)
+  creatorId?: string
+
+  @ManyToOne(type => User, {
+    nullable: true
+  })
+  @Field({ nullable: true })
+  updater?: User
+
+  @RelationId((dataKeySet: DataKeySet) => dataKeySet.creator)
+  updaterId?: string
+
+  @Field(type => String, { nullable: true })
+  thumbnail?: string
+}

package/server/service/data-key-set/index.ts

@@ -0,0 +1,6 @@
+import { DataKeySet } from './data-key-set'
+import { DataKeySetQuery } from './data-key-set-query'
+import { DataKeySetMutation } from './data-key-set-mutation'
+
+export const entities = [DataKeySet]
+export const resolvers = [DataKeySetQuery, DataKeySetMutation]

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

@@ -109,6 +109,26 @@ export class DataOoc {
   @Field({ nullable: true })
   useCase?: string
 
+  @Column({ nullable: true, default: '' })
+  @Field({ nullable: true })
+  key01?: string = ''
+
+  @Column({ nullable: true, default: '' })
+  @Field({ nullable: true })
+  key02?: string = ''
+
+  @Column({ nullable: true, default: '' })
+  @Field({ nullable: true })
+  key03?: string = ''
+
+  @Column({ nullable: true, default: '' })
+  @Field({ nullable: true })
+  key04?: string = ''
+
+  @Column({ nullable: true, default: '' })
+  @Field({ nullable: true })
+  key05?: string = ''
+
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
   partitionKeys?: ScalarObject

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

@@ -4,6 +4,7 @@ import { getRepository } from 'typeorm'
 import { User } from '@things-factory/auth-base'
 import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
 
+import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataSetHistory } from '../data-set-history/data-set-history'
 import { DataItem } from '../data-set/data-item-type'
 import { DataSet } from '../data-set/data-set'
@@ -39,6 +40,34 @@ export class DataSampleQuery {
     return { items, total }
   }
 
+  @Directive('@privilege(category: "data-sample", privilege: "query", domainOwnerGranted: true)')
+  @Query(returns => DataSampleList, { description: 'To fetch multiple data samples by data key set' })
+  async dataSamplesByDataKeySet(
+    @Arg('dataKeySetId') dataKeySetId: string,
+    @Args() params: ListParam,
+    @Ctx() context: any
+  ): Promise<DataSampleList> {
+    const { domain } = context.state
+
+    const dataKeySet = await getRepository(DataKeySet).findOne(dataKeySetId)
+    const dataKeyItems = dataKeySet?.dataKeyItems || []
+    const searchables = dataKeyItems.map((item, index) => `key0${index + 1}`)
+
+    const queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(DataSample),
+      params,
+      domain,
+      alias: 'dks',
+      searchables: ['name', 'description'].concat(searchables)
+    }).innerJoin('dks.dataSet', 'ds', 'ds.dataKeySet = :dataKeySetId', {
+      dataKeySetId
+    })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
+
+    return { items, total }
+  }
+
   @FieldResolver(type => [DataItem])
   async dataItems(@Root() dataSample: DataSample): Promise<DataItem[]> {
     const dataSetHistory: DataSetHistory = await getRepository(DataSetHistory).findOne({

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

@@ -25,6 +25,20 @@ const DATABASE_TYPE = ORMCONFIG.type
   (dataSample: DataSample) => [dataSample.domain, dataSample.dataSet, dataSample.collectedAt],
   { unique: false }
 )
+@Index(
+  'ix_data_sample_1',
+  (dataSample: DataSample) => [
+    dataSample.domain,
+    dataSample.dataSet,
+    dataSample.key01,
+    dataSample.key02,
+    dataSample.key03,
+    dataSample.key04,
+    dataSample.key05,
+    dataSample.collectedAt
+  ],
+  { unique: false }
+)
 @ObjectType({ description: 'Entity for DataSample' })
 export class DataSample {
   @PrimaryGeneratedColumn('uuid')
@@ -116,6 +130,26 @@ export class DataSample {
   @Field({ nullable: true })
   oos?: boolean
 
+  @Column({ nullable: true, default: '' })
+  @Field({ nullable: true })
+  key01?: string = ''
+
+  @Column({ nullable: true, default: '' })
+  @Field({ nullable: true })
+  key02?: string = ''
+
+  @Column({ nullable: true, default: '' })
+  @Field({ nullable: true })
+  key03?: string = ''
+
+  @Column({ nullable: true, default: '' })
+  @Field({ nullable: true })
+  key04?: string = ''
+
+  @Column({ nullable: true, default: '' })
+  @Field({ nullable: true })
+  key05?: string = ''
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   workDate?: string

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

@@ -12,7 +12,7 @@ export enum DataItemType {
 
 registerEnumType(DataItemType, {
   name: 'DataItemType',
-  description: 'state enumeration of a data-item'
+  description: 'type enumeration of a data-item'
 })
 
 @ObjectType({ description: 'Entity for DataItem' })

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

@@ -7,6 +7,7 @@ import { Board } from '@things-factory/board-service'
 import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
 
 import { DataItem } from '../data-item/data-item'
+import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataSample } from '../data-sample/data-sample'
 import { DataSet } from './data-set'
 import { DataSetList } from './data-set-type'
@@ -147,6 +148,16 @@ export class DataSetQuery {
     }
   }
 
+  @FieldResolver(type => DataKeySet, { nullable: true })
+  async dataKeySet(@Root() dataSet: DataSet) {
+    return (
+      dataSet.dataKeySet ||
+      (await getRepository(DataKeySet).findOne({
+        id: dataSet.dataKeySetId
+      }))
+    )
+  }
+
   @FieldResolver(type => Domain)
   async domain(@Root() dataSet: DataSet): Promise<Domain> {
     return await getRepository(Domain).findOne(dataSet.domainId)

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

@@ -15,6 +15,9 @@ export class NewDataSet {
   @Field({ nullable: true })
   description?: string
 
+  @Field(type => ObjectRef, { nullable: true })
+  dataKeySet?: ObjectRef
+
   @Field(type => ObjectRef, { nullable: true })
   entryRole?: ObjectRef
 
@@ -75,6 +78,9 @@ export class DataSetPatch {
   @Field({ nullable: true })
   description?: string
 
+  @Field(type => ObjectRef, { nullable: true })
+  dataKeySet?: ObjectRef
+
   @Field(type => ObjectRef, { nullable: true })
   supervisoryRole?: ObjectRef
 

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

@@ -14,6 +14,7 @@ import {
 import { Role, User } from '@things-factory/auth-base'
 import { Domain, ScalarObject } from '@things-factory/shell'
 
+import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataItem } from './data-item-type'
 
 export enum DataSetEntryType {
@@ -71,9 +72,7 @@ export class DataSet {
   @Field()
   name: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   description?: string
 
@@ -81,78 +80,63 @@ export class DataSet {
   @Field({ nullable: true })
   version?: number = 1
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   active?: boolean
 
-  @ManyToOne(type => Role, {
-    nullable: true
-  })
+  @ManyToOne(type => DataKeySet, { nullable: true })
+  @Field(type => DataKeySet, { nullable: true })
+  dataKeySet?: Role
+
+  @RelationId((dataSet: DataSet) => dataSet.dataKeySet)
+  dataKeySetId?: string
+
+  @ManyToOne(type => Role, { nullable: true })
   @Field(type => Role, { nullable: true })
   entryRole?: Role
 
   @RelationId((dataSet: DataSet) => dataSet.entryRole)
   entryRoleId?: string
 
-  @ManyToOne(type => Role, {
-    nullable: true
-  })
+  @ManyToOne(type => Role, { nullable: true })
   @Field(type => Role, { nullable: true })
   supervisoryRole?: Role
 
   @RelationId((dataSet: DataSet) => dataSet.supervisoryRole)
   supervisoryRoleId?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   type?: 'manual' | 'automatic' | string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   entryType?: DataSetEntryType
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   entryView?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   monitorType?: DataSetMonitorType
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   monitorView?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   reportType?: DataSetReportType
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   reportView?: string
 
   @Field({ nullable: true })
   reportTemplate?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   useCase?: string
 
@@ -164,15 +148,11 @@ export class DataSet {
   @Field(type => [DataItem], { nullable: true })
   dataItems: DataItem[]
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   schedule?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   timezone?: string
 
@@ -184,18 +164,14 @@ export class DataSet {
   @Field({ nullable: true })
   updatedAt?: Date
 
-  @ManyToOne(type => User, {
-    nullable: true
-  })
+  @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
   creator?: User
 
   @RelationId((dataSet: DataSet) => dataSet.creator)
   creatorId?: string
 
-  @ManyToOne(type => User, {
-    nullable: true
-  })
+  @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
   updater?: User
 

package/server/service/index.ts

@@ -1,5 +1,5 @@
 import { entities as DataItemEntities } from './data-item'
-/* IMPORT ENTITIES AND RESOLVERS */
+import { entities as DataKeySetEntities, resolvers as DataKeySetResolvers } from './data-key-set'
 import { entities as DataOocEntities, resolvers as DataOocResolvers } from './data-ooc'
 import { entities as DataSampleEntities, resolvers as DataSampleResolvers } from './data-sample'
 import { entities as DataSensorEntities, resolvers as DataSensorResolvers } from './data-sensor'
@@ -12,6 +12,7 @@ import {
 import { entities as DataSpecEntities, resolvers as DataSpecResolvers } from './data-spec'
 
 /* EXPORT ENTITY TYPES */
+export * from './data-key-set/data-key-set'
 export * from './data-ooc/data-ooc'
 export * from './data-sensor/data-sensor'
 export * from './data-sample/data-sample'
@@ -22,6 +23,7 @@ export * from './data-spec/data-spec'
 
 export const entities = [
   /* ENTITIES */
+  ...DataKeySetEntities,
   ...DataItemEntities,
   ...DataOocEntities,
   ...DataSensorEntities,
@@ -39,6 +41,7 @@ export const subscribers = [
 export const schema = {
   resolverClasses: [
     /* RESOLVER CLASSES */
+    ...DataKeySetResolvers,
     ...DataOocResolvers,
     ...DataSensorResolvers,
     ...DataSampleResolvers,

package/things-factory.config.js

@@ -16,6 +16,10 @@ export default {
       tagname: 'data-sample-list-page',
       page: 'data-sample-list'
     },
+    {
+      tagname: 'data-sample-search-page',
+      page: 'data-sample-search'
+    },
     {
       tagname: 'data-ooc-list-page',
       page: 'data-ooc-list'
@@ -44,6 +48,10 @@ export default {
       tagname: 'data-report-embed-page',
       page: 'data-report-embed'
     },
+    {
+      tagname: 'data-key-set-list-page',
+      page: 'data-key-set-list'
+    }
   ],
   bootstrap
 }

package/translations/en.json

@@ -7,6 +7,8 @@
   "field.corrector": "corrector",
   "field.corrected-at": "corrected at",
   "field.data": "data",
+  "field.data-key": "data key",
+  "field.data-key-set": "data key set",
   "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
@@ -14,6 +16,11 @@
   "field.entry-type": "entry type",
   "field.entry-view": "entry view",
   "field.hidden": "hidden",
+  "field.key-01": "key 1",
+  "field.key-02": "key 2",
+  "field.key-03": "key 3",
+  "field.key-04": "key 4",
+  "field.key-05": "key 5",
   "field.latest-collected-at": "latest collected at",
   "field.monitor-type": "monitor type",
   "field.monitor-view": "monitor view",
@@ -34,6 +41,7 @@
   "field.spec": "spec",
   "field.status": "status",
   "field.supervisory-role": "supervisory role",
+  "field.t-key": "translation key",
   "field.tag": "tag name",
   "field.unit": "unit",
   "field.use-case": "use case",
@@ -51,12 +59,15 @@
   "text.manually collected": "manually collected",
   "title.data-entry-form": "data entry form",
   "title.data-entry list": "data entry list",
+  "title.data-key-item list": "data key item list",
+  "title.data-key-set list": "data key set list",
   "title.data-item list": "data item list",
   "title.data-monitor-view": "data monitor view",
   "title.data-report-view": "data report view",
   "title.data-ooc list": "data OOC list",
   "title.data-ooc view": "data OOC view",
   "title.data-sample list": "data sample list",
+  "title.data-sample search": "data sample search",
   "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

@@ -9,11 +9,18 @@
   "field.data-sample": "데이타 샘플",
   "field.data-set": "데이타셋",
   "field.data": "데이타",
+  "field.data-key": "데이타 키",
+  "field.data-key-set": "데이타 키셋",
   "field.device-id": "디바이스 아이디",
   "field.entry-role": "입력담당 역할",
   "field.entry-type": "입력용 화면종류",
   "field.entry-view": "입력용 화면",
   "field.hidden": "숨기기",
+  "field.key-01": "데이타키 1",
+  "field.key-02": "데이타키 2",
+  "field.key-03": "데이타키 3",
+  "field.key-04": "데이타키 4",
+  "field.key-05": "데이타키 5",
   "field.latest-collected-at": "최근 수집 시간",
   "field.monitor-type": "모니터용 화면종류",
   "field.monitor-view": "모니터용 화면",
@@ -34,6 +41,7 @@
   "field.spec": "명세",
   "field.status": "상태",
   "field.supervisory-role": "관리자 역할",
+  "field.t-key": "번역 키",
   "field.tag": "태그이름",
   "field.unit": "단위",
   "field.use-case": "사용 사례",
@@ -50,12 +58,15 @@
   "text.data sample created successfully": "데이타 샘플이 성공적으로 생성되었습니다",
   "text.manually collected": "수동 수집",
   "title.data-entry-form": "데이타 입력",
+  "title.data-key-item list": "데이타 키 상세",
+  "title.data-key-set list": "데이타 키셋 조회",
   "title.data-item list": "데이타 아이템 조회",
   "title.data-monitor-view": "데이타 모니터",
   "title.data-ooc list": "데이타 이탈점 조회",
   "title.data-ooc view": "데이타 이탈점 상세",
   "title.data-report-view": "데이타 리포트",
   "title.data-sample list": "데이타 샘플 조회",
+  "title.data-sample search": "데이타 샘플 검색",
   "title.data-sample view": "데이타 샘플 상세",
   "title.data-sensor list": "데이타 센서 조회",
   "title.data-set list": "데이타 셋 조회",

package/translations/ms.json

@@ -7,12 +7,20 @@
   "field.corrector": "corrector",
   "field.corrected-at": "corrected at",
   "field.data": "data",
+  "field.data-key": "data key",
+  "field.data-key-set": "data key set",
   "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
   "field.entry-role": "entry role",
   "field.entry-type": "entry type",
   "field.entry-view": "entry view",
+  "field.hidden": "hidden",
+  "field.key-01": "key 1",
+  "field.key-02": "key 2",
+  "field.key-03": "key 3",
+  "field.key-04": "key 4",
+  "field.key-05": "key 5",
   "field.latest-collected-at": "latest collected at",
   "field.monitor-type": "monitor type",
   "field.monitor-view": "monitor view",
@@ -21,7 +29,6 @@
   "field.oos": "out of critical limit",
   "field.ooc": "out of control limit",
   "field.options": "options",
-  "field.hidden": "hidden",
   "field.partition-keys": "partition keys",
   "field.prev-schedule": "previous schedule",
   "field.quota": "sampling #",
@@ -33,6 +40,7 @@
   "field.spec": "spec",
   "field.status": "keadaan",
   "field.supervisory-role": "supervisory role",
+  "field.t-key": "translation key",
   "field.tag": "tag name",
   "field.unit": "unit",
   "field.use-case": "use case",
@@ -49,12 +57,15 @@
   "text.data ooc updated successfully": "a data ooc updated successfully",
   "text.manually collected": "manually collected",
   "title.data-entry-form": "data entry form",
+  "title.data-key-item list": "data key item list",
+  "title.data-key-set list": "data key set list",
   "title.data-item list": "data item list",
   "title.data-monitor-view": "data monitor view",
   "title.data-report-view": "data report view",
   "title.data-ooc list": "data OOC list",
   "title.data-ooc view": "data OOC view",
   "title.data-sample list": "data sample list",
+  "title.data-sample search": "data sample search",
   "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list",