dashboard / erock/git-pr / fix patchset count for specific user #61 rss

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

diff --git a/pr.go b/pr.go
index 78d41fe..59664c7 100644
--- a/pr.go
+++ b/pr.go
@@ -38,6 +38,7 @@ type GitPatchRequest interface {
 	GetPatchRequestByID(prID int64) (*PatchRequest, error)
 	GetPatchRequests() ([]*PatchRequest, error)
 	GetPatchRequestsByRepoID(repoID int64) ([]*PatchRequest, error)
+	GetPatchRequestsByPubkey(pubkey string) ([]*PatchRequest, error)
 	GetPatchsetsByPrID(prID int64) ([]*Patchset, error)
 	GetPatchsetByID(patchsetID int64) (*Patchset, error)
 	GetLatestPatchsetByPrID(prID int64) (*Patchset, error)
@@ -271,6 +272,16 @@ func (cmd PrCmd) GetPatchRequestsByRepoID(repoID int64) ([]*PatchRequest, error)
 	return prs, err
 }
 
+func (cmd PrCmd) GetPatchRequestsByPubkey(pubkey string) ([]*PatchRequest, error) {
+	prs := []*PatchRequest{}
+	err := cmd.Backend.DB.Select(
+		&prs,
+		"SELECT pr.* FROM patch_requests pr, app_users au WHERE pr.user_id=au.id AND au.pubkey=? ORDER BY id DESC",
+		pubkey,
+	)
+	return prs, err
+}
+
 func (cmd PrCmd) GetPatchRequestByID(prID int64) (*PatchRequest, error) {
 	pr := PatchRequest{}
 	err := cmd.Backend.DB.Get(

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13

diff --git a/web.go b/web.go
index cab9357..8bc8839 100644
--- a/web.go
+++ b/web.go
@@ -390,7 +390,7 @@ func userDetailHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	isAdmin := web.Backend.IsAdmin(pk)
 
-	prs, err := web.Pr.GetPatchRequests()
+	prs, err := web.Pr.GetPatchRequestsByPubkey(user.Pubkey)
 	if err != nil {
 		web.Logger.Error("cannot get prs", "err", err)
 		w.WriteHeader(http.StatusInternalServerError)