overflow_backup_2018_0455/overflow_service
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fmt

Browse Source
This commit is contained in:
geek
2017-06-27 09:08:47 +09:00
parent 60d5ab3232
commit f93fbeea2f
35 changed files with 262 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
proxy/member/member_service.go
View File

@@ -6,19 +6,19 @@ import (
"git.loafle.net/overflow/encryption_go"
"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"
"log"
)
type Member struct {
Id json.Number `json:"id,Number,omitempty"`
Email string `json:"email"`
PwSalt string `json:"pwSalt"`
Pw string `json:"pw"`
Name string `json:"name"`
CompanyName string `json:"companyName"`
Phone string `json:"phone"`
Status *MetaMemberStatus `json:"status"`
Id json.Number `json:"id,Number,omitempty"`
Email string `json:"email"`
PwSalt string `json:"pwSalt"`
Pw string `json:"pw"`
Name string `json:"name"`
CompanyName string `json:"companyName"`
Phone string `json:"phone"`
Status *MetaMemberStatus `json:"status"`
}
type MetaMemberStatus struct {
@@ -87,7 +87,7 @@ func (m *MemberService) Regist(mem *Member) (string, error) {
func (m *MemberService) ReadByEmail(mem *Member) (string, error) {
log.Println("Call ReadByEmail", mem.Email)
re, err := utils.InvokeDBByModel(TARGET_DAO, "findByEmail",mem, utils.MODEL_MEMBER)
re, err := utils.InvokeDBByModel(TARGET_DAO, "findByEmail", mem, utils.MODEL_MEMBER)
if err != nil {
return "", err
@@ -98,7 +98,7 @@ func (m *MemberService) ReadByEmail(mem *Member) (string, error) {
func (m *MemberService) Read(mem *Member) (string, error) {
re, err := utils.InvokeDBByModel("member","findOne",mem.Id,"java.lang.Long")
re, err := utils.InvokeDBByModel("member", "findOne", mem.Id, "java.lang.Long")
if err != nil {
return "", err
@@ -113,7 +113,7 @@ func (m *MemberService) Modify(mem *Member) (string, error) {
log.Fatal("Id nil")
}
re, err := utils.InvokeDBByModel("member","findOne",mem,utils.MODEL_MEMBER)
re, err := utils.InvokeDBByModel("member", "findOne", mem, utils.MODEL_MEMBER)
if err != nil {
return "", err
@@ -124,7 +124,7 @@ func (m *MemberService) Modify(mem *Member) (string, error) {
func (m *MemberService) Remove(mem *Member) (string, error) {
re, err := utils.InvokeDBByModel("member","delete",mem.Id,"java.lang.Long")
re, err := utils.InvokeDBByModel("member", "delete", mem.Id, "java.lang.Long")
if err != nil {
return "", err

32
proxy/member/member_service_test.go
View File

@@ -1,10 +1,10 @@
package member
import (
"testing"
"encoding/json"
"github.com/golang/glog"
"fmt"
"github.com/golang/glog"
"testing"
)
func TestMemberService_Login(t *testing.T) {
@@ -25,13 +25,13 @@ func TestMemberService_Regist(t *testing.T) {
ms := NewMemberService()
m := &Member{
Email:"geek2@loafle.com",
PwSalt:"qwer5795",
Pw:"qwer5795",
CompanyName:"Loafle",
Name:"Geek",
Phone:"010-4055-6699",
Status:&MetaMemberStatus{Id:"1"},
Email: "geek2@loafle.com",
PwSalt: "qwer5795",
Pw: "qwer5795",
CompanyName: "Loafle",
Name: "Geek",
Phone: "010-4055-6699",
Status: &MetaMemberStatus{Id: "1"},
}
retMem, _ := ms.Regist(m)
t.Log(retMem)
@@ -46,8 +46,8 @@ func TestMemberLogin(t *testing.T) {
//}
ms := NewMemberService()
m := &Member{
Email:"geek@loafle.com",
PwSalt:"qwer5795",
Email: "geek@loafle.com",
PwSalt: "qwer5795",
}
b, _ := ms.Login(m)
@@ -56,7 +56,7 @@ func TestMemberLogin(t *testing.T) {
func TestMemberService_Read(t *testing.T) {
mm := &Member{
Id:"1",
Id: "1",
}
ms := NewMemberService()
@@ -69,10 +69,10 @@ func TestMemberService_Read(t *testing.T) {
t.Log(rr)
}
func TestMemberService_ReadByEmail(t *testing.T) {
func TestMemberService_ReadByEmail(t *testing.T) {
ms := NewMemberService()
m := &Member{
Email:"overflow@loafle.com",
Email: "overflow@loafle.com",
}
rr, err := ms.ReadByEmail(m)
@@ -87,7 +87,7 @@ func TestMemberUpdate(t *testing.T) {
ms := NewMemberService()
m := &Member{
Id:"1",
Id: "1",
}
rm, _ := ms.Read(m)
@@ -125,4 +125,4 @@ func TestComvertJson(t *testing.T) {
// glog.Fatal("Json Unmarshal Failed : ", err.Error())
//}
//fmt.Println(mem.(*Member).Email)
}
}