Merge remote-tracking branch 'origin/master'

proxy/agent/agent_service.go

@@ -17,7 +17,7 @@ type Agent struct {
 	Description     string        `json:"description,omitempty"`
 	Member          member.Member `json:"member,omitempty"`
 	LastPollingDate int64         `json:"description,omitempty"`
-	Status          string        `json:"Status,omitempty"`
+	Status          string        `json:"status,omitempty"`
 }
 
 func NewAgentService() *AgentService {

proxy/member/member_service_test.go

@@ -14,28 +14,43 @@ func TestMemberService_Login(t *testing.T) {
 }
 
 func TestMemberService_Regist(t *testing.T) {
-	m := &MemberService{
+	//m := &MemberService{
-		Param: &Member{
+	//	Param: &Member{
+	//		Email:"geek2@loafle.com",
+	//		PwSalt:"qwer5795",
+	//		Company:"Loafle",
+	//		Name:"Geek",
+	//		Phone:"010-4055-6699",
+	//	},
+	//}
+
+	ms := NewMemberService()
+
+	m := &Member{
 		Email:"geek2@loafle.com",
 		PwSalt:"qwer5795",
 		Company:"Loafle",
 		Name:"Geek",
 		Phone:"010-4055-6699",
-		},
 	}
-
+	retMem := ms.Regist(m)
-	retMem := m.Regist()
 	t.Log(retMem)
 }
 
 func TestMemberLogin(t *testing.T) {
-	m := &MemberService{
+	//m := &MemberService{
-		Param:&Member{
+	//	Param:&Member{
+	//		Email:"geek@loafle.com",
+	//		PwSalt:"qwer5795",
+	//	},
+	//}
+	ms := NewMemberService()
+	m := &Member{
 		Email:"geek@loafle.com",
 		PwSalt:"qwer5795",
-		},
 	}
-	b := m.Login()
+
+	b := ms.Login(m)
 	t.Log("LOGIN RESULT : ", b)
 }
 
@@ -48,26 +63,23 @@ func TestMemberService_Read(t *testing.T) {
 }
 
 func TestMemberService_ReadByEmail(t *testing.T)  {
-	m := &MemberService{
+	ms := NewMemberService()
-		Param:&Member{
+	m := &Member{
 		Email:"geek@loafle.com",
-		},
 	}
-
+	mm := ms.getMemberMap(m)
-	mm := m.getMemberMap()
 	rr := proxy.InvokeDB(TARGET_DAO, "findByEmail", mm)
 	log.Println(rr)
 }
 
 func TestMemberUpdate(t *testing.T) {
-	m := &MemberService{
+
-		Param:&Member{
+	ms := NewMemberService()
+	m := &Member{
 		Id: "11",
 		Email:"keeg@loafle.com",
-		},
 	}
-
+	mm := ms.getMemberMap(m)
-	mm := m.getMemberMap()
 	rr := proxy.InvokeDB(TARGET_DAO, "update", mm)
 	log.Println(rr)
 }
@@ -76,7 +88,7 @@ func TestComvertJson(t *testing.T) {
 
 	m := make(map[string]string)
 	m["email"] = "geek@loafle.com"
-	m["password"] = "qwer5795"
+	m["pwSalt"] = "qwer5795"
 	ss := NewMemberService()
 
 	paramStr, err := json.Marshal(m)
@@ -84,9 +96,10 @@ func TestComvertJson(t *testing.T) {
 		glog.Fatal("Json Marshal Failed : ", err.Error())
 	}
 	// service converting
-	err = json.Unmarshal(paramStr, ss.Param)
+	mem := ss.GetModel()
+	err = json.Unmarshal(paramStr, mem)
 	if err != nil {
 		glog.Fatal("Json Unmarshal Failed : ", err.Error())
 	}
-	fmt.Println(ss.Param.Email)
+	fmt.Println(mem.(*Member).Email)
 }

proxy/noauthagent/agent_service.go

@@ -5,6 +5,9 @@ import (
 	"git.loafle.net/overflow/commons_go/model/timestamp"
 	"git.loafle.net/overflow/overflow_proxy_service/proxy"
 	"encoding/json"
+	"git.loafle.net/overflow/overflow_proxy_service/proxy/member"
+	"git.loafle.net/overflow/overflow_proxy_service/proxy/agent"
+	"github.com/reactivex/rxgo/errors"
 )
 
 type NoAuthAgentService struct {
@@ -77,12 +80,12 @@ func(as *NoAuthAgentService)CheckAuth(tempKey string) (string,error) {
 }
 
 
-func(as *NoAuthAgentService)GetNoAuthList(authStatus string) (string,error) {
+func(as *NoAuthAgentService)GetNoAuthList(excludeStatus string) (string,error) {
 
 	memMap := make(map[string]string)
 
 	na := NewNoAuthAgent("", 0, "")
-	na.AuthStatus = authStatus
+	na.AuthStatus = excludeStatus
 
 	bytes, err := json.Marshal(na)
 	if err != nil {
@@ -101,3 +104,35 @@ func(as *NoAuthAgentService)GetNoAuthList(authStatus string) (string,error) {
 func (as *NoAuthAgentService) GetModel() (interface{}) {
 	return NewNoAuthAgent("", 0, "")
 }
+
+func (as *NoAuthAgentService)RequestAuth(noauthAgt NoAuthAgent, memberId, desc string) (string, error) {
+	paramMap := make(map[string]string)
+	noauthAgt.AuthStatus = "ACCEPT"
+
+	bytes, err := json.Marshal(noauthAgt)
+	if err != nil {
+		return "", err;
+	}
+	paramMap["com.loafle.overflow.noauthagent.model.NoAuthAgent"] = string(bytes)
+	out := proxy.InvokeDB("noauthAgent", "update", paramMap)
+	if len(out) == 0 {
+		return "", errors.New("Cannot update Agent. ")
+	}
+	m := member.Member{}
+	m.Id = json.Number(memberId)
+	newAgent := agent.NewAgent(desc, m)
+	newone, err := agent.NewAgentService().SaveAgent(newAgent)
+	if err!= nil {
+		return "", err
+	}
+
+	return newone, nil
+}
+
+func (as *NoAuthAgentService)ReadNoAuthAgent(id string) (string, error){
+	mm := make(map[string]string)
+	mm["id"] = id
+	out := proxy.InvokeDB("noauthAgent", "find", mm)
+
+	return out, nil
+}

proxy/noauthagent/agent_service_test.go

@@ -5,6 +5,7 @@ import (
 	"github.com/google/uuid"
 	"testing"
 
+	"encoding/json"
 )
 
 
@@ -22,9 +23,9 @@ func TestCreateUUid(t *testing.T) {
 
 func TestCreateNoAuthAgent(t *testing.T) {
 
-	na := NewNoAuthAgent("2334278390283", 111, "Snoop")
+	na := NewNoAuthAgent("233421390283", 111, "Snoop")
 
-	na.TempKey = "22222222"
+	na.TempKey = "1111111"
 	na.AuthStatus = "WAIT"
 
 	nas := NewNoAuthAgentService()
@@ -73,3 +74,17 @@ func TestNoAuthList(t *testing.T) {
 	t.Log(out)
 
 }
+
+func TestRequestAuth(t *testing.T) {
+	nas := NewNoAuthAgentService()
+	res, err := nas.ReadNoAuthAgent("1")
+
+	na := NoAuthAgent{}
+	json.Unmarshal([]byte(res), na)
+
+	newone, err := nas.RequestAuth(na, "1", "test")
+	if err!= nil {
+		t.Fatal(err)
+	}
+	t.Log(newone)
+}