ing

src/core/model/Page.ts

@@ -1,11 +1,11 @@
 export interface Page<T> {
-	content: T[];
-	first: boolean;
-	last: boolean;
-	number: number;
-	numberOfElements: number;
-	size: number;
-	sort: any;
-	totalElements: number;
-	totalPages: number;
+  content: T[];
+  first: boolean;
+  last: boolean;
+  number: number;
+  numberOfElements: number;
+  size: number;
+  sort: any;
+  totalElements: number;
+  totalPages: number;
 }

src/model/discovery/DiscoverHost.ts

@@ -1,13 +1,12 @@
 import { DiscoverPort } from "./DiscoverPort";
+import { MetaIPType } from "../meta";
 
 export interface DiscoverHost {
-  firstScanRangev4?: string;
-  lastScanRangev4?: string;
-  excludeHostsv4?: string[];
-  includeHostsv4?: string[];
-  firstScanRangev6?: string;
-  lastScanRangev6?: string;
-  excludeHostsv6?: string[];
-  includeHostsv6?: string[];
+  metaIPType?: MetaIPType;
+
+  firstScanRange?: string;
+  lastScanRange?: string;
+  excludeHosts?: string[];
+  includeHosts?: string[];
   discoverPort?: DiscoverPort;
 }

src/model/discovery/Host.ts

@@ -1,11 +1,14 @@
 import { Zone } from './Zone';
 import { Port } from './Port';
+import { MetaIPType } from '../meta';
 
 export interface Host {
-  metaIPTypeKey?: string;
+  metaIPType?: MetaIPType;
   address?: string;
   mac?: string;
-  discoveredDate?: Date;
+
   zone?: Zone;
   portList?: Port[];
+
+  discoveredDate?: Date;
 }

src/model/discovery/Port.ts

@@ -1,10 +1,12 @@
 import { Host } from './Host';
 import { Service } from './Service';
+import { MetaPortType } from '../meta';
 
 export interface Port {
-  metaPortTypeKey?: string;
+  metaPortType?: MetaPortType;
   portNumber?: number;
   discoveredDate?: Date;
+
   host?: Host;
   serviceList?: Service[];
 }

src/model/discovery/Service.ts

@@ -1,8 +1,11 @@
 import { Port } from './Port';
+import { MetaCryptoType } from '../meta';
 
 export interface Service {
-  metaCryptoTypeKey?: string;
+  metaCryptoType?: MetaCryptoType;
   name?: string;
-  discoveredDate?: Date;
+
   port?: Port;
+
+  discoveredDate?: Date;
 }

src/model/discovery/Zone.ts

@@ -1,10 +1,12 @@
 import { Host } from './Host';
+import { MetaIPType } from '../meta';
 
 export interface Zone {
   network?: string;
   iface?: string;
-  metaIPTypeKey?: string;
+  metaIPType?: MetaIPType;
   address?: string;
   mac?: string;
+
   discoveredDate?: Date;
 }

src/model/domain/DomainMember.ts

@@ -3,7 +3,7 @@ import { Member } from '../member';
 
 export interface DomainMember {
   id?: number;
-  createDate?: Date;
   member?: Member;
   domain?: Domain;
+  createDate?: Date;
 }

src/model/email/EmailAuth.ts

@@ -5,10 +5,10 @@ import { Domain } from '../domain';
 
 export interface EmailAuth {
   id?: number;
-  createDate?: Date;
   metaHistoryType?: MetaHistoryType;
   message?: string;
   probe?: Probe;
   member?: Member;
   domain?: Domain;
+  createDate?: Date;
 }

src/model/history/History.ts

@@ -5,10 +5,10 @@ import { Domain } from '../domain';
 
 export interface History {
   id?: number;
-  createDate?: Date;
   metaHistoryType?: MetaHistoryType;
   message?: string;
   probe?: Probe;
   member?: Member;
   domain?: Domain;
+  createDate?: Date;
 }

src/model/member/Member.ts

@@ -3,7 +3,7 @@ import { MetaMemberStatus } from '../meta';
 export interface Member {
   id?: number;
   email?: string;
-  pw?: string;
+  password?: string;
   name?: string;
   phone?: string;
   companyName?: string;

src/model/member/MemberTotp.ts

@@ -4,7 +4,7 @@ export interface MemberTotp {
   id?: number;
   member?: Member;
   secretCode?: string;
-  createDate?: Date;
   updateDate?: Date;
   otpAuth?: string;
+  createDate?: Date;
 }

src/model/meta/MetaCrawler.ts

@@ -2,6 +2,6 @@ export interface MetaCrawler {
   id?: number;
   key?: string;
   name?: string;
-  createDate?: Date;
   default?: boolean;
+  createDate?: Date;
 }

src/model/meta/MetaCryptoType.ts

@@ -4,3 +4,35 @@ export interface MetaCryptoType {
   key?: string;
   createDate?: Date;
 }
+
+export enum MetaCryptoTypeEnum {
+  NONE = 'NONE',
+  UNKNOWN = 'UNKNOWN',
+  AES = 'AES',
+  CIPHER = 'CIPHER',
+  DES = 'DES',
+  DSA = 'DSA',
+  ECDSA = 'ECDSA',
+  ELLIPTIC = 'ELLIPTIC',
+  HMAC = 'HMAC',
+  MD5 = 'MD5',
+  RAND = 'RAND',
+  RC4 = 'RC4',
+  RSA = 'RSA',
+  SHA1 = 'SHA1',
+  SHA256 = 'SHA256',
+  SUBTLE = 'SUBTLE',
+  TLS = 'TLS',
+  X509 = 'X509',
+  PKIX = 'PKIX',
+}
+
+export const toMetaCryptoTypeEnum = (v: MetaCryptoType): MetaCryptoTypeEnum => {
+  return MetaCryptoTypeEnum[v.key];
+}
+
+export const toMetaCryptoType = (v: MetaCryptoTypeEnum): MetaCryptoType => {
+  return {
+    key: v,
+  };
+}

src/model/meta/MetaEmailType.ts

@@ -6,6 +6,16 @@ export interface MetaEmailType {
 }
 
 export enum MetaEmailTypeEnum {
-  SIGNUP = 1,
-  RESET_PASSWORD = 2,
-}
+  SIGNUP = 'SIGNUP',
+  RESET_PASSWORD = 'RESET_PASSWORD',
+}
+
+export const toMetaEmailTypeEnum = (v: MetaEmailType): MetaEmailTypeEnum => {
+  return MetaEmailTypeEnum[v.key];
+}
+
+export const toMetaEmailType = (v: MetaEmailTypeEnum): MetaEmailType => {
+  return {
+    key: v,
+  };
+}

src/model/meta/MetaHistoryType.ts

@@ -5,3 +5,21 @@ export interface MetaHistoryType {
   createDate?: Date;
 }
 
+export enum MetaHistoryTypeEnum {
+  MEMBER = 'MEMBER',
+  PROBE = 'PROBE',
+  DISCOVERY = 'DISCOVERY',
+  TARGET = 'TARGET',
+  CRAWLER = 'CRAWLER',
+  SENSOR = 'SENSOR',
+}
+
+export const toMetaHistoryTypeEnum = (v: MetaHistoryType): MetaHistoryTypeEnum => {
+  return MetaHistoryTypeEnum[v.key];
+}
+
+export const toMetaHistoryType = (v: MetaHistoryTypeEnum): MetaHistoryType => {
+  return {
+    key: v,
+  };
+}

src/model/meta/MetaIPType.ts

@@ -6,6 +6,16 @@ export interface MetaIPType {
 }
 
 export enum MetaIPTypeEnum {
-  V4 = 1,
-  V6 = 2,
-}
+  V4 = 'V4',
+  V6 = 'V6',
+}
+
+export const toMetaIPTypeEnum = (v: MetaIPType): MetaIPTypeEnum => {
+  return MetaIPTypeEnum[v.key];
+}
+
+export const toMetaIPType = (v: MetaIPTypeEnum): MetaIPType => {
+  return {
+    key: v,
+  };
+}

src/model/meta/MetaInfraType.ts

@@ -6,7 +6,17 @@ export interface MetaInfraType {
 }
 
 export enum MetaInfraTypeEnum {
-  ZONE = 1,
-  HOST = 2,
-  SERVICE = 3,
-}
+  ZONE = 'ZONE',
+  HOST = 'HOST',
+  SERVICE = 'SERVICE',
+}
+
+export const toMetaInfraTypeEnum = (v: MetaInfraType): MetaInfraTypeEnum => {
+  return MetaInfraTypeEnum[v.key];
+}
+
+export const toMetaInfraType = (v: MetaInfraTypeEnum): MetaInfraType => {
+  return {
+    key: v,
+  };
+}

src/model/meta/MetaInputType.ts

@@ -1,7 +1,26 @@
 
 export interface MetaInputType {
   id?: number;
+  key?: string;
   name?: string;
-  description?: string;
   createDate?: Date;
 }
+
+export enum MetaInputTypeEnum {
+  TEXT = 'TEXT',
+  PASSWORD = 'PASSWORD',
+  NUMBER = 'NUMBER',
+  BOOLEAN = 'BOOLEAN',
+  SELECT = 'SELECT',
+}
+
+export const toMetaInputTypeEnum = (v: MetaInputType): MetaInputTypeEnum => {
+  return MetaInputTypeEnum[v.key];
+}
+
+export const toMetaInputType = (v: MetaInputTypeEnum): MetaInputType => {
+  return {
+    key: v,
+  };
+}
+

src/model/meta/MetaMemberStatus.ts

@@ -7,8 +7,18 @@ export interface MetaMemberStatus {
 }
 
 export enum MetaMemberStatusEnum {
-  NOAUTH = 1,
-  NORMAL = 2,
-  DORMANCY = 3,
-  WITHDRAWAL = 4,
+  NOAUTH = 'NOAUTH',
+  NORMAL = 'NORMAL',
+  DORMANCY = 'DORMANCY',
+  WITHDRAWAL = 'WITHDRAWAL',
+}
+
+export const toMetaMemberStatusEnum = (v: MetaMemberStatus): MetaMemberStatusEnum => {
+  return MetaMemberStatusEnum[v.key];
+}
+
+export const toMetaMemberStatus = (v: MetaMemberStatusEnum): MetaMemberStatus => {
+  return {
+    key: v,
+  };
 }

src/model/meta/MetaNoAuthProbeStatus.ts

@@ -7,7 +7,17 @@ export interface MetaNoAuthProbeStatus {
 }
 
 export enum MetaNoAuthProbeStatusEnum {
-  ACCEPTED = 1,
-  DENIED = 2,
-  PROCESSING = 3,
+  ACCEPTED = 'ACCEPTED',
+  DENIED = 'DENIED',
+  PROCESSING = 'PROCESSING',
+}
+
+export const toMetaNoAuthProbeStatusEnum = (v: MetaNoAuthProbeStatus): MetaNoAuthProbeStatusEnum => {
+  return MetaNoAuthProbeStatusEnum[v.key];
+}
+
+export const toMetaNoAuthProbeStatus = (v: MetaNoAuthProbeStatusEnum): MetaNoAuthProbeStatus => {
+  return {
+    key: v,
+  };
 }

src/model/meta/MetaPortType.ts

@@ -6,3 +6,18 @@ export interface MetaPortType {
   createDate?: Date;
 }
 
+
+export enum MetaPortTypeEnum {
+  TCP = 'TCP',
+  UDP = 'UDP',
+}
+
+export const toMetaPortTypeEnum = (v: MetaPortType): MetaPortTypeEnum => {
+  return MetaPortTypeEnum[v.key];
+}
+
+export const toMetaPortType = (v: MetaPortTypeEnum): MetaPortType => {
+  return {
+    key: v,
+  };
+}

src/model/meta/MetaProbeStatus.ts

@@ -7,6 +7,16 @@ export interface MetaProbeStatus {
 }
 
 export enum MetaProbeStatusEnum {
-  INITIAL = 1,
-  NORMAL = 2,
+  INITIAL = 'INITIAL',
+  NORMAL = 'NORMAL',
+}
+
+export const toMetaProbeStatusEnum = (v: MetaProbeStatus): MetaProbeStatusEnum => {
+  return MetaProbeStatusEnum[v.key];
+}
+
+export const toMetaProbeStatus = (v: MetaProbeStatusEnum): MetaProbeStatus => {
+  return {
+    key: v,
+  };
 }

src/model/meta/MetaTargetHostType.ts

@@ -3,6 +3,17 @@ import { MetaTargetType } from "./MetaTargetType";
 export interface MetaTargetHostType extends MetaTargetType {
 }
 
-export enum MetaTargetTypeEnum {
-  UNKNOWN = 100,
+export enum MetaTargetHostTypeEnum {
+  UNKNOWN = 'UNKNOWN',
 }
+
+export const toMetaTargetHostTypeEnum = (v: MetaTargetHostType): MetaTargetHostTypeEnum => {
+  return MetaTargetHostTypeEnum[v.key];
+}
+
+export const toMetaTargetHostType = (v: MetaTargetHostTypeEnum): MetaTargetHostType => {
+  return {
+    key: v,
+  };
+}
+

src/model/meta/MetaTargetServiceType.ts

@@ -3,6 +3,17 @@ import { MetaTargetType } from "./MetaTargetType";
 export interface MetaTargetServiceType extends MetaTargetType {
 }
 
-export enum MetaServiceTypeEnum {
-  UNKNOWN = 1000,
+export enum MetaTargetServiceTypeEnum {
+  UNKNOWN = 'UNKNOWN',
 }
+
+export const toMetaTargetServiceTypeEnum = (v: MetaTargetServiceType): MetaTargetServiceTypeEnum => {
+  return MetaTargetServiceTypeEnum[v.key];
+}
+
+export const toMetaTargetServiceType = (v: MetaTargetServiceTypeEnum): MetaTargetServiceType => {
+  return {
+    key: v,
+  };
+}
+

src/model/meta/MetaTargetStatus.ts

@@ -6,8 +6,18 @@ export interface MetaTargetStatus {
 }
 
 export enum MetaTargetStatusEnum {
-  UP = 1,
-  DOWN = 2,
-  WARN = 3,
-  ERROR = 4, 
+  UP = 'UP',
+  DOWN = 'DOWN',
+  WARN = 'WARN',
+  ERROR = 'ERROR',
+}
+
+export const toMetaTargetStatusEnum = (v: MetaTargetStatus): MetaTargetStatusEnum => {
+  return MetaTargetStatusEnum[v.key];
+}
+
+export const toMetaTargetStatus = (v: MetaTargetStatusEnum): MetaTargetStatus => {
+  return {
+    key: v,
+  };
 }

src/model/meta/MetaTargetZoneType.ts

@@ -4,6 +4,16 @@ export interface MetaTargetZoneType extends MetaTargetType {
 }
 
 export enum MetaTargetZoneTypeEnum {
-  UNKNOWN = 1,
-  ZONE = 2,
+  UNKNOWN = 'UNKNOWN',
+  ZONE = 'ZONE',
+}
+
+export const toMetaTargetZoneTypeEnum = (v: MetaTargetZoneType): MetaTargetZoneTypeEnum => {
+  return MetaTargetZoneTypeEnum[v.key];
+}
+
+export const toMetaTargetZoneType = (v: MetaTargetZoneTypeEnum): MetaTargetZoneType => {
+  return {
+    key: v,
+  };
 }

src/model/noauth/NoAuthProbeDescription.ts

@@ -1,6 +0,0 @@
-import { InfraHost, InfraZone } from "../infra";
-
-export interface NoAuthProbeDescription {
-  infraHost?: InfraHost;
-  infraZones?: InfraZone[];
-}

src/model/target/Target.ts

@@ -3,12 +3,12 @@ import { Infra } from '../infra';
 import { MetaTargetType } from '../meta';
 
 export interface Target {
-  id?:  number;
-  infra?:  Infra;
-  metaTargetType?:  MetaTargetType;
-  name?:  string;
-  description?:  string;
-  sensorCount?:  number;
-  createDate?:  Date;
-  sensors?:  Sensor[];
+  id?: number;
+  infra?: Infra;
+  metaTargetType?: MetaTargetType;
+  name?: string;
+  description?: string;
+  sensorCount?: number;
+  createDate?: Date;
+  sensors?: Sensor[];
 }