Skip to content

Commit 82b3066

Browse files
committed
fixes m count, consolidates log line
1 parent a1a20ad commit 82b3066

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

db/store_impl.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ package db
33
import (
44
"context"
55
"fmt"
6-
"go.uber.org/zap"
7-
"gorm.io/gorm"
86
"log"
97
"maintainerd/model"
108
"strings"
119
"time"
10+
11+
"go.uber.org/zap"
12+
"gorm.io/gorm"
1213
)
1314

1415
type SQLStore struct {
@@ -196,7 +197,10 @@ func (s *SQLStore) GetProjectServiceTeamMap(serviceName string) (map[uint]*model
196197
}
197198
func (s *SQLStore) GetProjectMapByName() (map[string]model.Project, error) {
198199
var projects []model.Project
199-
if err := s.db.Find(&projects).Error; err != nil {
200+
if err := s.db.
201+
Preload("Maintainers").
202+
Preload("Maintainers.Company").
203+
Find(&projects).Error; err != nil {
200204
return nil, err
201205
}
202206

onboarding/server.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,15 @@ func (s *EventListener) Init(dbPath, fossaAPItokenEnvVar, ghToken, org, repo str
4747
}
4848
s.Projects = projectMap
4949
log.Printf("Init: DBG, project map has %d entries", len(s.Projects))
50-
log.Printf("Init: DBG, they are...")
50+
log.Printf("Init: DBG, listening for events on %s", s.Repo.Name)
51+
var landscape string
52+
5153
for _, project := range s.Projects {
52-
log.Printf("info: project: %s, projectID: %d, maintainer count: %d", project.Name, project.ID,
53-
len(project.Maintainers))
54+
pmc := fmt.Sprintf("%s %d, ", project.Name, len(project.Maintainers))
55+
landscape += pmc
5456
}
57+
log.Printf("Init: INF\n%s", landscape)
58+
5559
token := os.Getenv(fossaAPItokenEnvVar)
5660
if token == "" {
5761
log.Printf("Init: ERR, the environment variable %s must be set", fossaAPItokenEnvVar)

0 commit comments

Comments
 (0)