From bd705e96163f938724dd22ef4c0eb93b76ac7d81 Mon Sep 17 00:00:00 2001 From: snoop Date: Mon, 5 Jun 2017 15:10:10 +0900 Subject: [PATCH 1/2] added target service --- proxy/target/target_service.go | 62 +++++++++++++++++++++++++++++ proxy/target/target_service_test.go | 52 ++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 proxy/target/target_service.go create mode 100644 proxy/target/target_service_test.go diff --git a/proxy/target/target_service.go b/proxy/target/target_service.go new file mode 100644 index 0000000..071c4be --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/proxy/target/target_service_test.go b/proxy/target/target_service_test.go new file mode 100644 index 0000000..5814acd --- /dev/null +++ b/proxy/target/target_service_test.go @@ -0,0 +1,52 @@ +package target + +import ( + "testing" + //"git.loafle.net/overflow/overflow_proxy_service/proxy/member" + "encoding/json" + + "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 TestMashal(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"}, + } + + + + + bytes, _ := json.Marshal(tt) + + t.Log(string(bytes)) + +} + From 82d717c79a52bc21402743adf67e01401507456c Mon Sep 17 00:00:00 2001 From: snoop Date: Mon, 5 Jun 2017 15:37:35 +0900 Subject: [PATCH 2/2] added target service test --- proxy/target/target_service_test.go | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/proxy/target/target_service_test.go b/proxy/target/target_service_test.go index 5814acd..c949e12 100644 --- a/proxy/target/target_service_test.go +++ b/proxy/target/target_service_test.go @@ -3,7 +3,7 @@ package target import ( "testing" //"git.loafle.net/overflow/overflow_proxy_service/proxy/member" - "encoding/json" + "git.loafle.net/overflow/overflow_proxy_service/proxy/member" ) @@ -29,24 +29,15 @@ func TestCreateTarget(t *testing.T) { } -func TestMashal(t *testing.T){ +func TestFindAll(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() - - bytes, _ := json.Marshal(tt) - - t.Log(string(bytes)) - + str := ts.List(&tt) + t.Log(str) } -