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

Merge branch 'master' of https://git.loafle.net/overflow/overflow_service

Browse Source
This commit is contained in:
insanity@loafle.com 2017-06-27 11:57:36 +09:00
commit bfd00b2685
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
proxy/email/email_service.go
View File

@ -35,14 +35,19 @@ type Email struct {
BodyMsg string `json:"_"` BodyMsg string `json:"_"`
} }
func NewEmail(member *member.Member, subject string) *Email { func NewEmail(id json.Number, email string, companyName string, memberName string, subject string) *Email {
if subject == "" { if subject == "" {
subject = SUBJECT subject = SUBJECT
} }
return &Email{ return &Email{
Member: member, Member: &member.Member{
Id: id,
Email: email,
CompanyName: companyName,
Name: memberName,
},
From: FROM, From: FROM,
Subj: subject, Subj: subject,
SmtpServer: SERVER_NAME, SmtpServer: SERVER_NAME,
@ -50,7 +55,6 @@ func NewEmail(member *member.Member, subject string) *Email {
} }
type EmailService struct { type EmailService struct {
email *Email
} }
func NewEmailService() *EmailService { func NewEmailService() *EmailService {
@ -84,11 +88,6 @@ func (es *EmailService) getSendMailMessage(e *Email) string {
return message return message
} }
func (es *EmailService) SetEmail(m *member.Member, sub string) {
e := NewEmail(m, sub)
es.email = e
}
func (es *EmailService) generationAuthToken(e *Email) string { func (es *EmailService) generationAuthToken(e *Email) string {
var tempToken string var tempToken string

24
proxy/email/email_service_test.go
View File

@ -1,32 +1,26 @@
package email package email
import ( import (
"encoding/json"
"fmt" "fmt"
"git.loafle.net/overflow/overflow_service/proxy/member"
"testing" "testing"
) )
func getEmailObj() (*Email, *EmailService) { func getEmailObj() (*Email, *EmailService) {
es := NewEmailService() es := NewEmailService()
m := &member.Member{ //m := &member.Member{
Email: "geek@loafle.com", // Email: "geek@loafle.com",
Name: "geek", // Name: "geek",
CompanyName: "loafle", // CompanyName: "loafle",
Id: json.Number("2"), // Id: json.Number("2"),
} //}
e := NewEmail(m, "Hello Oveflow") //e := NewEmail(m, "Hello Oveflow")
e := NewEmail("1", "geek@loafle.com", "loafle", "geek", "")
return e, es return e, es
} }
func TestNewEmail(t *testing.T) { func TestNewEmail(t *testing.T) {
e := NewEmail(&member.Member{ e := NewEmail("1", "geek@loafle.com", "loafle", "geek", "")
Email: "geek@loafle.com",
Name: "geek",
CompanyName: "loafle",
Id: json.Number("2"),
},"")
t.Log(e.Member.Email) t.Log(e.Member.Email)
} }