From e8d3cab3171e634fcf62bae72fc8009a914ecef2 Mon Sep 17 00:00:00 2001
From: fnetx <git@fralix.ovh>
Date: Thu, 3 Mar 2022 22:17:45 +0100
Subject: [PATCH 1/2] Fix potential assignee query for repo
---
models/repo.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/models/repo.go b/models/repo.go
index 4b2221e6435a5..f6e75c15fa769 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -153,7 +153,7 @@ func getRepoAssignees(ctx context.Context, repo *repo_model.Repository) (_ []*us
userIDs := make([]int64, 0, 10)
if err = e.Table("access").
Where("repo_id = ? AND mode >= ?", repo.ID, perm.AccessModeWrite).
- Select("id").
+ Select("user_id").
Find(&userIDs); err != nil {
return nil, err
}
From 66e8050ddd94a35bcb7123992c14d3c0da0a065b Mon Sep 17 00:00:00 2001
From: Gusted <williamzijl7@hotmail.com>
Date: Thu, 3 Mar 2022 22:45:35 +0100
Subject: [PATCH 2/2] Add tests for `GetRepoAssignees`
- As per https://github.com/go-gitea/gitea/pull/18994#issuecomment-1058506640
---
models/repo_test.go | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/models/repo_test.go b/models/repo_test.go
index c0790e532d751..ea250be9763c3 100644
--- a/models/repo_test.go
+++ b/models/repo_test.go
@@ -167,3 +167,21 @@ func TestLinkedRepository(t *testing.T) {
})
}
}
+
+func TestRepoAssignees(t *testing.T) {
+ assert.NoError(t, unittest.PrepareTestDatabase())
+
+ repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}).(*repo_model.Repository)
+ users, err := GetRepoAssignees(repo2)
+ assert.NoError(t, err)
+ assert.Len(t, users, 1)
+ assert.Equal(t, users[0].ID, int64(2))
+
+ repo21 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 21}).(*repo_model.Repository)
+ users, err = GetRepoAssignees(repo21)
+ assert.NoError(t, err)
+ assert.Len(t, users, 3)
+ assert.Equal(t, users[0].ID, int64(15))
+ assert.Equal(t, users[1].ID, int64(18))
+ assert.Equal(t, users[2].ID, int64(16))
+}