BlueGit

timfa bluegit

Merge branch 'cursor/activiteit-heatmap-65da' into 'master'

Activiteitsheatmap op dashboard, groep en repository

See merge request Timfa/bluegit!4

timfa Tim Falken · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
cbf8f6111b0180b3c9babc6b5e944e84e243bd8f
18 files changed +1175 −0
internal/activity/calendar.go added +136 −0
@@ -0,0 +1,136 @@
1 // Package activity bouwt de bijdragenkalender van de laatste 12 maanden.
2 package activity
3
4 import (
5 "fmt"
6 "time"
7 )
8
9 // Day is één vakje. Off ligt buiten het venster en telt niet mee.
10 type Day struct {
11 Off bool
12 Level int
13 Tip string
14 }
15
16 // Week is een kolom. De eerste dag is zondag. Label is de maandafkorting
17 // boven de kolom waarin die maand begint, anders leeg.
18 type Week struct {
19 Days []Day
20 Label string
21 }
22
23 // Calendar is het rooster plus het totaal.
24 type Calendar struct {
25 Weeks []Week
26 Total int
27 TotalText string
28 }
29
30 // Location is de tijdzone waarin een bijdrage op een dag valt.
31 func Location() *time.Location {
32 loc, err := time.LoadLocation("Europe/Amsterdam")
33 if err != nil {
34 return time.UTC
35 }
36 return loc
37 }
38
39 // Level zet een aantal om in 0..4. Vijf tinten, waarvan de eerste leeg is.
40 func Level(n int) int {
41 switch {
42 case n <= 0:
43 return 0
44 case n == 1:
45 return 1
46 case n <= 3:
47 return 2
48 case n <= 6:
49 return 3
50 default:
51 return 4
52 }
53 }
54
55 // Build maakt het rooster tot en met de dag van now.
56 // counts gebruikt de sleutel 2006-01-02 in Location.
57 func Build(now time.Time, counts map[string]int) Calendar {
58 loc := Location()
59 end := midnight(now, loc)
60 start := end.AddDate(0, -12, 0)
61 week := start
62 for week.Weekday() != time.Sunday {
63 week = week.AddDate(0, 0, -1)
64 }
65 var cal Calendar
66 first := true
67 for !week.After(end) {
68 var days []Day
69 label := ""
70 for i := 0; i < 7; i++ {
71 day := week.AddDate(0, 0, i)
72 if day.After(end) {
73 break
74 }
75 if day.Before(start) {
76 days = append(days, Day{Off: true})
77 continue
78 }
79 n := 0
80 if counts != nil {
81 n = counts[day.Format("2006-01-02")]
82 }
83 cal.Total += n
84 if day.Day() == 1 {
85 label = monthShort(day.Month())
86 }
87 days = append(days, Day{Level: Level(n), Tip: phrase(n, "op "+longDate(day))})
88 }
89 if label == "" && first {
90 if d := firstInside(week, start, end); !d.IsZero() {
91 label = monthShort(d.Month())
92 }
93 }
94 first = false
95 cal.Weeks = append(cal.Weeks, Week{Days: days, Label: label})
96 week = week.AddDate(0, 0, 7)
97 }
98 cal.TotalText = phrase(cal.Total, "in de laatste 12 maanden")
99 return cal
100 }
101
102 func midnight(t time.Time, loc *time.Location) time.Time {
103 t = t.In(loc)
104 return time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, loc)
105 }
106
107 func firstInside(week, start, end time.Time) time.Time {
108 for i := 0; i < 7; i++ {
109 day := week.AddDate(0, 0, i)
110 if !day.Before(start) && !day.After(end) {
111 return day
112 }
113 }
114 return time.Time{}
115 }
116
117 func phrase(n int, tail string) string {
118 switch {
119 case n <= 0:
120 return "Geen bijdragen " + tail
121 case n == 1:
122 return "1 bijdrage " + tail
123 default:
124 return fmt.Sprintf("%d bijdragen %s", n, tail)
125 }
126 }
127
128 func longDate(t time.Time) string {
129 months := []string{"", "januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"}
130 return fmt.Sprintf("%d %s %d", t.Day(), months[t.Month()], t.Year())
131 }
132
133 func monthShort(m time.Month) string {
134 short := []string{"", "jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}
135 return short[m]
136 }
@@ -0,0 +1,136 @@
1// Package activity bouwt de bijdragenkalender van de laatste 12 maanden.
2package activity
3
4import (
5 "fmt"
6 "time"
7)
8
9// Day is één vakje. Off ligt buiten het venster en telt niet mee.
10type Day struct {
11 Off bool
12 Level int
13 Tip string
14}
15
16// Week is een kolom. De eerste dag is zondag. Label is de maandafkorting
17// boven de kolom waarin die maand begint, anders leeg.
18type Week struct {
19 Days []Day
20 Label string
21}
22
23// Calendar is het rooster plus het totaal.
24type Calendar struct {
25 Weeks []Week
26 Total int
27 TotalText string
28}
29
30// Location is de tijdzone waarin een bijdrage op een dag valt.
31func Location() *time.Location {
32 loc, err := time.LoadLocation("Europe/Amsterdam")
33 if err != nil {
34 return time.UTC
35 }
36 return loc
37}
38
39// Level zet een aantal om in 0..4. Vijf tinten, waarvan de eerste leeg is.
40func Level(n int) int {
41 switch {
42 case n <= 0:
43 return 0
44 case n == 1:
45 return 1
46 case n <= 3:
47 return 2
48 case n <= 6:
49 return 3
50 default:
51 return 4
52 }
53}
54
55// Build maakt het rooster tot en met de dag van now.
56// counts gebruikt de sleutel 2006-01-02 in Location.
57func Build(now time.Time, counts map[string]int) Calendar {
58 loc := Location()
59 end := midnight(now, loc)
60 start := end.AddDate(0, -12, 0)
61 week := start
62 for week.Weekday() != time.Sunday {
63 week = week.AddDate(0, 0, -1)
64 }
65 var cal Calendar
66 first := true
67 for !week.After(end) {
68 var days []Day
69 label := ""
70 for i := 0; i < 7; i++ {
71 day := week.AddDate(0, 0, i)
72 if day.After(end) {
73 break
74 }
75 if day.Before(start) {
76 days = append(days, Day{Off: true})
77 continue
78 }
79 n := 0
80 if counts != nil {
81 n = counts[day.Format("2006-01-02")]
82 }
83 cal.Total += n
84 if day.Day() == 1 {
85 label = monthShort(day.Month())
86 }
87 days = append(days, Day{Level: Level(n), Tip: phrase(n, "op "+longDate(day))})
88 }
89 if label == "" && first {
90 if d := firstInside(week, start, end); !d.IsZero() {
91 label = monthShort(d.Month())
92 }
93 }
94 first = false
95 cal.Weeks = append(cal.Weeks, Week{Days: days, Label: label})
96 week = week.AddDate(0, 0, 7)
97 }
98 cal.TotalText = phrase(cal.Total, "in de laatste 12 maanden")
99 return cal
100}
101
102func midnight(t time.Time, loc *time.Location) time.Time {
103 t = t.In(loc)
104 return time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, loc)
105}
106
107func firstInside(week, start, end time.Time) time.Time {
108 for i := 0; i < 7; i++ {
109 day := week.AddDate(0, 0, i)
110 if !day.Before(start) && !day.After(end) {
111 return day
112 }
113 }
114 return time.Time{}
115}
116
117func phrase(n int, tail string) string {
118 switch {
119 case n <= 0:
120 return "Geen bijdragen " + tail
121 case n == 1:
122 return "1 bijdrage " + tail
123 default:
124 return fmt.Sprintf("%d bijdragen %s", n, tail)
125 }
126}
127
128func longDate(t time.Time) string {
129 months := []string{"", "januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"}
130 return fmt.Sprintf("%d %s %d", t.Day(), months[t.Month()], t.Year())
131}
132
133func monthShort(m time.Month) string {
134 short := []string{"", "jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}
135 return short[m]
136}
internal/activity/calendar_test.go added +73 −0
@@ -0,0 +1,73 @@
1 package activity
2
3 import (
4 "strings"
5 "testing"
6 "time"
7 )
8
9 func TestLevel(t *testing.T) {
10 cases := []struct{ n, want int }{{0, 0}, {1, 1}, {2, 2}, {3, 2}, {4, 3}, {6, 3}, {7, 4}, {40, 4}}
11 for _, c := range cases {
12 if got := Level(c.n); got != c.want {
13 t.Fatalf("level %d = %d, wil %d", c.n, got, c.want)
14 }
15 }
16 }
17
18 func TestBuildYearGrid(t *testing.T) {
19 loc := Location()
20 now := time.Date(2026, 10, 21, 15, 0, 0, 0, loc)
21 cal := Build(now, map[string]int{
22 "2026-10-21": 1,
23 "2026-10-20": 4,
24 "2025-11-01": 2,
25 "2025-10-20": 9,
26 })
27 if cal.Total != 7 {
28 t.Fatalf("totaal %d, tekst %s", cal.Total, cal.TotalText)
29 }
30 if cal.TotalText != "7 bijdragen in de laatste 12 maanden" {
31 t.Fatal(cal.TotalText)
32 }
33 if len(cal.Weeks) < 52 || len(cal.Weeks) > 54 {
34 t.Fatalf("weken %d", len(cal.Weeks))
35 }
36 first := cal.Weeks[0]
37 if len(first.Days) != 7 || !first.Days[0].Off || !first.Days[1].Off || first.Days[2].Off {
38 t.Fatalf("eerste week %+v", first.Days)
39 }
40 if first.Label != "okt" {
41 t.Fatalf("eerste label %q", first.Label)
42 }
43 last := cal.Weeks[len(cal.Weeks)-1]
44 if len(last.Days) != 4 {
45 t.Fatalf("laatste week heeft %d dagen", len(last.Days))
46 }
47 if last.Days[2].Level != 3 || last.Days[2].Tip != "4 bijdragen op 20 oktober 2026" {
48 t.Fatalf("dinsdag %+v", last.Days[2])
49 }
50 if last.Days[3].Level != 1 || !strings.Contains(last.Days[3].Tip, "1 bijdrage op 21 oktober 2026") {
51 t.Fatalf("woensdag %+v", last.Days[3])
52 }
53 labels := 0
54 var seen []string
55 for _, w := range cal.Weeks {
56 if w.Label != "" {
57 labels++
58 seen = append(seen, w.Label)
59 }
60 }
61 if labels != 13 || seen[0] != "okt" || seen[len(seen)-1] != "okt" || !contains(seen, "nov") || !contains(seen, "mrt") {
62 t.Fatalf("labels %v", seen)
63 }
64 }
65
66 func contains(ss []string, want string) bool {
67 for _, s := range ss {
68 if s == want {
69 return true
70 }
71 }
72 return false
73 }
@@ -0,0 +1,73 @@
1package activity
2
3import (
4 "strings"
5 "testing"
6 "time"
7)
8
9func TestLevel(t *testing.T) {
10 cases := []struct{ n, want int }{{0, 0}, {1, 1}, {2, 2}, {3, 2}, {4, 3}, {6, 3}, {7, 4}, {40, 4}}
11 for _, c := range cases {
12 if got := Level(c.n); got != c.want {
13 t.Fatalf("level %d = %d, wil %d", c.n, got, c.want)
14 }
15 }
16}
17
18func TestBuildYearGrid(t *testing.T) {
19 loc := Location()
20 now := time.Date(2026, 10, 21, 15, 0, 0, 0, loc)
21 cal := Build(now, map[string]int{
22 "2026-10-21": 1,
23 "2026-10-20": 4,
24 "2025-11-01": 2,
25 "2025-10-20": 9,
26 })
27 if cal.Total != 7 {
28 t.Fatalf("totaal %d, tekst %s", cal.Total, cal.TotalText)
29 }
30 if cal.TotalText != "7 bijdragen in de laatste 12 maanden" {
31 t.Fatal(cal.TotalText)
32 }
33 if len(cal.Weeks) < 52 || len(cal.Weeks) > 54 {
34 t.Fatalf("weken %d", len(cal.Weeks))
35 }
36 first := cal.Weeks[0]
37 if len(first.Days) != 7 || !first.Days[0].Off || !first.Days[1].Off || first.Days[2].Off {
38 t.Fatalf("eerste week %+v", first.Days)
39 }
40 if first.Label != "okt" {
41 t.Fatalf("eerste label %q", first.Label)
42 }
43 last := cal.Weeks[len(cal.Weeks)-1]
44 if len(last.Days) != 4 {
45 t.Fatalf("laatste week heeft %d dagen", len(last.Days))
46 }
47 if last.Days[2].Level != 3 || last.Days[2].Tip != "4 bijdragen op 20 oktober 2026" {
48 t.Fatalf("dinsdag %+v", last.Days[2])
49 }
50 if last.Days[3].Level != 1 || !strings.Contains(last.Days[3].Tip, "1 bijdrage op 21 oktober 2026") {
51 t.Fatalf("woensdag %+v", last.Days[3])
52 }
53 labels := 0
54 var seen []string
55 for _, w := range cal.Weeks {
56 if w.Label != "" {
57 labels++
58 seen = append(seen, w.Label)
59 }
60 }
61 if labels != 13 || seen[0] != "okt" || seen[len(seen)-1] != "okt" || !contains(seen, "nov") || !contains(seen, "mrt") {
62 t.Fatalf("labels %v", seen)
63 }
64}
65
66func contains(ss []string, want string) bool {
67 for _, s := range ss {
68 if s == want {
69 return true
70 }
71 }
72 return false
73}
internal/gitrepo/repo.go +46 −0
@@ -426,6 +426,52 @@ func BlobSize(ctx context.Context, gitBin, dir, rev, rel string) (int64, error)
426 426 return strconv.ParseInt(strings.TrimSpace(out), 10, 64)
427 427 }
428 428
429 // PushedCommit is een commit die met een push nieuw bereikbaar werd.
430 type PushedCommit struct {
431 SHA string
432 Email string
433 Name string
434 Unix int64
435 }
436
437 // CommitsSince geeft commits die newSHA bereikt en old niet.
438 // Een lege of nul-old is de hele geschiedenis van newSHA.
439 func CommitsSince(ctx context.Context, gitBin, dir, old, newSHA string) ([]PushedCommit, error) {
440 if newSHA == "" || allZero(newSHA) {
441 return nil, nil
442 }
443 args := []string{"-C", dir, "log", "--format=%H%x1f%ae%x1f%an%x1f%at", newSHA}
444 if old != "" && !allZero(old) {
445 args = append(args, "--not", old)
446 }
447 out, err := run(ctx, gitBin, nil, args...)
448 if err != nil {
449 if emptyHistory(err) {
450 return nil, nil
451 }
452 return nil, err
453 }
454 var commits []PushedCommit
455 for _, line := range strings.Split(out, "\n") {
456 line = strings.TrimSpace(line)
457 if line == "" || !strings.Contains(line, "\x1f") {
458 continue
459 }
460 parts := strings.Split(line, "\x1f")
461 if len(parts) < 4 {
462 continue
463 }
464 c := PushedCommit{SHA: parts[0], Email: parts[1], Name: parts[2]}
465 c.Unix, _ = strconv.ParseInt(parts[3], 10, 64)
466 commits = append(commits, c)
467 }
468 return commits, nil
469 }
470
471 func allZero(sha string) bool {
472 return strings.Trim(sha, "0") == ""
473 }
474
429 475 // BranchOfRef haalt de branch uit refs/heads/… .
430 476 func BranchOfRef(ref string) (string, bool) {
431 477 const p = "refs/heads/"
@@ -426,6 +426,52 @@ func BlobSize(ctx context.Context, gitBin, dir, rev, rel string) (int64, error)
426 return strconv.ParseInt(strings.TrimSpace(out), 10, 64)
426 return strconv.ParseInt(strings.TrimSpace(out), 10, 64)
427}
427}
428
428
429// PushedCommit is een commit die met een push nieuw bereikbaar werd.
430type PushedCommit struct {
431 SHA string
432 Email string
433 Name string
434 Unix int64
435}
436
437// CommitsSince geeft commits die newSHA bereikt en old niet.
438// Een lege of nul-old is de hele geschiedenis van newSHA.
439func CommitsSince(ctx context.Context, gitBin, dir, old, newSHA string) ([]PushedCommit, error) {
440 if newSHA == "" || allZero(newSHA) {
441 return nil, nil
442 }
443 args := []string{"-C", dir, "log", "--format=%H%x1f%ae%x1f%an%x1f%at", newSHA}
444 if old != "" && !allZero(old) {
445 args = append(args, "--not", old)
446 }
447 out, err := run(ctx, gitBin, nil, args...)
448 if err != nil {
449 if emptyHistory(err) {
450 return nil, nil
451 }
452 return nil, err
453 }
454 var commits []PushedCommit
455 for _, line := range strings.Split(out, "\n") {
456 line = strings.TrimSpace(line)
457 if line == "" || !strings.Contains(line, "\x1f") {
458 continue
459 }
460 parts := strings.Split(line, "\x1f")
461 if len(parts) < 4 {
462 continue
463 }
464 c := PushedCommit{SHA: parts[0], Email: parts[1], Name: parts[2]}
465 c.Unix, _ = strconv.ParseInt(parts[3], 10, 64)
466 commits = append(commits, c)
467 }
468 return commits, nil
469}
470
471func allZero(sha string) bool {
472 return strings.Trim(sha, "0") == ""
473}
474
429// BranchOfRef haalt de branch uit refs/heads/… .
475// BranchOfRef haalt de branch uit refs/heads/… .
430func BranchOfRef(ref string) (string, bool) {
476func BranchOfRef(ref string) (string, bool) {
431 const p = "refs/heads/"
477 const p = "refs/heads/"
internal/gitrepo/repo_test.go +43 −0
@@ -84,6 +84,49 @@ func execCommand(t *testing.T, dir string, args ...string) error {
84 84 return err
85 85 }
86 86
87 func TestCommitsSince(t *testing.T) {
88 if _, err := os.Stat("/usr/bin/git"); err != nil {
89 t.Skip("git ontbreekt")
90 }
91 ctx := context.Background()
92 dir := filepath.Join(t.TempDir(), "demo.git")
93 if err := Init("git", dir, "master", "/bin/true"); err != nil {
94 t.Fatal(err)
95 }
96 work := t.TempDir()
97 runGit := func(args ...string) {
98 t.Helper()
99 if err := execCommand(t, work, args...); err != nil {
100 t.Fatal(err)
101 }
102 }
103 runGit("init", "-b", "master")
104 runGit("config", "user.email", "tim@users.git.timfalken.com")
105 runGit("config", "user.name", "tim")
106 if err := os.WriteFile(filepath.Join(work, "README.md"), []byte("a\n"), 0o644); err != nil {
107 t.Fatal(err)
108 }
109 runGit("add", "README.md")
110 env := append(os.Environ(), "GIT_AUTHOR_DATE=2026-05-05T12:00:00", "GIT_COMMITTER_DATE=2026-05-05T12:00:00")
111 if _, err := run(ctx, "git", env, "-C", work, "commit", "-m", "eerste"); err != nil {
112 t.Fatal(err)
113 }
114 if _, err := run(ctx, "git", nil, "-C", work, "remote", "add", "origin", dir); err != nil {
115 t.Fatal(err)
116 }
117 if _, err := run(ctx, "git", nil, "-C", work, "push", "origin", "master"); err != nil {
118 t.Fatal(err)
119 }
120 list, err := CommitsSince(ctx, "git", dir, "", "master")
121 if err != nil || len(list) != 1 || list[0].Email != "tim@users.git.timfalken.com" || list[0].Unix == 0 {
122 t.Fatalf("%v %v", list, err)
123 }
124 again, err := CommitsSince(ctx, "git", dir, list[0].SHA, "master")
125 if err != nil || len(again) != 0 {
126 t.Fatalf("opnieuw %v %v", again, err)
127 }
128 }
129
87 130 func TestInitWritesHook(t *testing.T) {
88 131 if _, err := os.Stat("/usr/bin/git"); err != nil {
89 132 t.Skip("git ontbreekt")
@@ -84,6 +84,49 @@ func execCommand(t *testing.T, dir string, args ...string) error {
84 return err
84 return err
85}
85}
86
86
87func TestCommitsSince(t *testing.T) {
88 if _, err := os.Stat("/usr/bin/git"); err != nil {
89 t.Skip("git ontbreekt")
90 }
91 ctx := context.Background()
92 dir := filepath.Join(t.TempDir(), "demo.git")
93 if err := Init("git", dir, "master", "/bin/true"); err != nil {
94 t.Fatal(err)
95 }
96 work := t.TempDir()
97 runGit := func(args ...string) {
98 t.Helper()
99 if err := execCommand(t, work, args...); err != nil {
100 t.Fatal(err)
101 }
102 }
103 runGit("init", "-b", "master")
104 runGit("config", "user.email", "tim@users.git.timfalken.com")
105 runGit("config", "user.name", "tim")
106 if err := os.WriteFile(filepath.Join(work, "README.md"), []byte("a\n"), 0o644); err != nil {
107 t.Fatal(err)
108 }
109 runGit("add", "README.md")
110 env := append(os.Environ(), "GIT_AUTHOR_DATE=2026-05-05T12:00:00", "GIT_COMMITTER_DATE=2026-05-05T12:00:00")
111 if _, err := run(ctx, "git", env, "-C", work, "commit", "-m", "eerste"); err != nil {
112 t.Fatal(err)
113 }
114 if _, err := run(ctx, "git", nil, "-C", work, "remote", "add", "origin", dir); err != nil {
115 t.Fatal(err)
116 }
117 if _, err := run(ctx, "git", nil, "-C", work, "push", "origin", "master"); err != nil {
118 t.Fatal(err)
119 }
120 list, err := CommitsSince(ctx, "git", dir, "", "master")
121 if err != nil || len(list) != 1 || list[0].Email != "tim@users.git.timfalken.com" || list[0].Unix == 0 {
122 t.Fatalf("%v %v", list, err)
123 }
124 again, err := CommitsSince(ctx, "git", dir, list[0].SHA, "master")
125 if err != nil || len(again) != 0 {
126 t.Fatalf("opnieuw %v %v", again, err)
127 }
128}
129
87func TestInitWritesHook(t *testing.T) {
130func TestInitWritesHook(t *testing.T) {
88 if _, err := os.Stat("/usr/bin/git"); err != nil {
131 if _, err := os.Stat("/usr/bin/git"); err != nil {
89 t.Skip("git ontbreekt")
132 t.Skip("git ontbreekt")
internal/server/activity.go added +160 −0
@@ -0,0 +1,160 @@
1 package server
2
3 import (
4 "context"
5 "strconv"
6 "time"
7
8 "gitlab.com/Timfa/bluegit/internal/activity"
9 "gitlab.com/Timfa/bluegit/internal/gitrepo"
10 "gitlab.com/Timfa/bluegit/internal/store"
11 )
12
13 func (s *Server) heatmap(ctx context.Context, userID int64, repoIDs []int64) *activity.Calendar {
14 s.syncRepos(ctx, repoIDs)
15 loc := activity.Location()
16 since := time.Now().In(loc).AddDate(-1, 0, -3)
17 times, err := s.Store.ContributionTimes(ctx, userID, repoIDs, since)
18 counts := map[string]int{}
19 if err == nil {
20 for _, ts := range times {
21 counts[ts.In(loc).Format("2006-01-02")]++
22 }
23 }
24 cal := activity.Build(time.Now(), counts)
25 return &cal
26 }
27
28 func (s *Server) visibleIDs(ctx context.Context, userID int64, repos []store.Repo) []int64 {
29 allowed, err := s.Store.ListRepoIDs(ctx, userID)
30 if err != nil {
31 return nil
32 }
33 set := map[int64]bool{}
34 for _, id := range allowed {
35 set[id] = true
36 }
37 var ids []int64
38 for _, repo := range repos {
39 if set[repo.ID] {
40 ids = append(ids, repo.ID)
41 }
42 }
43 return ids
44 }
45
46 func (s *Server) syncRepos(ctx context.Context, repoIDs []int64) {
47 if s.StoragePath() == "" {
48 return
49 }
50 for _, id := range repoIDs {
51 done, err := s.Store.ContributionSynced(ctx, id)
52 if err != nil || done {
53 continue
54 }
55 repo, err := s.Store.RepoByID(ctx, id)
56 if err != nil {
57 continue
58 }
59 if err := s.backfillRepo(ctx, repo); err != nil {
60 if s.Log != nil {
61 s.Log.Error("bijdragen", "err", err)
62 }
63 continue
64 }
65 _ = s.Store.MarkContributionSynced(ctx, id)
66 }
67 }
68
69 func (s *Server) backfillRepo(ctx context.Context, repo store.Repo) error {
70 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
71 refs, err := gitrepo.Refs(ctx, s.Git, dir)
72 if err != nil {
73 return err
74 }
75 var rows []store.Contribution
76 seen := map[string]bool{}
77 for ref, sha := range refs {
78 if _, ok := gitrepo.BranchOfRef(ref); !ok {
79 continue
80 }
81 list, err := gitrepo.CommitsSince(ctx, s.Git, dir, "", sha)
82 if err != nil {
83 return err
84 }
85 for _, c := range list {
86 if seen[c.SHA] {
87 continue
88 }
89 seen[c.SHA] = true
90 uid, ok := s.Store.UserIDByGitAuthor(ctx, c.Email, c.Name)
91 if !ok {
92 continue
93 }
94 when := time.Unix(c.Unix, 0).UTC()
95 if c.Unix <= 0 {
96 when = time.Now().UTC()
97 }
98 rows = append(rows, store.Contribution{
99 UserID: uid, RepoID: repo.ID, Kind: "commit", Ref: c.SHA, At: when,
100 })
101 }
102 }
103 return s.Store.AddContributions(ctx, rows)
104 }
105
106 func (s *Server) recordPushContributions(repo store.Repo, user store.User, before, after map[string]string) {
107 if s.Store == nil || user.ID == 0 || s.StoragePath() == "" || after == nil {
108 return
109 }
110 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
111 ctx := context.Background()
112 var rows []store.Contribution
113 for ref, sha := range after {
114 if before[ref] == sha {
115 continue
116 }
117 if _, ok := gitrepo.BranchOfRef(ref); !ok {
118 continue
119 }
120 list, err := gitrepo.CommitsSince(ctx, s.Git, dir, before[ref], sha)
121 if err != nil {
122 if s.Log != nil {
123 s.Log.Error("bijdragen", "err", err)
124 }
125 continue
126 }
127 for _, c := range list {
128 uid := user.ID
129 if id, ok := s.Store.UserIDByGitAuthor(ctx, c.Email, c.Name); ok {
130 uid = id
131 }
132 when := time.Unix(c.Unix, 0).UTC()
133 if c.Unix <= 0 {
134 when = time.Now().UTC()
135 }
136 rows = append(rows, store.Contribution{
137 UserID: uid, RepoID: repo.ID, Kind: "commit", Ref: c.SHA, At: when,
138 })
139 }
140 }
141 if err := s.Store.AddContributions(ctx, rows); err != nil && s.Log != nil {
142 s.Log.Error("bijdragen", "err", err)
143 }
144 }
145
146 func (s *Server) recordContribution(userID, repoID int64, kind, ref string, at time.Time) {
147 if s.Store == nil || userID == 0 || repoID == 0 || ref == "" {
148 return
149 }
150 if at.IsZero() {
151 at = time.Now().UTC()
152 }
153 if err := s.Store.AddContributions(context.Background(), []store.Contribution{{
154 UserID: userID, RepoID: repoID, Kind: kind, Ref: ref, At: at,
155 }}); err != nil && s.Log != nil {
156 s.Log.Error("bijdragen", "err", err)
157 }
158 }
159
160 func mrRef(id int64) string { return "mr:" + strconv.FormatInt(id, 10) }
@@ -0,0 +1,160 @@
1package server
2
3import (
4 "context"
5 "strconv"
6 "time"
7
8 "gitlab.com/Timfa/bluegit/internal/activity"
9 "gitlab.com/Timfa/bluegit/internal/gitrepo"
10 "gitlab.com/Timfa/bluegit/internal/store"
11)
12
13func (s *Server) heatmap(ctx context.Context, userID int64, repoIDs []int64) *activity.Calendar {
14 s.syncRepos(ctx, repoIDs)
15 loc := activity.Location()
16 since := time.Now().In(loc).AddDate(-1, 0, -3)
17 times, err := s.Store.ContributionTimes(ctx, userID, repoIDs, since)
18 counts := map[string]int{}
19 if err == nil {
20 for _, ts := range times {
21 counts[ts.In(loc).Format("2006-01-02")]++
22 }
23 }
24 cal := activity.Build(time.Now(), counts)
25 return &cal
26}
27
28func (s *Server) visibleIDs(ctx context.Context, userID int64, repos []store.Repo) []int64 {
29 allowed, err := s.Store.ListRepoIDs(ctx, userID)
30 if err != nil {
31 return nil
32 }
33 set := map[int64]bool{}
34 for _, id := range allowed {
35 set[id] = true
36 }
37 var ids []int64
38 for _, repo := range repos {
39 if set[repo.ID] {
40 ids = append(ids, repo.ID)
41 }
42 }
43 return ids
44}
45
46func (s *Server) syncRepos(ctx context.Context, repoIDs []int64) {
47 if s.StoragePath() == "" {
48 return
49 }
50 for _, id := range repoIDs {
51 done, err := s.Store.ContributionSynced(ctx, id)
52 if err != nil || done {
53 continue
54 }
55 repo, err := s.Store.RepoByID(ctx, id)
56 if err != nil {
57 continue
58 }
59 if err := s.backfillRepo(ctx, repo); err != nil {
60 if s.Log != nil {
61 s.Log.Error("bijdragen", "err", err)
62 }
63 continue
64 }
65 _ = s.Store.MarkContributionSynced(ctx, id)
66 }
67}
68
69func (s *Server) backfillRepo(ctx context.Context, repo store.Repo) error {
70 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
71 refs, err := gitrepo.Refs(ctx, s.Git, dir)
72 if err != nil {
73 return err
74 }
75 var rows []store.Contribution
76 seen := map[string]bool{}
77 for ref, sha := range refs {
78 if _, ok := gitrepo.BranchOfRef(ref); !ok {
79 continue
80 }
81 list, err := gitrepo.CommitsSince(ctx, s.Git, dir, "", sha)
82 if err != nil {
83 return err
84 }
85 for _, c := range list {
86 if seen[c.SHA] {
87 continue
88 }
89 seen[c.SHA] = true
90 uid, ok := s.Store.UserIDByGitAuthor(ctx, c.Email, c.Name)
91 if !ok {
92 continue
93 }
94 when := time.Unix(c.Unix, 0).UTC()
95 if c.Unix <= 0 {
96 when = time.Now().UTC()
97 }
98 rows = append(rows, store.Contribution{
99 UserID: uid, RepoID: repo.ID, Kind: "commit", Ref: c.SHA, At: when,
100 })
101 }
102 }
103 return s.Store.AddContributions(ctx, rows)
104}
105
106func (s *Server) recordPushContributions(repo store.Repo, user store.User, before, after map[string]string) {
107 if s.Store == nil || user.ID == 0 || s.StoragePath() == "" || after == nil {
108 return
109 }
110 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
111 ctx := context.Background()
112 var rows []store.Contribution
113 for ref, sha := range after {
114 if before[ref] == sha {
115 continue
116 }
117 if _, ok := gitrepo.BranchOfRef(ref); !ok {
118 continue
119 }
120 list, err := gitrepo.CommitsSince(ctx, s.Git, dir, before[ref], sha)
121 if err != nil {
122 if s.Log != nil {
123 s.Log.Error("bijdragen", "err", err)
124 }
125 continue
126 }
127 for _, c := range list {
128 uid := user.ID
129 if id, ok := s.Store.UserIDByGitAuthor(ctx, c.Email, c.Name); ok {
130 uid = id
131 }
132 when := time.Unix(c.Unix, 0).UTC()
133 if c.Unix <= 0 {
134 when = time.Now().UTC()
135 }
136 rows = append(rows, store.Contribution{
137 UserID: uid, RepoID: repo.ID, Kind: "commit", Ref: c.SHA, At: when,
138 })
139 }
140 }
141 if err := s.Store.AddContributions(ctx, rows); err != nil && s.Log != nil {
142 s.Log.Error("bijdragen", "err", err)
143 }
144}
145
146func (s *Server) recordContribution(userID, repoID int64, kind, ref string, at time.Time) {
147 if s.Store == nil || userID == 0 || repoID == 0 || ref == "" {
148 return
149 }
150 if at.IsZero() {
151 at = time.Now().UTC()
152 }
153 if err := s.Store.AddContributions(context.Background(), []store.Contribution{{
154 UserID: userID, RepoID: repoID, Kind: kind, Ref: ref, At: at,
155 }}); err != nil && s.Log != nil {
156 s.Log.Error("bijdragen", "err", err)
157 }
158}
159
160func mrRef(id int64) string { return "mr:" + strconv.FormatInt(id, 10) }
internal/server/activity_test.go added +292 −0
@@ -0,0 +1,292 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6 "net/http/cookiejar"
7 "net/http/httptest"
8 "net/url"
9 "os"
10 "os/exec"
11 "path/filepath"
12 "strings"
13 "testing"
14 "time"
15
16 "gitlab.com/Timfa/bluegit/internal/auth"
17 "gitlab.com/Timfa/bluegit/internal/config"
18 "gitlab.com/Timfa/bluegit/internal/store"
19 )
20
21 func TestActivityHeatmap(t *testing.T) {
22 if _, err := exec.LookPath("git"); err != nil {
23 t.Skip("git ontbreekt")
24 }
25 storage := t.TempDir()
26 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
27 if err != nil {
28 t.Fatal(err)
29 }
30 t.Cleanup(func() { _ = st.Close() })
31 cfg := config.Config{
32 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
33 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
34 Git: config.Git{Binary: "git", DefaultBranch: "master"},
35 }
36 cfg.Auth.BaseURL = "https://auth.timfalken.com"
37 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
38 ts := httptest.NewServer(srv.Handler())
39 t.Cleanup(ts.Close)
40
41 jar, _ := cookiejar.New(nil)
42 client := &http.Client{Jar: jar}
43 res, err := client.Get(ts.URL + "/login")
44 if err != nil {
45 t.Fatal(err)
46 }
47 page := read(t, res)
48 csrf := csrfOf(t, page)
49 res, err = client.PostForm(ts.URL+"/new/group", url.Values{"csrf": {csrf}, "name": {"Studio"}})
50 if err != nil {
51 t.Fatal(err)
52 }
53 page = read(t, res)
54 if !strings.Contains(page, "Activiteit") || strings.Index(page, "Activiteit") > strings.Index(page, "<h2>Repositories</h2>") {
55 t.Fatalf("groep zonder heatmap boven de lijst:\n%s", page)
56 }
57 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
58 "csrf": {csrfOf(t, page)}, "name": {"demo"}, "group": {"studio"}, "visibility": {"private"},
59 })
60 if err != nil {
61 t.Fatal(err)
62 }
63 page = read(t, res)
64 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
65 "csrf": {csrfOf(t, page)}, "name": {"geheim"}, "visibility": {"private"},
66 })
67 if err != nil {
68 t.Fatal(err)
69 }
70 page = read(t, res)
71 res, err = client.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
72 if err != nil {
73 t.Fatal(err)
74 }
75 token := between(read(t, res), `<p class="code">`, "</p>")
76 if !strings.HasPrefix(token, "bg_") {
77 t.Fatal("geen token")
78 }
79
80 pushDated := func(repo, date, message string) {
81 t.Helper()
82 work := t.TempDir()
83 git(t, work, "init", "-b", "master")
84 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
85 git(t, work, "config", "user.name", "tim")
86 writeFile(t, filepath.Join(work, "README.md"), message+"\n")
87 git(t, work, "add", "README.md")
88 gitAt(t, work, date, message)
89 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/" + repo + ".git"
90 if repo == "demo" {
91 remote = strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/studio/demo.git"
92 }
93 git(t, work, "remote", "add", "origin", remote)
94 git(t, work, "push", "-u", "origin", "master")
95 }
96 pushDated("geheim", "2026-03-03T12:00:00Z", "geheim-maart")
97 pushDated("demo", "2026-05-05T12:00:00Z", "demo-mei")
98
99 demo := t.TempDir()
100 demoRemote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/studio/demo.git"
101 git(t, demo, "clone", demoRemote, ".")
102 git(t, demo, "config", "user.email", "tim@users.git.timfalken.com")
103 git(t, demo, "config", "user.name", "tim")
104 git(t, demo, "checkout", "-b", "feature")
105 writeFile(t, filepath.Join(demo, "extra.txt"), "feature\n")
106 git(t, demo, "add", "extra.txt")
107 gitAt(t, demo, "2026-05-15T12:00:00Z", "feature-mei")
108 git(t, demo, "push", "-u", "origin", "feature")
109
110 ctx := context.Background()
111 ada, err := st.UpsertUser(ctx, 2, "ada", "", false)
112 if err != nil {
113 t.Fatal(err)
114 }
115 if err := st.SetMember(ctx, "group", groupID(t, st, "studio"), "ada", "developer"); err != nil {
116 t.Fatal(err)
117 }
118 adaToken, err := st.CreateToken(ctx, ada.ID, "ada")
119 if err != nil {
120 t.Fatal(err)
121 }
122 adaWork := t.TempDir()
123 adaRemote := strings.Replace(ts.URL, "http://", "http://ada:"+adaToken+"@", 1) + "/studio/demo.git"
124 git(t, adaWork, "clone", adaRemote, ".")
125 git(t, adaWork, "config", "user.email", "ada@users.git.timfalken.com")
126 git(t, adaWork, "config", "user.name", "ada")
127 git(t, adaWork, "checkout", "-b", "ada")
128 writeFile(t, filepath.Join(adaWork, "ada.txt"), "ada\n")
129 git(t, adaWork, "add", "ada.txt")
130 gitAt(t, adaWork, "2026-06-06T12:00:00Z", "ada-juni")
131 git(t, adaWork, "push", "-u", "origin", "ada")
132
133 res, err = client.Get(ts.URL + "/studio/demo/-/merge-requests")
134 if err != nil {
135 t.Fatal(err)
136 }
137 mrPage := read(t, res)
138 res, err = client.PostForm(ts.URL+"/studio/demo/-/merge-requests", url.Values{
139 "csrf": {csrfOf(t, mrPage)}, "title": {"Samen"}, "source": {"feature"}, "target": {"master"},
140 })
141 if err != nil {
142 t.Fatal(err)
143 }
144 opened := read(t, res)
145 if !strings.Contains(opened, "!1") {
146 t.Fatalf("mr:\n%s", opened)
147 }
148 res, err = client.PostForm(ts.URL+"/studio/demo/-/merge-requests/1/notes", url.Values{
149 "csrf": {csrfOf(t, opened)}, "body": {"<script>alert(1)</script>"},
150 })
151 if err != nil {
152 t.Fatal(err)
153 }
154 noted := read(t, res)
155 if !strings.Contains(noted, "&lt;script&gt;alert(1)&lt;/script&gt;") || strings.Contains(noted, "<script>alert(1)</script>") {
156 t.Fatalf("reactie:\n%s", noted)
157 }
158
159 res, err = client.Get(ts.URL + "/")
160 if err != nil {
161 t.Fatal(err)
162 }
163 dash := read(t, res)
164 for _, want := range []string{
165 "Activiteit",
166 "5 bijdragen in de laatste 12 maanden",
167 `title="1 bijdrage op 3 maart 2026"`,
168 `title="1 bijdrage op 5 mei 2026"`,
169 `title="1 bijdrage op 15 mei 2026"`,
170 ">M</span>",
171 ">W</span>",
172 ">F</span>",
173 "Minder",
174 "Meer",
175 `class="sq lv4"`,
176 "Commits, merge requests en reacties.",
177 } {
178 if !strings.Contains(dash, want) {
179 t.Fatalf("dashboard mist %q", want)
180 }
181 }
182 if strings.Contains(dash, `title="1 bijdrage op 6 juni 2026"`) {
183 t.Fatal("dashboard toont Ada's commit")
184 }
185 if strings.Index(dash, "Activiteit") > strings.Index(dash, "<h2>Repositories</h2>") {
186 t.Fatal("heatmap staat onder de repositorylijst")
187 }
188
189 res, err = client.Get(ts.URL + "/groups/studio")
190 if err != nil {
191 t.Fatal(err)
192 }
193 group := read(t, res)
194 if !strings.Contains(group, "5 bijdragen in de laatste 12 maanden") || !strings.Contains(group, `title="1 bijdrage op 6 juni 2026"`) || strings.Contains(group, `title="1 bijdrage op 3 maart 2026"`) {
195 t.Fatalf("groep heatmap klopt niet")
196 }
197
198 res, err = client.Get(ts.URL + "/studio/demo")
199 if err != nil {
200 t.Fatal(err)
201 }
202 repoPage := read(t, res)
203 if !strings.Contains(repoPage, "5 bijdragen in de laatste 12 maanden") || !strings.Contains(repoPage, `title="1 bijdrage op 6 juni 2026"`) || strings.Contains(repoPage, `title="1 bijdrage op 3 maart 2026"`) {
204 t.Fatalf("repo-heatmap klopt niet")
205 }
206 if strings.Index(repoPage, "Activiteit") > strings.Index(repoPage, "Projectinformatie") {
207 t.Fatal("heatmap staat onder de projectinformatie")
208 }
209
210 adaJar, _ := cookiejar.New(nil)
211 adaClient := &http.Client{Jar: adaJar}
212 sess, err := st.CreateSession(ctx, ada.ID, "dev", time.Now().Add(time.Hour))
213 if err != nil {
214 t.Fatal(err)
215 }
216 u, _ := url.Parse(ts.URL)
217 adaJar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: sess.ID, Path: "/"}})
218 res, err = adaClient.Get(ts.URL + "/")
219 if err != nil {
220 t.Fatal(err)
221 }
222 adaDash := read(t, res)
223 if !strings.Contains(adaDash, "1 bijdrage in de laatste 12 maanden") || !strings.Contains(adaDash, `title="1 bijdrage op 6 juni 2026"`) || strings.Contains(adaDash, `title="1 bijdrage op 3 maart 2026"`) || strings.Contains(adaDash, `title="1 bijdrage op 5 mei 2026"`) {
224 t.Fatalf("ada-heatmap klopt niet")
225 }
226
227 anon := &http.Client{}
228 res, err = anon.Get(ts.URL + "/studio/demo")
229 if err != nil {
230 t.Fatal(err)
231 }
232 if res.StatusCode != http.StatusNotFound {
233 t.Fatalf("privé voor anoniem: %d", res.StatusCode)
234 }
235 _ = res.Body.Close()
236 res, err = client.Get(ts.URL + "/studio/demo/-/settings")
237 if err != nil {
238 t.Fatal(err)
239 }
240 settings := read(t, res)
241 res, err = client.PostForm(ts.URL+"/studio/demo/-/settings", url.Values{
242 "csrf": {csrfOf(t, settings)}, "visibility": {"public"}, "description": {"zichtbaar"},
243 })
244 if err != nil {
245 t.Fatal(err)
246 }
247 _ = read(t, res)
248 res, err = anon.Get(ts.URL + "/studio/demo")
249 if err != nil {
250 t.Fatal(err)
251 }
252 pub := read(t, res)
253 if res.StatusCode != 200 || !strings.Contains(pub, "5 bijdragen in de laatste 12 maanden") || strings.Contains(pub, `title="1 bijdrage op 3 maart 2026"`) {
254 t.Fatalf("openbaar %d, heatmap klopt niet", res.StatusCode)
255 }
256
257 repo, err := st.RepoByPath(ctx, "studio", "demo")
258 if err != nil {
259 t.Fatal(err)
260 }
261 if err := st.DropContributions(ctx, repo.ID); err != nil {
262 t.Fatal(err)
263 }
264 res, err = client.Get(ts.URL + "/studio/demo")
265 if err != nil {
266 t.Fatal(err)
267 }
268 again := read(t, res)
269 if !strings.Contains(again, `title="1 bijdrage op 5 mei 2026"`) || strings.Contains(again, "5 bijdragen in de laatste 12 maanden") {
270 t.Fatal("bestaande commits zijn niet opnieuw geteld")
271 }
272 }
273
274 func gitAt(t *testing.T, dir, date, message string) {
275 t.Helper()
276 cmd := exec.Command("git", "commit", "-m", message)
277 cmd.Dir = dir
278 cmd.Env = append(os.Environ(), "GIT_AUTHOR_DATE="+date, "GIT_COMMITTER_DATE="+date)
279 out, err := cmd.CombinedOutput()
280 if err != nil {
281 t.Fatalf("commit %s: %v\n%s", message, err, out)
282 }
283 }
284
285 func groupID(t *testing.T, st *store.Store, path string) int64 {
286 t.Helper()
287 g, err := st.GroupByPath(context.Background(), path)
288 if err != nil {
289 t.Fatal(err)
290 }
291 return g.ID
292 }
@@ -0,0 +1,292 @@
1package server
2
3import (
4 "context"
5 "net/http"
6 "net/http/cookiejar"
7 "net/http/httptest"
8 "net/url"
9 "os"
10 "os/exec"
11 "path/filepath"
12 "strings"
13 "testing"
14 "time"
15
16 "gitlab.com/Timfa/bluegit/internal/auth"
17 "gitlab.com/Timfa/bluegit/internal/config"
18 "gitlab.com/Timfa/bluegit/internal/store"
19)
20
21func TestActivityHeatmap(t *testing.T) {
22 if _, err := exec.LookPath("git"); err != nil {
23 t.Skip("git ontbreekt")
24 }
25 storage := t.TempDir()
26 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
27 if err != nil {
28 t.Fatal(err)
29 }
30 t.Cleanup(func() { _ = st.Close() })
31 cfg := config.Config{
32 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
33 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
34 Git: config.Git{Binary: "git", DefaultBranch: "master"},
35 }
36 cfg.Auth.BaseURL = "https://auth.timfalken.com"
37 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
38 ts := httptest.NewServer(srv.Handler())
39 t.Cleanup(ts.Close)
40
41 jar, _ := cookiejar.New(nil)
42 client := &http.Client{Jar: jar}
43 res, err := client.Get(ts.URL + "/login")
44 if err != nil {
45 t.Fatal(err)
46 }
47 page := read(t, res)
48 csrf := csrfOf(t, page)
49 res, err = client.PostForm(ts.URL+"/new/group", url.Values{"csrf": {csrf}, "name": {"Studio"}})
50 if err != nil {
51 t.Fatal(err)
52 }
53 page = read(t, res)
54 if !strings.Contains(page, "Activiteit") || strings.Index(page, "Activiteit") > strings.Index(page, "<h2>Repositories</h2>") {
55 t.Fatalf("groep zonder heatmap boven de lijst:\n%s", page)
56 }
57 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
58 "csrf": {csrfOf(t, page)}, "name": {"demo"}, "group": {"studio"}, "visibility": {"private"},
59 })
60 if err != nil {
61 t.Fatal(err)
62 }
63 page = read(t, res)
64 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
65 "csrf": {csrfOf(t, page)}, "name": {"geheim"}, "visibility": {"private"},
66 })
67 if err != nil {
68 t.Fatal(err)
69 }
70 page = read(t, res)
71 res, err = client.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
72 if err != nil {
73 t.Fatal(err)
74 }
75 token := between(read(t, res), `<p class="code">`, "</p>")
76 if !strings.HasPrefix(token, "bg_") {
77 t.Fatal("geen token")
78 }
79
80 pushDated := func(repo, date, message string) {
81 t.Helper()
82 work := t.TempDir()
83 git(t, work, "init", "-b", "master")
84 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
85 git(t, work, "config", "user.name", "tim")
86 writeFile(t, filepath.Join(work, "README.md"), message+"\n")
87 git(t, work, "add", "README.md")
88 gitAt(t, work, date, message)
89 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/" + repo + ".git"
90 if repo == "demo" {
91 remote = strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/studio/demo.git"
92 }
93 git(t, work, "remote", "add", "origin", remote)
94 git(t, work, "push", "-u", "origin", "master")
95 }
96 pushDated("geheim", "2026-03-03T12:00:00Z", "geheim-maart")
97 pushDated("demo", "2026-05-05T12:00:00Z", "demo-mei")
98
99 demo := t.TempDir()
100 demoRemote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/studio/demo.git"
101 git(t, demo, "clone", demoRemote, ".")
102 git(t, demo, "config", "user.email", "tim@users.git.timfalken.com")
103 git(t, demo, "config", "user.name", "tim")
104 git(t, demo, "checkout", "-b", "feature")
105 writeFile(t, filepath.Join(demo, "extra.txt"), "feature\n")
106 git(t, demo, "add", "extra.txt")
107 gitAt(t, demo, "2026-05-15T12:00:00Z", "feature-mei")
108 git(t, demo, "push", "-u", "origin", "feature")
109
110 ctx := context.Background()
111 ada, err := st.UpsertUser(ctx, 2, "ada", "", false)
112 if err != nil {
113 t.Fatal(err)
114 }
115 if err := st.SetMember(ctx, "group", groupID(t, st, "studio"), "ada", "developer"); err != nil {
116 t.Fatal(err)
117 }
118 adaToken, err := st.CreateToken(ctx, ada.ID, "ada")
119 if err != nil {
120 t.Fatal(err)
121 }
122 adaWork := t.TempDir()
123 adaRemote := strings.Replace(ts.URL, "http://", "http://ada:"+adaToken+"@", 1) + "/studio/demo.git"
124 git(t, adaWork, "clone", adaRemote, ".")
125 git(t, adaWork, "config", "user.email", "ada@users.git.timfalken.com")
126 git(t, adaWork, "config", "user.name", "ada")
127 git(t, adaWork, "checkout", "-b", "ada")
128 writeFile(t, filepath.Join(adaWork, "ada.txt"), "ada\n")
129 git(t, adaWork, "add", "ada.txt")
130 gitAt(t, adaWork, "2026-06-06T12:00:00Z", "ada-juni")
131 git(t, adaWork, "push", "-u", "origin", "ada")
132
133 res, err = client.Get(ts.URL + "/studio/demo/-/merge-requests")
134 if err != nil {
135 t.Fatal(err)
136 }
137 mrPage := read(t, res)
138 res, err = client.PostForm(ts.URL+"/studio/demo/-/merge-requests", url.Values{
139 "csrf": {csrfOf(t, mrPage)}, "title": {"Samen"}, "source": {"feature"}, "target": {"master"},
140 })
141 if err != nil {
142 t.Fatal(err)
143 }
144 opened := read(t, res)
145 if !strings.Contains(opened, "!1") {
146 t.Fatalf("mr:\n%s", opened)
147 }
148 res, err = client.PostForm(ts.URL+"/studio/demo/-/merge-requests/1/notes", url.Values{
149 "csrf": {csrfOf(t, opened)}, "body": {"<script>alert(1)</script>"},
150 })
151 if err != nil {
152 t.Fatal(err)
153 }
154 noted := read(t, res)
155 if !strings.Contains(noted, "&lt;script&gt;alert(1)&lt;/script&gt;") || strings.Contains(noted, "<script>alert(1)</script>") {
156 t.Fatalf("reactie:\n%s", noted)
157 }
158
159 res, err = client.Get(ts.URL + "/")
160 if err != nil {
161 t.Fatal(err)
162 }
163 dash := read(t, res)
164 for _, want := range []string{
165 "Activiteit",
166 "5 bijdragen in de laatste 12 maanden",
167 `title="1 bijdrage op 3 maart 2026"`,
168 `title="1 bijdrage op 5 mei 2026"`,
169 `title="1 bijdrage op 15 mei 2026"`,
170 ">M</span>",
171 ">W</span>",
172 ">F</span>",
173 "Minder",
174 "Meer",
175 `class="sq lv4"`,
176 "Commits, merge requests en reacties.",
177 } {
178 if !strings.Contains(dash, want) {
179 t.Fatalf("dashboard mist %q", want)
180 }
181 }
182 if strings.Contains(dash, `title="1 bijdrage op 6 juni 2026"`) {
183 t.Fatal("dashboard toont Ada's commit")
184 }
185 if strings.Index(dash, "Activiteit") > strings.Index(dash, "<h2>Repositories</h2>") {
186 t.Fatal("heatmap staat onder de repositorylijst")
187 }
188
189 res, err = client.Get(ts.URL + "/groups/studio")
190 if err != nil {
191 t.Fatal(err)
192 }
193 group := read(t, res)
194 if !strings.Contains(group, "5 bijdragen in de laatste 12 maanden") || !strings.Contains(group, `title="1 bijdrage op 6 juni 2026"`) || strings.Contains(group, `title="1 bijdrage op 3 maart 2026"`) {
195 t.Fatalf("groep heatmap klopt niet")
196 }
197
198 res, err = client.Get(ts.URL + "/studio/demo")
199 if err != nil {
200 t.Fatal(err)
201 }
202 repoPage := read(t, res)
203 if !strings.Contains(repoPage, "5 bijdragen in de laatste 12 maanden") || !strings.Contains(repoPage, `title="1 bijdrage op 6 juni 2026"`) || strings.Contains(repoPage, `title="1 bijdrage op 3 maart 2026"`) {
204 t.Fatalf("repo-heatmap klopt niet")
205 }
206 if strings.Index(repoPage, "Activiteit") > strings.Index(repoPage, "Projectinformatie") {
207 t.Fatal("heatmap staat onder de projectinformatie")
208 }
209
210 adaJar, _ := cookiejar.New(nil)
211 adaClient := &http.Client{Jar: adaJar}
212 sess, err := st.CreateSession(ctx, ada.ID, "dev", time.Now().Add(time.Hour))
213 if err != nil {
214 t.Fatal(err)
215 }
216 u, _ := url.Parse(ts.URL)
217 adaJar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: sess.ID, Path: "/"}})
218 res, err = adaClient.Get(ts.URL + "/")
219 if err != nil {
220 t.Fatal(err)
221 }
222 adaDash := read(t, res)
223 if !strings.Contains(adaDash, "1 bijdrage in de laatste 12 maanden") || !strings.Contains(adaDash, `title="1 bijdrage op 6 juni 2026"`) || strings.Contains(adaDash, `title="1 bijdrage op 3 maart 2026"`) || strings.Contains(adaDash, `title="1 bijdrage op 5 mei 2026"`) {
224 t.Fatalf("ada-heatmap klopt niet")
225 }
226
227 anon := &http.Client{}
228 res, err = anon.Get(ts.URL + "/studio/demo")
229 if err != nil {
230 t.Fatal(err)
231 }
232 if res.StatusCode != http.StatusNotFound {
233 t.Fatalf("privé voor anoniem: %d", res.StatusCode)
234 }
235 _ = res.Body.Close()
236 res, err = client.Get(ts.URL + "/studio/demo/-/settings")
237 if err != nil {
238 t.Fatal(err)
239 }
240 settings := read(t, res)
241 res, err = client.PostForm(ts.URL+"/studio/demo/-/settings", url.Values{
242 "csrf": {csrfOf(t, settings)}, "visibility": {"public"}, "description": {"zichtbaar"},
243 })
244 if err != nil {
245 t.Fatal(err)
246 }
247 _ = read(t, res)
248 res, err = anon.Get(ts.URL + "/studio/demo")
249 if err != nil {
250 t.Fatal(err)
251 }
252 pub := read(t, res)
253 if res.StatusCode != 200 || !strings.Contains(pub, "5 bijdragen in de laatste 12 maanden") || strings.Contains(pub, `title="1 bijdrage op 3 maart 2026"`) {
254 t.Fatalf("openbaar %d, heatmap klopt niet", res.StatusCode)
255 }
256
257 repo, err := st.RepoByPath(ctx, "studio", "demo")
258 if err != nil {
259 t.Fatal(err)
260 }
261 if err := st.DropContributions(ctx, repo.ID); err != nil {
262 t.Fatal(err)
263 }
264 res, err = client.Get(ts.URL + "/studio/demo")
265 if err != nil {
266 t.Fatal(err)
267 }
268 again := read(t, res)
269 if !strings.Contains(again, `title="1 bijdrage op 5 mei 2026"`) || strings.Contains(again, "5 bijdragen in de laatste 12 maanden") {
270 t.Fatal("bestaande commits zijn niet opnieuw geteld")
271 }
272}
273
274func gitAt(t *testing.T, dir, date, message string) {
275 t.Helper()
276 cmd := exec.Command("git", "commit", "-m", message)
277 cmd.Dir = dir
278 cmd.Env = append(os.Environ(), "GIT_AUTHOR_DATE="+date, "GIT_COMMITTER_DATE="+date)
279 out, err := cmd.CombinedOutput()
280 if err != nil {
281 t.Fatalf("commit %s: %v\n%s", message, err, out)
282 }
283}
284
285func groupID(t *testing.T, st *store.Store, path string) int64 {
286 t.Helper()
287 g, err := st.GroupByPath(context.Background(), path)
288 if err != nil {
289 t.Fatal(err)
290 }
291 return g.ID
292}
internal/server/auth_handlers.go +1 −0
@@ -114,6 +114,7 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {
114 114 }
115 115 v.Groups = groups
116 116 v.Title = "Overzicht"
117 v.Heat = s.heatmap(r.Context(), v.User.ID, ids)
117 118 s.render(w, "dashboard", v)
118 119 return
119 120 }
@@ -114,6 +114,7 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {
114 }
114 }
115 v.Groups = groups
115 v.Groups = groups
116 v.Title = "Overzicht"
116 v.Title = "Overzicht"
117 v.Heat = s.heatmap(r.Context(), v.User.ID, ids)
117 s.render(w, "dashboard", v)
118 s.render(w, "dashboard", v)
118 return
119 return
119 }
120 }
internal/server/events.go +1 −0
@@ -32,6 +32,7 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
32 32 if !ok || isZero(sha) {
33 33 continue
34 34 }
35 s.recordPushContributions(repo, user, map[string]string{ref: before[ref]}, map[string]string{ref: sha})
35 36 s.startPipeline(context.Background(), repo, sha, ref, actor)
36 37 web := strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath()
37 38 s.Dispatch(repo.ID, webhook.Event{
@@ -32,6 +32,7 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
32 if !ok || isZero(sha) {
32 if !ok || isZero(sha) {
33 continue
33 continue
34 }
34 }
35 s.recordPushContributions(repo, user, map[string]string{ref: before[ref]}, map[string]string{ref: sha})
35 s.startPipeline(context.Background(), repo, sha, ref, actor)
36 s.startPipeline(context.Background(), repo, sha, ref, actor)
36 web := strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath()
37 web := strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath()
37 s.Dispatch(repo.ID, webhook.Event{
38 s.Dispatch(repo.ID, webhook.Event{
internal/server/repo_handlers.go +28 −0
@@ -64,6 +64,7 @@ func (s *Server) repoHome(w http.ResponseWriter, r *http.Request) {
64 64 v := s.repoView(w, r, repo, role, repo.Name)
65 65 v.Wide = true
66 66 s.fillOverview(r, &v, repo)
67 v.Heat = s.heatmap(r.Context(), 0, []int64{repo.ID})
67 68 s.render(w, "repo", v)
68 69 }
69 70
@@ -202,6 +203,7 @@ func (s *Server) createMR(w http.ResponseWriter, r *http.Request) {
202 203 return
203 204 }
204 205 s.Dispatch(repo.ID, pushEvent(repo, "merge_request", target, "", u.Username, "merge request !"+strconv.FormatInt(mr.Number, 10)+" geopend: "+mr.Title, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10)))
206 s.recordContribution(u.ID, repo.ID, "merge_request", mrRef(mr.ID), mr.CreatedAt)
205 207 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "Merge request geopend", "")
206 208 }
207 209
@@ -229,9 +231,35 @@ func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
229 231 if err == nil {
230 232 v.Diff = diff
231 233 }
234 notes, _ := s.Store.ListNotes(r.Context(), mr.ID)
235 for _, n := range notes {
236 v.Notes = append(v.Notes, NoteRow{Author: n.Author, Body: n.Body, When: dutchDate(n.CreatedAt)})
237 }
232 238 s.render(w, "mr", v)
233 239 }
234 240
241 func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
242 u, repo, _, ok := s.guard(w, r, access.RoleReadonly)
243 if !ok || !s.csrfOK(w, r) {
244 return
245 }
246 if u.ID == 0 {
247 http.Error(w, "geen toegang", http.StatusForbidden)
248 return
249 }
250 mr, err := s.mrFromRequest(r, repo.ID)
251 if err != nil {
252 http.NotFound(w, r)
253 return
254 }
255 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
256 if _, err := s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body")); err != nil {
257 s.redirect(w, r, back, "", err.Error())
258 return
259 }
260 s.redirect(w, r, back, "Reactie geplaatst", "")
261 }
262
235 263 func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
236 264 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
237 265 if !ok || !s.csrfOK(w, r) {
@@ -64,6 +64,7 @@ func (s *Server) repoHome(w http.ResponseWriter, r *http.Request) {
64 v := s.repoView(w, r, repo, role, repo.Name)
64 v := s.repoView(w, r, repo, role, repo.Name)
65 v.Wide = true
65 v.Wide = true
66 s.fillOverview(r, &v, repo)
66 s.fillOverview(r, &v, repo)
67 v.Heat = s.heatmap(r.Context(), 0, []int64{repo.ID})
67 s.render(w, "repo", v)
68 s.render(w, "repo", v)
68}
69}
69
70
@@ -202,6 +203,7 @@ func (s *Server) createMR(w http.ResponseWriter, r *http.Request) {
202 return
203 return
203 }
204 }
204 s.Dispatch(repo.ID, pushEvent(repo, "merge_request", target, "", u.Username, "merge request !"+strconv.FormatInt(mr.Number, 10)+" geopend: "+mr.Title, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10)))
205 s.Dispatch(repo.ID, pushEvent(repo, "merge_request", target, "", u.Username, "merge request !"+strconv.FormatInt(mr.Number, 10)+" geopend: "+mr.Title, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10)))
206 s.recordContribution(u.ID, repo.ID, "merge_request", mrRef(mr.ID), mr.CreatedAt)
205 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "Merge request geopend", "")
207 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "Merge request geopend", "")
206}
208}
207
209
@@ -229,9 +231,35 @@ func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
229 if err == nil {
231 if err == nil {
230 v.Diff = diff
232 v.Diff = diff
231 }
233 }
234 notes, _ := s.Store.ListNotes(r.Context(), mr.ID)
235 for _, n := range notes {
236 v.Notes = append(v.Notes, NoteRow{Author: n.Author, Body: n.Body, When: dutchDate(n.CreatedAt)})
237 }
232 s.render(w, "mr", v)
238 s.render(w, "mr", v)
233}
239}
234
240
241func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
242 u, repo, _, ok := s.guard(w, r, access.RoleReadonly)
243 if !ok || !s.csrfOK(w, r) {
244 return
245 }
246 if u.ID == 0 {
247 http.Error(w, "geen toegang", http.StatusForbidden)
248 return
249 }
250 mr, err := s.mrFromRequest(r, repo.ID)
251 if err != nil {
252 http.NotFound(w, r)
253 return
254 }
255 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
256 if _, err := s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body")); err != nil {
257 s.redirect(w, r, back, "", err.Error())
258 return
259 }
260 s.redirect(w, r, back, "Reactie geplaatst", "")
261}
262
235func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
263func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
236 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
264 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
237 if !ok || !s.csrfOK(w, r) {
265 if !ok || !s.csrfOK(w, r) {
internal/server/server.go +9 −0
@@ -16,6 +16,7 @@ import (
16 16 "unicode/utf8"
17 17
18 18 "gitlab.com/Timfa/bluegit/internal/access"
19 "gitlab.com/Timfa/bluegit/internal/activity"
19 20 "gitlab.com/Timfa/bluegit/internal/auth"
20 21 "gitlab.com/Timfa/bluegit/internal/config"
21 22 "gitlab.com/Timfa/bluegit/internal/realip"
@@ -106,6 +107,7 @@ func (s *Server) Handler() http.Handler {
106 107 mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/{number}", s.showMR)
107 108 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)
108 109 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)
110 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/notes", s.createNote)
109 111 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines", s.pipelines)
110 112 mux.HandleFunc("POST /{owner}/{repo}/-/pipelines", s.runPipeline)
111 113 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}", s.pipeline)
@@ -378,6 +380,13 @@ type View struct {
378 380 FileName string
379 381 RevProtected bool
380 382 TagNames []string
383 Heat *activity.Calendar
384 Notes []NoteRow
385 }
386
387 // NoteRow is een reactie in de interface.
388 type NoteRow struct {
389 Author, Body, When string
381 390 }
382 391
383 392 // FileRow is een rij in de bestandstabel of de boom.
@@ -16,6 +16,7 @@ import (
16 "unicode/utf8"
16 "unicode/utf8"
17
17
18 "gitlab.com/Timfa/bluegit/internal/access"
18 "gitlab.com/Timfa/bluegit/internal/access"
19 "gitlab.com/Timfa/bluegit/internal/activity"
19 "gitlab.com/Timfa/bluegit/internal/auth"
20 "gitlab.com/Timfa/bluegit/internal/auth"
20 "gitlab.com/Timfa/bluegit/internal/config"
21 "gitlab.com/Timfa/bluegit/internal/config"
21 "gitlab.com/Timfa/bluegit/internal/realip"
22 "gitlab.com/Timfa/bluegit/internal/realip"
@@ -106,6 +107,7 @@ func (s *Server) Handler() http.Handler {
106 mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/{number}", s.showMR)
107 mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/{number}", s.showMR)
107 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)
108 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)
108 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)
109 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)
110 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/notes", s.createNote)
109 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines", s.pipelines)
111 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines", s.pipelines)
110 mux.HandleFunc("POST /{owner}/{repo}/-/pipelines", s.runPipeline)
112 mux.HandleFunc("POST /{owner}/{repo}/-/pipelines", s.runPipeline)
111 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}", s.pipeline)
113 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}", s.pipeline)
@@ -378,6 +380,13 @@ type View struct {
378 FileName string
380 FileName string
379 RevProtected bool
381 RevProtected bool
380 TagNames []string
382 TagNames []string
383 Heat *activity.Calendar
384 Notes []NoteRow
385}
386
387// NoteRow is een reactie in de interface.
388type NoteRow struct {
389 Author, Body, When string
381}
390}
382
391
383// FileRow is een rij in de bestandstabel of de boom.
392// FileRow is een rij in de bestandstabel of de boom.
internal/server/settings_handlers.go +3 −0
@@ -322,6 +322,9 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
322 322 v.Role = role
323 323 v.CanAdmin = role.CanManageSettings()
324 324 v.Repos, _ = s.Store.ReposByGroup(r.Context(), g.ID)
325 if v.User != nil {
326 v.Heat = s.heatmap(r.Context(), 0, s.visibleIDs(r.Context(), v.User.ID, v.Repos))
327 }
325 328 if role.CanManageSettings() {
326 329 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
327 330 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
@@ -322,6 +322,9 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
322 v.Role = role
322 v.Role = role
323 v.CanAdmin = role.CanManageSettings()
323 v.CanAdmin = role.CanManageSettings()
324 v.Repos, _ = s.Store.ReposByGroup(r.Context(), g.ID)
324 v.Repos, _ = s.Store.ReposByGroup(r.Context(), g.ID)
325 if v.User != nil {
326 v.Heat = s.heatmap(r.Context(), 0, s.visibleIDs(r.Context(), v.User.ID, v.Repos))
327 }
325 if role.CanManageSettings() {
328 if role.CanManageSettings() {
326 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
329 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
327 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
330 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
internal/server/static/style.css +39 −0
@@ -147,6 +147,45 @@ table.code td.src { white-space: pre; }
147 147 .hl-s { color: #cf222e; }
148 148 .hl-c { color: #6e7781; }
149 149 .hl-n { color: #0550ae; }
150 .heat {
151 background: white; border: 1px solid var(--line); border-radius: 16px;
152 padding: 1rem 1.1rem 0.8rem; box-shadow: var(--shadow); margin: 0.4rem 0 1.1rem;
153 }
154 .heat h2 { margin: 0 0 0.55rem; font-size: 1.05rem; }
155 .heat-scroll { overflow-x: auto; padding: 1.7rem 0.2rem 0.15rem; }
156 .heat-months, .heat-cols {
157 display: grid; grid-auto-flow: column; grid-auto-columns: 11px; column-gap: 3px;
158 }
159 .heat-months { margin: 0 0 0.25rem 20px; height: 1rem; font-size: 0.68rem; color: var(--muted); }
160 .heat-months span { white-space: nowrap; line-height: 1rem; }
161 .heat-body { display: flex; gap: 4px; }
162 .heat-dow {
163 display: grid; grid-template-rows: repeat(7, 11px); row-gap: 3px;
164 width: 16px; font-size: 0.65rem; color: var(--muted); line-height: 11px;
165 }
166 .heat-col { display: grid; grid-auto-rows: 11px; row-gap: 3px; }
167 .sq { width: 11px; height: 11px; border-radius: 2px; display: block; position: relative; }
168 .sq[title]:hover::after, .sq[title]:focus::after {
169 content: attr(title);
170 position: absolute; left: 50%; bottom: calc(100% + 4px); transform: translateX(-50%);
171 background: #142033; color: white; padding: 0.28rem 0.5rem; border-radius: 6px;
172 font-size: 0.78rem; line-height: 1.2; white-space: nowrap; z-index: 5; pointer-events: none;
173 }
174 .sq.off { background: transparent; }
175 .sq.lv0 { background: #e6edf5; }
176 .sq.lv1 { background: #b9d4f6; }
177 .sq.lv2 { background: #6eacf0; }
178 .sq.lv3 { background: #1f6feb; }
179 .sq.lv4 { background: #0c3f86; }
180 .heat-foot {
181 display: flex; justify-content: space-between; align-items: flex-end; gap: 1rem;
182 margin-top: 0.7rem; color: var(--muted); font-size: 0.85rem;
183 }
184 .heat-total, .heat-legend, .heat-foot .muted { margin: 0; }
185 .heat-legend { display: flex; align-items: center; justify-content: flex-end; gap: 4px; }
186 .heat-foot .muted { text-align: right; margin-top: 0.2rem; }
150 187 @media (max-width: 800px) {
151 188 .proj, .fileview { grid-template-columns: 1fr; }
189 .heat-foot { flex-direction: column; align-items: flex-start; }
190 .heat-legend, .heat-foot .muted { justify-content: flex-start; text-align: left; }
152 191 }
@@ -147,6 +147,45 @@ table.code td.src { white-space: pre; }
147.hl-s { color: #cf222e; }
147.hl-s { color: #cf222e; }
148.hl-c { color: #6e7781; }
148.hl-c { color: #6e7781; }
149.hl-n { color: #0550ae; }
149.hl-n { color: #0550ae; }
150.heat {
151 background: white; border: 1px solid var(--line); border-radius: 16px;
152 padding: 1rem 1.1rem 0.8rem; box-shadow: var(--shadow); margin: 0.4rem 0 1.1rem;
153}
154.heat h2 { margin: 0 0 0.55rem; font-size: 1.05rem; }
155.heat-scroll { overflow-x: auto; padding: 1.7rem 0.2rem 0.15rem; }
156.heat-months, .heat-cols {
157 display: grid; grid-auto-flow: column; grid-auto-columns: 11px; column-gap: 3px;
158}
159.heat-months { margin: 0 0 0.25rem 20px; height: 1rem; font-size: 0.68rem; color: var(--muted); }
160.heat-months span { white-space: nowrap; line-height: 1rem; }
161.heat-body { display: flex; gap: 4px; }
162.heat-dow {
163 display: grid; grid-template-rows: repeat(7, 11px); row-gap: 3px;
164 width: 16px; font-size: 0.65rem; color: var(--muted); line-height: 11px;
165}
166.heat-col { display: grid; grid-auto-rows: 11px; row-gap: 3px; }
167.sq { width: 11px; height: 11px; border-radius: 2px; display: block; position: relative; }
168.sq[title]:hover::after, .sq[title]:focus::after {
169 content: attr(title);
170 position: absolute; left: 50%; bottom: calc(100% + 4px); transform: translateX(-50%);
171 background: #142033; color: white; padding: 0.28rem 0.5rem; border-radius: 6px;
172 font-size: 0.78rem; line-height: 1.2; white-space: nowrap; z-index: 5; pointer-events: none;
173}
174.sq.off { background: transparent; }
175.sq.lv0 { background: #e6edf5; }
176.sq.lv1 { background: #b9d4f6; }
177.sq.lv2 { background: #6eacf0; }
178.sq.lv3 { background: #1f6feb; }
179.sq.lv4 { background: #0c3f86; }
180.heat-foot {
181 display: flex; justify-content: space-between; align-items: flex-end; gap: 1rem;
182 margin-top: 0.7rem; color: var(--muted); font-size: 0.85rem;
183}
184.heat-total, .heat-legend, .heat-foot .muted { margin: 0; }
185.heat-legend { display: flex; align-items: center; justify-content: flex-end; gap: 4px; }
186.heat-foot .muted { text-align: right; margin-top: 0.2rem; }
150@media (max-width: 800px) {
187@media (max-width: 800px) {
151 .proj, .fileview { grid-template-columns: 1fr; }
188 .proj, .fileview { grid-template-columns: 1fr; }
189 .heat-foot { flex-direction: column; align-items: flex-start; }
190 .heat-legend, .heat-foot .muted { justify-content: flex-start; text-align: left; }
152}
191}
internal/server/templates/collab.html +12 −0
@@ -37,6 +37,17 @@
37 37 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">Sluiten</button>
38 38 </form>
39 39 {{end}}
40 <h2>Reacties</h2>
41 <ul class="clean">
42 {{range .Notes}}<li><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><p>{{.Body}}</p></li>{{else}}<li class="muted">Nog geen reacties.</li>{{end}}
43 </ul>
44 {{if .User}}
45 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">
46 <input type="hidden" name="csrf" value="{{.CSRF}}">
47 <label>Reactie <textarea name="body" required></textarea></label>
48 <button type="submit">Plaatsen</button>
49 </form>
50 {{end}}
40 51 {{template "layout-end" .}}
41 52 {{end}}
42 53
@@ -197,6 +208,7 @@
197 208 {{template "layout-start" .}}
198 209 <h1>{{.Group.Name}}</h1>
199 210 <p class="muted">{{.Group.Path}} · {{.Group.Description}}</p>
211 {{if .Heat}}{{template "heatmap" .Heat}}{{end}}
200 212 <h2>Repositories</h2>
201 213 <ul class="clean">{{range .Repos}}<li><a href="/{{.FullPath}}">{{.Name}}</a></li>{{else}}<li class="muted">Nog geen repositories.</li>{{end}}</ul>
202 214 {{if .CanAdmin}}
@@ -37,6 +37,17 @@
37 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">Sluiten</button>
37 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">Sluiten</button>
38</form>
38</form>
39{{end}}
39{{end}}
40<h2>Reacties</h2>
41<ul class="clean">
42 {{range .Notes}}<li><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><p>{{.Body}}</p></li>{{else}}<li class="muted">Nog geen reacties.</li>{{end}}
43</ul>
44{{if .User}}
45<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">
46 <input type="hidden" name="csrf" value="{{.CSRF}}">
47 <label>Reactie <textarea name="body" required></textarea></label>
48 <button type="submit">Plaatsen</button>
49</form>
50{{end}}
40{{template "layout-end" .}}
51{{template "layout-end" .}}
41{{end}}
52{{end}}
42
53
@@ -197,6 +208,7 @@
197{{template "layout-start" .}}
208{{template "layout-start" .}}
198<h1>{{.Group.Name}}</h1>
209<h1>{{.Group.Name}}</h1>
199<p class="muted">{{.Group.Path}} · {{.Group.Description}}</p>
210<p class="muted">{{.Group.Path}} · {{.Group.Description}}</p>
211{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
200<h2>Repositories</h2>
212<h2>Repositories</h2>
201<ul class="clean">{{range .Repos}}<li><a href="/{{.FullPath}}">{{.Name}}</a></li>{{else}}<li class="muted">Nog geen repositories.</li>{{end}}</ul>
213<ul class="clean">{{range .Repos}}<li><a href="/{{.FullPath}}">{{.Name}}</a></li>{{else}}<li class="muted">Nog geen repositories.</li>{{end}}</ul>
202{{if .CanAdmin}}
214{{if .CanAdmin}}
internal/server/templates/pages.html +30 −0
@@ -44,6 +44,7 @@
44 44 {{template "layout-start" .}}
45 45 <h1>Overzicht</h1>
46 46 {{if .StorageUnset}}<p class="flash bad">Opslag is nog niet ingesteld. Repositories zijn tijdelijk niet beschikbaar.</p>{{end}}
47 {{if .Heat}}{{template "heatmap" .Heat}}{{end}}
47 48 <div class="grid-2">
48 49 <section class="panel">
49 50 <h2>Repositories</h2>
@@ -63,6 +64,34 @@
63 64 {{template "layout-end" .}}
64 65 {{end}}
65 66
67 {{define "heatmap"}}
68 <section class="heat" aria-label="Activiteit">
69 <h2>Activiteit</h2>
70 <div class="heat-scroll">
71 <div class="heat-months">
72 {{range .Weeks}}<span>{{.Label}}</span>{{end}}
73 </div>
74 <div class="heat-body">
75 <div class="heat-dow" aria-hidden="true"><span></span><span>M</span><span></span><span>W</span><span></span><span>F</span><span></span></div>
76 <div class="heat-cols">
77 {{range .Weeks}}
78 <div class="heat-col">
79 {{range .Days}}{{if .Off}}<span class="sq off"></span>{{else}}<span class="sq lv{{.Level}}" title="{{.Tip}}" tabindex="0"></span>{{end}}{{end}}
80 </div>
81 {{end}}
82 </div>
83 </div>
84 </div>
85 <div class="heat-foot">
86 <p class="heat-total">{{.TotalText}}</p>
87 <div>
88 <p class="heat-legend"><span>Minder</span><span class="sq lv0"></span><span class="sq lv1"></span><span class="sq lv2"></span><span class="sq lv3"></span><span class="sq lv4"></span><span>Meer</span></p>
89 <p class="muted">Commits, merge requests en reacties.</p>
90 </div>
91 </div>
92 </section>
93 {{end}}
94
66 95 {{define "new"}}
67 96 {{template "layout-start" .}}
68 97 <h1>Nieuw</h1>
@@ -220,6 +249,7 @@
220 249 <h1>{{.Repo.Name}}</h1>
221 250 {{template "visicon" .}}
222 251 </div>
252 {{if .Heat}}{{template "heatmap" .Heat}}{{end}}
223 253 <div class="proj">
224 254 <div>
225 255 <div class="toolbar">
@@ -44,6 +44,7 @@
44{{template "layout-start" .}}
44{{template "layout-start" .}}
45<h1>Overzicht</h1>
45<h1>Overzicht</h1>
46{{if .StorageUnset}}<p class="flash bad">Opslag is nog niet ingesteld. Repositories zijn tijdelijk niet beschikbaar.</p>{{end}}
46{{if .StorageUnset}}<p class="flash bad">Opslag is nog niet ingesteld. Repositories zijn tijdelijk niet beschikbaar.</p>{{end}}
47{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
47<div class="grid-2">
48<div class="grid-2">
48 <section class="panel">
49 <section class="panel">
49 <h2>Repositories</h2>
50 <h2>Repositories</h2>
@@ -63,6 +64,34 @@
63{{template "layout-end" .}}
64{{template "layout-end" .}}
64{{end}}
65{{end}}
65
66
67{{define "heatmap"}}
68<section class="heat" aria-label="Activiteit">
69 <h2>Activiteit</h2>
70 <div class="heat-scroll">
71 <div class="heat-months">
72 {{range .Weeks}}<span>{{.Label}}</span>{{end}}
73 </div>
74 <div class="heat-body">
75 <div class="heat-dow" aria-hidden="true"><span></span><span>M</span><span></span><span>W</span><span></span><span>F</span><span></span></div>
76 <div class="heat-cols">
77 {{range .Weeks}}
78 <div class="heat-col">
79 {{range .Days}}{{if .Off}}<span class="sq off"></span>{{else}}<span class="sq lv{{.Level}}" title="{{.Tip}}" tabindex="0"></span>{{end}}{{end}}
80 </div>
81 {{end}}
82 </div>
83 </div>
84 </div>
85 <div class="heat-foot">
86 <p class="heat-total">{{.TotalText}}</p>
87 <div>
88 <p class="heat-legend"><span>Minder</span><span class="sq lv0"></span><span class="sq lv1"></span><span class="sq lv2"></span><span class="sq lv3"></span><span class="sq lv4"></span><span>Meer</span></p>
89 <p class="muted">Commits, merge requests en reacties.</p>
90 </div>
91 </div>
92</section>
93{{end}}
94
66{{define "new"}}
95{{define "new"}}
67{{template "layout-start" .}}
96{{template "layout-start" .}}
68<h1>Nieuw</h1>
97<h1>Nieuw</h1>
@@ -220,6 +249,7 @@
220 <h1>{{.Repo.Name}}</h1>
249 <h1>{{.Repo.Name}}</h1>
221 {{template "visicon" .}}
250 {{template "visicon" .}}
222</div>
251</div>
252{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
223<div class="proj">
253<div class="proj">
224 <div>
254 <div>
225 <div class="toolbar">
255 <div class="toolbar">
internal/store/activity.go added +129 −0
@@ -0,0 +1,129 @@
1 package store
2
3 import (
4 "context"
5 "strings"
6 "time"
7 )
8
9 // Contribution is één getelde bijdrage.
10 type Contribution struct {
11 UserID int64
12 RepoID int64
13 Kind string
14 Ref string
15 At time.Time
16 }
17
18 // AddContributions bewaart bijdragen. Een herhaling van dezelfde ref telt niet opnieuw.
19 func (s *Store) AddContributions(ctx context.Context, rows []Contribution) error {
20 if len(rows) == 0 {
21 return nil
22 }
23 tx, err := s.db.BeginTx(ctx, nil)
24 if err != nil {
25 return err
26 }
27 defer func() { _ = tx.Rollback() }()
28 for _, row := range rows {
29 if row.UserID == 0 || row.RepoID == 0 || row.Kind == "" || row.Ref == "" {
30 continue
31 }
32 at := row.At.UTC()
33 if at.IsZero() {
34 at = time.Now().UTC()
35 }
36 if _, err := tx.ExecContext(ctx, `INSERT OR IGNORE INTO contributions (user_id, repo_id, kind, ref, occurred_at) VALUES (?, ?, ?, ?, ?)`,
37 row.UserID, row.RepoID, row.Kind, row.Ref, at.Format(time.RFC3339)); err != nil {
38 return err
39 }
40 }
41 return tx.Commit()
42 }
43
44 // ContributionTimes geeft tijdstippen binnen de filter.
45 // userID 0 is iedereen. Een lege repolijst geeft niets terug.
46 func (s *Store) ContributionTimes(ctx context.Context, userID int64, repoIDs []int64, since time.Time) ([]time.Time, error) {
47 if len(repoIDs) == 0 {
48 return nil, nil
49 }
50 holders := make([]string, len(repoIDs))
51 args := make([]any, 0, len(repoIDs)+2)
52 args = append(args, since.UTC().Format(time.RFC3339))
53 for i, id := range repoIDs {
54 holders[i] = "?"
55 args = append(args, id)
56 }
57 q := `SELECT occurred_at FROM contributions WHERE occurred_at >= ? AND repo_id IN (` + strings.Join(holders, ",") + `)`
58 if userID != 0 {
59 q += ` AND user_id = ?`
60 args = append(args, userID)
61 }
62 rows, err := s.db.QueryContext(ctx, q, args...)
63 if err != nil {
64 return nil, err
65 }
66 defer rows.Close()
67 var out []time.Time
68 for rows.Next() {
69 var raw string
70 if err := rows.Scan(&raw); err != nil {
71 return nil, err
72 }
73 out = append(out, parseTime(raw))
74 }
75 return out, rows.Err()
76 }
77
78 // ContributionSynced meldt of de bestaande commits van een repository al zijn overgenomen.
79 func (s *Store) ContributionSynced(ctx context.Context, repoID int64) (bool, error) {
80 var n int
81 err := s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM contribution_sync WHERE repo_id = ?`, repoID).Scan(&n)
82 return n > 0, err
83 }
84
85 // MarkContributionSynced onthoudt dat de bestaande commits zijn overgenomen.
86 func (s *Store) MarkContributionSynced(ctx context.Context, repoID int64) error {
87 _, err := s.db.ExecContext(ctx, `INSERT OR REPLACE INTO contribution_sync (repo_id, synced_at) VALUES (?, ?)`, repoID, now())
88 return err
89 }
90
91 // DropContributions wist de telling van één repository, zodat die opnieuw uit git komt.
92 func (s *Store) DropContributions(ctx context.Context, repoID int64) error {
93 if _, err := s.db.ExecContext(ctx, `DELETE FROM contributions WHERE repo_id = ?`, repoID); err != nil {
94 return err
95 }
96 _, err := s.db.ExecContext(ctx, `DELETE FROM contribution_sync WHERE repo_id = ?`, repoID)
97 return err
98 }
99
100 // UserIDByGitAuthor koppelt een commit aan een account via het e-mailadres of de naam.
101 func (s *Store) UserIDByGitAuthor(ctx context.Context, email, name string) (int64, bool) {
102 if id, ok := s.userIDByName(ctx, emailLocal(email)); ok {
103 return id, true
104 }
105 if id, ok := s.userIDByName(ctx, name); ok {
106 return id, true
107 }
108 return 0, false
109 }
110
111 func (s *Store) userIDByName(ctx context.Context, name string) (int64, bool) {
112 name = strings.ToLower(strings.TrimSpace(name))
113 if name == "" || strings.ContainsAny(name, " @") {
114 return 0, false
115 }
116 u, err := s.UserByUsername(ctx, name)
117 if err != nil {
118 return 0, false
119 }
120 return u.ID, true
121 }
122
123 func emailLocal(email string) string {
124 email = strings.ToLower(strings.TrimSpace(email))
125 if i := strings.LastIndex(email, "@"); i >= 0 {
126 email = email[:i]
127 }
128 return email
129 }
@@ -0,0 +1,129 @@
1package store
2
3import (
4 "context"
5 "strings"
6 "time"
7)
8
9// Contribution is één getelde bijdrage.
10type Contribution struct {
11 UserID int64
12 RepoID int64
13 Kind string
14 Ref string
15 At time.Time
16}
17
18// AddContributions bewaart bijdragen. Een herhaling van dezelfde ref telt niet opnieuw.
19func (s *Store) AddContributions(ctx context.Context, rows []Contribution) error {
20 if len(rows) == 0 {
21 return nil
22 }
23 tx, err := s.db.BeginTx(ctx, nil)
24 if err != nil {
25 return err
26 }
27 defer func() { _ = tx.Rollback() }()
28 for _, row := range rows {
29 if row.UserID == 0 || row.RepoID == 0 || row.Kind == "" || row.Ref == "" {
30 continue
31 }
32 at := row.At.UTC()
33 if at.IsZero() {
34 at = time.Now().UTC()
35 }
36 if _, err := tx.ExecContext(ctx, `INSERT OR IGNORE INTO contributions (user_id, repo_id, kind, ref, occurred_at) VALUES (?, ?, ?, ?, ?)`,
37 row.UserID, row.RepoID, row.Kind, row.Ref, at.Format(time.RFC3339)); err != nil {
38 return err
39 }
40 }
41 return tx.Commit()
42}
43
44// ContributionTimes geeft tijdstippen binnen de filter.
45// userID 0 is iedereen. Een lege repolijst geeft niets terug.
46func (s *Store) ContributionTimes(ctx context.Context, userID int64, repoIDs []int64, since time.Time) ([]time.Time, error) {
47 if len(repoIDs) == 0 {
48 return nil, nil
49 }
50 holders := make([]string, len(repoIDs))
51 args := make([]any, 0, len(repoIDs)+2)
52 args = append(args, since.UTC().Format(time.RFC3339))
53 for i, id := range repoIDs {
54 holders[i] = "?"
55 args = append(args, id)
56 }
57 q := `SELECT occurred_at FROM contributions WHERE occurred_at >= ? AND repo_id IN (` + strings.Join(holders, ",") + `)`
58 if userID != 0 {
59 q += ` AND user_id = ?`
60 args = append(args, userID)
61 }
62 rows, err := s.db.QueryContext(ctx, q, args...)
63 if err != nil {
64 return nil, err
65 }
66 defer rows.Close()
67 var out []time.Time
68 for rows.Next() {
69 var raw string
70 if err := rows.Scan(&raw); err != nil {
71 return nil, err
72 }
73 out = append(out, parseTime(raw))
74 }
75 return out, rows.Err()
76}
77
78// ContributionSynced meldt of de bestaande commits van een repository al zijn overgenomen.
79func (s *Store) ContributionSynced(ctx context.Context, repoID int64) (bool, error) {
80 var n int
81 err := s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM contribution_sync WHERE repo_id = ?`, repoID).Scan(&n)
82 return n > 0, err
83}
84
85// MarkContributionSynced onthoudt dat de bestaande commits zijn overgenomen.
86func (s *Store) MarkContributionSynced(ctx context.Context, repoID int64) error {
87 _, err := s.db.ExecContext(ctx, `INSERT OR REPLACE INTO contribution_sync (repo_id, synced_at) VALUES (?, ?)`, repoID, now())
88 return err
89}
90
91// DropContributions wist de telling van één repository, zodat die opnieuw uit git komt.
92func (s *Store) DropContributions(ctx context.Context, repoID int64) error {
93 if _, err := s.db.ExecContext(ctx, `DELETE FROM contributions WHERE repo_id = ?`, repoID); err != nil {
94 return err
95 }
96 _, err := s.db.ExecContext(ctx, `DELETE FROM contribution_sync WHERE repo_id = ?`, repoID)
97 return err
98}
99
100// UserIDByGitAuthor koppelt een commit aan een account via het e-mailadres of de naam.
101func (s *Store) UserIDByGitAuthor(ctx context.Context, email, name string) (int64, bool) {
102 if id, ok := s.userIDByName(ctx, emailLocal(email)); ok {
103 return id, true
104 }
105 if id, ok := s.userIDByName(ctx, name); ok {
106 return id, true
107 }
108 return 0, false
109}
110
111func (s *Store) userIDByName(ctx context.Context, name string) (int64, bool) {
112 name = strings.ToLower(strings.TrimSpace(name))
113 if name == "" || strings.ContainsAny(name, " @") {
114 return 0, false
115 }
116 u, err := s.UserByUsername(ctx, name)
117 if err != nil {
118 return 0, false
119 }
120 return u.ID, true
121}
122
123func emailLocal(email string) string {
124 email = strings.ToLower(strings.TrimSpace(email))
125 if i := strings.LastIndex(email, "@"); i >= 0 {
126 email = email[:i]
127 }
128 return email
129}
internal/store/activity_test.go added +80 −0
@@ -0,0 +1,80 @@
1 package store
2
3 import (
4 "context"
5 "testing"
6 "time"
7 )
8
9 func TestContributionsFilterAndNotes(t *testing.T) {
10 s := openTest(t)
11 ctx := context.Background()
12 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
13 if err != nil {
14 t.Fatal(err)
15 }
16 ada, err := s.UpsertUser(ctx, 2, "ada", "", false)
17 if err != nil {
18 t.Fatal(err)
19 }
20 demo, err := s.CreateRepo(ctx, "user", tim.ID, "demo", "", "master", "private")
21 if err != nil {
22 t.Fatal(err)
23 }
24 geheim, err := s.CreateRepo(ctx, "user", tim.ID, "geheim", "", "master", "private")
25 if err != nil {
26 t.Fatal(err)
27 }
28 march := time.Date(2026, 3, 3, 12, 0, 0, 0, time.UTC)
29 may := time.Date(2026, 5, 5, 12, 0, 0, 0, time.UTC)
30 if err := s.AddContributions(ctx, []Contribution{
31 {UserID: tim.ID, RepoID: geheim.ID, Kind: "commit", Ref: "aaa", At: march},
32 {UserID: tim.ID, RepoID: demo.ID, Kind: "commit", Ref: "bbb", At: may},
33 {UserID: tim.ID, RepoID: demo.ID, Kind: "commit", Ref: "bbb", At: may.Add(time.Hour)},
34 {UserID: ada.ID, RepoID: demo.ID, Kind: "commit", Ref: "ccc", At: may},
35 }); err != nil {
36 t.Fatal(err)
37 }
38 since := time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC)
39 timDemo, err := s.ContributionTimes(ctx, tim.ID, []int64{demo.ID}, since)
40 if err != nil || len(timDemo) != 1 {
41 t.Fatalf("tim demo %v %v", timDemo, err)
42 }
43 allDemo, err := s.ContributionTimes(ctx, 0, []int64{demo.ID}, since)
44 if err != nil || len(allDemo) != 2 {
45 t.Fatalf("demo %v %v", allDemo, err)
46 }
47 none, err := s.ContributionTimes(ctx, tim.ID, nil, since)
48 if err != nil || len(none) != 0 {
49 t.Fatalf("lege lijst %v %v", none, err)
50 }
51 id, ok := s.UserIDByGitAuthor(ctx, "Tim@users.git.timfalken.com", "Tim Falken")
52 if !ok || id != tim.ID {
53 t.Fatalf("auteur %d %v", id, ok)
54 }
55 if _, ok := s.UserIDByGitAuthor(ctx, "onbekend@example.com", "Niemand"); ok {
56 t.Fatal("onbekende auteur gekoppeld")
57 }
58 mr, err := s.CreateMergeRequest(ctx, demo.ID, tim.ID, "titel", "", "feature", "master")
59 if err != nil {
60 t.Fatal(err)
61 }
62 note, err := s.AddNote(ctx, demo.ID, mr.ID, ada.ID, " <b>mooi</b> ")
63 if err != nil {
64 t.Fatal(err)
65 }
66 if note.Body != "<b>mooi</b>" {
67 t.Fatal(note.Body)
68 }
69 if _, err := s.AddNote(ctx, demo.ID, mr.ID, ada.ID, " "); err == nil {
70 t.Fatal("lege reactie geaccepteerd")
71 }
72 notes, err := s.ListNotes(ctx, mr.ID)
73 if err != nil || len(notes) != 1 || notes[0].Author != "ada" {
74 t.Fatalf("%+v %v", notes, err)
75 }
76 adaDemo, err := s.ContributionTimes(ctx, ada.ID, []int64{demo.ID}, since)
77 if err != nil || len(adaDemo) != 2 {
78 t.Fatalf("ada %d %v", len(adaDemo), err)
79 }
80 }
@@ -0,0 +1,80 @@
1package store
2
3import (
4 "context"
5 "testing"
6 "time"
7)
8
9func TestContributionsFilterAndNotes(t *testing.T) {
10 s := openTest(t)
11 ctx := context.Background()
12 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
13 if err != nil {
14 t.Fatal(err)
15 }
16 ada, err := s.UpsertUser(ctx, 2, "ada", "", false)
17 if err != nil {
18 t.Fatal(err)
19 }
20 demo, err := s.CreateRepo(ctx, "user", tim.ID, "demo", "", "master", "private")
21 if err != nil {
22 t.Fatal(err)
23 }
24 geheim, err := s.CreateRepo(ctx, "user", tim.ID, "geheim", "", "master", "private")
25 if err != nil {
26 t.Fatal(err)
27 }
28 march := time.Date(2026, 3, 3, 12, 0, 0, 0, time.UTC)
29 may := time.Date(2026, 5, 5, 12, 0, 0, 0, time.UTC)
30 if err := s.AddContributions(ctx, []Contribution{
31 {UserID: tim.ID, RepoID: geheim.ID, Kind: "commit", Ref: "aaa", At: march},
32 {UserID: tim.ID, RepoID: demo.ID, Kind: "commit", Ref: "bbb", At: may},
33 {UserID: tim.ID, RepoID: demo.ID, Kind: "commit", Ref: "bbb", At: may.Add(time.Hour)},
34 {UserID: ada.ID, RepoID: demo.ID, Kind: "commit", Ref: "ccc", At: may},
35 }); err != nil {
36 t.Fatal(err)
37 }
38 since := time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC)
39 timDemo, err := s.ContributionTimes(ctx, tim.ID, []int64{demo.ID}, since)
40 if err != nil || len(timDemo) != 1 {
41 t.Fatalf("tim demo %v %v", timDemo, err)
42 }
43 allDemo, err := s.ContributionTimes(ctx, 0, []int64{demo.ID}, since)
44 if err != nil || len(allDemo) != 2 {
45 t.Fatalf("demo %v %v", allDemo, err)
46 }
47 none, err := s.ContributionTimes(ctx, tim.ID, nil, since)
48 if err != nil || len(none) != 0 {
49 t.Fatalf("lege lijst %v %v", none, err)
50 }
51 id, ok := s.UserIDByGitAuthor(ctx, "Tim@users.git.timfalken.com", "Tim Falken")
52 if !ok || id != tim.ID {
53 t.Fatalf("auteur %d %v", id, ok)
54 }
55 if _, ok := s.UserIDByGitAuthor(ctx, "onbekend@example.com", "Niemand"); ok {
56 t.Fatal("onbekende auteur gekoppeld")
57 }
58 mr, err := s.CreateMergeRequest(ctx, demo.ID, tim.ID, "titel", "", "feature", "master")
59 if err != nil {
60 t.Fatal(err)
61 }
62 note, err := s.AddNote(ctx, demo.ID, mr.ID, ada.ID, " <b>mooi</b> ")
63 if err != nil {
64 t.Fatal(err)
65 }
66 if note.Body != "<b>mooi</b>" {
67 t.Fatal(note.Body)
68 }
69 if _, err := s.AddNote(ctx, demo.ID, mr.ID, ada.ID, " "); err == nil {
70 t.Fatal("lege reactie geaccepteerd")
71 }
72 notes, err := s.ListNotes(ctx, mr.ID)
73 if err != nil || len(notes) != 1 || notes[0].Author != "ada" {
74 t.Fatalf("%+v %v", notes, err)
75 }
76 adaDemo, err := s.ContributionTimes(ctx, ada.ID, []int64{demo.ID}, since)
77 if err != nil || len(adaDemo) != 2 {
78 t.Fatalf("ada %d %v", len(adaDemo), err)
79 }
80}
internal/store/notes.go added +70 −0
@@ -0,0 +1,70 @@
1 package store
2
3 import (
4 "context"
5 "fmt"
6 "strconv"
7 "strings"
8 "time"
9 )
10
11 // Note is een reactie op een merge request.
12 type Note struct {
13 ID int64
14 RepoID int64
15 MRID int64
16 AuthorID int64
17 Author string
18 Body string
19 CreatedAt time.Time
20 }
21
22 // AddNote bewaart een reactie en telt hem als bijdrage.
23 func (s *Store) AddNote(ctx context.Context, repoID, mrID, authorID int64, body string) (Note, error) {
24 body = strings.TrimSpace(body)
25 if body == "" {
26 return Note{}, fmt.Errorf("een reactie is leeg")
27 }
28 body = trim(body, 4000)
29 tx, err := s.db.BeginTx(ctx, nil)
30 if err != nil {
31 return Note{}, err
32 }
33 defer func() { _ = tx.Rollback() }()
34 ts := now()
35 res, err := tx.ExecContext(ctx, `INSERT INTO notes (repo_id, mr_id, author_id, body, created_at) VALUES (?, ?, ?, ?, ?)`,
36 repoID, mrID, authorID, body, ts)
37 if err != nil {
38 return Note{}, err
39 }
40 id, _ := res.LastInsertId()
41 if _, err := tx.ExecContext(ctx, `INSERT OR IGNORE INTO contributions (user_id, repo_id, kind, ref, occurred_at) VALUES (?, ?, 'comment', ?, ?)`,
42 authorID, repoID, "note:"+strconv.FormatInt(id, 10), ts); err != nil {
43 return Note{}, err
44 }
45 if err := tx.Commit(); err != nil {
46 return Note{}, err
47 }
48 return Note{ID: id, RepoID: repoID, MRID: mrID, AuthorID: authorID, Body: body, CreatedAt: parseTime(ts)}, nil
49 }
50
51 // ListNotes geeft de reacties van één merge request, oudste eerst.
52 func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
53 rows, err := s.db.QueryContext(ctx, `SELECT n.id, n.repo_id, n.mr_id, n.author_id, u.username, n.body, n.created_at
54 FROM notes n JOIN users u ON u.id = n.author_id WHERE n.mr_id = ? ORDER BY n.id`, mrID)
55 if err != nil {
56 return nil, err
57 }
58 defer rows.Close()
59 var out []Note
60 for rows.Next() {
61 var n Note
62 var created string
63 if err := rows.Scan(&n.ID, &n.RepoID, &n.MRID, &n.AuthorID, &n.Author, &n.Body, &created); err != nil {
64 return nil, err
65 }
66 n.CreatedAt = parseTime(created)
67 out = append(out, n)
68 }
69 return out, rows.Err()
70 }
@@ -0,0 +1,70 @@
1package store
2
3import (
4 "context"
5 "fmt"
6 "strconv"
7 "strings"
8 "time"
9)
10
11// Note is een reactie op een merge request.
12type Note struct {
13 ID int64
14 RepoID int64
15 MRID int64
16 AuthorID int64
17 Author string
18 Body string
19 CreatedAt time.Time
20}
21
22// AddNote bewaart een reactie en telt hem als bijdrage.
23func (s *Store) AddNote(ctx context.Context, repoID, mrID, authorID int64, body string) (Note, error) {
24 body = strings.TrimSpace(body)
25 if body == "" {
26 return Note{}, fmt.Errorf("een reactie is leeg")
27 }
28 body = trim(body, 4000)
29 tx, err := s.db.BeginTx(ctx, nil)
30 if err != nil {
31 return Note{}, err
32 }
33 defer func() { _ = tx.Rollback() }()
34 ts := now()
35 res, err := tx.ExecContext(ctx, `INSERT INTO notes (repo_id, mr_id, author_id, body, created_at) VALUES (?, ?, ?, ?, ?)`,
36 repoID, mrID, authorID, body, ts)
37 if err != nil {
38 return Note{}, err
39 }
40 id, _ := res.LastInsertId()
41 if _, err := tx.ExecContext(ctx, `INSERT OR IGNORE INTO contributions (user_id, repo_id, kind, ref, occurred_at) VALUES (?, ?, 'comment', ?, ?)`,
42 authorID, repoID, "note:"+strconv.FormatInt(id, 10), ts); err != nil {
43 return Note{}, err
44 }
45 if err := tx.Commit(); err != nil {
46 return Note{}, err
47 }
48 return Note{ID: id, RepoID: repoID, MRID: mrID, AuthorID: authorID, Body: body, CreatedAt: parseTime(ts)}, nil
49}
50
51// ListNotes geeft de reacties van één merge request, oudste eerst.
52func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
53 rows, err := s.db.QueryContext(ctx, `SELECT n.id, n.repo_id, n.mr_id, n.author_id, u.username, n.body, n.created_at
54 FROM notes n JOIN users u ON u.id = n.author_id WHERE n.mr_id = ? ORDER BY n.id`, mrID)
55 if err != nil {
56 return nil, err
57 }
58 defer rows.Close()
59 var out []Note
60 for rows.Next() {
61 var n Note
62 var created string
63 if err := rows.Scan(&n.ID, &n.RepoID, &n.MRID, &n.AuthorID, &n.Author, &n.Body, &created); err != nil {
64 return nil, err
65 }
66 n.CreatedAt = parseTime(created)
67 out = append(out, n)
68 }
69 return out, rows.Err()
70}
internal/store/store.go +23 −0
@@ -248,6 +248,29 @@ CREATE TABLE IF NOT EXISTS release_assets (
248 248 size INTEGER NOT NULL,
249 249 UNIQUE(release_id, name)
250 250 );
251 CREATE TABLE IF NOT EXISTS contributions (
252 id INTEGER PRIMARY KEY,
253 user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
254 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
255 kind TEXT NOT NULL,
256 ref TEXT NOT NULL,
257 occurred_at TEXT NOT NULL,
258 UNIQUE(repo_id, kind, ref)
259 );
260 CREATE INDEX IF NOT EXISTS contributions_repo_time ON contributions(repo_id, occurred_at);
261 CREATE INDEX IF NOT EXISTS contributions_user_time ON contributions(user_id, occurred_at);
262 CREATE TABLE IF NOT EXISTS contribution_sync (
263 repo_id INTEGER PRIMARY KEY REFERENCES repos(id) ON DELETE CASCADE,
264 synced_at TEXT NOT NULL
265 );
266 CREATE TABLE IF NOT EXISTS notes (
267 id INTEGER PRIMARY KEY,
268 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
269 mr_id INTEGER NOT NULL REFERENCES merge_requests(id) ON DELETE CASCADE,
270 author_id INTEGER NOT NULL REFERENCES users(id),
271 body TEXT NOT NULL,
272 created_at TEXT NOT NULL
273 );
251 274 `
252 275
253 276 func now() string { return time.Now().UTC().Format(time.RFC3339) }
@@ -248,6 +248,29 @@ CREATE TABLE IF NOT EXISTS release_assets (
248 size INTEGER NOT NULL,
248 size INTEGER NOT NULL,
249 UNIQUE(release_id, name)
249 UNIQUE(release_id, name)
250);
250);
251CREATE TABLE IF NOT EXISTS contributions (
252 id INTEGER PRIMARY KEY,
253 user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
254 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
255 kind TEXT NOT NULL,
256 ref TEXT NOT NULL,
257 occurred_at TEXT NOT NULL,
258 UNIQUE(repo_id, kind, ref)
259);
260CREATE INDEX IF NOT EXISTS contributions_repo_time ON contributions(repo_id, occurred_at);
261CREATE INDEX IF NOT EXISTS contributions_user_time ON contributions(user_id, occurred_at);
262CREATE TABLE IF NOT EXISTS contribution_sync (
263 repo_id INTEGER PRIMARY KEY REFERENCES repos(id) ON DELETE CASCADE,
264 synced_at TEXT NOT NULL
265);
266CREATE TABLE IF NOT EXISTS notes (
267 id INTEGER PRIMARY KEY,
268 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
269 mr_id INTEGER NOT NULL REFERENCES merge_requests(id) ON DELETE CASCADE,
270 author_id INTEGER NOT NULL REFERENCES users(id),
271 body TEXT NOT NULL,
272 created_at TEXT NOT NULL
273);
251`
274`
252
275
253func now() string { return time.Now().UTC().Format(time.RFC3339) }
276func now() string { return time.Now().UTC().Format(time.RFC3339) }