From 0d186afd78c529e4fe16afb7c5ff170a342edee2 Mon Sep 17 00:00:00 2001 From: geek Date: Mon, 26 Jun 2017 14:37:48 +0900 Subject: [PATCH 1/2] member modify --- proxy/member/member_service.go | 41 ++++++++++------------- proxy/member/member_service_test.go | 50 ++++++++++++++++++++--------- 2 files changed, 51 insertions(+), 40 deletions(-) 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) { From 491068c8ec8b553127d4cf4292e5480abf9c2f54 Mon Sep 17 00:00:00 2001 From: "insanity@loafle.com" Date: Mon, 26 Jun 2017 14:49:02 +0900 Subject: [PATCH 2/2] model adddedddd --- proxy/infra/infra_service.go | 43 ++++++++++++++++++------------------ proxy/utils/model_mapping.go | 21 +++++++++++++----- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/proxy/infra/infra_service.go b/proxy/infra/infra_service.go index 08a1890..8c9b4d7 100644 --- a/proxy/infra/infra_service.go +++ b/proxy/infra/infra_service.go @@ -79,90 +79,89 @@ func NewInfraService() *InfraService { return &InfraService{} } -func(is *InfraService) Save(infra *Infra) (string, error) { +func (is *InfraService) Save(infra *Infra) (string, error) { out, err := utils.InvokeDBByModel("infra", "save", infra, "com.loafle.overflow.module.infra.model.Infra") if err != nil { return "", err } - return out, nil; + return out, nil } - -func(is *InfraService) SaveMachine(i *InfraMachine) (string, error) { +func (is *InfraService) SaveMachine(i *InfraMachine) (string, error) { out, err := utils.InvokeDBByModel("infraMachine", "save", i, "com.loafle.overflow.module.infra.model.InfraMachine") if err != nil { return "", err } - return out, nil; + return out, nil } -func(is *InfraService) SaveHost(i *InfraHost) (string, error) { +func (is *InfraService) SaveHost(i *InfraHost) (string, error) { out, err := utils.InvokeDBByModel("infraHost", "save", i, "com.loafle.overflow.module.infra.model.InfraHost") if err != nil { return "", err } - return out, nil; + return out, nil } -func(is *InfraService) SaveOS(i *InfraOS) (string, error) { +func (is *InfraService) SaveOS(i *InfraOS) (string, error) { out, err := utils.InvokeDBByModel("InfraOS", "save", i, "com.loafle.overflow.module.infra.model.InfraOS") if err != nil { return "", err } - return out, nil; + return out, nil } -func(is *InfraService) SaveOSApplication(i *InfraOSApplication) (string, error) { +func (is *InfraService) SaveOSApplication(i *InfraOSApplication) (string, error) { out, err := utils.InvokeDBByModel("InfraOSApplication", "save", i, "com.loafle.overflow.module.infra.model.InfraOSApplication") if err != nil { return "", err } - return out, nil; + return out, nil } -func(is *InfraService) SaveOSDaemon(i *InfraOSDaemon) (string, error) { +func (is *InfraService) SaveOSDaemon(i *InfraOSDaemon) (string, error) { out, err := utils.InvokeDBByModel("InfraOSDaemon", "save", i, "com.loafle.overflow.module.infra.model.InfraOSDaemon") if err != nil { return "", err } - return out, nil; + return out, nil } -func(is *InfraService) SaveOSPort(i *InfraOSPort) (string, error) { +func (is *InfraService) SaveOSPort(i *InfraOSPort) (string, error) { out, err := utils.InvokeDBByModel("InfraOSPort", "save", i, "com.loafle.overflow.module.infra.model.InfraOSPort") if err != nil { return "", err } - return out, nil; + return out, nil } -func(is *InfraService) SaveService(i *InfraService) (string, error) { +func (is *InfraService) SaveService(i *InfraService) (string, error) { out, err := utils.InvokeDBByModel("InfraService", "save", i, "com.loafle.overflow.module.infra.model.InfraService") if err != nil { return "", err } - return out, nil; + return out, nil } -func (is *InfraService)Read(id string) (string, error){ +func (is *InfraService) Read(id string) (string, error) { - out,err :=utils.InvokeDBByModel("infra","findOne",id,"java.lang.Long") + out, err := utils.InvokeDBByModel("infra", "findOne", id, "java.lang.Long") if err != nil { return "", err @@ -171,13 +170,13 @@ func (is *InfraService)Read(id string) (string, error){ return out, nil } -func (is *InfraService)ReadChild(infraType, id string) (string, error){ +func (is *InfraService) ReadChild(infraType, id string) (string, error) { - out,err :=utils.InvokeDBByModel(infraType,"findOne",id,"java.lang.Long") + out, err := utils.InvokeDBByModel(infraType, "findOne", id, "java.lang.Long") if err != nil { return "", err } return out, nil -} \ No newline at end of file +} diff --git a/proxy/utils/model_mapping.go b/proxy/utils/model_mapping.go index 142de80..537bc31 100644 --- a/proxy/utils/model_mapping.go +++ b/proxy/utils/model_mapping.go @@ -1,10 +1,19 @@ package utils - const ( - MODEL_DOMAIN = "com.loafle.overflow.module.domain.model.Domain" - MODEL_NOAUTHPROBE = "com.loafle.overflow.module.noauthprobe.model.NoAuthProbe" - MODEL_PROBE = "com.loafle.overflow.module.probe.model.Probe" + MODEL_DOMAIN = "com.loafle.overflow.module.domain.model.Domain" + MODEL_NOAUTHPROBE = "com.loafle.overflow.module.noauthprobe.model.NoAuthProbe" + MODEL_PROBE = "com.loafle.overflow.module.probe.model.Probe" + MODEL_INFRA = "com.loafle.overflow.module.infra.model.Infra" + MODEL_INFRA_MACHINE = "com.loafle.overflow.module.infra.model.InfraMachine" + MODEL_INFRA_HOST = "com.loafle.overflow.module.infra.model.InfraHost" + MODEL_INFRA_OS = "com.loafle.overflow.module.infra.model.InfraOS" + MODEL_INFRA_OS_APPLICATION = "com.loafle.overflow.module.infra.model.InfraOSApplication" + MODEL_INFRA_OS_DAEMON = "com.loafle.overflow.module.infra.model.InfraOSDaemon" + MODEL_INFRA_OS_PORT = "com.loafle.overflow.module.infra.model.InfraOSPort" + MODEL_INFRA_SERVICE = "com.loafle.overflow.module.infra.model.InfraService" + MODEL_TARGET = "com.loafle.overflow.module.target.model.Target" + MODEL_STRING = "java.lang.String" - MODEL_LONG = "java.lang.Long" -) \ No newline at end of file + MODEL_LONG = "java.lang.Long" +)