Merge remote-tracking branch 'origin/master'

glide.yaml

@@ -1,4 +1,4 @@
-package: git.loafle.net/overflow/overflow_proxy_service
+package: loafle.com/overflow/overflow_proxy_service
 import:
 - package: git.loafle.net/overflow/commons_go
   subpackages:
@@ -7,8 +7,19 @@ import:
 - package: git.loafle.net/overflow/overflow_api_db
   subpackages:
   - build/golang
+- package: git.loafle.net/overflow/overflow_proxy_service
+  vcs: git
+  version: master
+  repo: https://git.loafle.net/overflow/overflow_proxy_service.git
+  subpackages:
+  - proxy
+  - proxy/apikey
+  - proxy/keystore
+  - proxy/member
 - package: github.com/google/uuid
 - package: golang.org/x/net
   subpackages:
   - context
 - package: google.golang.org/grpc
+testImport:
+- package: github.com/golang/glog

proxy/agent/agent_service.go

@@ -0,0 +1,68 @@
+package agent
+
+import (
+	"encoding/json"
+	"fmt"
+	"git.loafle.net/overflow/overflow_proxy_service/proxy"
+	"git.loafle.net/overflow/overflow_proxy_service/proxy/member"
+	"time"
+)
+
+type AgentService struct {
+}
+
+type Agent struct {
+	Id              json.Number   `json:"id,Number,omitempty"`
+	AuthorizedDate  int64         `json:"authorizedDate,Number,omitempty"`
+	Description     string        `json:"description,omitempty"`
+	Member          member.Member `json:"member,omitempty"`
+	LastPollingDate int64         `json:"description,omitempty"`
+	Status          string        `json:"Status,omitempty"`
+}
+
+func NewAgentService() *AgentService {
+	return &AgentService{}
+}
+
+func NewAgent(desc string, member member.Member) *Agent {
+
+	na := &Agent{
+		AuthorizedDate: time.Now().Unix(),
+		Description:    desc,
+		Member:         member,
+	}
+	return na
+}
+
+func (as *AgentService) SaveAgent(agent *Agent) (string, error) {
+	bytes, err := json.Marshal(agent)
+	if err != nil {
+		return "", err
+	}
+	fmt.Println(agent.Member.Id)
+	fmt.Println(string(bytes))
+	paramMap := make(map[string]string)
+	paramMap["com.loafle.overflow.agent.model.Agent"] = string(bytes)
+
+	out := proxy.InvokeDB("agent", "create", paramMap)
+
+	return out, nil
+}
+
+func (as *AgentService) getAgentList(memberId string) (string, error) {
+	paramMap := make(map[string]string)
+
+	mem := member.NewMember()
+	mem.Id = json.Number(memberId)
+
+	bytes, err := json.Marshal(mem)
+	if err != nil {
+		return "", err
+	}
+
+	paramMap["com.loafle.overflow.member.model.Member"] = string(bytes)
+
+	out := proxy.InvokeDB("agent", "findAgentListByMemberId", paramMap)
+
+	return out, nil
+}

proxy/agent/agent_service_test.go

@@ -0,0 +1,31 @@
+package agent
+
+import (
+	"encoding/json"
+	"testing"
+	"git.loafle.net/overflow/overflow_proxy_service/proxy/member"
+)
+
+func TestSaveAgent(t *testing.T) {
+	m := member.Member{}
+	m.Id = json.Number("1")
+
+	agt := NewAgent("test agent424", m)
+	as := NewAgentService()
+
+	res, err := as.SaveAgent(agt)
+	if err != nil {
+		t.Log(res)
+	}
+}
+
+
+func TestListAgent(t *testing.T) {
+	as := NewAgentService()
+	if res, err := as.getAgentList("1"); err != nil {
+		t.Fatal(err)
+	}else {
+		t.Log(res)
+	}
+
+}