From b46468fcb1185eaa3786c1a20d88be779f98e074 Mon Sep 17 00:00:00 2001
From: geek <geek@loafle.com>
Date: Mon, 5 Jun 2017 19:16:03 +0900
Subject: [PATCH] MemberService param remove

---
 proxy/member/member_service.go | 53 ++++++++++++++++------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/proxy/member/member_service.go b/proxy/member/member_service.go
index c6d25a4..ff91dc8 100644
--- a/proxy/member/member_service.go
+++ b/proxy/member/member_service.go
@@ -21,25 +21,22 @@ type Member struct {
 }
 
 type MemberService struct {
-	Param *Member 	`json:"param"`
+
 }
 
 var TARGET_DAO = "member"
 
 func NewMember() *Member {
-	m := Member{}
-	return &m
+	return &Member{}
 }
 func NewMemberService() *MemberService {
-	ms := &MemberService{}
-	ms.Param = NewMember()
-	return ms
+	return &MemberService{}
 }
 
-func (m *MemberService) getMemberMap() map[string]string {
+func (m *MemberService) getMemberMap(mem *Member) map[string]string {
 	memMap := make(map[string]string)
 
-	str, err := json.Marshal(m.Param)
+	str, err := json.Marshal(mem)
 
 	if err != nil {
 		log.Fatal("Json Marshal Error: ", err)
@@ -50,7 +47,7 @@ func (m *MemberService) getMemberMap() map[string]string {
 	return memMap
 }
 
-func (m *MemberService) Login() string {
+func (m *MemberService) Login(mem *Member) string {
 
 	result := m.ReadByEmail()
 	if result == "" {
@@ -65,7 +62,7 @@ func (m *MemberService) Login() string {
 		return "Not authenticated."
 	}
 
-	b := encryption.Check(m.Param.PwSalt, temp.PwSalt, temp.Digest)
+	b := encryption.Check(mem.PwSalt, temp.PwSalt, temp.Digest)
 	if !b {
 		return "login reject"
 	}
@@ -73,47 +70,47 @@ func (m *MemberService) Login() string {
 	return "login success"
 }
 
-func (m *MemberService) Regist() string {
-	log.Println("Call Regist", m.Param.Email, m.Param.PwSalt)
+func (m *MemberService) Regist(mem *Member) string {
+	log.Println("Call Regist", mem.Email, mem.PwSalt)
 
-	pwSalt, digest, err := encryption.Encrypt(m.Param.PwSalt)
+	pwSalt, digest, err := encryption.Encrypt(mem.PwSalt)
 	if err != nil {
 		log.Fatal("encryption Encrypt Error: ", err)
 	}
 
-	m.Param.PwSalt = pwSalt
-	m.Param.Digest = digest
-	memMap := m.getMemberMap()
+	mem.PwSalt = pwSalt
+	mem.Digest = digest
+	memMap := m.getMemberMap(mem)
 
 	re := proxy.InvokeDB(TARGET_DAO, "create", memMap)
 
 	return re
 }
 
-func (m *MemberService) ReadByEmail() string {
-	log.Println("Call ReadByEmail", m.Param.Email)
+func (m *MemberService) ReadByEmail(mem *Member) string {
+	log.Println("Call ReadByEmail", mem.Email)
 	memMap := m.getMemberMap()
 	re := proxy.InvokeDB(TARGET_DAO, "findByEmail", memMap)
 	return re
 }
 
-func (m *MemberService) Read() string {
-	log.Println("Call Read", m.Param.Email)
+func (m *MemberService) Read(mem *Member) string {
+	log.Println("Call Read", mem.Email)
 	// Todo Call DB Gateway
-	m.Param.Digest = "qwer5795"
+	mem.Digest = "qwer5795"
 	//memMap := m.getMemberMap()
 	mm := make(map[string]string)
-	mm["id"] = string(m.Param.Id)
+	mm["id"] = string(mem.Id)
 	log.Println("Read Member", m)
 	re := proxy.InvokeDB(TARGET_DAO, "find", mm)
 
 	return re
 }
 
-func (m *MemberService) Modify() string {
-	log.Println("Call Modify", m.Param.Email, "::", m.Param.PwSalt)
+func (m *MemberService) Modify(mem *Member) string {
+	log.Println("Call Modify", mem.Email, "::", mem.PwSalt)
 	// Todo Call DB Gateway
-	m.Param.Digest = "read"
+	mem.Digest = "read"
 	memMap := m.getMemberMap()
 
 	re := proxy.InvokeDB(TARGET_DAO, "update", memMap)
@@ -121,8 +118,8 @@ func (m *MemberService) Modify() string {
 	return re
 }
 
-func (m *MemberService) Remove() string {
-	log.Println("Call Remove", m.Param.Email)
+func (m *MemberService) Remove(mem *Member) string {
+	log.Println("Call Remove", mem.Email)
 	// Todo Call DB Gateway
 	//m.Digest = "read"
 	memMap := m.getMemberMap()
@@ -133,7 +130,7 @@ func (m *MemberService) Remove() string {
 }
 
 func (m *MemberService) GetModel() (interface{}) {
-	return m.Param
+	return NewMember()
 }
 func (m *MemberService) EmailConfirm() string {