fixed modes java -> ts

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;
+}

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;
+}

src/model/discovery/CryptoType.ts

@@ -0,0 +1,3 @@
+
+
+export type CryptoType = "TLS";

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;
+}

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;
+}

src/model/discovery/DiscoverService.ts

@@ -0,0 +1,3 @@
+export interface DiscoverService {
+  includeServices?: string[];
+}

src/model/discovery/DiscoverZone.ts

@@ -0,0 +1,6 @@
+import { DiscoverHost } from "./DiscoverHost";
+
+export interface DiscoverZone {
+  excludePatterns?: string[];
+  discoverHost?: DiscoverHost;
+}

src/model/discovery/DiscoveryHost.ts

@@ -1,10 +0,0 @@
-import { DiscoveryPort } from './DiscoveryPort';
-
-export interface DiscoveryHost {
-  firstScanRange?: string;
-  lastScanRange?: string;
-  excludeHosts?: string[];
-  includeHosts?: string[];
-
-  discoveryPort?: DiscoveryPort;
-}

src/model/discovery/DiscoveryPort.ts

@@ -1,11 +0,0 @@
-import { DiscoveryService } from './DiscoveryService';
-
-export interface DiscoveryPort {
-  firstScanRange: number;
-  lastScanRange: number;
-  excludePorts: number[];
-  includeTCP: boolean;
-  includeUDP: boolean;
-
-  discoveryService?: DiscoveryService;
-}

src/model/discovery/DiscoveryService.ts

@@ -1,3 +0,0 @@
-export interface DiscoveryService {
-  includeServices: string[];
-}

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<string>;
+  services?: string[];
 }
-
-// export default DiscoveryStartInfo;

src/model/discovery/DiscoveryZone.ts

@@ -1,7 +0,0 @@
-import { DiscoveryHost } from './DiscoveryHost';
-
-export interface DiscoveryZone {
-  excludePatterns?: string[];
-
-  discoveryHost?: DiscoveryHost;
-}

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<number, Port> | null;
-    portList: Port[] | null;
+    ports?: Map<number, Port> | null;
+    portList?: Port[] | null;
 }

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<string, Service> | null;
-    serviceList: Service[] | null;
+    services?: Map<string, Service> | null;
+    serviceList?: Service[] | null;
 }

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;
-}
+}

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;

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';

src/model/domain/Domain.ts

@@ -1,5 +1,6 @@
+
 export interface Domain {
   id?: number;
   name?: string;
   createDate?: Date;
-}
+}

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;
 }

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;
+}

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;
+}

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;
-}
+}

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;
+}

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;
 }

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;
-}
+}

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;
-}
+}

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;
-}
+}

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;
-}
+}

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;
-}
+}

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;
+}

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;
+}

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;
-}
+}

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;

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 {

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,

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,

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 {

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 {

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 {

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;
+}

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 {

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 {

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;
+}

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,