diff --git a/proxy/member/member_service.go b/proxy/member/member_service.go index c76593c..0bc58f7 100644 --- a/proxy/member/member_service.go +++ b/proxy/member/member_service.go @@ -8,6 +8,7 @@ import ( "git.loafle.net/overflow/overflow_service/proxy/apikey" "git.loafle.net/overflow/overflow_service/proxy/keystore" "log" + "git.loafle.net/overflow/overflow_service/proxy/utils" ) type Member struct { @@ -80,14 +81,14 @@ func (m *MemberService) Login(mem *Member) (string, error) { func (m *MemberService) Regist(mem *Member) (string, error) { log.Println("Call Regist", mem.Email, mem.PwSalt) - pwSalt, digest, err := encryption.Encrypt(mem.PwSalt) - if err != nil { - //log.Fatal("encryption Encrypt Error: ", err) - return "", err - } + //pwSalt, digest, err := encryption.Encrypt(mem.PwSalt) + //if err != nil { + // //log.Fatal("encryption Encrypt Error: ", err) + // return "", err + //} - mem.PwSalt = pwSalt - mem.Pw = digest + //mem.PwSalt = pwSalt + //mem.Pw = digest memMap := m.getMemberMap(mem) re, err := proxy.InvokeDB(TARGET_DAO, "save", memMap) @@ -111,14 +112,8 @@ func (m *MemberService) ReadByEmail(mem *Member) (string, error) { } func (m *MemberService) Read(mem *Member) (string, error) { - log.Println("Call Read", mem.Email) - // Todo Call DB Gateway - mem.Pw = "qwer5795" - //memMap := m.getMemberMap() - mm := make(map[string]string) - mm["id"] = string(mem.Id) - log.Println("Read Member", m) - re, err := proxy.InvokeDB(TARGET_DAO, "find", mm) + + re, err := utils.InvokeDBByModel("member","findOne",mem.Id,"java.lang.Long") if err != nil { return "", err @@ -128,12 +123,14 @@ func (m *MemberService) Read(mem *Member) (string, error) { } func (m *MemberService) Modify(mem *Member) (string, error) { - log.Println("Call Modify", mem.Email, "::", mem.PwSalt) - // Todo Call DB Gateway - mem.Pw = "read" + + if mem.Id == "" { + log.Fatal("Id nil") + } + memMap := m.getMemberMap(mem) - re, err := proxy.InvokeDB(TARGET_DAO, "update", memMap) + re, err := proxy.InvokeDB(TARGET_DAO, "save", memMap) if err != nil { return "", err @@ -143,12 +140,8 @@ func (m *MemberService) Modify(mem *Member) (string, error) { } func (m *MemberService) Remove(mem *Member) (string, error) { - log.Println("Call Remove", mem.Email) - // Todo Call DB Gateway - //m.Digest = "read" - memMap := m.getMemberMap(mem) - re, err := proxy.InvokeDB(TARGET_DAO, "delete", memMap) + re, err := utils.InvokeDBByModel("member","delete",mem.Id,"java.lang.Long") if err != nil { return "", err diff --git a/proxy/member/member_service_test.go b/proxy/member/member_service_test.go index 47955e3..7f73b9f 100644 --- a/proxy/member/member_service_test.go +++ b/proxy/member/member_service_test.go @@ -5,9 +5,6 @@ import ( "encoding/json" "github.com/golang/glog" "fmt" - "log" - "git.loafle.net/overflow/overflow_service/proxy" - ) func TestMemberService_Login(t *testing.T) { @@ -58,33 +55,54 @@ func TestMemberLogin(t *testing.T) { } func TestMemberService_Read(t *testing.T) { - mm := make(map[string] string) - mm["id"] = "12" - rr, _ := proxy.InvokeDB(TARGET_DAO, "find", mm) + mm := &Member{ + Id:"1", + } - log.Println(rr) + ms := NewMemberService() + rr, err := ms.Read(mm) + + if err != nil { + t.Error(err) + } + + t.Log(rr) } func TestMemberService_ReadByEmail(t *testing.T) { ms := NewMemberService() m := &Member{ - Email:"geek@loafle.com", + Email:"overflow@loafle.com", } - mm := ms.getMemberMap(m) - rr, _ := proxy.InvokeDB(TARGET_DAO, "findByEmail", mm) - log.Println(rr) + + rr, err := ms.ReadByEmail(m) + if err != nil { + t.Error(err) + } + + t.Log(rr) } func TestMemberUpdate(t *testing.T) { ms := NewMemberService() m := &Member{ - Id: "11", - Email:"keeg@loafle.com", + Id:"1", } - mm := ms.getMemberMap(m) - rr, _ := proxy.InvokeDB(TARGET_DAO, "update", mm) - log.Println(rr) + rm, _ := ms.Read(m) + + json.Unmarshal([]byte(rm), m) + + m.Phone = "010-4055-6699" + m.Status.Id = "1" + m.Name = "Park" + rr, err := ms.Modify(m) + + if err != nil { + t.Error(err) + } + + t.Log(rr) } func TestComvertJson(t *testing.T) {