Skip to content

X
xpkg
提交 d7fe160a authored 作者: mooncake's avatar mooncake
浏览文件
操作

modify email

上级 5bfbda52
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 174 行增加 和 453 行删除
pkg/email/biz/email.go
浏览文件 @ d7fe160a
package biz
import (
"context"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setUtils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceUtils"
......@@ -27,9 +26,6 @@ func (x *Email) GetTplIDs(rs []*Email) []xsf.ID {
return set.Slice()
}
type EmailOpts struct {
}
func (Email) NewFromModel(m *models.Email) *Email {
if m == nil {
return nil
......@@ -45,23 +41,3 @@ func (x *Email) ToModel() *models.Email {
}
return &x.Email
}
func (x Email) Valid(ctx context.Context, email *Email, opts *EmailOpts) error {
if email == nil {
return nil
}
if opts == nil {
opts = &EmailOpts{}
}
return nil
}
func (x Email) ValidSlice(ctx context.Context, emailBizSlice []*Email, opts *EmailOpts) error {
if len(emailBizSlice) == 0 {
return nil
}
if opts == nil {
opts = &EmailOpts{}
}
return nil
}
pkg/email/biz/email_receiver.go
浏览文件 @ d7fe160a
package biz
import (
"context"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setUtils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceUtils"
......@@ -27,9 +26,6 @@ func (x *EmailReceiver) GetEmailIDs(rs []*EmailReceiver) []xsf.ID {
return set.Slice()
}
type EmailReceiverOpts struct {
}
func (EmailReceiver) NewFromModel(m *models.EmailReceiver) *EmailReceiver {
if m == nil {
return nil
......@@ -45,23 +41,3 @@ func (x *EmailReceiver) ToModel() *models.EmailReceiver {
}
return &x.EmailReceiver
}
func (x EmailReceiver) Valid(ctx context.Context, emailReceiver *EmailReceiver, opts *EmailReceiverOpts) error {
if emailReceiver == nil {
return nil
}
if opts == nil {
opts = &EmailReceiverOpts{}
}
return nil
}
func (x EmailReceiver) ValidSlice(ctx context.Context, emailReceiverBizSlice []*EmailReceiver, opts *EmailReceiverOpts) error {
if len(emailReceiverBizSlice) == 0 {
return nil
}
if opts == nil {
opts = &EmailReceiverOpts{}
}
return nil
}
pkg/email/biz/email_send.go
浏览文件 @ d7fe160a
package biz
import (
"context"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setUtils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceUtils"
......@@ -27,9 +26,6 @@ func (x *EmailSend) GetEmailIDs(rs []*EmailSend) []xsf.ID {
return set.Slice()
}
type EmailSendOpts struct {
}
func (EmailSend) NewFromModel(m *models.EmailSend) *EmailSend {
if m == nil {
return nil
......@@ -45,23 +41,3 @@ func (x *EmailSend) ToModel() *models.EmailSend {
}
return &x.EmailSend
}
func (x EmailSend) Valid(ctx context.Context, emailSend *EmailSend, opts *EmailSendOpts) error {
if emailSend == nil {
return nil
}
if opts == nil {
opts = &EmailSendOpts{}
}
return nil
}
func (x EmailSend) ValidSlice(ctx context.Context, emailSendBizSlice []*EmailSend, opts *EmailSendOpts) error {
if len(emailSendBizSlice) == 0 {
return nil
}
if opts == nil {
opts = &EmailSendOpts{}
}
return nil
}
pkg/email/biz/email_send_log.go
浏览文件 @ d7fe160a
package biz
import (
"context"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setUtils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceUtils"
......@@ -27,9 +26,6 @@ func (x *EmailSendLog) GetEmailSendIDs(rs []*EmailSendLog) []xsf.ID {
return set.Slice()
}
type EmailSendLogOpts struct {
}
func (EmailSendLog) NewFromModel(m *models.EmailSendLog) *EmailSendLog {
if m == nil {
return nil
......@@ -45,23 +41,3 @@ func (x *EmailSendLog) ToModel() *models.EmailSendLog {
}
return &x.EmailSendLog
}
func (x EmailSendLog) Valid(ctx context.Context, emailSendLog *EmailSendLog, opts *EmailSendLogOpts) error {
if emailSendLog == nil {
return nil
}
if opts == nil {
opts = &EmailSendLogOpts{}
}
return nil
}
func (x EmailSendLog) ValidSlice(ctx context.Context, emailSendLogBizSlice []*EmailSendLog, opts *EmailSendLogOpts) error {
if len(emailSendLogBizSlice) == 0 {
return nil
}
if opts == nil {
opts = &EmailSendLogOpts{}
}
return nil
}
pkg/email/biz/email_tpl.go
浏览文件 @ d7fe160a
package biz
import (
"context"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceUtils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf"
......@@ -19,9 +18,6 @@ func (*EmailTpl) GetIDs(rs []*EmailTpl) []xsf.ID {
return sliceUtils.GetIDs[xsf.ID](rs)
}
type EmailTplOpts struct {
}
func (EmailTpl) NewFromModel(m *models.EmailTpl) *EmailTpl {
if m == nil {
return nil
......@@ -37,23 +33,3 @@ func (x *EmailTpl) ToModel() *models.EmailTpl {
}
return &x.EmailTpl
}
func (x EmailTpl) Valid(ctx context.Context, emailTpl *EmailTpl, opts *EmailTplOpts) error {
if emailTpl == nil {
return nil
}
if opts == nil {
opts = &EmailTplOpts{}
}
return nil
}
func (x EmailTpl) ValidSlice(ctx context.Context, emailTplBizSlice []*EmailTpl, opts *EmailTplOpts) error {
if len(emailTplBizSlice) == 0 {
return nil
}
if opts == nil {
opts = &EmailTplOpts{}
}
return nil
}
pkg/email/biz/email_tpl_receiver.go
浏览文件 @ d7fe160a
package biz
import (
"context"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setUtils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceUtils"
......@@ -27,9 +26,6 @@ func (x *EmailTplReceiver) GetTplIDs(rs []*EmailTplReceiver) []xsf.ID {
return set.Slice()
}
type EmailTplReceiverOpts struct {
}
func (EmailTplReceiver) NewFromModel(m *models.EmailTplReceiver) *EmailTplReceiver {
if m == nil {
return nil
......@@ -45,23 +41,3 @@ func (x *EmailTplReceiver) ToModel() *models.EmailTplReceiver {
}
return &x.EmailTplReceiver
}
func (x EmailTplReceiver) Valid(ctx context.Context, emailTplReceiver *EmailTplReceiver, opts *EmailTplReceiverOpts) error {
if emailTplReceiver == nil {
return nil
}
if opts == nil {
opts = &EmailTplReceiverOpts{}
}
return nil
}
func (x EmailTplReceiver) ValidSlice(ctx context.Context, emailTplReceiverBizSlice []*EmailTplReceiver, opts *EmailTplReceiverOpts) error {
if len(emailTplReceiverBizSlice) == 0 {
return nil
}
if opts == nil {
opts = &EmailTplReceiverOpts{}
}
return nil
}
pkg/email/controller/email.go
浏览文件 @ d7fe160a
......@@ -40,7 +40,7 @@ func (x *emailController) DeleteByID(c *gin.Context) {
response.Error(c, err)
return
}
if err := service.EmailService.DeleteByID(ctxUtils.WrapCtx(c), in.ID, nil); err != nil {
if err := service.EmailService.DeleteByID(ctxUtils.WrapCtx(c), in.ID); err != nil {
response.Error(c, err)
return
}
......@@ -52,7 +52,7 @@ func (x *emailController) UpdateByID(c *gin.Context) {
response.Error(c, err)
return
}
if err := service.EmailService.UpdateByID(ctxUtils.WrapCtx(c), in, nil); err != nil {
if err := service.EmailService.UpdateByID(ctxUtils.WrapCtx(c), in); err != nil {
response.Error(c, err)
return
}
......@@ -75,7 +75,7 @@ func (x *emailController) GetByID(c *gin.Context) {
response.Error(c, err)
return
}
email, err := service.EmailService.GetByID(ctxUtils.WrapCtx(c), in.ID, nil)
email, err := service.EmailService.GetByID(ctxUtils.WrapCtx(c), in.ID)
if err != nil {
response.Error(c, err)
return
......@@ -89,7 +89,7 @@ func (x *emailController) GetByIDs(c *gin.Context) {
response.Error(c, err)
return
}
emails, err := service.EmailService.GetSliceByIDs(ctxUtils.WrapCtx(c), in.IDs, nil)
emails, err := service.EmailService.GetSliceByIDs(ctxUtils.WrapCtx(c), in.IDs)
if err != nil {
response.Error(c, err)
return
......@@ -115,7 +115,7 @@ func (x *emailController) Page(c *gin.Context) {
response.Error(c, err)
return
}
emails, total, err := service.EmailService.Page(ctxUtils.WrapCtx(c), in, nil)
emails, total, err := service.EmailService.Page(ctxUtils.WrapCtx(c), in)
if err != nil {
response.Error(c, err)
return
......@@ -141,7 +141,7 @@ func (x *emailController) ExportCSV(c *gin.Context) {
response.Error(c, err)
return
}
url, err := service.EmailService.ExportCSV(ctxUtils.WrapCtx(c), in, nil)
url, err := service.EmailService.ExportCSV(ctxUtils.WrapCtx(c), in)
if err != nil {
response.Error(c, err)
return
......
pkg/email/controller/email_receiver.go
浏览文件 @ d7fe160a
......@@ -40,7 +40,7 @@ func (x *emailReceiverController) DeleteByID(c *gin.Context) {
response.Error(c, err)
return
}
if err := service.EmailReceiverService.DeleteByID(ctxUtils.WrapCtx(c), in.ID, nil); err != nil {
if err := service.EmailReceiverService.DeleteByID(ctxUtils.WrapCtx(c), in.ID); err != nil {
response.Error(c, err)
return
}
......@@ -52,7 +52,7 @@ func (x *emailReceiverController) UpdateByID(c *gin.Context) {
response.Error(c, err)
return
}
if err := service.EmailReceiverService.UpdateByID(ctxUtils.WrapCtx(c), in, nil); err != nil {
if err := service.EmailReceiverService.UpdateByID(ctxUtils.WrapCtx(c), in); err != nil {
response.Error(c, err)
return
}
......@@ -75,7 +75,7 @@ func (x *emailReceiverController) GetByID(c *gin.Context) {
response.Error(c, err)
return
}
emailReceiver, err := service.EmailReceiverService.GetByID(ctxUtils.WrapCtx(c), in.ID, nil)
emailReceiver, err := service.EmailReceiverService.GetByID(ctxUtils.WrapCtx(c), in.ID)
if err != nil {
response.Error(c, err)
return
......@@ -89,7 +89,7 @@ func (x *emailReceiverController) GetByIDs(c *gin.Context) {
response.Error(c, err)
return
}
emailReceivers, err := service.EmailReceiverService.GetSliceByIDs(ctxUtils.WrapCtx(c), in.IDs, nil)
emailReceivers, err := service.EmailReceiverService.GetSliceByIDs(ctxUtils.WrapCtx(c), in.IDs)
if err != nil {
response.Error(c, err)
return
......@@ -115,7 +115,7 @@ func (x *emailReceiverController) Page(c *gin.Context) {
response.Error(c, err)
return
}
emailReceivers, total, err := service.EmailReceiverService.Page(ctxUtils.WrapCtx(c), in, nil)
emailReceivers, total, err := service.EmailReceiverService.Page(ctxUtils.WrapCtx(c), in)
if err != nil {
response.Error(c, err)
return
......@@ -141,7 +141,7 @@ func (x *emailReceiverController) ExportCSV(c *gin.Context) {
response.Error(c, err)
return
}
url, err := service.EmailReceiverService.ExportCSV(ctxUtils.WrapCtx(c), in, nil)
url, err := service.EmailReceiverService.ExportCSV(ctxUtils.WrapCtx(c), in)
if err != nil {
response.Error(c, err)
return
......
pkg/email/controller/email_send.go
浏览文件 @ d7fe160a
......@@ -40,7 +40,7 @@ func (x *emailSendController) DeleteByID(c *gin.Context) {
response.Error(c, err)
return
}
if err := service.EmailSendService.DeleteByID(ctxUtils.WrapCtx(c), in.ID, nil); err != nil {
if err := service.EmailSendService.DeleteByID(ctxUtils.WrapCtx(c), in.ID); err != nil {
response.Error(c, err)
return
}
......@@ -53,7 +53,7 @@ func (x *emailSendController) UpdateByID(c *gin.Context) {
response.Error(c, err)
return
}
if err := service.EmailSendService.UpdateByID(ctxUtils.WrapCtx(c), in, nil); err != nil {
if err := service.EmailSendService.UpdateByID(ctxUtils.WrapCtx(c), in); err != nil {
response.Error(c, err)
return
}
......@@ -76,7 +76,7 @@ func (x *emailSendController) GetByID(c *gin.Context) {
response.Error(c, err)
return
}
emailSend, err := service.EmailSendService.GetByID(ctxUtils.WrapCtx(c), in.ID, nil)
emailSend, err := service.EmailSendService.GetByID(ctxUtils.WrapCtx(c), in.ID)
if err != nil {
response.Error(c, err)
return
......@@ -90,7 +90,7 @@ func (x *emailSendController) GetByIDs(c *gin.Context) {
response.Error(c, err)
return
}
emailSends, err := service.EmailSendService.GetSliceByIDs(ctxUtils.WrapCtx(c), in.IDs, nil)
emailSends, err := service.EmailSendService.GetSliceByIDs(ctxUtils.WrapCtx(c), in.IDs)
if err != nil {
response.Error(c, err)
return
......@@ -116,7 +116,7 @@ func (x *emailSendController) Page(c *gin.Context) {
response.Error(c, err)
return
}
emailSends, total, err := service.EmailSendService.Page(ctxUtils.WrapCtx(c), in, nil)
emailSends, total, err := service.EmailSendService.Page(ctxUtils.WrapCtx(c), in)
if err != nil {
response.Error(c, err)
return
......@@ -142,7 +142,7 @@ func (x *emailSendController) ExportCSV(c *gin.Context) {
response.Error(c, err)
return
}
url, err := service.EmailSendService.ExportCSV(ctxUtils.WrapCtx(c), in, nil)
url, err := service.EmailSendService.ExportCSV(ctxUtils.WrapCtx(c), in)
if err != nil {
response.Error(c, err)
return
......
pkg/email/controller/email_send_log.go
浏览文件 @ d7fe160a
......@@ -40,7 +40,7 @@ func (x *emailSendLogController) DeleteByID(c *gin.Context) {
response.Error(c, err)
return
}
if err := service.EmailSendLogService.DeleteByID(ctxUtils.WrapCtx(c), in.ID, nil); err != nil {
if err := service.EmailSendLogService.DeleteByID(ctxUtils.WrapCtx(c), in.ID); err != nil {
response.Error(c, err)
return
}
......@@ -52,7 +52,7 @@ func (x *emailSendLogController) UpdateByID(c *gin.Context) {
response.Error(c, err)
return
}
if err := service.EmailSendLogService.UpdateByID(ctxUtils.WrapCtx(c), in, nil); err != nil {
if err := service.EmailSendLogService.UpdateByID(ctxUtils.WrapCtx(c), in); err != nil {
response.Error(c, err)
return
}
......@@ -75,7 +75,7 @@ func (x *emailSendLogController) GetByID(c *gin.Context) {
response.Error(c, err)
return
}
emailSendLog, err := service.EmailSendLogService.GetByID(ctxUtils.WrapCtx(c), in.ID, nil)
emailSendLog, err := service.EmailSendLogService.GetByID(ctxUtils.WrapCtx(c), in.ID)
if err != nil {
response.Error(c, err)
return
......@@ -89,7 +89,7 @@ func (x *emailSendLogController) GetByIDs(c *gin.Context) {
response.Error(c, err)
return
}
emailSendLogs, err := service.EmailSendLogService.GetSliceByIDs(ctxUtils.WrapCtx(c), in.IDs, nil)
emailSendLogs, err := service.EmailSendLogService.GetSliceByIDs(ctxUtils.WrapCtx(c), in.IDs)
if err != nil {
response.Error(c, err)
return
......@@ -115,7 +115,7 @@ func (x *emailSendLogController) Page(c *gin.Context) {
response.Error(c, err)
return
}
emailSendLogs, total, err := service.EmailSendLogService.Page(ctxUtils.WrapCtx(c), in, nil)
emailSendLogs, total, err := service.EmailSendLogService.Page(ctxUtils.WrapCtx(c), in)
if err != nil {
response.Error(c, err)
return
......@@ -141,7 +141,7 @@ func (x *emailSendLogController) ExportCSV(c *gin.Context) {
response.Error(c, err)
return
}
url, err := service.EmailSendLogService.ExportCSV(ctxUtils.WrapCtx(c), in, nil)
url, err := service.EmailSendLogService.ExportCSV(ctxUtils.WrapCtx(c), in)
if err != nil {
response.Error(c, err)
return
......
pkg/email/controller/email_tpl.go
浏览文件 @ d7fe160a
......@@ -40,7 +40,7 @@ func (x *emailTplController) DeleteByID(c *gin.Context) {
response.Error(c, err)
return
}
if err := service.EmailTplService.DeleteByID(ctxUtils.WrapCtx(c), in.ID, nil); err != nil {
if err := service.EmailTplService.DeleteByID(ctxUtils.WrapCtx(c), in.ID); err != nil {
response.Error(c, err)
return
}
......@@ -52,7 +52,7 @@ func (x *emailTplController) UpdateByID(c *gin.Context) {
response.Error(c, err)
return
}
if err := service.EmailTplService.UpdateByID(ctxUtils.WrapCtx(c), in, nil); err != nil {
if err := service.EmailTplService.UpdateByID(ctxUtils.WrapCtx(c), in); err != nil {
response.Error(c, err)
return
}
......@@ -75,7 +75,7 @@ func (x *emailTplController) GetByID(c *gin.Context) {
response.Error(c, err)
return
}
emailTpl, err := service.EmailTplService.GetByID(ctxUtils.WrapCtx(c), in.ID, nil)
emailTpl, err := service.EmailTplService.GetByID(ctxUtils.WrapCtx(c), in.ID)
if err != nil {
response.Error(c, err)
return
......@@ -89,7 +89,7 @@ func (x *emailTplController) GetByIDs(c *gin.Context) {
response.Error(c, err)
return
}
emailTpls, err := service.EmailTplService.GetSliceByIDs(ctxUtils.WrapCtx(c), in.IDs, nil)
emailTpls, err := service.EmailTplService.GetSliceByIDs(ctxUtils.WrapCtx(c), in.IDs)
if err != nil {
response.Error(c, err)
return
......@@ -115,7 +115,7 @@ func (x *emailTplController) Page(c *gin.Context) {
response.Error(c, err)
return
}
emailTpls, total, err := service.EmailTplService.Page(ctxUtils.WrapCtx(c), in, nil)
emailTpls, total, err := service.EmailTplService.Page(ctxUtils.WrapCtx(c), in)
if err != nil {
response.Error(c, err)
return
......@@ -141,7 +141,7 @@ func (x *emailTplController) ExportCSV(c *gin.Context) {
response.Error(c, err)
return
}
url, err := service.EmailTplService.ExportCSV(ctxUtils.WrapCtx(c), in, nil)
url, err := service.EmailTplService.ExportCSV(ctxUtils.WrapCtx(c), in)
if err != nil {
response.Error(c, err)
return
......
pkg/email/controller/email_tpl_receiver.go
浏览文件 @ d7fe160a
......@@ -40,7 +40,7 @@ func (x *emailTplReceiverController) DeleteByID(c *gin.Context) {
response.Error(c, err)
return
}
if err := service.EmailTplReceiverService.DeleteByID(ctxUtils.WrapCtx(c), in.ID, nil); err != nil {
if err := service.EmailTplReceiverService.DeleteByID(ctxUtils.WrapCtx(c), in.ID); err != nil {
response.Error(c, err)
return
}
......@@ -52,7 +52,7 @@ func (x *emailTplReceiverController) UpdateByID(c *gin.Context) {
response.Error(c, err)
return
}
if err := service.EmailTplReceiverService.UpdateByID(ctxUtils.WrapCtx(c), in, nil); err != nil {
if err := service.EmailTplReceiverService.UpdateByID(ctxUtils.WrapCtx(c), in); err != nil {
response.Error(c, err)
return
}
......@@ -75,7 +75,7 @@ func (x *emailTplReceiverController) GetByID(c *gin.Context) {
response.Error(c, err)
return
}
emailTplReceiver, err := service.EmailTplReceiverService.GetByID(ctxUtils.WrapCtx(c), in.ID, nil)
emailTplReceiver, err := service.EmailTplReceiverService.GetByID(ctxUtils.WrapCtx(c), in.ID)
if err != nil {
response.Error(c, err)
return
......@@ -89,7 +89,7 @@ func (x *emailTplReceiverController) GetByIDs(c *gin.Context) {
response.Error(c, err)
return
}
emailTplReceivers, err := service.EmailTplReceiverService.GetSliceByIDs(ctxUtils.WrapCtx(c), in.IDs, nil)
emailTplReceivers, err := service.EmailTplReceiverService.GetSliceByIDs(ctxUtils.WrapCtx(c), in.IDs)
if err != nil {
response.Error(c, err)
return
......@@ -115,7 +115,7 @@ func (x *emailTplReceiverController) Page(c *gin.Context) {
response.Error(c, err)
return
}
emailTplReceivers, total, err := service.EmailTplReceiverService.Page(ctxUtils.WrapCtx(c), in, nil)
emailTplReceivers, total, err := service.EmailTplReceiverService.Page(ctxUtils.WrapCtx(c), in)
if err != nil {
response.Error(c, err)
return
......@@ -141,7 +141,7 @@ func (x *emailTplReceiverController) ExportCSV(c *gin.Context) {
response.Error(c, err)
return
}
url, err := service.EmailTplReceiverService.ExportCSV(ctxUtils.WrapCtx(c), in, nil)
url, err := service.EmailTplReceiverService.ExportCSV(ctxUtils.WrapCtx(c), in)
if err != nil {
response.Error(c, err)
return
......
pkg/email/email.go
浏览文件 @ d7fe160a
......@@ -135,14 +135,14 @@ type Params struct {
}
func (x *oEmail) SendTLS(ctx context.Context, in *Params) (err error) {
et, err := service.EmailTplService.GetByCode(ctx, in.TplCode, nil)
et, err := service.EmailTplService.GetByCode(ctx, in.TplCode)
if err != nil {
return err
}
if et == nil {
return ecode.ErrEmailTplNotFound
}
rs, err := service.EmailTplReceiverService.GetSliceByTplID(ctx, et.GetID(), nil)
rs, err := service.EmailTplReceiverService.GetSliceByTplID(ctx, et.GetID())
if err != nil {
return err
}
......
pkg/email/service/email.go
浏览文件 @ d7fe160a
......@@ -39,21 +39,21 @@ func (x *emailService) Create(ctx context.Context, in *types.EmailCreateReq) (id
return email.ID, nil
}
func (x *emailService) DeleteByID(ctx context.Context, id xsf.ID, opts *biz.EmailOpts) error {
func (x *emailService) DeleteByID(ctx context.Context, id xsf.ID) error {
if id <= 0 {
return nil
}
if _, err := x.ErrNotFound(ctx, id, opts); err != nil {
if _, err := x.ErrNotFound(ctx, id); err != nil {
return err
}
return dao.EmailDao.DeleteByID(ctx, id)
}
func (x *emailService) UpdateByID(ctx context.Context, in *types.EmailUpdateByIDReq, opts *biz.EmailOpts) error {
func (x *emailService) UpdateByID(ctx context.Context, in *types.EmailUpdateByIDReq) error {
if in.ID <= 0 {
return nil
}
if _, err := x.ErrNotFound(ctx, in.ID, opts); err != nil {
if _, err := x.ErrNotFound(ctx, in.ID); err != nil {
return err
}
emailUpd := &models.Email{}
......@@ -61,11 +61,11 @@ func (x *emailService) UpdateByID(ctx context.Context, in *types.EmailUpdateByID
return dao.EmailDao.UpdateByID(ctx, in.ID, emailUpd)
}
func (x *emailService) ErrFound(ctx context.Context, id xsf.ID, opts *biz.EmailOpts) (emailBiz *biz.Email, err error) {
func (x *emailService) ErrFound(ctx context.Context, id xsf.ID) (emailBiz *biz.Email, err error) {
if id <= 0 {
return nil, nil
}
emailBiz, err = x.GetByID(ctx, id, opts)
emailBiz, err = x.GetByID(ctx, id)
if err != nil {
return nil, err
}
......@@ -75,11 +75,11 @@ func (x *emailService) ErrFound(ctx context.Context, id xsf.ID, opts *biz.EmailO
return emailBiz, nil
}
func (x *emailService) ErrNotFound(ctx context.Context, id xsf.ID, opts *biz.EmailOpts) (emailBiz *biz.Email, err error) {
func (x *emailService) ErrNotFound(ctx context.Context, id xsf.ID) (emailBiz *biz.Email, err error) {
if id <= 0 {
return nil, nil
}
emailBiz, err = x.GetByID(ctx, id, opts)
emailBiz, err = x.GetByID(ctx, id)
if err != nil {
return nil, err
}
......@@ -89,7 +89,7 @@ func (x *emailService) ErrNotFound(ctx context.Context, id xsf.ID, opts *biz.Ema
return emailBiz, nil
}
func (x *emailService) GetByID(ctx context.Context, id xsf.ID, opts *biz.EmailOpts) (emailBiz *biz.Email, err error) {
func (x *emailService) GetByID(ctx context.Context, id xsf.ID) (emailBiz *biz.Email, err error) {
if id <= 0 {
return nil, nil
}
......@@ -100,10 +100,10 @@ func (x *emailService) GetByID(ctx context.Context, id xsf.ID, opts *biz.EmailOp
if email == nil {
return nil, nil
}
return x.ToBiz(ctx, email, opts)
return x.ToBiz(ctx, email)
}
func (x *emailService) GetSliceByIDs(ctx context.Context, ids []xsf.ID, opts *biz.EmailOpts) ([]*biz.Email, error) {
func (x *emailService) GetSliceByIDs(ctx context.Context, ids []xsf.ID) ([]*biz.Email, error) {
if len(ids) == 0 {
return nil, nil
}
......@@ -114,14 +114,14 @@ func (x *emailService) GetSliceByIDs(ctx context.Context, ids []xsf.ID, opts *bi
if len(emails) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emails, opts)
return x.ToSliceBiz(ctx, emails)
}
func (x *emailService) GetMapByIDs(ctx context.Context, ids []xsf.ID, opts *biz.EmailOpts) (map[xsf.ID]*biz.Email, error) {
func (x *emailService) GetMapByIDs(ctx context.Context, ids []xsf.ID) (map[xsf.ID]*biz.Email, error) {
if len(ids) == 0 {
return nil, nil
}
emailBizSlice, err := x.GetSliceByIDs(ctx, ids, opts)
emailBizSlice, err := x.GetSliceByIDs(ctx, ids)
if err != nil {
return nil, err
}
......@@ -132,7 +132,7 @@ func (x *emailService) GetMapByIDs(ctx context.Context, ids []xsf.ID, opts *biz.
return emailBizIDMap, nil
}
func (x *emailService) Page(ctx context.Context, in *types.EmailPageReq, opts *biz.EmailOpts) ([]*biz.Email, int64, error) {
func (x *emailService) Page(ctx context.Context, in *types.EmailPageReq) ([]*biz.Email, int64, error) {
emails, total, err := dao.EmailDao.Page(ctx, in)
if err != nil {
return nil, 0, err
......@@ -140,13 +140,13 @@ func (x *emailService) Page(ctx context.Context, in *types.EmailPageReq, opts *b
if len(emails) == 0 {
return nil, total, nil
}
emailBizSlice, err := x.ToSliceBiz(ctx, emails, opts)
emailBizSlice, err := x.ToSliceBiz(ctx, emails)
if err != nil {
return nil, 0, err
}
return emailBizSlice, total, nil
}
func (x *emailService) GetSliceByTplID(ctx context.Context, tplID xsf.ID, opts *biz.EmailOpts) ([]*biz.Email, error) {
func (x *emailService) GetSliceByTplID(ctx context.Context, tplID xsf.ID) ([]*biz.Email, error) {
if tplID == 0 {
return nil, nil
}
......@@ -157,10 +157,10 @@ func (x *emailService) GetSliceByTplID(ctx context.Context, tplID xsf.ID, opts *
if len(emails) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emails, opts)
return x.ToSliceBiz(ctx, emails)
}
func (x *emailService) GetSliceByTplIDs(ctx context.Context, tplIDs []xsf.ID, opts *biz.EmailOpts) ([]*biz.Email, error) {
func (x *emailService) GetSliceByTplIDs(ctx context.Context, tplIDs []xsf.ID) ([]*biz.Email, error) {
if len(tplIDs) == 0 {
return nil, nil
}
......@@ -171,14 +171,14 @@ func (x *emailService) GetSliceByTplIDs(ctx context.Context, tplIDs []xsf.ID, op
if len(emails) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emails, opts)
return x.ToSliceBiz(ctx, emails)
}
func (x *emailService) GetMapSliceByTplIDs(ctx context.Context, tplIDs []xsf.ID, opts *biz.EmailOpts) (map[xsf.ID][]*biz.Email, int, error) {
func (x *emailService) GetMapSliceByTplIDs(ctx context.Context, tplIDs []xsf.ID) (map[xsf.ID][]*biz.Email, int, error) {
if len(tplIDs) == 0 {
return nil, 0, nil
}
emailBizSlice, err := x.GetSliceByTplIDs(ctx, tplIDs, opts)
emailBizSlice, err := x.GetSliceByTplIDs(ctx, tplIDs)
if err != nil {
return nil, 0, err
}
......@@ -192,50 +192,23 @@ func (x *emailService) GetMapSliceByTplIDs(ctx context.Context, tplIDs []xsf.ID,
return ret, len(emailBizSlice), nil
}
func (x *emailService) ToBiz(ctx context.Context, email *models.Email, opts *biz.EmailOpts) (emailBiz *biz.Email, err error) {
func (x *emailService) ToBiz(ctx context.Context, email *models.Email) (emailBiz *biz.Email, err error) {
if email == nil {
return nil, nil
}
emailBiz = biz.EmailTool.NewFromModel(email)
if err = x.Fill(ctx, emailBiz, opts); err != nil {
return nil, err
}
return emailBiz, nil
}
func (x *emailService) ToSliceBiz(ctx context.Context, emails []*models.Email, opts *biz.EmailOpts) (emailBizSlice []*biz.Email, err error) {
func (x *emailService) ToSliceBiz(ctx context.Context, emails []*models.Email) (emailBizSlice []*biz.Email, err error) {
if len(emails) == 0 {
return nil, nil
}
emailBizSlice = biz.EmailTool.NewSliceFromModelsBiz(emails)
if err = x.SliceFill(ctx, emailBizSlice, opts); err != nil {
return nil, err
}
if err = biz.EmailTool.ValidSlice(ctx, emailBizSlice, opts); err != nil {
return nil, err
}
return emailBizSlice, nil
}
func (x *emailService) Fill(ctx context.Context, emailBiz *biz.Email, opts *biz.EmailOpts) error {
if emailBiz == nil {
return nil
}
if opts != nil {
}
return nil
}
func (x *emailService) SliceFill(ctx context.Context, emailBizSlice []*biz.Email, opts *biz.EmailOpts) error {
if len(emailBizSlice) == 0 {
return nil
}
if opts != nil {
}
return nil
}
func (x *emailService) GetAll(ctx context.Context, opts *biz.EmailOpts) ([]*biz.Email, error) {
func (x *emailService) GetAll(ctx context.Context) ([]*biz.Email, error) {
emails, err := dao.EmailDao.GetAll(ctx)
if err != nil {
return nil, err
......@@ -243,10 +216,10 @@ func (x *emailService) GetAll(ctx context.Context, opts *biz.EmailOpts) ([]*biz.
if len(emails) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emails, opts)
return x.ToSliceBiz(ctx, emails)
}
func (x *emailService) ExportCSV(ctx context.Context, in *types.EmailExportReq, opts *biz.EmailOpts) (string, error) {
func (x *emailService) ExportCSV(ctx context.Context, in *types.EmailExportReq) (string, error) {
req := &types.EmailPageReq{}
_ = copier.Copy(req, in)
var total = func() (int64, error) {
......@@ -260,7 +233,7 @@ func (x *emailService) ExportCSV(ctx context.Context, in *types.EmailExportReq,
if len(rs) == 0 {
return nil, nil
}
bizs, err := x.ToSliceBiz(ctx, rs, opts)
bizs, err := x.ToSliceBiz(ctx, rs)
if err != nil {
return nil, err
}
......
pkg/email/service/email_receiver.go
浏览文件 @ d7fe160a
......@@ -39,21 +39,21 @@ func (x *emailReceiverService) Create(ctx context.Context, in *types.EmailReceiv
return emailReceiver.ID, nil
}
func (x *emailReceiverService) DeleteByID(ctx context.Context, id xsf.ID, opts *biz.EmailReceiverOpts) error {
func (x *emailReceiverService) DeleteByID(ctx context.Context, id xsf.ID) error {
if id <= 0 {
return nil
}
if _, err := x.ErrNotFound(ctx, id, opts); err != nil {
if _, err := x.ErrNotFound(ctx, id); err != nil {
return err
}
return dao.EmailReceiverDao.DeleteByID(ctx, id)
}
func (x *emailReceiverService) UpdateByID(ctx context.Context, in *types.EmailReceiverUpdateByIDReq, opts *biz.EmailReceiverOpts) error {
func (x *emailReceiverService) UpdateByID(ctx context.Context, in *types.EmailReceiverUpdateByIDReq) error {
if in.ID <= 0 {
return nil
}
if _, err := x.ErrNotFound(ctx, in.ID, opts); err != nil {
if _, err := x.ErrNotFound(ctx, in.ID); err != nil {
return err
}
emailReceiverUpd := &models.EmailReceiver{}
......@@ -61,11 +61,11 @@ func (x *emailReceiverService) UpdateByID(ctx context.Context, in *types.EmailRe
return dao.EmailReceiverDao.UpdateByID(ctx, in.ID, emailReceiverUpd)
}
func (x *emailReceiverService) ErrFound(ctx context.Context, id xsf.ID, opts *biz.EmailReceiverOpts) (emailReceiverBiz *biz.EmailReceiver, err error) {
func (x *emailReceiverService) ErrFound(ctx context.Context, id xsf.ID) (emailReceiverBiz *biz.EmailReceiver, err error) {
if id <= 0 {
return nil, nil
}
emailReceiverBiz, err = x.GetByID(ctx, id, opts)
emailReceiverBiz, err = x.GetByID(ctx, id)
if err != nil {
return nil, err
}
......@@ -75,11 +75,11 @@ func (x *emailReceiverService) ErrFound(ctx context.Context, id xsf.ID, opts *bi
return emailReceiverBiz, nil
}
func (x *emailReceiverService) ErrNotFound(ctx context.Context, id xsf.ID, opts *biz.EmailReceiverOpts) (emailReceiverBiz *biz.EmailReceiver, err error) {
func (x *emailReceiverService) ErrNotFound(ctx context.Context, id xsf.ID) (emailReceiverBiz *biz.EmailReceiver, err error) {
if id <= 0 {
return nil, nil
}
emailReceiverBiz, err = x.GetByID(ctx, id, opts)
emailReceiverBiz, err = x.GetByID(ctx, id)
if err != nil {
return nil, err
}
......@@ -89,7 +89,7 @@ func (x *emailReceiverService) ErrNotFound(ctx context.Context, id xsf.ID, opts
return emailReceiverBiz, nil
}
func (x *emailReceiverService) GetByID(ctx context.Context, id xsf.ID, opts *biz.EmailReceiverOpts) (emailReceiverBiz *biz.EmailReceiver, err error) {
func (x *emailReceiverService) GetByID(ctx context.Context, id xsf.ID) (emailReceiverBiz *biz.EmailReceiver, err error) {
if id <= 0 {
return nil, nil
}
......@@ -100,10 +100,10 @@ func (x *emailReceiverService) GetByID(ctx context.Context, id xsf.ID, opts *biz
if emailReceiver == nil {
return nil, nil
}
return x.ToBiz(ctx, emailReceiver, opts)
return x.ToBiz(ctx, emailReceiver)
}
func (x *emailReceiverService) GetSliceByIDs(ctx context.Context, ids []xsf.ID, opts *biz.EmailReceiverOpts) ([]*biz.EmailReceiver, error) {
func (x *emailReceiverService) GetSliceByIDs(ctx context.Context, ids []xsf.ID) ([]*biz.EmailReceiver, error) {
if len(ids) == 0 {
return nil, nil
}
......@@ -114,14 +114,14 @@ func (x *emailReceiverService) GetSliceByIDs(ctx context.Context, ids []xsf.ID,
if len(emailReceivers) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emailReceivers, opts)
return x.ToSliceBiz(ctx, emailReceivers)
}
func (x *emailReceiverService) GetMapByIDs(ctx context.Context, ids []xsf.ID, opts *biz.EmailReceiverOpts) (map[xsf.ID]*biz.EmailReceiver, error) {
func (x *emailReceiverService) GetMapByIDs(ctx context.Context, ids []xsf.ID) (map[xsf.ID]*biz.EmailReceiver, error) {
if len(ids) == 0 {
return nil, nil
}
emailReceiverBizSlice, err := x.GetSliceByIDs(ctx, ids, opts)
emailReceiverBizSlice, err := x.GetSliceByIDs(ctx, ids)
if err != nil {
return nil, err
}
......@@ -132,7 +132,7 @@ func (x *emailReceiverService) GetMapByIDs(ctx context.Context, ids []xsf.ID, op
return emailReceiverBizIDMap, nil
}
func (x *emailReceiverService) Page(ctx context.Context, in *types.EmailReceiverPageReq, opts *biz.EmailReceiverOpts) ([]*biz.EmailReceiver, int64, error) {
func (x *emailReceiverService) Page(ctx context.Context, in *types.EmailReceiverPageReq) ([]*biz.EmailReceiver, int64, error) {
emailReceivers, total, err := dao.EmailReceiverDao.Page(ctx, in)
if err != nil {
return nil, 0, err
......@@ -140,13 +140,13 @@ func (x *emailReceiverService) Page(ctx context.Context, in *types.EmailReceiver
if len(emailReceivers) == 0 {
return nil, total, nil
}
emailReceiverBizSlice, err := x.ToSliceBiz(ctx, emailReceivers, opts)
emailReceiverBizSlice, err := x.ToSliceBiz(ctx, emailReceivers)
if err != nil {
return nil, 0, err
}
return emailReceiverBizSlice, total, nil
}
func (x *emailReceiverService) GetSliceByEmailID(ctx context.Context, emailID xsf.ID, opts *biz.EmailReceiverOpts) ([]*biz.EmailReceiver, error) {
func (x *emailReceiverService) GetSliceByEmailID(ctx context.Context, emailID xsf.ID) ([]*biz.EmailReceiver, error) {
if emailID == 0 {
return nil, nil
}
......@@ -157,10 +157,10 @@ func (x *emailReceiverService) GetSliceByEmailID(ctx context.Context, emailID xs
if len(emailReceivers) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emailReceivers, opts)
return x.ToSliceBiz(ctx, emailReceivers)
}
func (x *emailReceiverService) GetSliceByEmailIDs(ctx context.Context, emailIDs []xsf.ID, opts *biz.EmailReceiverOpts) ([]*biz.EmailReceiver, error) {
func (x *emailReceiverService) GetSliceByEmailIDs(ctx context.Context, emailIDs []xsf.ID) ([]*biz.EmailReceiver, error) {
if len(emailIDs) == 0 {
return nil, nil
}
......@@ -171,14 +171,14 @@ func (x *emailReceiverService) GetSliceByEmailIDs(ctx context.Context, emailIDs
if len(emailReceivers) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emailReceivers, opts)
return x.ToSliceBiz(ctx, emailReceivers)
}
func (x *emailReceiverService) GetMapSliceByEmailIDs(ctx context.Context, emailIDs []xsf.ID, opts *biz.EmailReceiverOpts) (map[xsf.ID][]*biz.EmailReceiver, int, error) {
func (x *emailReceiverService) GetMapSliceByEmailIDs(ctx context.Context, emailIDs []xsf.ID) (map[xsf.ID][]*biz.EmailReceiver, int, error) {
if len(emailIDs) == 0 {
return nil, 0, nil
}
emailReceiverBizSlice, err := x.GetSliceByEmailIDs(ctx, emailIDs, opts)
emailReceiverBizSlice, err := x.GetSliceByEmailIDs(ctx, emailIDs)
if err != nil {
return nil, 0, err
}
......@@ -192,50 +192,23 @@ func (x *emailReceiverService) GetMapSliceByEmailIDs(ctx context.Context, emailI
return ret, len(emailReceiverBizSlice), nil
}
func (x *emailReceiverService) ToBiz(ctx context.Context, emailReceiver *models.EmailReceiver, opts *biz.EmailReceiverOpts) (emailReceiverBiz *biz.EmailReceiver, err error) {
func (x *emailReceiverService) ToBiz(ctx context.Context, emailReceiver *models.EmailReceiver) (emailReceiverBiz *biz.EmailReceiver, err error) {
if emailReceiver == nil {
return nil, nil
}
emailReceiverBiz = biz.EmailReceiverTool.NewFromModel(emailReceiver)
if err = x.Fill(ctx, emailReceiverBiz, opts); err != nil {
return nil, err
}
return emailReceiverBiz, nil
}
func (x *emailReceiverService) ToSliceBiz(ctx context.Context, emailReceivers []*models.EmailReceiver, opts *biz.EmailReceiverOpts) (emailReceiverBizSlice []*biz.EmailReceiver, err error) {
func (x *emailReceiverService) ToSliceBiz(ctx context.Context, emailReceivers []*models.EmailReceiver) (emailReceiverBizSlice []*biz.EmailReceiver, err error) {
if len(emailReceivers) == 0 {
return nil, nil
}
emailReceiverBizSlice = biz.EmailReceiverTool.NewSliceFromModelsBiz(emailReceivers)
if err = x.SliceFill(ctx, emailReceiverBizSlice, opts); err != nil {
return nil, err
}
if err = biz.EmailReceiverTool.ValidSlice(ctx, emailReceiverBizSlice, opts); err != nil {
return nil, err
}
return emailReceiverBizSlice, nil
}
func (x *emailReceiverService) Fill(ctx context.Context, emailReceiverBiz *biz.EmailReceiver, opts *biz.EmailReceiverOpts) error {
if emailReceiverBiz == nil {
return nil
}
if opts != nil {
}
return nil
}
func (x *emailReceiverService) SliceFill(ctx context.Context, emailReceiverBizSlice []*biz.EmailReceiver, opts *biz.EmailReceiverOpts) error {
if len(emailReceiverBizSlice) == 0 {
return nil
}
if opts != nil {
}
return nil
}
func (x *emailReceiverService) GetAll(ctx context.Context, opts *biz.EmailReceiverOpts) ([]*biz.EmailReceiver, error) {
func (x *emailReceiverService) GetAll(ctx context.Context) ([]*biz.EmailReceiver, error) {
emailReceivers, err := dao.EmailReceiverDao.GetAll(ctx)
if err != nil {
return nil, err
......@@ -243,9 +216,9 @@ func (x *emailReceiverService) GetAll(ctx context.Context, opts *biz.EmailReceiv
if len(emailReceivers) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emailReceivers, opts)
return x.ToSliceBiz(ctx, emailReceivers)
}
func (x *emailReceiverService) ExportCSV(ctx context.Context, in *types.EmailReceiverExportReq, opts *biz.EmailReceiverOpts) (string, error) {
func (x *emailReceiverService) ExportCSV(ctx context.Context, in *types.EmailReceiverExportReq) (string, error) {
req := &types.EmailReceiverPageReq{}
_ = copier.Copy(req, in)
var total = func() (int64, error) {
......@@ -259,7 +232,7 @@ func (x *emailReceiverService) ExportCSV(ctx context.Context, in *types.EmailRec
if len(rs) == 0 {
return nil, nil
}
bizs, err := x.ToSliceBiz(ctx, rs, opts)
bizs, err := x.ToSliceBiz(ctx, rs)
if err != nil {
return nil, err
}
......
pkg/email/service/email_send_log.go
浏览文件 @ d7fe160a
......@@ -39,21 +39,21 @@ func (x *emailSendLogService) Create(ctx context.Context, in *types.EmailSendLog
return emailSendLog.ID, nil
}
func (x *emailSendLogService) DeleteByID(ctx context.Context, id xsf.ID, opts *biz.EmailSendLogOpts) error {
func (x *emailSendLogService) DeleteByID(ctx context.Context, id xsf.ID) error {
if id <= 0 {
return nil
}
if _, err := x.ErrNotFound(ctx, id, opts); err != nil {
if _, err := x.ErrNotFound(ctx, id); err != nil {
return err
}
return dao.EmailSendLogDao.DeleteByID(ctx, id)
}
func (x *emailSendLogService) UpdateByID(ctx context.Context, in *types.EmailSendLogUpdateByIDReq, opts *biz.EmailSendLogOpts) error {
func (x *emailSendLogService) UpdateByID(ctx context.Context, in *types.EmailSendLogUpdateByIDReq) error {
if in.ID <= 0 {
return nil
}
if _, err := x.ErrNotFound(ctx, in.ID, opts); err != nil {
if _, err := x.ErrNotFound(ctx, in.ID); err != nil {
return err
}
emailSendLogUpd := &models.EmailSendLog{}
......@@ -61,11 +61,11 @@ func (x *emailSendLogService) UpdateByID(ctx context.Context, in *types.EmailSen
return dao.EmailSendLogDao.UpdateByID(ctx, in.ID, emailSendLogUpd)
}
func (x *emailSendLogService) ErrFound(ctx context.Context, id xsf.ID, opts *biz.EmailSendLogOpts) (emailSendLogBiz *biz.EmailSendLog, err error) {
func (x *emailSendLogService) ErrFound(ctx context.Context, id xsf.ID) (emailSendLogBiz *biz.EmailSendLog, err error) {
if id <= 0 {
return nil, nil
}
emailSendLogBiz, err = x.GetByID(ctx, id, opts)
emailSendLogBiz, err = x.GetByID(ctx, id)
if err != nil {
return nil, err
}
......@@ -75,11 +75,11 @@ func (x *emailSendLogService) ErrFound(ctx context.Context, id xsf.ID, opts *biz
return emailSendLogBiz, nil
}
func (x *emailSendLogService) ErrNotFound(ctx context.Context, id xsf.ID, opts *biz.EmailSendLogOpts) (emailSendLogBiz *biz.EmailSendLog, err error) {
func (x *emailSendLogService) ErrNotFound(ctx context.Context, id xsf.ID) (emailSendLogBiz *biz.EmailSendLog, err error) {
if id <= 0 {
return nil, nil
}
emailSendLogBiz, err = x.GetByID(ctx, id, opts)
emailSendLogBiz, err = x.GetByID(ctx, id)
if err != nil {
return nil, err
}
......@@ -89,7 +89,7 @@ func (x *emailSendLogService) ErrNotFound(ctx context.Context, id xsf.ID, opts *
return emailSendLogBiz, nil
}
func (x *emailSendLogService) GetByID(ctx context.Context, id xsf.ID, opts *biz.EmailSendLogOpts) (emailSendLogBiz *biz.EmailSendLog, err error) {
func (x *emailSendLogService) GetByID(ctx context.Context, id xsf.ID) (emailSendLogBiz *biz.EmailSendLog, err error) {
if id <= 0 {
return nil, nil
}
......@@ -100,10 +100,10 @@ func (x *emailSendLogService) GetByID(ctx context.Context, id xsf.ID, opts *biz.
if emailSendLog == nil {
return nil, nil
}
return x.ToBiz(ctx, emailSendLog, opts)
return x.ToBiz(ctx, emailSendLog)
}
func (x *emailSendLogService) GetSliceByIDs(ctx context.Context, ids []xsf.ID, opts *biz.EmailSendLogOpts) ([]*biz.EmailSendLog, error) {
func (x *emailSendLogService) GetSliceByIDs(ctx context.Context, ids []xsf.ID) ([]*biz.EmailSendLog, error) {
if len(ids) == 0 {
return nil, nil
}
......@@ -114,14 +114,14 @@ func (x *emailSendLogService) GetSliceByIDs(ctx context.Context, ids []xsf.ID, o
if len(emailSendLogs) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emailSendLogs, opts)
return x.ToSliceBiz(ctx, emailSendLogs)
}
func (x *emailSendLogService) GetMapByIDs(ctx context.Context, ids []xsf.ID, opts *biz.EmailSendLogOpts) (map[xsf.ID]*biz.EmailSendLog, error) {
func (x *emailSendLogService) GetMapByIDs(ctx context.Context, ids []xsf.ID) (map[xsf.ID]*biz.EmailSendLog, error) {
if len(ids) == 0 {
return nil, nil
}
emailSendLogBizSlice, err := x.GetSliceByIDs(ctx, ids, opts)
emailSendLogBizSlice, err := x.GetSliceByIDs(ctx, ids)
if err != nil {
return nil, err
}
......@@ -132,7 +132,7 @@ func (x *emailSendLogService) GetMapByIDs(ctx context.Context, ids []xsf.ID, opt
return emailSendLogBizIDMap, nil
}
func (x *emailSendLogService) Page(ctx context.Context, in *types.EmailSendLogPageReq, opts *biz.EmailSendLogOpts) ([]*biz.EmailSendLog, int64, error) {
func (x *emailSendLogService) Page(ctx context.Context, in *types.EmailSendLogPageReq) ([]*biz.EmailSendLog, int64, error) {
emailSendLogs, total, err := dao.EmailSendLogDao.Page(ctx, in)
if err != nil {
return nil, 0, err
......@@ -140,13 +140,13 @@ func (x *emailSendLogService) Page(ctx context.Context, in *types.EmailSendLogPa
if len(emailSendLogs) == 0 {
return nil, total, nil
}
emailSendLogBizSlice, err := x.ToSliceBiz(ctx, emailSendLogs, opts)
emailSendLogBizSlice, err := x.ToSliceBiz(ctx, emailSendLogs)
if err != nil {
return nil, 0, err
}
return emailSendLogBizSlice, total, nil
}
func (x *emailSendLogService) GetSliceByEmailSendID(ctx context.Context, emailSendID xsf.ID, opts *biz.EmailSendLogOpts) ([]*biz.EmailSendLog, error) {
func (x *emailSendLogService) GetSliceByEmailSendID(ctx context.Context, emailSendID xsf.ID) ([]*biz.EmailSendLog, error) {
if emailSendID == 0 {
return nil, nil
}
......@@ -157,10 +157,10 @@ func (x *emailSendLogService) GetSliceByEmailSendID(ctx context.Context, emailSe
if len(emailSendLogs) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emailSendLogs, opts)
return x.ToSliceBiz(ctx, emailSendLogs)
}
func (x *emailSendLogService) GetSliceByEmailSendIDs(ctx context.Context, emailSendIDs []xsf.ID, opts *biz.EmailSendLogOpts) ([]*biz.EmailSendLog, error) {
func (x *emailSendLogService) GetSliceByEmailSendIDs(ctx context.Context, emailSendIDs []xsf.ID) ([]*biz.EmailSendLog, error) {
if len(emailSendIDs) == 0 {
return nil, nil
}
......@@ -171,14 +171,14 @@ func (x *emailSendLogService) GetSliceByEmailSendIDs(ctx context.Context, emailS
if len(emailSendLogs) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emailSendLogs, opts)
return x.ToSliceBiz(ctx, emailSendLogs)
}
func (x *emailSendLogService) GetMapSliceByEmailSendIDs(ctx context.Context, emailSendIDs []xsf.ID, opts *biz.EmailSendLogOpts) (map[xsf.ID][]*biz.EmailSendLog, int, error) {
func (x *emailSendLogService) GetMapSliceByEmailSendIDs(ctx context.Context, emailSendIDs []xsf.ID) (map[xsf.ID][]*biz.EmailSendLog, int, error) {
if len(emailSendIDs) == 0 {
return nil, 0, nil
}
emailSendLogBizSlice, err := x.GetSliceByEmailSendIDs(ctx, emailSendIDs, opts)
emailSendLogBizSlice, err := x.GetSliceByEmailSendIDs(ctx, emailSendIDs)
if err != nil {
return nil, 0, err
}
......@@ -192,50 +192,23 @@ func (x *emailSendLogService) GetMapSliceByEmailSendIDs(ctx context.Context, ema
return ret, len(emailSendLogBizSlice), nil
}
func (x *emailSendLogService) ToBiz(ctx context.Context, emailSendLog *models.EmailSendLog, opts *biz.EmailSendLogOpts) (emailSendLogBiz *biz.EmailSendLog, err error) {
func (x *emailSendLogService) ToBiz(ctx context.Context, emailSendLog *models.EmailSendLog) (emailSendLogBiz *biz.EmailSendLog, err error) {
if emailSendLog == nil {
return nil, nil
}
emailSendLogBiz = biz.EmailSendLogTool.NewFromModel(emailSendLog)
if err = x.Fill(ctx, emailSendLogBiz, opts); err != nil {
return nil, err
}
return emailSendLogBiz, nil
}
func (x *emailSendLogService) ToSliceBiz(ctx context.Context, emailSendLogs []*models.EmailSendLog, opts *biz.EmailSendLogOpts) (emailSendLogBizSlice []*biz.EmailSendLog, err error) {
func (x *emailSendLogService) ToSliceBiz(ctx context.Context, emailSendLogs []*models.EmailSendLog) (emailSendLogBizSlice []*biz.EmailSendLog, err error) {
if len(emailSendLogs) == 0 {
return nil, nil
}
emailSendLogBizSlice = biz.EmailSendLogTool.NewSliceFromModelsBiz(emailSendLogs)
if err = x.SliceFill(ctx, emailSendLogBizSlice, opts); err != nil {
return nil, err
}
if err = biz.EmailSendLogTool.ValidSlice(ctx, emailSendLogBizSlice, opts); err != nil {
return nil, err
}
return emailSendLogBizSlice, nil
}
func (x *emailSendLogService) Fill(ctx context.Context, emailSendLogBiz *biz.EmailSendLog, opts *biz.EmailSendLogOpts) error {
if emailSendLogBiz == nil {
return nil
}
if opts != nil {
}
return nil
}
func (x *emailSendLogService) SliceFill(ctx context.Context, emailSendLogBizSlice []*biz.EmailSendLog, opts *biz.EmailSendLogOpts) error {
if len(emailSendLogBizSlice) == 0 {
return nil
}
if opts != nil {
}
return nil
}
func (x *emailSendLogService) GetAll(ctx context.Context, opts *biz.EmailSendLogOpts) ([]*biz.EmailSendLog, error) {
func (x *emailSendLogService) GetAll(ctx context.Context) ([]*biz.EmailSendLog, error) {
emailSendLogs, err := dao.EmailSendLogDao.GetAll(ctx)
if err != nil {
return nil, err
......@@ -243,9 +216,9 @@ func (x *emailSendLogService) GetAll(ctx context.Context, opts *biz.EmailSendLog
if len(emailSendLogs) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emailSendLogs, opts)
return x.ToSliceBiz(ctx, emailSendLogs)
}
func (x *emailSendLogService) ExportCSV(ctx context.Context, in *types.EmailSendLogExportReq, opts *biz.EmailSendLogOpts) (string, error) {
func (x *emailSendLogService) ExportCSV(ctx context.Context, in *types.EmailSendLogExportReq) (string, error) {
req := &types.EmailSendLogPageReq{}
_ = copier.Copy(req, in)
var total = func() (int64, error) {
......@@ -259,7 +232,7 @@ func (x *emailSendLogService) ExportCSV(ctx context.Context, in *types.EmailSend
if len(rs) == 0 {
return nil, nil
}
bizs, err := x.ToSliceBiz(ctx, rs, opts)
bizs, err := x.ToSliceBiz(ctx, rs)
if err != nil {
return nil, err
}
......
pkg/email/service/email_tpl.go
浏览文件 @ d7fe160a
......@@ -39,21 +39,21 @@ func (x *emailTplService) Create(ctx context.Context, in *types.EmailTplCreateRe
return emailTpl.ID, nil
}
func (x *emailTplService) DeleteByID(ctx context.Context, id xsf.ID, opts *biz.EmailTplOpts) error {
func (x *emailTplService) DeleteByID(ctx context.Context, id xsf.ID) error {
if id <= 0 {
return nil
}
if _, err := x.ErrNotFound(ctx, id, opts); err != nil {
if _, err := x.ErrNotFound(ctx, id); err != nil {
return err
}
return dao.EmailTplDao.DeleteByID(ctx, id)
}
func (x *emailTplService) UpdateByID(ctx context.Context, in *types.EmailTplUpdateByIDReq, opts *biz.EmailTplOpts) error {
func (x *emailTplService) UpdateByID(ctx context.Context, in *types.EmailTplUpdateByIDReq) error {
if in.ID <= 0 {
return nil
}
if _, err := x.ErrNotFound(ctx, in.ID, opts); err != nil {
if _, err := x.ErrNotFound(ctx, in.ID); err != nil {
return err
}
emailTplUpd := &models.EmailTpl{}
......@@ -61,11 +61,11 @@ func (x *emailTplService) UpdateByID(ctx context.Context, in *types.EmailTplUpda
return dao.EmailTplDao.UpdateByID(ctx, in.ID, emailTplUpd)
}
func (x *emailTplService) ErrFound(ctx context.Context, id xsf.ID, opts *biz.EmailTplOpts) (emailTplBiz *biz.EmailTpl, err error) {
func (x *emailTplService) ErrFound(ctx context.Context, id xsf.ID) (emailTplBiz *biz.EmailTpl, err error) {
if id <= 0 {
return nil, nil
}
emailTplBiz, err = x.GetByID(ctx, id, opts)
emailTplBiz, err = x.GetByID(ctx, id)
if err != nil {
return nil, err
}
......@@ -75,11 +75,11 @@ func (x *emailTplService) ErrFound(ctx context.Context, id xsf.ID, opts *biz.Ema
return emailTplBiz, nil
}
func (x *emailTplService) ErrNotFound(ctx context.Context, id xsf.ID, opts *biz.EmailTplOpts) (emailTplBiz *biz.EmailTpl, err error) {
func (x *emailTplService) ErrNotFound(ctx context.Context, id xsf.ID) (emailTplBiz *biz.EmailTpl, err error) {
if id <= 0 {
return nil, nil
}
emailTplBiz, err = x.GetByID(ctx, id, opts)
emailTplBiz, err = x.GetByID(ctx, id)
if err != nil {
return nil, err
}
......@@ -89,7 +89,7 @@ func (x *emailTplService) ErrNotFound(ctx context.Context, id xsf.ID, opts *biz.
return emailTplBiz, nil
}
func (x *emailTplService) GetByID(ctx context.Context, id xsf.ID, opts *biz.EmailTplOpts) (emailTplBiz *biz.EmailTpl, err error) {
func (x *emailTplService) GetByID(ctx context.Context, id xsf.ID) (emailTplBiz *biz.EmailTpl, err error) {
if id <= 0 {
return nil, nil
}
......@@ -100,10 +100,10 @@ func (x *emailTplService) GetByID(ctx context.Context, id xsf.ID, opts *biz.Emai
if emailTpl == nil {
return nil, nil
}
return x.ToBiz(ctx, emailTpl, opts)
return x.ToBiz(ctx, emailTpl)
}
func (x *emailTplService) GetByCode(ctx context.Context, code string, opts *biz.EmailTplOpts) (emailTplBiz *biz.EmailTpl, err error) {
func (x *emailTplService) GetByCode(ctx context.Context, code string) (emailTplBiz *biz.EmailTpl, err error) {
if code == "" {
return nil, nil
}
......@@ -114,10 +114,10 @@ func (x *emailTplService) GetByCode(ctx context.Context, code string, opts *biz.
if emailTpl == nil {
return nil, nil
}
return x.ToBiz(ctx, emailTpl, opts)
return x.ToBiz(ctx, emailTpl)
}
func (x *emailTplService) GetSliceByIDs(ctx context.Context, ids []xsf.ID, opts *biz.EmailTplOpts) ([]*biz.EmailTpl, error) {
func (x *emailTplService) GetSliceByIDs(ctx context.Context, ids []xsf.ID) ([]*biz.EmailTpl, error) {
if len(ids) == 0 {
return nil, nil
}
......@@ -128,14 +128,14 @@ func (x *emailTplService) GetSliceByIDs(ctx context.Context, ids []xsf.ID, opts
if len(emailTpls) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emailTpls, opts)
return x.ToSliceBiz(ctx, emailTpls)
}
func (x *emailTplService) GetMapByIDs(ctx context.Context, ids []xsf.ID, opts *biz.EmailTplOpts) (map[xsf.ID]*biz.EmailTpl, error) {
func (x *emailTplService) GetMapByIDs(ctx context.Context, ids []xsf.ID) (map[xsf.ID]*biz.EmailTpl, error) {
if len(ids) == 0 {
return nil, nil
}
emailTplBizSlice, err := x.GetSliceByIDs(ctx, ids, opts)
emailTplBizSlice, err := x.GetSliceByIDs(ctx, ids)
if err != nil {
return nil, err
}
......@@ -146,7 +146,7 @@ func (x *emailTplService) GetMapByIDs(ctx context.Context, ids []xsf.ID, opts *b
return emailTplBizIDMap, nil
}
func (x *emailTplService) Page(ctx context.Context, in *types.EmailTplPageReq, opts *biz.EmailTplOpts) ([]*biz.EmailTpl, int64, error) {
func (x *emailTplService) Page(ctx context.Context, in *types.EmailTplPageReq) ([]*biz.EmailTpl, int64, error) {
emailTpls, total, err := dao.EmailTplDao.Page(ctx, in)
if err != nil {
return nil, 0, err
......@@ -154,57 +154,30 @@ func (x *emailTplService) Page(ctx context.Context, in *types.EmailTplPageReq, o
if len(emailTpls) == 0 {
return nil, total, nil
}
emailTplBizSlice, err := x.ToSliceBiz(ctx, emailTpls, opts)
emailTplBizSlice, err := x.ToSliceBiz(ctx, emailTpls)
if err != nil {
return nil, 0, err
}
return emailTplBizSlice, total, nil
}
func (x *emailTplService) ToBiz(ctx context.Context, emailTpl *models.EmailTpl, opts *biz.EmailTplOpts) (emailTplBiz *biz.EmailTpl, err error) {
func (x *emailTplService) ToBiz(ctx context.Context, emailTpl *models.EmailTpl) (emailTplBiz *biz.EmailTpl, err error) {
if emailTpl == nil {
return nil, nil
}
emailTplBiz = biz.EmailTplTool.NewFromModel(emailTpl)
if err = x.Fill(ctx, emailTplBiz, opts); err != nil {
return nil, err
}
return emailTplBiz, nil
}
func (x *emailTplService) ToSliceBiz(ctx context.Context, emailTpls []*models.EmailTpl, opts *biz.EmailTplOpts) (emailTplBizSlice []*biz.EmailTpl, err error) {
func (x *emailTplService) ToSliceBiz(ctx context.Context, emailTpls []*models.EmailTpl) (emailTplBizSlice []*biz.EmailTpl, err error) {
if len(emailTpls) == 0 {
return nil, nil
}
emailTplBizSlice = biz.EmailTplTool.NewSliceFromModelsBiz(emailTpls)
if err = x.SliceFill(ctx, emailTplBizSlice, opts); err != nil {
return nil, err
}
if err = biz.EmailTplTool.ValidSlice(ctx, emailTplBizSlice, opts); err != nil {
return nil, err
}
return emailTplBizSlice, nil
}
func (x *emailTplService) Fill(ctx context.Context, emailTplBiz *biz.EmailTpl, opts *biz.EmailTplOpts) error {
if emailTplBiz == nil {
return nil
}
if opts != nil {
}
return nil
}
func (x *emailTplService) SliceFill(ctx context.Context, emailTplBizSlice []*biz.EmailTpl, opts *biz.EmailTplOpts) error {
if len(emailTplBizSlice) == 0 {
return nil
}
if opts != nil {
}
return nil
}
func (x *emailTplService) GetAll(ctx context.Context, opts *biz.EmailTplOpts) ([]*biz.EmailTpl, error) {
func (x *emailTplService) GetAll(ctx context.Context) ([]*biz.EmailTpl, error) {
emailTpls, err := dao.EmailTplDao.GetAll(ctx)
if err != nil {
return nil, err
......@@ -212,9 +185,9 @@ func (x *emailTplService) GetAll(ctx context.Context, opts *biz.EmailTplOpts) ([
if len(emailTpls) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emailTpls, opts)
return x.ToSliceBiz(ctx, emailTpls)
}
func (x *emailTplService) ExportCSV(ctx context.Context, in *types.EmailTplExportReq, opts *biz.EmailTplOpts) (string, error) {
func (x *emailTplService) ExportCSV(ctx context.Context, in *types.EmailTplExportReq) (string, error) {
req := &types.EmailTplPageReq{}
_ = copier.Copy(req, in)
var total = func() (int64, error) {
......@@ -228,7 +201,7 @@ func (x *emailTplService) ExportCSV(ctx context.Context, in *types.EmailTplExpor
if len(rs) == 0 {
return nil, nil
}
bizs, err := x.ToSliceBiz(ctx, rs, opts)
bizs, err := x.ToSliceBiz(ctx, rs)
if err != nil {
return nil, err
}
......
pkg/email/service/email_tpl_receiver.go
浏览文件 @ d7fe160a
......@@ -39,21 +39,21 @@ func (x *emailTplReceiverService) Create(ctx context.Context, in *types.EmailTpl
return emailTplReceiver.ID, nil
}
func (x *emailTplReceiverService) DeleteByID(ctx context.Context, id xsf.ID, opts *biz.EmailTplReceiverOpts) error {
func (x *emailTplReceiverService) DeleteByID(ctx context.Context, id xsf.ID) error {
if id <= 0 {
return nil
}
if _, err := x.ErrNotFound(ctx, id, opts); err != nil {
if _, err := x.ErrNotFound(ctx, id); err != nil {
return err
}
return dao.EmailTplReceiverDao.DeleteByID(ctx, id)
}
func (x *emailTplReceiverService) UpdateByID(ctx context.Context, in *types.EmailTplReceiverUpdateByIDReq, opts *biz.EmailTplReceiverOpts) error {
func (x *emailTplReceiverService) UpdateByID(ctx context.Context, in *types.EmailTplReceiverUpdateByIDReq) error {
if in.ID <= 0 {
return nil
}
if _, err := x.ErrNotFound(ctx, in.ID, opts); err != nil {
if _, err := x.ErrNotFound(ctx, in.ID); err != nil {
return err
}
emailTplReceiverUpd := &models.EmailTplReceiver{}
......@@ -61,11 +61,11 @@ func (x *emailTplReceiverService) UpdateByID(ctx context.Context, in *types.Emai
return dao.EmailTplReceiverDao.UpdateByID(ctx, in.ID, emailTplReceiverUpd)
}
func (x *emailTplReceiverService) ErrFound(ctx context.Context, id xsf.ID, opts *biz.EmailTplReceiverOpts) (emailTplReceiverBiz *biz.EmailTplReceiver, err error) {
func (x *emailTplReceiverService) ErrFound(ctx context.Context, id xsf.ID) (emailTplReceiverBiz *biz.EmailTplReceiver, err error) {
if id <= 0 {
return nil, nil
}
emailTplReceiverBiz, err = x.GetByID(ctx, id, opts)
emailTplReceiverBiz, err = x.GetByID(ctx, id)
if err != nil {
return nil, err
}
......@@ -75,11 +75,11 @@ func (x *emailTplReceiverService) ErrFound(ctx context.Context, id xsf.ID, opts
return emailTplReceiverBiz, nil
}
func (x *emailTplReceiverService) ErrNotFound(ctx context.Context, id xsf.ID, opts *biz.EmailTplReceiverOpts) (emailTplReceiverBiz *biz.EmailTplReceiver, err error) {
func (x *emailTplReceiverService) ErrNotFound(ctx context.Context, id xsf.ID) (emailTplReceiverBiz *biz.EmailTplReceiver, err error) {
if id <= 0 {
return nil, nil
}
emailTplReceiverBiz, err = x.GetByID(ctx, id, opts)
emailTplReceiverBiz, err = x.GetByID(ctx, id)
if err != nil {
return nil, err
}
......@@ -89,7 +89,7 @@ func (x *emailTplReceiverService) ErrNotFound(ctx context.Context, id xsf.ID, op
return emailTplReceiverBiz, nil
}
func (x *emailTplReceiverService) GetByID(ctx context.Context, id xsf.ID, opts *biz.EmailTplReceiverOpts) (emailTplReceiverBiz *biz.EmailTplReceiver, err error) {
func (x *emailTplReceiverService) GetByID(ctx context.Context, id xsf.ID) (emailTplReceiverBiz *biz.EmailTplReceiver, err error) {
if id <= 0 {
return nil, nil
}
......@@ -100,10 +100,10 @@ func (x *emailTplReceiverService) GetByID(ctx context.Context, id xsf.ID, opts *
if emailTplReceiver == nil {
return nil, nil
}
return x.ToBiz(ctx, emailTplReceiver, opts)
return x.ToBiz(ctx, emailTplReceiver)
}
func (x *emailTplReceiverService) GetSliceByIDs(ctx context.Context, ids []xsf.ID, opts *biz.EmailTplReceiverOpts) ([]*biz.EmailTplReceiver, error) {
func (x *emailTplReceiverService) GetSliceByIDs(ctx context.Context, ids []xsf.ID) ([]*biz.EmailTplReceiver, error) {
if len(ids) == 0 {
return nil, nil
}
......@@ -114,14 +114,14 @@ func (x *emailTplReceiverService) GetSliceByIDs(ctx context.Context, ids []xsf.I
if len(emailTplReceivers) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emailTplReceivers, opts)
return x.ToSliceBiz(ctx, emailTplReceivers)
}
func (x *emailTplReceiverService) GetMapByIDs(ctx context.Context, ids []xsf.ID, opts *biz.EmailTplReceiverOpts) (map[xsf.ID]*biz.EmailTplReceiver, error) {
func (x *emailTplReceiverService) GetMapByIDs(ctx context.Context, ids []xsf.ID) (map[xsf.ID]*biz.EmailTplReceiver, error) {
if len(ids) == 0 {
return nil, nil
}
emailTplReceiverBizSlice, err := x.GetSliceByIDs(ctx, ids, opts)
emailTplReceiverBizSlice, err := x.GetSliceByIDs(ctx, ids)
if err != nil {
return nil, err
}
......@@ -132,7 +132,7 @@ func (x *emailTplReceiverService) GetMapByIDs(ctx context.Context, ids []xsf.ID,
return emailTplReceiverBizIDMap, nil
}
func (x *emailTplReceiverService) Page(ctx context.Context, in *types.EmailTplReceiverPageReq, opts *biz.EmailTplReceiverOpts) ([]*biz.EmailTplReceiver, int64, error) {
func (x *emailTplReceiverService) Page(ctx context.Context, in *types.EmailTplReceiverPageReq) ([]*biz.EmailTplReceiver, int64, error) {
emailTplReceivers, total, err := dao.EmailTplReceiverDao.Page(ctx, in)
if err != nil {
return nil, 0, err
......@@ -140,13 +140,13 @@ func (x *emailTplReceiverService) Page(ctx context.Context, in *types.EmailTplRe
if len(emailTplReceivers) == 0 {
return nil, total, nil
}
emailTplReceiverBizSlice, err := x.ToSliceBiz(ctx, emailTplReceivers, opts)
emailTplReceiverBizSlice, err := x.ToSliceBiz(ctx, emailTplReceivers)
if err != nil {
return nil, 0, err
}
return emailTplReceiverBizSlice, total, nil
}
func (x *emailTplReceiverService) GetSliceByTplID(ctx context.Context, tplID xsf.ID, opts *biz.EmailTplReceiverOpts) ([]*biz.EmailTplReceiver, error) {
func (x *emailTplReceiverService) GetSliceByTplID(ctx context.Context, tplID xsf.ID) ([]*biz.EmailTplReceiver, error) {
if tplID == 0 {
return nil, nil
}
......@@ -157,10 +157,10 @@ func (x *emailTplReceiverService) GetSliceByTplID(ctx context.Context, tplID xsf
if len(emailTplReceivers) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emailTplReceivers, opts)
return x.ToSliceBiz(ctx, emailTplReceivers)
}
func (x *emailTplReceiverService) GetSliceByTplIDs(ctx context.Context, tplIDs []xsf.ID, opts *biz.EmailTplReceiverOpts) ([]*biz.EmailTplReceiver, error) {
func (x *emailTplReceiverService) GetSliceByTplIDs(ctx context.Context, tplIDs []xsf.ID) ([]*biz.EmailTplReceiver, error) {
if len(tplIDs) == 0 {
return nil, nil
}
......@@ -171,14 +171,14 @@ func (x *emailTplReceiverService) GetSliceByTplIDs(ctx context.Context, tplIDs [
if len(emailTplReceivers) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emailTplReceivers, opts)
return x.ToSliceBiz(ctx, emailTplReceivers)
}
func (x *emailTplReceiverService) GetMapSliceByTplIDs(ctx context.Context, tplIDs []xsf.ID, opts *biz.EmailTplReceiverOpts) (map[xsf.ID][]*biz.EmailTplReceiver, int, error) {
func (x *emailTplReceiverService) GetMapSliceByTplIDs(ctx context.Context, tplIDs []xsf.ID) (map[xsf.ID][]*biz.EmailTplReceiver, int, error) {
if len(tplIDs) == 0 {
return nil, 0, nil
}
emailTplReceiverBizSlice, err := x.GetSliceByTplIDs(ctx, tplIDs, opts)
emailTplReceiverBizSlice, err := x.GetSliceByTplIDs(ctx, tplIDs)
if err != nil {
return nil, 0, err
}
......@@ -192,50 +192,23 @@ func (x *emailTplReceiverService) GetMapSliceByTplIDs(ctx context.Context, tplID
return ret, len(emailTplReceiverBizSlice), nil
}
func (x *emailTplReceiverService) ToBiz(ctx context.Context, emailTplReceiver *models.EmailTplReceiver, opts *biz.EmailTplReceiverOpts) (emailTplReceiverBiz *biz.EmailTplReceiver, err error) {
func (x *emailTplReceiverService) ToBiz(ctx context.Context, emailTplReceiver *models.EmailTplReceiver) (emailTplReceiverBiz *biz.EmailTplReceiver, err error) {
if emailTplReceiver == nil {
return nil, nil
}
emailTplReceiverBiz = biz.EmailTplReceiverTool.NewFromModel(emailTplReceiver)
if err = x.Fill(ctx, emailTplReceiverBiz, opts); err != nil {
return nil, err
}
return emailTplReceiverBiz, nil
}
func (x *emailTplReceiverService) ToSliceBiz(ctx context.Context, emailTplReceivers []*models.EmailTplReceiver, opts *biz.EmailTplReceiverOpts) (emailTplReceiverBizSlice []*biz.EmailTplReceiver, err error) {
func (x *emailTplReceiverService) ToSliceBiz(ctx context.Context, emailTplReceivers []*models.EmailTplReceiver) (emailTplReceiverBizSlice []*biz.EmailTplReceiver, err error) {
if len(emailTplReceivers) == 0 {
return nil, nil
}
emailTplReceiverBizSlice = biz.EmailTplReceiverTool.NewSliceFromModelsBiz(emailTplReceivers)
if err = x.SliceFill(ctx, emailTplReceiverBizSlice, opts); err != nil {
return nil, err
}
if err = biz.EmailTplReceiverTool.ValidSlice(ctx, emailTplReceiverBizSlice, opts); err != nil {
return nil, err
}
return emailTplReceiverBizSlice, nil
}
func (x *emailTplReceiverService) Fill(ctx context.Context, emailTplReceiverBiz *biz.EmailTplReceiver, opts *biz.EmailTplReceiverOpts) error {
if emailTplReceiverBiz == nil {
return nil
}
if opts != nil {
}
return nil
}
func (x *emailTplReceiverService) SliceFill(ctx context.Context, emailTplReceiverBizSlice []*biz.EmailTplReceiver, opts *biz.EmailTplReceiverOpts) error {
if len(emailTplReceiverBizSlice) == 0 {
return nil
}
if opts != nil {
}
return nil
}
func (x *emailTplReceiverService) GetAll(ctx context.Context, opts *biz.EmailTplReceiverOpts) ([]*biz.EmailTplReceiver, error) {
func (x *emailTplReceiverService) GetAll(ctx context.Context) ([]*biz.EmailTplReceiver, error) {
emailTplReceivers, err := dao.EmailTplReceiverDao.GetAll(ctx)
if err != nil {
return nil, err
......@@ -243,9 +216,9 @@ func (x *emailTplReceiverService) GetAll(ctx context.Context, opts *biz.EmailTpl
if len(emailTplReceivers) == 0 {
return nil, nil
}
return x.ToSliceBiz(ctx, emailTplReceivers, opts)
return x.ToSliceBiz(ctx, emailTplReceivers)
}
func (x *emailTplReceiverService) ExportCSV(ctx context.Context, in *types.EmailTplReceiverExportReq, opts *biz.EmailTplReceiverOpts) (string, error) {
func (x *emailTplReceiverService) ExportCSV(ctx context.Context, in *types.EmailTplReceiverExportReq) (string, error) {
req := &types.EmailTplReceiverPageReq{}
_ = copier.Copy(req, in)
var total = func() (int64, error) {
......@@ -259,7 +232,7 @@ func (x *emailTplReceiverService) ExportCSV(ctx context.Context, in *types.Email
if len(rs) == 0 {
return nil, nil
}
bizs, err := x.ToSliceBiz(ctx, rs, opts)
bizs, err := x.ToSliceBiz(ctx, rs)
if err != nil {
return nil, err
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论