From 9cf05c3547d2f98b0835bc40b47082388ce884a8 Mon Sep 17 00:00:00 2001 From: snoop Date: Thu, 26 Apr 2018 18:23:25 +0900 Subject: [PATCH] fixed modes java -> ts --- src/model/apikey/ApiKey.ts | 9 +++++++++ src/model/auth/AuthCrawler.ts | 10 ++++++++++ src/model/discovery/CryptoType.ts | 3 +++ src/model/discovery/DiscoverHost.ts | 14 ++++++++++++++ src/model/discovery/DiscoverPort.ts | 10 ++++++++++ src/model/discovery/DiscoverService.ts | 3 +++ src/model/discovery/DiscoverZone.ts | 6 ++++++ src/model/discovery/DiscoveryHost.ts | 10 ---------- src/model/discovery/DiscoveryPort.ts | 11 ----------- src/model/discovery/DiscoveryService.ts | 3 --- src/model/discovery/DiscoveryStartInfo.ts | 14 +++++++------- src/model/discovery/DiscoveryZone.ts | 7 ------- src/model/discovery/Host.ts | 11 ++++++----- src/model/discovery/Port.ts | 10 +++++----- src/model/discovery/Service.ts | 11 ++++++----- src/model/discovery/Zone.ts | 3 ++- src/model/discovery/index.ts | 8 ++++---- src/model/domain/Domain.ts | 3 ++- src/model/domain/DomainMember.ts | 8 ++++---- src/model/email/EmailAuth.ts | 9 +++++++++ src/model/history/History.ts | 14 ++++++++++++++ src/model/infra/Infra.ts | 12 ++++++++++-- src/model/infra/InfraHost.ts | 17 ++++++++++++----- src/model/infra/InfraMachine.ts | 8 ++++++-- src/model/infra/InfraOS.ts | 13 ++++++++++--- src/model/infra/InfraOSApplication.ts | 11 ++++++++--- src/model/infra/InfraOSDaemon.ts | 12 +++++++++--- src/model/infra/InfraOSPort.ts | 14 +++++++++++--- src/model/infra/InfraService.ts | 14 +++++++++++--- src/model/member/Member.ts | 19 ++++++++++++++++--- src/model/member/MemberTotp.ts | 16 +++++++++++++--- .../MetaCrawlerInputItem.ts | 16 +++++++++++++++- src/model/meta/crawler/MetaCrawler.ts | 8 +++++++- .../meta/history-type/MetaHistoryType.ts | 12 +++++++++--- src/model/meta/infra-type/MetaInfraType.ts | 7 +++++++ .../meta/infra-vendor/MetaInfraVendor.ts | 8 ++++++++ src/model/meta/input-type/MetaInputType.ts | 13 ++++++++++--- .../meta/member-status/MetaMemberStatus.ts | 9 +++++++-- .../MetaNoAuthProbeStatus.ts | 7 ++++++- .../meta/notification/MetaNotification.ts | 17 +++++++++++++---- .../MetaProbeArchitecture.ts | 10 ++++++++-- src/model/meta/probe-os/MetaProbeOs.ts | 10 ++++++++-- .../meta/probe-package/MetaProbePackage.ts | 19 ++++++++++++++----- .../meta/probe-status/MetaProbeStatus.ts | 10 ++++++++-- 44 files changed, 340 insertions(+), 119 deletions(-) create mode 100644 src/model/apikey/ApiKey.ts create mode 100644 src/model/auth/AuthCrawler.ts create mode 100644 src/model/discovery/CryptoType.ts create mode 100644 src/model/discovery/DiscoverHost.ts create mode 100644 src/model/discovery/DiscoverPort.ts create mode 100644 src/model/discovery/DiscoverService.ts create mode 100644 src/model/discovery/DiscoverZone.ts delete mode 100644 src/model/discovery/DiscoveryHost.ts delete mode 100644 src/model/discovery/DiscoveryPort.ts delete mode 100644 src/model/discovery/DiscoveryService.ts delete mode 100644 src/model/discovery/DiscoveryZone.ts create mode 100644 src/model/email/EmailAuth.ts create mode 100644 src/model/history/History.ts diff --git a/src/model/apikey/ApiKey.ts b/src/model/apikey/ApiKey.ts new file mode 100644 index 0000000..62c771a --- /dev/null +++ b/src/model/apikey/ApiKey.ts @@ -0,0 +1,9 @@ +import { Domain } from "model/domain"; + + +export interface ApiKey { + id?: number; + apiKey?: string; + createDate?: Date; + domain?: Domain; +} \ No newline at end of file diff --git a/src/model/auth/AuthCrawler.ts b/src/model/auth/AuthCrawler.ts new file mode 100644 index 0000000..768f2aa --- /dev/null +++ b/src/model/auth/AuthCrawler.ts @@ -0,0 +1,10 @@ +import { MetaCrawler } from "model/meta/crawler/MetaCrawler"; +import { Target } from "model/target"; + +export interface AuthCrawler { + id?: number; + crawler?: MetaCrawler; + target?: Target; + authJson?: string; + createDate?: Date; +} \ No newline at end of file diff --git a/src/model/discovery/CryptoType.ts b/src/model/discovery/CryptoType.ts new file mode 100644 index 0000000..5061e16 --- /dev/null +++ b/src/model/discovery/CryptoType.ts @@ -0,0 +1,3 @@ + + +export type CryptoType = "TLS"; \ No newline at end of file diff --git a/src/model/discovery/DiscoverHost.ts b/src/model/discovery/DiscoverHost.ts new file mode 100644 index 0000000..f677528 --- /dev/null +++ b/src/model/discovery/DiscoverHost.ts @@ -0,0 +1,14 @@ +import { DiscoverPort } from "./DiscoverPort"; + + +export interface DiscoverHost { + firstScanRangev4?: string; + lastScanRangev4?: string; + excludeHostsv4?: string[]; + includeHostsv4?: string[]; + firstScanRangev6?: string; + lastScanRangev6?: string; + excludeHostsv6?: string[]; + includeHostsv6?: string[]; + discoverPort?: DiscoverPort; +} diff --git a/src/model/discovery/DiscoverPort.ts b/src/model/discovery/DiscoverPort.ts new file mode 100644 index 0000000..717826e --- /dev/null +++ b/src/model/discovery/DiscoverPort.ts @@ -0,0 +1,10 @@ +import { DiscoverService } from './DiscoverService'; + +export interface DiscoverPort { + firstScanRange?: number; + lastScanRange?: number; + excludePorts?: number[]; + includeTCP?: boolean; + includeUDP?: boolean; + discoverService?: DiscoverService; +} diff --git a/src/model/discovery/DiscoverService.ts b/src/model/discovery/DiscoverService.ts new file mode 100644 index 0000000..5ea77db --- /dev/null +++ b/src/model/discovery/DiscoverService.ts @@ -0,0 +1,3 @@ +export interface DiscoverService { + includeServices?: string[]; +} diff --git a/src/model/discovery/DiscoverZone.ts b/src/model/discovery/DiscoverZone.ts new file mode 100644 index 0000000..0959dec --- /dev/null +++ b/src/model/discovery/DiscoverZone.ts @@ -0,0 +1,6 @@ +import { DiscoverHost } from "./DiscoverHost"; + +export interface DiscoverZone { + excludePatterns?: string[]; + discoverHost?: DiscoverHost; +} \ No newline at end of file diff --git a/src/model/discovery/DiscoveryHost.ts b/src/model/discovery/DiscoveryHost.ts deleted file mode 100644 index a1dc3e4..0000000 --- a/src/model/discovery/DiscoveryHost.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { DiscoveryPort } from './DiscoveryPort'; - -export interface DiscoveryHost { - firstScanRange?: string; - lastScanRange?: string; - excludeHosts?: string[]; - includeHosts?: string[]; - - discoveryPort?: DiscoveryPort; -} diff --git a/src/model/discovery/DiscoveryPort.ts b/src/model/discovery/DiscoveryPort.ts deleted file mode 100644 index 90f5e79..0000000 --- a/src/model/discovery/DiscoveryPort.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { DiscoveryService } from './DiscoveryService'; - -export interface DiscoveryPort { - firstScanRange: number; - lastScanRange: number; - excludePorts: number[]; - includeTCP: boolean; - includeUDP: boolean; - - discoveryService?: DiscoveryService; -} diff --git a/src/model/discovery/DiscoveryService.ts b/src/model/discovery/DiscoveryService.ts deleted file mode 100644 index 96ffe70..0000000 --- a/src/model/discovery/DiscoveryService.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface DiscoveryService { - includeServices: string[]; -} diff --git a/src/model/discovery/DiscoveryStartInfo.ts b/src/model/discovery/DiscoveryStartInfo.ts index c294137..1e01439 100644 --- a/src/model/discovery/DiscoveryStartInfo.ts +++ b/src/model/discovery/DiscoveryStartInfo.ts @@ -1,11 +1,11 @@ - export interface DiscoveryStartInfo { - startIp: string; - endIP: string; - excludeIp?: string; + startIpv4?: string; + endIPv4?: string; + excludeIpv4?: string; + startIpv6?: string; + endIPv6?: string; + excludeIpv6?: string; startPort?: string; endPort?: string; - services?: Array; + services?: string[]; } - -// export default DiscoveryStartInfo; diff --git a/src/model/discovery/DiscoveryZone.ts b/src/model/discovery/DiscoveryZone.ts deleted file mode 100644 index 7a17f6a..0000000 --- a/src/model/discovery/DiscoveryZone.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { DiscoveryHost } from './DiscoveryHost'; - -export interface DiscoveryZone { - excludePatterns?: string[]; - - discoveryHost?: DiscoveryHost; -} diff --git a/src/model/discovery/Host.ts b/src/model/discovery/Host.ts index 15f72df..dd35fe1 100644 --- a/src/model/discovery/Host.ts +++ b/src/model/discovery/Host.ts @@ -3,13 +3,14 @@ import { Port } from './Port'; export interface Host { id?: number; - ip: string; - mac: number; - os: string; + ipv4?: string; + ipv6?: string; + mac?: string; + os?: string; discoveredDate?: Date; zone?: Zone; target?: boolean; - ports: Map | null; - portList: Port[] | null; + ports?: Map | null; + portList?: Port[] | null; } diff --git a/src/model/discovery/Port.ts b/src/model/discovery/Port.ts index a30a1dc..501557e 100644 --- a/src/model/discovery/Port.ts +++ b/src/model/discovery/Port.ts @@ -4,12 +4,12 @@ import { Service } from './Service'; export interface Port { id?: number; - portType: PortType; - portNumber: number; + portType?: PortType; + portNumber?: number; discoveredDate?: Date; - host: Host; + host?: Host; target?: boolean; - services: Map | null; - serviceList: Service[] | null; + services?: Map | null; + serviceList?: Service[] | null; } diff --git a/src/model/discovery/Service.ts b/src/model/discovery/Service.ts index a7f9cd4..66e9ba0 100644 --- a/src/model/discovery/Service.ts +++ b/src/model/discovery/Service.ts @@ -1,10 +1,11 @@ import { Port } from './Port'; +import { CryptoType } from './CryptoType'; export interface Service { - id: number; - cryptoType: string; - serviceName: string; + id?: number; + cryptoType?: CryptoType; + serviceName?: string; discoveredDate?: Date; - port: Port; + port?: Port; target?: boolean; -} +} \ No newline at end of file diff --git a/src/model/discovery/Zone.ts b/src/model/discovery/Zone.ts index 6eaa24b..7d4ba7a 100644 --- a/src/model/discovery/Zone.ts +++ b/src/model/discovery/Zone.ts @@ -3,7 +3,8 @@ import { Host } from './Host'; export interface Zone { id?: number; network?: string; - ip?: string; + ipv4?: string; + ipv6?: string; iface?: string; mac?: string; discoveredDate?: Date; diff --git a/src/model/discovery/index.ts b/src/model/discovery/index.ts index c2583d5..076d52a 100644 --- a/src/model/discovery/index.ts +++ b/src/model/discovery/index.ts @@ -1,7 +1,7 @@ -export * from './DiscoveryHost'; -export * from './DiscoveryPort'; -export * from './DiscoveryService'; -export * from './DiscoveryZone'; +export * from './DiscoverHost'; +export * from './DiscoverPort'; +export * from './DiscoverService'; +export * from './DiscoverZone'; export * from './DiscoveryStartInfo'; export * from './Host'; export * from './Port'; diff --git a/src/model/domain/Domain.ts b/src/model/domain/Domain.ts index 8571aa4..ea6f1e5 100644 --- a/src/model/domain/Domain.ts +++ b/src/model/domain/Domain.ts @@ -1,5 +1,6 @@ + export interface Domain { id?: number; name?: string; createDate?: Date; -} +} \ No newline at end of file diff --git a/src/model/domain/DomainMember.ts b/src/model/domain/DomainMember.ts index ab07b7b..582eddf 100644 --- a/src/model/domain/DomainMember.ts +++ b/src/model/domain/DomainMember.ts @@ -2,8 +2,8 @@ import { Domain } from './Domain'; import { Member } from 'model/member'; export interface DomainMember { - id: number; - createDate: Date; - member: Member; - domain: Domain; + id?: number; + createDate?: Date; + member?: Member; + domain?: Domain; } diff --git a/src/model/email/EmailAuth.ts b/src/model/email/EmailAuth.ts new file mode 100644 index 0000000..9f361fd --- /dev/null +++ b/src/model/email/EmailAuth.ts @@ -0,0 +1,9 @@ +import { Member } from "model/member"; + +export interface EmailAuth { + id?: number; + emailAuthKey?: string; + createDate?: Date; + authConfirmDate?: Date; + member?: Member; +} \ No newline at end of file diff --git a/src/model/history/History.ts b/src/model/history/History.ts new file mode 100644 index 0000000..951c8a5 --- /dev/null +++ b/src/model/history/History.ts @@ -0,0 +1,14 @@ +import { MetaHistoryType } from "model/meta/history-type/MetaHistoryType"; +import { Probe } from "model/probe"; +import { Member } from "model/member"; +import { Domain } from "model/domain"; + +export interface History { + id?: number; + createDate?: Date; + type?: MetaHistoryType; + message?: string; + probe?: Probe; + member?: Member; + domain?: Domain; +} diff --git a/src/model/infra/Infra.ts b/src/model/infra/Infra.ts index ef7baf2..8baece2 100644 --- a/src/model/infra/Infra.ts +++ b/src/model/infra/Infra.ts @@ -3,11 +3,19 @@ import { Probe } from 'model/probe'; import { Target } from 'model/target'; import { MetaInfraType } from 'model/meta/infra-type/MetaInfraType'; +// export interface Infra { +// id?: number; +// infraType?: MetaInfraType; +// childId?: number; +// createDate?: Date; +// probe?: Probe; +// target?: Target; +// } + export interface Infra { id?: number; infraType?: MetaInfraType; - childId?: number; createDate?: Date; probe?: Probe; target?: Target; -} +} \ No newline at end of file diff --git a/src/model/infra/InfraHost.ts b/src/model/infra/InfraHost.ts index 272fad7..5530f4f 100644 --- a/src/model/infra/InfraHost.ts +++ b/src/model/infra/InfraHost.ts @@ -1,10 +1,17 @@ import { InfraOS } from './InfraOS'; import { Infra } from './Infra'; +// export interface InfraHost extends Infra { +// // id?: number; +// os?: InfraOS; +// ip?: number; +// mac?: number; +// createDate?: Date; +// } + export interface InfraHost extends Infra { - // id?: number; os?: InfraOS; - ip?: number; - mac?: number; - createDate?: Date; -} + ipv4?: string; + ipv6?: string; + mac?: string; +} \ No newline at end of file diff --git a/src/model/infra/InfraMachine.ts b/src/model/infra/InfraMachine.ts index c12fc7c..24eb601 100644 --- a/src/model/infra/InfraMachine.ts +++ b/src/model/infra/InfraMachine.ts @@ -1,8 +1,12 @@ import { Infra } from './Infra'; +// export interface InfraMachine extends Infra { +// // id?: number; +// meta?: string; +// createDate?: Date; +// } + export interface InfraMachine extends Infra { - // id?: number; meta?: string; - createDate?: Date; } diff --git a/src/model/infra/InfraOS.ts b/src/model/infra/InfraOS.ts index 3f75f51..aec5f38 100644 --- a/src/model/infra/InfraOS.ts +++ b/src/model/infra/InfraOS.ts @@ -2,10 +2,17 @@ import { InfraMachine } from './InfraMachine'; import { Infra } from './Infra'; import { MetaInfraVendor } from 'model/meta/infra-vendor/MetaInfraVendor'; +// export interface InfraOS extends Infra { +// // id?: number; +// machine?: InfraMachine; +// meta?: string; +// createDate?: Date; +// vendor?: MetaInfraVendor; +// } + + export interface InfraOS extends Infra { - // id?: number; machine?: InfraMachine; meta?: string; - createDate?: Date; vendor?: MetaInfraVendor; -} +} \ No newline at end of file diff --git a/src/model/infra/InfraOSApplication.ts b/src/model/infra/InfraOSApplication.ts index 40a5a2a..c92f9e9 100644 --- a/src/model/infra/InfraOSApplication.ts +++ b/src/model/infra/InfraOSApplication.ts @@ -2,9 +2,14 @@ import { InfraOS } from './InfraOS'; import { Infra } from './Infra'; +// export interface InfraOSApplication extends Infra { +// // id?: number; +// os?: InfraOS; +// name?: string; +// createDate?: Date; +// } + export interface InfraOSApplication extends Infra { - // id?: number; os?: InfraOS; name?: string; - createDate?: Date; -} +} \ No newline at end of file diff --git a/src/model/infra/InfraOSDaemon.ts b/src/model/infra/InfraOSDaemon.ts index 8e4eeb8..9b2d292 100644 --- a/src/model/infra/InfraOSDaemon.ts +++ b/src/model/infra/InfraOSDaemon.ts @@ -1,9 +1,15 @@ import { InfraOS } from './InfraOS'; import { Infra } from './Infra'; +// export interface InfraOSDaemon extends Infra { +// // id?: number; +// os?: InfraOS; +// name?: string; +// createDate?: Date; +// } + + export interface InfraOSDaemon extends Infra { - // id?: number; os?: InfraOS; name?: string; - createDate?: Date; -} +} \ No newline at end of file diff --git a/src/model/infra/InfraOSPort.ts b/src/model/infra/InfraOSPort.ts index ea982f7..019d4c9 100644 --- a/src/model/infra/InfraOSPort.ts +++ b/src/model/infra/InfraOSPort.ts @@ -2,12 +2,20 @@ import { InfraOS } from './InfraOS'; import { Infra } from './Infra'; import { MetaInfraVendor } from 'model/meta/infra-vendor/MetaInfraVendor'; +// export interface InfraOSPort extends Infra { +// // id?: number; +// os?: InfraOS; +// createDate?: Date; +// port?: number; +// portType?: string; +// vendor?: MetaInfraVendor; +// tlsType?: boolean; +// } + export interface InfraOSPort extends Infra { - // id?: number; os?: InfraOS; - createDate?: Date; port?: number; portType?: string; vendor?: MetaInfraVendor; tlsType?: boolean; -} +} \ No newline at end of file diff --git a/src/model/infra/InfraService.ts b/src/model/infra/InfraService.ts index 84364bb..ba13c2e 100644 --- a/src/model/infra/InfraService.ts +++ b/src/model/infra/InfraService.ts @@ -2,12 +2,20 @@ import { InfraHost } from './InfraHost'; import { Infra } from './Infra'; import { MetaInfraVendor } from 'model/meta/infra-vendor/MetaInfraVendor'; +// export interface InfraService extends Infra { +// // id?: number; +// host?: InfraHost; +// portType?: string; +// port?: number; +// vendor?: MetaInfraVendor; +// createDate?: Date; +// tlsType?: boolean; +// } + export interface InfraService extends Infra { - // id?: number; host?: InfraHost; portType?: string; port?: number; vendor?: MetaInfraVendor; - createDate?: Date; tlsType?: boolean; -} +} \ No newline at end of file diff --git a/src/model/member/Member.ts b/src/model/member/Member.ts index fb0971b..195c37a 100644 --- a/src/model/member/Member.ts +++ b/src/model/member/Member.ts @@ -1,13 +1,26 @@ import { MetaMemberStatus } from 'model/meta/member-status/MetaMemberStatus'; +// export interface Member { +// id?: number; +// email?: string; +// password?: string; +// name?: string; +// phone?: string; +// companyName?: string; +// createDate?: Date; +// totpType?: boolean; +// status?: MetaMemberStatus; +// } + export interface Member { id?: number; email?: string; - password?: string; + pw?: string; name?: string; phone?: string; companyName?: string; createDate?: Date; - totpType?: boolean; status?: MetaMemberStatus; -} + signinFailCount?: number; + totpType?: boolean; +} \ No newline at end of file diff --git a/src/model/member/MemberTotp.ts b/src/model/member/MemberTotp.ts index 17fd054..e49b6ab 100644 --- a/src/model/member/MemberTotp.ts +++ b/src/model/member/MemberTotp.ts @@ -1,10 +1,20 @@ import { Member } from 'model/member'; +// export interface MemberTotp { +// id?: number; +// member: Member; +// secretCode?: string; +// createDate?: Date; +// updateDate?: Date; +// otpAuthUrl?: string; +// } + + export interface MemberTotp { id?: number; - member: Member; + member?: Member; secretCode?: string; createDate?: Date; updateDate?: Date; - otpAuthUrl?: string; -} + otpAuth?: string; +} \ No newline at end of file diff --git a/src/model/meta/crawler-input-item/MetaCrawlerInputItem.ts b/src/model/meta/crawler-input-item/MetaCrawlerInputItem.ts index 7e072fd..2ea5150 100644 --- a/src/model/meta/crawler-input-item/MetaCrawlerInputItem.ts +++ b/src/model/meta/crawler-input-item/MetaCrawlerInputItem.ts @@ -2,6 +2,20 @@ import { MetaInputType } from 'model/meta/input-type/MetaInputType'; import { MetaCrawler } from 'model/meta/crawler/MetaCrawler'; +// export interface MetaCrawlerInputItem { +// id?: number; +// inputType?: MetaInputType; +// crawler?: MetaCrawler; +// description?: string; +// name?: string; +// createDate?: Date; +// required?: boolean; +// defaultValue?: string; +// pattern?: string; +// keyName?: string; +// keyValue?: string; +// } + export interface MetaCrawlerInputItem { id?: number; inputType?: MetaInputType; @@ -14,4 +28,4 @@ export interface MetaCrawlerInputItem { pattern?: string; keyName?: string; keyValue?: string; -} +} \ No newline at end of file diff --git a/src/model/meta/crawler/MetaCrawler.ts b/src/model/meta/crawler/MetaCrawler.ts index 7467fad..70f5fc4 100644 --- a/src/model/meta/crawler/MetaCrawler.ts +++ b/src/model/meta/crawler/MetaCrawler.ts @@ -1,6 +1,12 @@ +// export interface MetaCrawler { +// id: number; +// createDate?: Date; +// name?: string; +// description?: string; +// } export interface MetaCrawler { - id: number; + id?: number; createDate?: Date; name?: string; description?: string; diff --git a/src/model/meta/history-type/MetaHistoryType.ts b/src/model/meta/history-type/MetaHistoryType.ts index 052b3cc..16ff747 100644 --- a/src/model/meta/history-type/MetaHistoryType.ts +++ b/src/model/meta/history-type/MetaHistoryType.ts @@ -1,7 +1,13 @@ +// export interface MetaHistoryType { +// id?: number; +// name?: string; +// createDate?: Date; +// } + export interface MetaHistoryType { - id?: number; - name?: string; - createDate?: Date; + id?: number; + name?: string; + createDate?: Date; } export enum MetaHistoryType_ID { diff --git a/src/model/meta/infra-type/MetaInfraType.ts b/src/model/meta/infra-type/MetaInfraType.ts index 7dea3a9..17fc2e7 100644 --- a/src/model/meta/infra-type/MetaInfraType.ts +++ b/src/model/meta/infra-type/MetaInfraType.ts @@ -1,9 +1,16 @@ +// export interface MetaInfraType { +// id?: number; +// name?: string; +// createDate?: Date; +// } + export interface MetaInfraType { id?: number; name?: string; createDate?: Date; } + export enum MetaInfraType_ID { MACHINE = 1, HOST = 2, diff --git a/src/model/meta/infra-vendor/MetaInfraVendor.ts b/src/model/meta/infra-vendor/MetaInfraVendor.ts index 8202870..dde4b46 100644 --- a/src/model/meta/infra-vendor/MetaInfraVendor.ts +++ b/src/model/meta/infra-vendor/MetaInfraVendor.ts @@ -1,6 +1,13 @@ import { MetaInfraType } from 'model/meta/infra-type/MetaInfraType'; +// export interface MetaInfraVendor { +// id?: number; +// name?: string; +// createDate?: Date; +// infraType?: MetaInfraType; +// } + export interface MetaInfraVendor { id?: number; name?: string; @@ -8,6 +15,7 @@ export interface MetaInfraVendor { infraType?: MetaInfraType; } + export enum MetaInfraVendor_Machine_ID { APPLE = 1, MICROSOFT = 2, diff --git a/src/model/meta/input-type/MetaInputType.ts b/src/model/meta/input-type/MetaInputType.ts index 83a028b..0a00fc9 100644 --- a/src/model/meta/input-type/MetaInputType.ts +++ b/src/model/meta/input-type/MetaInputType.ts @@ -1,8 +1,15 @@ +// export interface MetaInputType { +// id?: number; +// name: string; +// description: string; +// createDate: Date; +// } + export interface MetaInputType { id?: number; - name: string; - description: string; - createDate: Date; + name?: string; + description?: string; + createDate?: Date; } export enum MetaInputType_ID { diff --git a/src/model/meta/member-status/MetaMemberStatus.ts b/src/model/meta/member-status/MetaMemberStatus.ts index 6022652..69f5138 100644 --- a/src/model/meta/member-status/MetaMemberStatus.ts +++ b/src/model/meta/member-status/MetaMemberStatus.ts @@ -1,6 +1,11 @@ +// export interface MetaMemberStatus { +// id: number; +// name: string; +// } + export interface MetaMemberStatus { - id: number; - name: string; + id?: number; + name?: string; } export enum MetaMemberStatus_ID { diff --git a/src/model/meta/noauth-probe-status/MetaNoAuthProbeStatus.ts b/src/model/meta/noauth-probe-status/MetaNoAuthProbeStatus.ts index 45a6c86..4cf7c41 100644 --- a/src/model/meta/noauth-probe-status/MetaNoAuthProbeStatus.ts +++ b/src/model/meta/noauth-probe-status/MetaNoAuthProbeStatus.ts @@ -1,7 +1,12 @@ +// export interface MetaNoAuthProbeStatus { +// id?: number; +// name: string; +// } + export interface MetaNoAuthProbeStatus { id?: number; - name: string; + name?: string; } export enum MetaNoAuthProbeStatus_ID { diff --git a/src/model/meta/notification/MetaNotification.ts b/src/model/meta/notification/MetaNotification.ts index 3b88346..10cb790 100644 --- a/src/model/meta/notification/MetaNotification.ts +++ b/src/model/meta/notification/MetaNotification.ts @@ -1,7 +1,16 @@ +// export interface MetaNotification { +// id?: number; +// createDate: Date; +// name: string; +// description: string; +// } + + + export interface MetaNotification { id?: number; - createDate: Date; - name: string; - description: string; -} + createDate?: Date; + name?: string; + description?: string; +} \ No newline at end of file diff --git a/src/model/meta/probe-architecture/MetaProbeArchitecture.ts b/src/model/meta/probe-architecture/MetaProbeArchitecture.ts index 1e0e45b..27b960c 100644 --- a/src/model/meta/probe-architecture/MetaProbeArchitecture.ts +++ b/src/model/meta/probe-architecture/MetaProbeArchitecture.ts @@ -1,8 +1,14 @@ +// export interface MetaProbeArchitecture { +// id?: number; +// architecture: string; +// createDate: Date; +// } + export interface MetaProbeArchitecture { id?: number; - architecture: string; - createDate: Date; + architecture?: string; + createDate?: Date; } export enum MetaProbeArchitecture_ID { diff --git a/src/model/meta/probe-os/MetaProbeOs.ts b/src/model/meta/probe-os/MetaProbeOs.ts index 2d8958f..ac7baff 100644 --- a/src/model/meta/probe-os/MetaProbeOs.ts +++ b/src/model/meta/probe-os/MetaProbeOs.ts @@ -1,8 +1,14 @@ +// export interface MetaProbeOs { +// id?: number; +// name: string; +// createDate: Date; +// } + export interface MetaProbeOs { id?: number; - name: string; - createDate: Date; + name?: string; + createDate?: Date; } export enum MetaProbeOs_ID { diff --git a/src/model/meta/probe-package/MetaProbePackage.ts b/src/model/meta/probe-package/MetaProbePackage.ts index c7e752d..2b88ddd 100644 --- a/src/model/meta/probe-package/MetaProbePackage.ts +++ b/src/model/meta/probe-package/MetaProbePackage.ts @@ -2,10 +2,19 @@ import { MetaProbeVersion } from 'model/meta/probe-version/MetaProbeVersion'; import { MetaProbeOs } from 'model/meta/probe-os/MetaProbeOs'; import { MetaProbeArchitecture } from 'model/meta/probe-architecture/MetaProbeArchitecture'; +// export interface MetaProbePackage { +// id?: number; +// version: MetaProbeVersion; +// os: MetaProbeOs; +// architecture: MetaProbeArchitecture; +// createDate: Date; +// } + + export interface MetaProbePackage { id?: number; - version: MetaProbeVersion; - os: MetaProbeOs; - architecture: MetaProbeArchitecture; - createDate: Date; -} + version?: MetaProbeVersion; + os?: MetaProbeOs; + architecture?: MetaProbeArchitecture; + createDate?: Date; +} \ No newline at end of file diff --git a/src/model/meta/probe-status/MetaProbeStatus.ts b/src/model/meta/probe-status/MetaProbeStatus.ts index dccffbb..017ab2b 100644 --- a/src/model/meta/probe-status/MetaProbeStatus.ts +++ b/src/model/meta/probe-status/MetaProbeStatus.ts @@ -1,9 +1,15 @@ +// export interface MetaProbeStatus { +// id: number; +// name: string; +// } + export interface MetaProbeStatus { - id: number; - name: string; + id?: number; + name?: string; } + export enum MetaProbeStatus_ID { INITIAL = 1, NORMAL = 2,