From 992ee6dd3534684fb992b9ab6606b12f97ae0f52 Mon Sep 17 00:00:00 2001 From: snoop Date: Mon, 26 Jun 2017 14:59:41 +0900 Subject: [PATCH] added read --- proxy/probe/probe_service.go | 13 +++++++--- proxy/probe/probe_service_test.go | 43 ++++++++++++++++++++----------- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/proxy/probe/probe_service.go b/proxy/probe/probe_service.go index 07e698a..1cdf742 100644 --- a/proxy/probe/probe_service.go +++ b/proxy/probe/probe_service.go @@ -64,6 +64,13 @@ func (as *ProbeService) GetList(d *domain.Domain) (string, error) { return out, nil } -func (as *ProbeService) GetModel() interface{} { - return &Probe{} -} +func (as *ProbeService) ReadByProbeKey(probeKey string) (string, error) { + + out, err := utils.InvokeDBByModel("probe", "findByProbeKey", probeKey, utils.MODEL_STRING) + + if err != nil { + return "", err + } + + return out, nil +} \ No newline at end of file diff --git a/proxy/probe/probe_service_test.go b/proxy/probe/probe_service_test.go index ff91ab3..7db7df5 100644 --- a/proxy/probe/probe_service_test.go +++ b/proxy/probe/probe_service_test.go @@ -7,11 +7,10 @@ import ( "git.loafle.net/overflow/overflow_service/proxy/keystore" "git.loafle.net/overflow/overflow_service/proxy/domain" + ) func TestSaveProbe(t *testing.T) { - - ks := keystore.NewKeyStoreSerivce() pks, _ := ks.CreateKey() @@ -25,19 +24,33 @@ func TestSaveProbe(t *testing.T) { if err != nil { t.Log(res) } - - } // -//func TestListAgent(t *testing.T) { -// as := NewProbeService() -// m := member.Member{} -// m.Id = "1" -// if res, err := as.GetAgentList(&m); err != nil { -// t.Fatal(err) -// }else { -// t.Log(res) -// } -// -//} +func TestListProbe(t *testing.T) { + as := NewProbeService() + + d := &domain.Domain{Id:"1"} + + + if res, err := as.GetList(d); err != nil { + t.Fatal(err) + }else { + t.Log(res) + } + +} + +func TestReadProbeKey(t *testing.T) { + + as := NewProbeService() + + res, err := as.ReadByProbeKey("61351f265a3311e798fe080027658d13") + + if err != nil { + t.Fatal(err) + } + + t.Log(res) + +}