diff --git a/proxy/member/member_service.go b/proxy/member/member_service.go index 0bc58f7..79a7143 100644 --- a/proxy/member/member_service.go +++ b/proxy/member/member_service.go @@ -4,7 +4,6 @@ import ( "encoding/json" "errors" "git.loafle.net/overflow/encryption_go" - "git.loafle.net/overflow/overflow_service/proxy" "git.loafle.net/overflow/overflow_service/proxy/apikey" "git.loafle.net/overflow/overflow_service/proxy/keystore" "log" @@ -38,20 +37,6 @@ func NewMemberService() *MemberService { return &MemberService{} } -func (m *MemberService) getMemberMap(mem *Member) map[string]string { - memMap := make(map[string]string) - - str, err := json.Marshal(mem) - - if err != nil { - log.Fatal("Json Marshal Error: ", err) - } - - memMap["com.loafle.overflow.module.member.model.Member"] = string(str) - - return memMap -} - func (m *MemberService) Login(mem *Member) (string, error) { result, err := m.ReadByEmail(mem) @@ -89,9 +74,9 @@ func (m *MemberService) Regist(mem *Member) (string, error) { //mem.PwSalt = pwSalt //mem.Pw = digest - memMap := m.getMemberMap(mem) - re, err := proxy.InvokeDB(TARGET_DAO, "save", memMap) + re, err := utils.InvokeDBByModel(TARGET_DAO, "save", mem, utils.MODEL_MEMBER) + if err != nil { return "", err } @@ -101,8 +86,8 @@ func (m *MemberService) Regist(mem *Member) (string, error) { func (m *MemberService) ReadByEmail(mem *Member) (string, error) { log.Println("Call ReadByEmail", mem.Email) - memMap := m.getMemberMap(mem) - re, err := proxy.InvokeDB(TARGET_DAO, "findByEmail", memMap) + + re, err := utils.InvokeDBByModel(TARGET_DAO, "findByEmail",mem, utils.MODEL_MEMBER) if err != nil { return "", err @@ -128,9 +113,7 @@ func (m *MemberService) Modify(mem *Member) (string, error) { log.Fatal("Id nil") } - memMap := m.getMemberMap(mem) - - re, err := proxy.InvokeDB(TARGET_DAO, "save", memMap) + re, err := utils.InvokeDBByModel("member","findOne",mem,utils.MODEL_MEMBER) if err != nil { return "", err diff --git a/proxy/utils/model_mapping.go b/proxy/utils/model_mapping.go index 537bc31..14e1e0d 100644 --- a/proxy/utils/model_mapping.go +++ b/proxy/utils/model_mapping.go @@ -1,6 +1,7 @@ package utils const ( + MODEL_MEMBER = "com.loafle.overflow.module.member.model.Member" 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"