✨ Refactor subscription service to use RequestSubscribeCreate type and improve create logic

Author: 祖轩

internal/repo/subscribe.go

@@ -1,8 +1,9 @@
 package repo
 
 import (
-	"gorm.io/gorm"
 	"watchAlert/internal/models"
+
+	"gorm.io/gorm"
 )
 
 type (

internal/services/subscribe.go

@@ -2,12 +2,13 @@ package services
 
 import (
 	"fmt"
-	"gorm.io/gorm"
 	"time"
 	"watchAlert/internal/ctx"
 	"watchAlert/internal/models"
 	"watchAlert/internal/types"
 	"watchAlert/pkg/tools"
+
+	"gorm.io/gorm"
 )
 
 type (
@@ -50,7 +51,7 @@ func (s alertSubscribeService) Get(req interface{}) (interface{}, interface{}) {
 }
 
 func (s alertSubscribeService) Create(req interface{}) (interface{}, interface{}) {
-	r := req.(*models.AlertSubscribe)
+	r := req.(*types.RequestSubscribeCreate)
 	_, b, err := s.ctx.DB.Subscribe().Get(r.STenantId, "", r.SUserId, r.SRuleId)
 	if err != nil && err != gorm.ErrRecordNotFound {
 		return nil, err
@@ -59,9 +60,22 @@ func (s alertSubscribeService) Create(req interface{}) (interface{}, interface{}
 		return nil, fmt.Errorf("用户已订阅该规则, 请勿重复创建!")
 	}
 
-	r.SId = "as-" + tools.RandId()
-	r.SCreateAt = time.Now().Unix()
-	err = s.ctx.DB.Subscribe().Create(*r)
+	subscribe := models.AlertSubscribe{
+		SId:               "as-" + tools.RandId(),
+		STenantId:         r.STenantId,
+		SUserId:           r.SUserId,
+		SUserEmail:        r.SUserEmail,
+		SRuleId:           r.SRuleId,
+		SRuleName:         r.SRuleName,
+		SRuleType:         r.SRuleType,
+		SRuleSeverity:     r.SRuleSeverity,
+		SNoticeSubject:    r.SNoticeSubject,
+		SNoticeTemplateId: r.SNoticeTemplateId,
+		SFilter:           r.SFilter,
+		SCreateAt:         time.Now().Unix(),
+	}
+
+	err = s.ctx.DB.Subscribe().Create(subscribe)
 	if err != nil {
 		return nil, err
 	}

internal/types/subscribe.go

@@ -1,20 +1,6 @@
 package types
 
 type RequestSubscribeCreate struct {
-	STenantId         string   `json:"sTenantId"`                                          // 订阅规则的租户
-	SUserId           string   `json:"sUserId"`                                            // 订阅的用户 ID
-	SUserEmail        string   `json:"sUserEmail"`                                         // 订阅的用户邮箱
-	SRuleId           string   `json:"sRuleId"`                                            // 订阅的规则 ID
-	SRuleName         string   `json:"sRuleName"`                                          // 订阅的规则名称
-	SRuleType         string   `json:"sRuleType"`                                          // 订阅的规则类型
-	SRuleSeverity     []string `json:"sRuleSeverity" gorm:"sRuleSeverity;serializer:json"` // 订阅的告警等级
-	SNoticeSubject    string   `json:"sNoticeSubject"`                                     // 发布订阅消息的 Title
-	SNoticeTemplateId string   `json:"sNoticeTemplateId"`                                  // 发送订阅消息的通知模版 ID
-	SFilter           []string `json:"sFilter" gorm:"sFilter;serializer:json"`             // 过滤
-	SCreateAt         int64    `json:"sCreateAt"`
-}
-
-type RequestSubscribeUpdate struct {
 	SId               string   `json:"sId"`                                                // 订阅规则ID
 	STenantId         string   `json:"sTenantId"`                                          // 订阅规则的租户
 	SUserId           string   `json:"sUserId"`                                            // 订阅的用户 ID