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,45 @@
+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;
+
+    @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)
+    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,22 @@
+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("MetaInfraTypeService")
+public class MetaHistoryTypeService {
+
+    @Autowired
+    private MetaHistoryTypeDAO hisotyTypeDAO;
+
+    public List<MetaHistoryType> readAll() {
+        return this.hisotyTypeDAO.findAll();
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.loafle.overflow.module.meta.service;
+
+import com.loafle.overflow.module.meta.model.MetaHistoryType;
+import com.loafle.overflow.spring.AppConfigTest;
+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.List;
+
+/**
+ * Created by snoop on 17. 7. 27.
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = {AppConfigTest.class})
+public class MetaHistoryTypeServiceTest {
+
+    @Autowired
+    private MetaHistoryTypeService historyTypeService;
+
+    @Test
+    public void readAll() throws Exception {
+
+        List<MetaHistoryType> historyTypes = this.historyTypeService.readAll();
+
+    }
+
+}