Merge remote-tracking branch 'origin/master'

proxy/target/target_service.go

@@ -0,0 +1,62 @@
+package target
+
+import (
+	"encoding/json"
+	"git.loafle.net/overflow/commons_go/model/timestamp"
+	"git.loafle.net/overflow/overflow_proxy_service/proxy/member"
+	"git.loafle.net/overflow/overflow_proxy_service/proxy"
+)
+
+type Target struct {
+	Id json.Number 		`json:"id,Number,omitempty"`
+	Ip int64		`json:"ip,omitempty"`
+	Port int		`json:"port,omitempty"`
+	TargetType string	`json:"targetType,omitempty"`
+	VendorName	string	`json:"vendorName,omitempty"`
+	Kinds	string		`json:"kinds,omitempty"`
+	Version string		`json:"version,omitempty"`
+	CreateDate timestamp.Timestamp	`json:"createDate,omitempty"`
+	Member *member.MemberService	`json:"member,omitempty"`
+}
+
+type TargetService struct {
+
+}
+
+func NewTargetService() *TargetService {
+	return &TargetService{}
+}
+
+func (t *TargetService)List(tm *Target) string {
+
+	bytes, err := json.Marshal(tm)
+
+	if err != nil {
+		return ""
+	}
+
+	m := make(map[string]string)
+	m["com.loafle.overflow.target.model.Target"] = string(bytes)
+
+	out := proxy.InvokeDB("target", "findAll", m)
+
+
+	return out;
+}
+
+func (t *TargetService)Create(tm *Target) string {
+
+	bytes, err := json.Marshal(tm)
+
+	if err != nil {
+		return ""
+	}
+
+	m := make(map[string]string)
+	m["com.loafle.overflow.target.model.Target"] = string(bytes)
+
+	out := proxy.InvokeDB("target", "create", m)
+
+
+	return out;
+}

proxy/target/target_service_test.go

@@ -0,0 +1,43 @@
+package target
+
+import (
+	"testing"
+	//"git.loafle.net/overflow/overflow_proxy_service/proxy/member"
+
+
+	"git.loafle.net/overflow/overflow_proxy_service/proxy/member"
+)
+
+func TestCreateTarget(t *testing.T) {
+
+
+	tt := Target{
+		Ip:3232235882,
+		Port:5432,
+		TargetType:"DATABASE",
+		Kinds:"PostgreSQL",
+		Version:"9.5.0",
+		VendorName:"PostgreSQL 9.5.0",
+		Member:&member.MemberService{Id:"1"},
+	}
+
+	ts := NewTargetService()
+
+
+	ts.Create(&tt)
+
+
+}
+
+
+func TestFindAll(t *testing.T) {
+	tt := Target{
+		Member:&member.MemberService{Id:"1"},
+	}
+
+	ts := NewTargetService()
+
+
+	str := ts.List(&tt)
+	t.Log(str)
+}