senlinai/agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: simplify dataset source ownership

Browse Source
This commit is contained in:
yanweidong
2026-07-23 22:39:12 +08:00
parent 5a1b04c4ed
commit bc7fa40995
8 changed files with 123 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
backend/internal/logic/dataset/feed_test.go
View File

@@ -128,11 +128,11 @@ func TestSyncSourcesRecordsFeedFailure(t *testing.T) {
database := newDatasetTestDatabase(t)
user := createDatasetTestUser(t, database, "feed-owner@example.com")
source := models.SaDatasetSource{
CreatedBy: user.ID,
Name: "Broken feed",
Kind: "rss",
URL: "https://example.com/feed",
Enabled: true,
OwnerID: user.ID,
Name: "Broken feed",
Kind: "rss",
URL: "https://example.com/feed",
Enabled: true,
}
require.NoError(t, database.Create(&source).Error)
@@ -150,9 +150,9 @@ func TestSyncAllSourcesCollectsEnabledRSSSourcesForEveryUser(t *testing.T) {
firstUser := createDatasetTestUser(t, database, "first-feed-owner@example.com")
secondUser := createDatasetTestUser(t, database, "second-feed-owner@example.com")
for _, source := range []models.SaDatasetSource{
{CreatedBy: firstUser.ID, Name: "First RSS", Kind: "rss", URL: "https://example.com/first", Enabled: true},
{CreatedBy: secondUser.ID, Name: "Second RSS", Kind: "rss", URL: "https://example.com/second", Enabled: true},
{CreatedBy: firstUser.ID, Name: "Manual", Kind: "manual", Enabled: true},
{OwnerID: firstUser.ID, Name: "First RSS", Kind: "rss", URL: "https://example.com/first", Enabled: true},
{OwnerID: secondUser.ID, Name: "Second RSS", Kind: "rss", URL: "https://example.com/second", Enabled: true},
{OwnerID: firstUser.ID, Name: "Manual", Kind: "manual", Enabled: true},
} {
require.NoError(t, database.Create(&source).Error)
}
@@ -171,7 +171,7 @@ func TestSyncSourcesCollectsMultipleSourcesForOneOwner(t *testing.T) {
user := createDatasetTestUser(t, database, "multi-feed-owner@example.com")
for index := 0; index < 5; index++ {
require.NoError(t, database.Create(&models.SaDatasetSource{
CreatedBy: user.ID, Name: fmt.Sprintf("Feed %d", index), Kind: "rss",
OwnerID: user.ID, Name: fmt.Sprintf("Feed %d", index), Kind: "rss",
URL: fmt.Sprintf("https://example.com/feed-%d", index), Enabled: true,
}).Error)
}
@@ -189,7 +189,7 @@ func TestQueueSourcesRunsInBackgroundAndRejectsOverlap(t *testing.T) {
database := newDatasetTestDatabase(t)
user := createDatasetTestUser(t, database, "queued-feed-owner@example.com")
source := models.SaDatasetSource{
CreatedBy: user.ID, Name: "Queued RSS", Kind: "rss",
OwnerID: user.ID, Name: "Queued RSS", Kind: "rss",
URL: "https://example.com/feed", Enabled: true,
}
require.NoError(t, database.Create(&source).Error)

12
backend/internal/logic/dataset/handlers_test.go
View File

@@ -49,8 +49,6 @@ func TestDatasetAPIConnectsSourcesItemsAndSyncTasks(t *testing.T) {
require.NoError(t, database.Where("identity = ?", source.ID).First(&storedSource).Error)
require.Equal(t, owner.ID, storedSource.OwnerID)
require.Equal(t, owner.Identity, storedSource.OwnerIdentity)
require.Equal(t, owner.ID, storedSource.CreatedBy)
require.Equal(t, owner.Identity, storedSource.CreatedByIdentity)
createdItem := performDatasetRequest(t, ownerRouter, http.MethodPost, "/api/v1/dataset-items", map[string]any{
"sourceId": source.ID, "title": "A collected article", "summary": "Summary",
@@ -143,8 +141,8 @@ func TestDatasetSourceAuthorizationUsesOwner(t *testing.T) {
owner := createDatasetTestUser(t, database, "owner@example.com")
creator := createDatasetTestUser(t, database, "creator@example.com")
source := models.SaDatasetSource{
OwnerID: owner.ID, CreatedBy: creator.ID,
Name: "Owned feed", Kind: "rss", URL: "https://example.com/feed", Enabled: true,
OwnerID: owner.ID,
Name: "Owned feed", Kind: "rss", URL: "https://example.com/feed", Enabled: true,
}
require.NoError(t, database.Create(&source).Error)
@@ -180,8 +178,8 @@ func TestDatasetItemsArePaginatedByOwnedSource(t *testing.T) {
database := newDatasetTestDatabase(t)
owner := createDatasetTestUser(t, database, "owner@example.com")
source := models.SaDatasetSource{
OwnerID: owner.ID, CreatedBy: owner.ID,
Name: "Feed", Kind: "rss", URL: "https://example.com/feed", Enabled: true,
OwnerID: owner.ID,
Name: "Feed", Kind: "rss", URL: "https://example.com/feed", Enabled: true,
}
require.NoError(t, database.Create(&source).Error)
for index := 0; index < 3; index++ {
@@ -209,7 +207,7 @@ func TestBuiltInDatasetSourceKeepsManagedFieldsAndCannotBeDeleted(t *testing.T)
owner := createDatasetTestUser(t, database, "owner@example.com")
seedKey := "built-in"
source := models.SaDatasetSource{
OwnerID: owner.ID, CreatedBy: owner.ID, SeedKey: &seedKey,
OwnerID: owner.ID, SeedKey: &seedKey,
Name: "Built-in", Kind: "rss", URL: "https://example.com/feed",
IconURL: "https://example.com/icon.png", Enabled: true,
}

2
backend/internal/logic/dataset/service.go
View File

@@ -143,7 +143,7 @@ func (s *Service) CreateSource(userID uint, input SourceInput) (*models.SaDatase
return nil, err
}
source := &models.SaDatasetSource{
OwnerID: userID, CreatedBy: userID, Name: normalized.Name, Kind: normalized.Kind,
OwnerID: userID, Name: normalized.Name, Kind: normalized.Kind,
URL: normalized.URL, IconURL: normalized.IconURL,
Description: normalized.Description, Enabled: normalized.Enabled,
}