@things-factory/dataset 6.0.0-alpha.6 → 6.0.0-alpha.7

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

@@ -0,0 +1,49 @@
+import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
+import { DataArchive } from './data-archive'
+import { ObjectRef, ScalarObject } from '@things-factory/shell'
+
+@InputType()
+export class NewDataArchive {
+  @Field({ nullable: true })
+  type?: 'manual' | 'automatic' | string
+  
+  @Field(type => ScalarObject, { nullable: true })
+  requestParams?: { [key: string]: any }
+
+  @Field({ nullable: true })
+  downloadUrl?: string
+
+  @Field({ nullable: true })
+  status?: string
+
+}
+
+@InputType()
+export class DataArchivePatch {
+  @Field(type => ID, { nullable: true })
+  id?: string
+
+  @Field({ nullable: true })
+  type?: 'manual' | 'automatic' | string
+
+  @Field(type => ScalarObject, { nullable: true })
+  requestParams?: { [key: string]: any }
+
+  @Field({ nullable: true })
+  downloadUrl?: string
+
+  @Field({ nullable: true })
+  status?: string
+
+  @Field({ nullable: true })
+  cuFlag: string
+}
+
+@ObjectType()
+export class DataArchiveList {
+  @Field(type => [DataArchive])
+  items: DataArchive[]
+
+  @Field(type => Int)
+  total: number
+}

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

@@ -0,0 +1,69 @@
+import { Field, ID, ObjectType, registerEnumType } from 'type-graphql'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn,
+  VersionColumn
+} from 'typeorm'
+
+import { Role, User } from '@things-factory/auth-base'
+import { Domain, ScalarObject } from '@things-factory/shell'
+
+@Entity()
+@Index('ix_data_archive_0', (dataArchive: DataArchive) => [dataArchive.id], { unique: true })
+@ObjectType({ description: 'Entity for DataArchive' })
+export class DataArchive {
+  @PrimaryGeneratedColumn('uuid')
+  @Field(type => ID)
+  readonly id: string
+
+  @ManyToOne(type => Domain)
+  @Field({ nullable: true })
+  domain?: Domain
+
+  @RelationId((dataArchive: DataArchive) => dataArchive.domain)
+  domainId?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  type?: 'manual' | 'automatic' | string
+
+  @Column('simple-json', { nullable: true })
+  @Field(type => ScalarObject, { nullable: true })
+  requestParams?: { [key: string]: any }
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  downloadUrl?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  status?: string
+
+  @CreateDateColumn()
+  @Field({ nullable: true })
+  createdAt?: Date
+
+  @UpdateDateColumn()
+  @Field({ nullable: true })
+  updatedAt?: Date
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field({ nullable: true })
+  creator?: User
+
+  @RelationId((dataArchive: DataArchive) => dataArchive.creator)
+  creatorId?: string
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field({ nullable: true })
+  updater?: User
+
+  @RelationId((dataArchive: DataArchive) => dataArchive.creator)
+  updaterId?: string
+}

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

@@ -0,0 +1,6 @@
+import { DataArchive } from './data-archive'
+import { DataArchiveMutation } from './data-archive-mutation'
+import { DataArchiveQuery } from './data-archive-query'
+
+export const entities = [DataArchive]
+export const resolvers = [DataArchiveQuery, DataArchiveMutation]

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

@@ -180,7 +180,7 @@ export class DataSetMutation {
     const originals = await dataSetRepo.find({
       where: {
         id: In(ids),
-        domain
+        domain: { id: domain.id }
       },
       relations: ['domain', 'supervisoryRole', 'entryRole', 'dataKeySet']
     })

package/server/service/index.ts

@@ -9,6 +9,7 @@ import {
   subscribers as DataSetHistorySubscribers
 } from './data-set-history'
 import { entities as DataSpecEntities, resolvers as DataSpecResolvers } from './data-spec'
+import { entities as DataArchiveEntities, resolvers as DataArchiveResolvers } from './data-archive'
 
 /* EXPORT ENTITY TYPES */
 export * from './data-key-set/data-key-set'
@@ -28,7 +29,8 @@ export const entities = [
   ...DataSampleEntities,
   ...DataSetEntities,
   ...DataSetHistoryEntities,
-  ...DataSpecEntities
+  ...DataSpecEntities,
+  ...DataArchiveEntities
 ]
 
 export const subscribers = [
@@ -45,6 +47,7 @@ export const schema = {
     ...DataSampleResolvers,
     ...DataSetResolvers,
     ...DataSetHistoryResolvers,
-    ...DataSpecResolvers
+    ...DataSpecResolvers,
+    ...DataArchiveResolvers
   ]
 }

package/server/utils/config-resolver.ts

@@ -0,0 +1,29 @@
+
+export function getEndpointUrl(endpoint:any, subpath:string=''):string {
+    const { url='', protocol='http', host='', port=80 } = endpoint
+    
+    let _url = ''
+    let _protocol = protocol
+
+    if (url) {
+        _url = url
+    } else {
+        const hosts = host.split('://')
+        // host에 protocol을 포함한 경우
+        if (hosts.length == 2) {
+            const _host = hosts[1]
+            _protocol = hosts[0]
+            // host에 port를 포함한 경우
+            const _hosts = _host.split(':')
+            if (_hosts.length > 1) {
+                _url = `${_hosts[0]}:${_hosts[1]}`
+            } else {
+                _url = `${_host}:${port}`
+            }
+        } else if (hosts.length == 1) { 
+            _url = `${host}:${port}`
+        }
+    }
+
+    return _protocol + '://' + _url.split('/').concat(subpath.split('/')).filter(x=>x).join('/')
+}

package/server/utils/index.ts

@@ -0,0 +1 @@
+export * from './config-resolver'

package/things-factory.config.js

@@ -36,6 +36,10 @@ export default {
       tagname: 'data-report-samples-page',
       page: 'data-report-samples'
     },
+    {
+      tagname: 'data-archive-list-page',
+      page: 'data-archive-list'
+    },
     // {
     //   tagname: 'jasper-report-samples-page',
     //   page: 'jasper-report-samples'

package/translations/en.json

@@ -1,5 +1,6 @@
 {
   "button.corrected": "corrected",
+  "button.request": "request",
   "button.reviewed": "reviewed",
   "field.appliance": "appliance",
   "field.collected_at": "collected at",
@@ -12,6 +13,7 @@
   "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
+  "field.download-url": "download url",
   "field.entry-role": "entry role",
   "field.entry-type": "entry type",
   "field.entry-view": "entry view",
@@ -37,6 +39,7 @@
   "field.report-template": "report template",
   "field.report-type": "report type",
   "field.report-view": "report view",
+  "field.request-params": "request parameters",
   "field.serial-no": "serial #",
   "field.spec": "spec",
   "field.status": "status",
@@ -49,28 +52,40 @@
   "field.work-shift": "work shift",
   "label.acceptables": "acceptables",
   "label.critical-limits": "critical limits",
+  "label.data-set-type": "type",
+  "label.end-date": "end date",
   "label.minimum value": "minimum value",
   "label.maximum value": "maximum value",
   "label.pass-limits": "pass limits",
+  "label.start-date": "start date",
   "label.target-limits": "target limits",
   "text.automatically collected": "automatically collected",
+  "text.data-archive request failed": "data archive request is failed",
+  "text.data-archive waits": "It'll take few minutes, You can find a push message when ready",
   "text.data sample created successfully": "a data sample created successfully",
   "text.data ooc updated successfully": "a data ooc updated successfully",
   "text.manually collected": "manually collected",
+  "text.presigned_url_created": "a presigned url of archive is created",
+  "title.data-archive downloads ready": "data archive download ready",
+  "title.data-archive request failed": "failed a data archive request",
+  "title.data-archive list": "data archive list",
+  "title.data-archive request popup": "data archive request",
   "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-report samples": "samples data report",
   "title.data-ooc list": "data OOC list",
   "title.data-ooc view": "data OOC view",
+  "title.data-report list": "data report list",
+  "title.data-report-view": "data report view",
+  "title.data-report samples": "samples data report",
   "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",
-  "title.edit code": "edit code"
+  "title.edit code": "edit code",
+  "title.ready": "ready"
 }

package/translations/ko.json

@@ -1,6 +1,7 @@
 {
   "button.corrected": "조치완료",
   "button.reviewed": "검토완료",
+  "button.request": "요청",
   "field.appliance": "어플라이언스",
   "field.collected_at": "수집일시",
   "field.corrected-at": "조치 시간",
@@ -12,6 +13,7 @@
   "field.data-key": "데이타 키",
   "field.data-key-set": "데이타 키셋",
   "field.device-id": "디바이스 아이디",
+  "field.download-url": "다운로드 주소",
   "field.entry-role": "입력담당 역할",
   "field.entry-type": "입력용 화면종류",
   "field.entry-view": "입력용 화면",
@@ -37,6 +39,7 @@
   "field.report-template": "리포트용 템플릿",
   "field.report-type": "리포트용 화면종류",
   "field.report-view": "리포트용 화면",
+  "field.request-params": "요청 매개변수",
   "field.serial-no": "시리얼번호",
   "field.spec": "명세",
   "field.status": "상태",
@@ -49,14 +52,23 @@
   "field.work-shift": "교대근무조",
   "label.acceptables": "허용값",
   "label.critical-limits": "허용 한계범위",
+  "label.data-set-type": "유형",
+  "label.end-date": "종료일",
   "label.minimum value": "최소값",
   "label.maximum value": "최대값",
   "label.pass-limits": "통과 허용범위",
+  "label.start-date": "시작일",
   "label.target-limits": "관리 목표범위",
   "text.automatically collected": "자동 수집",
+  "text.data-archive request failed": "아카이브 다운로드 요청 실패",
+  "text.data-archive waits": "시간이 수 분 소요될 수 있습니다. 가능한 시점에 푸시 메시지로 알려드립니다.",
   "text.data ooc updated successfully": "이탈데이타 내용이 수정되었습니다",
   "text.data sample created successfully": "데이타 샘플이 성공적으로 생성되었습니다",
   "text.manually collected": "수동 수집",
+  "title.data-archive downloads ready": "아카이브 다운로드 가능",
+  "title.data-archive request failed": "아카이브 요청 실패",
+  "title.data-archive list": "아카이브 조회",
+  "title.data-archive request popup": "아카이브 요청",
   "title.data-entry-form": "데이타 입력",
   "title.data-key-item list": "데이타 키 상세",
   "title.data-key-set list": "데이타 키셋 조회",
@@ -64,6 +76,7 @@
   "title.data-monitor-view": "데이타 모니터",
   "title.data-ooc list": "데이타 이탈점 조회",
   "title.data-ooc view": "데이타 이탈점 상세",
+  "title.data-report list": "데이타 리포트 조회",
   "title.data-report-view": "데이타 리포트",
   "title.data-report samples": "샘플 데이타 리포트",
   "title.data-sample list": "데이타 샘플 조회",
@@ -71,5 +84,6 @@
   "title.data-sample view": "데이타 샘플 상세",
   "title.data-sensor list": "데이타 센서 조회",
   "title.data-set list": "데이타 셋 조회",
-  "title.edit code": "코드 편집"
+  "title.edit code": "코드 편집",
+  "title.ready": "준비 중"
 }

package/translations/ms.json

@@ -48,6 +48,7 @@
   "field.work-shift": "work shift",
   "label.acceptables": "acceptables",
   "label.critical-limits": "critical limits",
+  "label.data-set-type": "type",
   "label.minimum value": "minimum value",
   "label.maximum value": "maximum value",
   "label.pass-limits": "pass limits",

package/translations/zh.json

@@ -48,6 +48,7 @@
   "field.work-shift": "work shift",
   "label.acceptables": "acceptables",
   "label.critical-limits": "critical limits",
+  "label.data-set-type": "type",
   "label.minimum value": "minimum value",
   "label.maximum value": "maximum value",
   "label.pass-limits": "pass limits",