refactor: Update NotificationChannelV2 model to include Telegram notification settings

2026-01-21 17:21:09 +01:00 · 2024-07-25 22:58:39 +08:00
parent eef3eea777
commit 96b89d05b8
7 changed files with 81 additions and 268 deletions
--- a/core/models/common/index_service.go
+++ b/core/models/common/index_service.go
@@ -1,145 +0,0 @@
-package common
-
-import (
-	"github.com/crawlab-team/crawlab/core/constants"
-	"github.com/crawlab-team/crawlab/core/interfaces"
-	"github.com/crawlab-team/crawlab/db/mongo"
-	"go.mongodb.org/mongo-driver/bson"
-	mongo2 "go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-)
-
-func CreateIndexes() {
-	// artifacts
-	mongo.GetMongoCol(interfaces.ModelColNameArtifact).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"_col": 1}},
-		{Keys: bson.M{"_del": 1}},
-		{Keys: bson.M{"_tid": 1}},
-	})
-
-	// tags
-	mongo.GetMongoCol(interfaces.ModelColNameTag).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"col": 1}},
-		{Keys: bson.M{"name": 1}},
-	})
-
-	// nodes
-	mongo.GetMongoCol(interfaces.ModelColNameNode).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"key": 1}},       // key
-		{Keys: bson.M{"name": 1}},      // name
-		{Keys: bson.M{"is_master": 1}}, // is_master
-		{Keys: bson.M{"status": 1}},    // status
-		{Keys: bson.M{"enabled": 1}},   // enabled
-		{Keys: bson.M{"active": 1}},    // active
-	})
-
-	// projects
-	mongo.GetMongoCol(interfaces.ModelColNameNode).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"name": 1}},
-	})
-
-	// spiders
-	mongo.GetMongoCol(interfaces.ModelColNameSpider).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"name": 1}},
-		{Keys: bson.M{"type": 1}},
-		{Keys: bson.M{"col_id": 1}},
-		{Keys: bson.M{"project_id": 1}},
-	})
-
-	// tasks
-	mongo.GetMongoCol(interfaces.ModelColNameTask).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"spider_id": 1}},
-		{Keys: bson.M{"status": 1}},
-		{Keys: bson.M{"node_id": 1}},
-		{Keys: bson.M{"schedule_id": 1}},
-		{Keys: bson.M{"type": 1}},
-		{Keys: bson.M{"mode": 1}},
-		{Keys: bson.M{"priority": 1}},
-		{Keys: bson.M{"parent_id": 1}},
-		{Keys: bson.M{"has_sub": 1}},
-		{Keys: bson.M{"create_ts": -1}},
-	})
-
-	// task stats
-	mongo.GetMongoCol(interfaces.ModelColNameTaskStat).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"create_ts": 1}},
-	})
-
-	// schedules
-	mongo.GetMongoCol(interfaces.ModelColNameSchedule).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"name": 1}},
-		{Keys: bson.M{"spider_id": 1}},
-		{Keys: bson.M{"enabled": 1}},
-	})
-
-	// users
-	mongo.GetMongoCol(interfaces.ModelColNameUser).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"username": 1}},
-		{Keys: bson.M{"role": 1}},
-		{Keys: bson.M{"email": 1}},
-	})
-
-	// settings
-	mongo.GetMongoCol(interfaces.ModelColNameSetting).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"key": 1}},
-	})
-
-	// tokens
-	mongo.GetMongoCol(interfaces.ModelColNameToken).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"name": 1}},
-	})
-
-	// variables
-	mongo.GetMongoCol(interfaces.ModelColNameVariable).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"key": 1}},
-	})
-
-	// data sources
-	mongo.GetMongoCol(interfaces.ModelColNameDataSource).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"name": 1}},
-	})
-
-	// data collections
-	mongo.GetMongoCol(interfaces.ModelColNameDataCollection).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"name": 1}},
-	})
-
-	// extra values
-	mongo.GetMongoCol(interfaces.ModelColNameExtraValues).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.M{"oid": 1}},
-		{Keys: bson.M{"m": 1}},
-		{Keys: bson.M{"t": 1}},
-		{Keys: bson.M{"m": 1, "t": 1}},
-		{Keys: bson.M{"oid": 1, "m": 1, "t": 1}},
-	})
-
-	// roles
-	mongo.GetMongoCol(interfaces.ModelColNameRole).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.D{{"key", 1}}, Options: options.Index().SetUnique(true)},
-	})
-
-	// user role relations
-	mongo.GetMongoCol(interfaces.ModelColNameUserRole).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.D{{"user_id", 1}, {"role_id", 1}}, Options: options.Index().SetUnique(true)},
-		{Keys: bson.D{{"role_id", 1}, {"user_id", 1}}, Options: options.Index().SetUnique(true)},
-	})
-
-	// permissions
-	mongo.GetMongoCol(interfaces.ModelColNamePermission).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.D{{"key", 1}}, Options: options.Index().SetUnique(true)},
-	})
-
-	// role permission relations
-	mongo.GetMongoCol(interfaces.ModelColNameRolePermission).MustCreateIndexes([]mongo2.IndexModel{
-		{Keys: bson.D{{"role_id", 1}, {"permission_id", 1}}, Options: options.Index().SetUnique(true)},
-		{Keys: bson.D{{"permission_id", 1}, {"role_id", 1}}, Options: options.Index().SetUnique(true)},
-	})
-
-	// cache
-	mongo.GetMongoCol(constants.CacheColName).MustCreateIndexes([]mongo2.IndexModel{
-		{
-			Keys:    bson.M{constants.CacheColTime: 1},
-			Options: options.Index().SetExpireAfterSeconds(3600 * 24),
-		},
-	})
-}
--- a/core/models/common/index_service_v2.go
+++ b/core/models/common/index_service_v2.go
@@ -177,4 +177,29 @@ func CreateIndexesV2() {
 			},
 		},
 	})
+
+	// notification requests
+	mongo.GetMongoCol(service.GetCollectionNameByInstance(models2.NotificationRequestV2{})).MustCreateIndexes([]mongo2.IndexModel{
+		{
+			Keys: bson.D{
+				{"created_ts", -1},
+			},
+			Options: (&options.IndexOptions{}).SetExpireAfterSeconds(60 * 60 * 24 * 7),
+		},
+		{
+			Keys: bson.D{
+				{"channel_id", 1},
+			},
+		},
+		{
+			Keys: bson.D{
+				{"setting_id", 1},
+			},
+		},
+		{
+			Keys: bson.D{
+				{"status", 1},
+			},
+		},
+	})
 }
--- a/core/models/delegate/model_user_role_test.go
+++ b/core/models/delegate/model_user_role_test.go
@@ -1,97 +0,0 @@
-package delegate_test
-
-import (
-	"github.com/crawlab-team/crawlab/core/interfaces"
-	"github.com/crawlab-team/crawlab/core/models/common"
-	"github.com/crawlab-team/crawlab/core/models/delegate"
-	models2 "github.com/crawlab-team/crawlab/core/models/models"
-	"github.com/crawlab-team/crawlab/db/mongo"
-	"github.com/spf13/viper"
-	"github.com/stretchr/testify/require"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"testing"
-)
-
-func init() {
-	viper.Set("mongo.db", "crawlab_test")
-	common.CreateIndexes()
-}
-
-func TestUserRole_Add(t *testing.T) {
-	SetupTest(t)
-
-	p := &models2.UserRole{}
-
-	err := delegate.NewModelDelegate(p).Add()
-	require.Nil(t, err)
-	require.NotNil(t, p.Id)
-
-	a, err := delegate.NewModelDelegate(p).GetArtifact()
-	require.Nil(t, err)
-	require.Equal(t, p.Id, a.GetId())
-	require.NotNil(t, a.GetSys().GetCreateTs())
-	require.NotNil(t, a.GetSys().GetUpdateTs())
-}
-
-func TestUserRole_Save(t *testing.T) {
-	SetupTest(t)
-
-	p := &models2.UserRole{
-		UserId: primitive.NewObjectID(),
-		RoleId: primitive.NewObjectID(),
-	}
-
-	err := delegate.NewModelDelegate(p).Add()
-	require.Nil(t, err)
-
-	uid := primitive.NewObjectID()
-	rid := primitive.NewObjectID()
-	p.UserId = uid
-	p.RoleId = rid
-	err = delegate.NewModelDelegate(p).Save()
-	require.Nil(t, err)
-
-	err = mongo.GetMongoCol(interfaces.ModelColNameUserRole).FindId(p.Id).One(&p)
-	require.Nil(t, err)
-	require.Equal(t, uid, p.UserId)
-	require.Equal(t, rid, p.RoleId)
-}
-
-func TestUserRole_Delete(t *testing.T) {
-	SetupTest(t)
-
-	p := &models2.UserRole{}
-
-	err := delegate.NewModelDelegate(p).Add()
-	require.Nil(t, err)
-
-	err = delegate.NewModelDelegate(p).Delete()
-	require.Nil(t, err)
-
-	var a models2.Artifact
-	col := mongo.GetMongoCol(interfaces.ModelColNameArtifact)
-	err = col.FindId(p.Id).One(&a)
-	require.Nil(t, err)
-	require.NotNil(t, a.Obj)
-	require.True(t, a.Del)
-}
-
-func TestUserRole_AddDuplicates(t *testing.T) {
-	SetupTest(t)
-
-	uid := primitive.NewObjectID()
-	rid := primitive.NewObjectID()
-	p := &models2.UserRole{
-		UserId: uid,
-		RoleId: rid,
-	}
-	p2 := &models2.UserRole{
-		UserId: uid,
-		RoleId: rid,
-	}
-
-	err := delegate.NewModelDelegate(p).Add()
-	require.Nil(t, err)
-	err = delegate.NewModelDelegate(p2).Add()
-	require.NotNil(t, err)
-}
--- a/core/models/models/v2/notification_request_v2.go
+++ b/core/models/models/v2/notification_request_v2.go
@@ -5,8 +5,12 @@ import "go.mongodb.org/mongo-driver/bson/primitive"
 type NotificationRequestV2 struct {
 	any                                `collection:"notification_requests"`
 	BaseModelV2[NotificationRequestV2] `bson:",inline"`
-	Status                             string             `json:"status" bson:"status"`
-	Error                              string             `json:"error,omitempty" bson:"error,omitempty"`
-	SettingId                          primitive.ObjectID `json:"setting_id" bson:"setting_id"`
-	ChannelId                          primitive.ObjectID `json:"channel_id" bson:"channel_id"`
+	Status                             string                 `json:"status" bson:"status"`
+	Error                              string                 `json:"error,omitempty" bson:"error,omitempty"`
+	Title                              string                 `json:"title" bson:"title"`
+	Content                            string                 `json:"content" bson:"content"`
+	SettingId                          primitive.ObjectID     `json:"setting_id" bson:"setting_id"`
+	ChannelId                          primitive.ObjectID     `json:"channel_id" bson:"channel_id"`
+	Setting                            *NotificationSettingV2 `json:"setting,omitempty" bson:"-"`
+	Channel                            *NotificationChannelV2 `json:"channel,omitempty" bson:"-"`
 }