feat: associate dataset sources with owners

This commit is contained in:
2026-07-23 21:44:47 +08:00
parent 50d8246915
commit 55ff320cec
7 changed files with 112 additions and 14 deletions

View File

@@ -43,6 +43,9 @@ func InitDataset(database *gorm.DB) error {
}
return database.Transaction(func(tx *gorm.DB) error {
if err := prepareDatasetSourceOwners(tx); err != nil {
return err
}
if err := prepareDatasetItems(tx); err != nil {
return err
}
@@ -55,6 +58,29 @@ func InitDataset(database *gorm.DB) error {
})
}
func prepareDatasetSourceOwners(tx *gorm.DB) error {
var sources []models.SaDatasetSource
if err := tx.Where("owner_id = ? OR owner_identity = ?", 0, "").Find(&sources).Error; err != nil {
return err
}
for _, source := range sources {
ownerID := source.OwnerID
if ownerID == 0 {
ownerID = source.CreatedBy
}
var owner models.SaUser
if err := tx.Select("identity").First(&owner, ownerID).Error; err != nil {
return err
}
if err := tx.Model(&source).Updates(map[string]any{
"owner_id": ownerID, "owner_identity": owner.Identity,
}).Error; err != nil {
return err
}
}
return nil
}
func prepareDatasetItems(tx *gorm.DB) error {
if tx.Migrator().HasIndex(&models.SaDatasetItem{}, "idx_sa_dataset_item_source_external") {
return nil
@@ -85,7 +111,7 @@ func prepareDatasetItems(tx *gorm.DB) error {
func upsertDefaultDatasetSource(tx *gorm.DB, root models.SaUser, definition defaultDatasetSource) error {
var source models.SaDatasetSource
err := tx.Where("created_by = ? AND seed_key = ?", root.ID, definition.Key).First(&source).Error
err := tx.Where("owner_id = ? AND seed_key = ?", root.ID, definition.Key).First(&source).Error
if err == nil {
return tx.Model(&source).Updates(map[string]any{
"url": definition.URL, "icon_url": definition.IconURL, "kind": "rss",
@@ -96,7 +122,7 @@ func upsertDefaultDatasetSource(tx *gorm.DB, root models.SaUser, definition defa
}
knownURLs := append([]string{definition.URL}, definition.LegacyURLs...)
err = tx.Where("created_by = ? AND url IN ?", root.ID, knownURLs).First(&source).Error
err = tx.Where("owner_id = ? AND url IN ?", root.ID, knownURLs).First(&source).Error
if err == nil {
return tx.Model(&source).Updates(map[string]any{
"seed_key": definition.Key, "url": definition.URL,
@@ -109,7 +135,7 @@ func upsertDefaultDatasetSource(tx *gorm.DB, root models.SaUser, definition defa
seedKey := definition.Key
return tx.Create(&models.SaDatasetSource{
CreatedBy: root.ID, SeedKey: &seedKey, Name: definition.Name,
OwnerID: root.ID, CreatedBy: root.ID, SeedKey: &seedKey, Name: definition.Name,
Kind: "rss", URL: definition.URL, IconURL: definition.IconURL,
Description: "默认资讯订阅", Enabled: true,
}).Error