Merge remote-tracking branch 'origin/master'

src/main/java/com/loafle/overflow/module/history/History.java

@@ -1,54 +0,0 @@
-package com.loafle.overflow.module.history;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * Created by root on 17. 6. 22.
- */
-@Entity
-@Table(name = "HISTORY", schema = "public")
-public class History {
-    private long id;
-    private Date createDate;
-
-    @Id
-    @GeneratedValue(strategy= GenerationType.IDENTITY)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "CREATE_DATE", nullable = false)
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        History that = (History) o;
-
-        if (id != that.id) return false;
-        if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = (int) (id ^ (id >>> 32));
-        result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
-        return result;
-    }
-}

src/main/java/com/loafle/overflow/module/history/dao/HistoryDAO.java

@@ -0,0 +1,13 @@
+package com.loafle.overflow.module.history.dao;
+
+import com.loafle.overflow.module.history.model.History;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by insanity on 17. 8. 23.
+ */
+@Repository
+public interface HistoryDAO extends JpaRepository<History, Long> {
+
+}

src/main/java/com/loafle/overflow/module/history/model/History.java

@@ -0,0 +1,104 @@
+package com.loafle.overflow.module.history.model;
+
+import com.loafle.overflow.module.member.model.Member;
+import com.loafle.overflow.module.meta.model.MetaHistoryType;
+import com.loafle.overflow.module.probe.model.Probe;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * Created by root on 17. 6. 22.
+ */
+@Entity
+@Table(name = "HISTORY", schema = "public")
+public class History {
+    private long id;
+    private Date createDate;
+    private MetaHistoryType type;
+    private String message;
+    private Probe probe;
+    private Member member;
+
+    //private MetaResultType resultType; // i'm not sure this is necessary
+
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "TYPE_ID", nullable = false)
+    public MetaHistoryType getType() {
+        return type;
+    }
+
+    public void setType(MetaHistoryType type) {
+        this.type = type;
+    }
+
+    @Column(name = "MESSAGE", nullable = false, length = 255)
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "PROBE_ID", nullable = false)
+    public Probe getProbe() {
+        return probe;
+    }
+
+    public void setProbe(Probe probe) {
+        this.probe = probe;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "Member_ID", nullable = false)
+    public Member getMember() {
+        return member;
+    }
+
+    public void setMember(Member member) {
+        this.member = member;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        History that = (History) o;
+
+        if (id != that.id) return false;
+        if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = (int) (id ^ (id >>> 32));
+        result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
+        return result;
+    }
+}

src/main/java/com/loafle/overflow/module/history/service/HistoryService.java

@@ -0,0 +1,9 @@
+package com.loafle.overflow.module.history.service;
+
+import org.springframework.stereotype.Service;
+
+@Service("HistoryService")
+public class HistoryService {
+
+
+}

src/main/java/com/loafle/overflow/module/meta/dao/MetaHistoryTypeDAO.java

@@ -0,0 +1,13 @@
+package com.loafle.overflow.module.meta.dao;
+
+import com.loafle.overflow.module.meta.model.MetaHistoryType;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by insanity on 17. 6. 23.
+ */
+@Repository
+public interface MetaHistoryTypeDAO extends JpaRepository<MetaHistoryType, Integer> {
+
+}

src/main/java/com/loafle/overflow/module/meta/model/MetaHistoryType.java

@@ -0,0 +1,53 @@
+package com.loafle.overflow.module.meta.model;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * Created by root on 17. 6. 22.
+ */
+@Entity
+@Table(name = "META_HISTORY_TYPE", schema = "public")
+public class MetaHistoryType {
+    private int id;
+    private String name;
+    private Date createDate;
+
+    public MetaHistoryType() {
+
+    }
+
+    public MetaHistoryType(int id) {
+        this.id = id;
+    }
+
+    @Id
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+
+    @Column(name = "NAME", nullable = true, length = 50)
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name="CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+}

src/main/java/com/loafle/overflow/module/meta/service/MetaHistoryTypeService.java

@@ -0,0 +1,30 @@
+package com.loafle.overflow.module.meta.service;
+
+import com.loafle.overflow.module.meta.dao.MetaHistoryTypeDAO;
+import com.loafle.overflow.module.meta.model.MetaHistoryType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by snoop on 17. 7. 27.
+ */
+@Service("MetaHistoryTypeService")
+public class MetaHistoryTypeService {
+
+    @Autowired
+    private MetaHistoryTypeDAO hisotyTypeDAO;
+
+    public List<MetaHistoryType> readAll() {
+        return this.hisotyTypeDAO.findAll();
+    }
+
+    public MetaHistoryType regist(MetaHistoryType type) {
+        return this.hisotyTypeDAO.save(type);
+    }
+
+    public List<MetaHistoryType> registAll(List<MetaHistoryType> types) {
+        return this.hisotyTypeDAO.save(types);
+    }
+}

src/main/java/com/loafle/overflow/module/probe/model/Probe.java

@@ -29,6 +29,14 @@ public class Probe {
     private Member authorizeMember;
 //    private InfraHost host;
 
+    public Probe() {
+
+    }
+
+    public Probe(long id) {
+        this.id = id;
+    }
+
     @Id
     @GeneratedValue(strategy= GenerationType.IDENTITY)
     public long getId() {

src/main/java/com/loafle/overflow/module/target/service/TargetDiscoveryService.java

@@ -95,16 +95,6 @@ public class TargetDiscoveryService {
 
             this.infraHostService.regist(infraHost);
 
-//            Infra infraByHost = Infra.CreateInfraByType(infraHost.getId(), InfraHost.class);
-//            this.infraDAO.save(infraByHost);
-
-//            if(host.isTarget()) {
-//                Target targetHost = new Target();
-////                targetHost.setInfra(infraByHost);
-////                targetHost.setProbe(probe);
-//                this.targetDAO.save(targetHost);
-//            }
-
             if(host.getPorts() == null) {
                 continue;
             }
@@ -126,9 +116,6 @@ public class TargetDiscoveryService {
                 infraOSPort.setVendor(MetaInfraVendor.CreateInfraVendorByPort(port.getPortNumber()));
                 this.infraOSPortService.regist(infraOSPort);
 
-//                Infra infraByPort = Infra.CreateInfraByType(infraOSPort.getId(), InfraOSPort.class);
-//                this.infraDAO.save(infraByPort);
-
                 if(port.getServices() == null) {
                     continue;
                 }
@@ -158,11 +145,6 @@ public class TargetDiscoveryService {
 
                     this.infraServiceService.regist(infraService);
 
-//                    Infra infraByService = Infra.CreateInfraByType(infraService.getId(), InfraService.class);
-//                    this.infraDAO.save(infraByService);
-
-
-
                 }
 
             }
@@ -171,4 +153,14 @@ public class TargetDiscoveryService {
         }
 
     }
+
+    private InfraHost createAndReadHost(Host host, Probe probe) {
+
+
+        return null;
+    }
+
+
+
+
 }

src/main/resources/init.sql

@@ -377,6 +377,22 @@ INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VAL
 INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
 31,'2017-07-27 15:29:48.634',24,63);
 
+INSERT INTO public.meta_history_type (id,create_date,"name") VALUES (
+1,'2017-08-23 13:28:26.966','Member');
+INSERT INTO public.meta_history_type (id,create_date,"name") VALUES (
+2,'2017-08-23 13:28:26.966','Probe');
+INSERT INTO public.meta_history_type (id,create_date,"name") VALUES (
+3,'2017-08-23 13:28:26.966','Discovery');
+INSERT INTO public.meta_history_type (id,create_date,"name") VALUES (
+4,'2017-08-23 13:28:26.966','Target');
+INSERT INTO public.meta_history_type (id,create_date,"name") VALUES (
+5,'2017-08-23 13:28:26.966','Crawler');
+INSERT INTO public.meta_history_type (id,create_date,"name") VALUES (
+6,'2017-08-23 13:28:26.966','Sensor');
+
+
+
+
 
 
 INSERT INTO public."member" (company_name,create_date,email,"name",phone,pw,status_id) VALUES (

src/test/java/com/loafle/overflow/module/history/service/HistoryServiceTest.java

@@ -0,0 +1,34 @@
+package com.loafle.overflow.module.history.service;
+
+import com.loafle.overflow.module.history.model.History;
+import com.loafle.overflow.module.member.model.Member;
+import com.loafle.overflow.module.probe.model.Probe;
+import com.loafle.overflow.spring.AppConfigTest;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Created by insanity on 17. 8. 23.
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = {AppConfigTest.class})
+public class HistoryServiceTest {
+
+    @Autowired
+    private HistoryService historyService;
+
+    @Test
+    @Ignore
+    public void registHistories() {
+        for (int i=0;i<600;i++) {
+            History h = new History();
+            h.setMember(new Member(1));
+            h.setProbe(new Probe(1));
+            //h.setType(new MetaHistoryType(typeId));
+        }
+    }
+}

src/test/java/com/loafle/overflow/module/meta/service/MetaHistoryTypeServiceTest.java

@@ -0,0 +1,74 @@
+package com.loafle.overflow.module.meta.service;
+
+import com.loafle.overflow.module.meta.model.MetaHistoryType;
+import com.loafle.overflow.spring.AppConfigTest;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by snoop on 17. 7. 27.
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = {AppConfigTest.class})
+@Ignore
+public class MetaHistoryTypeServiceTest {
+
+    @Autowired
+    private MetaHistoryTypeService historyTypeService;
+
+    @Test
+    public void readAll() throws Exception {
+        List<MetaHistoryType> historyTypes = this.historyTypeService.readAll();
+        Assert.assertNotNull(historyTypes);
+    }
+
+    @Test
+    public void save() throws Exception {
+        List<MetaHistoryType> list = new ArrayList<>();
+
+        MetaHistoryType t1 = new MetaHistoryType();
+        t1.setId(1);
+        t1.setName("Member");
+
+        MetaHistoryType t2 = new MetaHistoryType();
+        t2.setId(2);
+        t2.setName("Probe");
+
+        MetaHistoryType t3 = new MetaHistoryType();
+        t3.setId(3);
+        t3.setName("Discovery");
+
+        MetaHistoryType t4 = new MetaHistoryType();
+        t4.setId(4);
+        t4.setName("Target");
+
+        MetaHistoryType t5 = new MetaHistoryType();
+        t5.setId(5);
+        t5.setName("Crawler");
+
+        MetaHistoryType t6 = new MetaHistoryType();
+        t6.setId(6);
+        t6.setName("Sensor");
+
+        //todo: need more
+
+        list.add(t1);
+        list.add(t2);
+        list.add(t3);
+        list.add(t4);
+        list.add(t5);
+        list.add(t6);
+
+        List<MetaHistoryType> result = this.historyTypeService.registAll(list);
+        Assert.assertEquals(result.size(), list.size());
+    }
+
+}

src/test/java/com/loafle/overflow/module/meta/service/MetaInfraTypeServiceTest.java

@@ -3,6 +3,7 @@ package com.loafle.overflow.module.meta.service;
 import com.loafle.overflow.module.meta.model.MetaInfraType;
 import com.loafle.overflow.spring.AppConfigTest;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,13 +12,12 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import java.util.List;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by snoop on 17. 7. 27.
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = {AppConfigTest.class})
+@Ignore
 public class MetaInfraTypeServiceTest {
 
     @Autowired