fix: update imports

Author: Alec Cunningham

pkg/api/router.go

@@ -3,9 +3,9 @@ package api
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/moosh3/github-actions-aggregator/pkg/auth"
-	"github.com/moosh3/github-actions-aggregator/pkg/config"
 	"github.com/moosh3/github-actions-aggregator/pkg/db"
-	"github.com/moosh3/github-actions-aggregator/pkg/github"
+	"github.com/mooshe3/github-actions-aggregator/pkg/config"
+	"github.com/mooshe3/github-actions-aggregator/pkg/github"
 )
 
 func StartServer(cfg *config.Config, db *db.Database, githubClient *github.Client) {

pkg/auth/oauth.go

@@ -9,8 +9,11 @@ import (
 	"os"
 
 	"github.com/gin-gonic/gin"
+	"github.com/moosh3/github-actions-aggregator/pkg/db/models"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/github"
+
+	"github.com/moosh3/github-actions-aggregator/pkg/db"
 )
 
 var (
@@ -52,35 +55,33 @@ func GitHubCallback(c *gin.Context) {
 		return
 	}
 
-	// Save or update user in database (implement saveOrUpdateUser)
+	// Save or update user in database
+	err = db.SaveUser(user)
+	if err != nil {
+		c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"error": "Failed to save user"})
+		return
+	}
 	// Set user session (implement setUserSession)
+	setUserSession(c, user)
 
 	c.Redirect(http.StatusFound, "/dashboard")
 }
 
-func getUserInfo(token *oauth2.Token) (*GitHubUser, error) {
+func getUserInfo(token *oauth2.Token) (*models.GitHubUser, error) {
 	client := oauthConfig.Client(context.Background(), token)
 	resp, err := client.Get("https://api.github.com/user")
 	if err != nil {
 		return nil, err
 	}
 	defer resp.Body.Close()
 
-	var user GitHubUser
+	var user models.GitHubUser
 	if err := json.NewDecoder(resp.Body).Decode(&user); err != nil {
 		return nil, err
 	}
 	return &user, nil
 }
 
-type GitHubUser struct {
-	ID        int64  `json:"id"`
-	Login     string `json:"login"`
-	Name      string `json:"name"`
-	Email     string `json:"email"`
-	AvatarURL string `json:"avatar_url"`
-}
-
 func generateStateString() string {
 	b := make([]byte, 16)
 	_, err := rand.Read(b)
@@ -102,6 +103,10 @@ func getSavedOAuthState(c *gin.Context) string {
 	return state
 }
 
+func setUserSession(c *gin.Context, user *models.GitHubUser) {
+	c.Set("user", user)
+}
+
 func getEnv(key, fallback string) string {
 	if value, exists := os.LookupEnv(key); exists {
 		return value

pkg/db/db.go

@@ -4,18 +4,32 @@ import (
 	"fmt"
 
 	"github.com/google/go-github/v50/github"
-	config "github.com/moosh3/github-actions-aggregator/pkg/config"
-	"github.com/moosh3/github-actions-aggregator/pkg/db/models"
+	"github.com/mooshe3/github-actions-aggregator/pkg/config"
+	"github.com/mooshe3/github-actions-aggregator/pkg/db/models"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 )
 
+// Database represents a wrapper around the GORM database connection.
 type Database struct {
+	// Conn is the underlying GORM database connection.
 	Conn *gorm.DB
 }
 
-func InitDB(cfg *config.Config) (*gorm.DB, error) {
+// InitDB initializes and returns a new Database instance.
+//
+// It takes a configuration object and uses it to establish a connection
+// to the PostgreSQL database. It also performs auto-migration of the
+// database schema for the Repository, WorkflowRun, and Statistics models.
+//
+// Parameters:
+//   - cfg: A pointer to a config.Config struct containing database connection details.
+//
+// Returns:
+//   - A pointer to a Database struct containing the initialized GORM DB connection.
+//   - An error if the database connection or auto-migration fails.
+func InitDB(cfg *config.Config) (*Database, error) {
 	// Database initialization logic
 	dsn := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%s sslmode=disable TimeZone=UTC",
 		cfg.Database.Host, cfg.Database.User, cfg.Database.Password, cfg.Database.DBName, cfg.Database.Port)
@@ -31,7 +45,7 @@ func InitDB(cfg *config.Config) (*gorm.DB, error) {
 		return nil, fmt.Errorf("failed to auto-migrate database schema: %w", err)
 	}
 
-	return db, nil
+	return &Database{Conn: db}, nil
 }
 
 func (db *Database) GetMonitoredRepositories() ([]models.Repository, error) {
@@ -42,13 +56,11 @@ func (db *Database) GetMonitoredRepositories() ([]models.Repository, error) {
 
 func (db *Database) SaveWorkflowRun(run *github.WorkflowRun) error {
 	workflowRun := models.WorkflowRun{
-		ID:           run.GetID(),
 		WorkflowID:   run.GetWorkflowID(),
 		RepositoryID: run.GetRepository().GetID(),
 		Status:       run.GetStatus(),
 		Conclusion:   run.GetConclusion(),
 		RunNumber:    run.GetRunNumber(),
-		Event:        run.GetEvent(),
 		CreatedAt:    run.GetCreatedAt().Time,
 		UpdatedAt:    run.GetUpdatedAt().Time,
 		// Add other fields as needed
@@ -65,3 +77,7 @@ func (db *Database) SaveStatistics(stats *models.Statistics) error {
 	// Upsert operation
 	return db.Conn.Save(stats).Error
 }
+
+func (db *Database) SaveUser(user *models.GitHubUser) error {
+	return db.Conn.Save(user).Error
+}

pkg/github/polling.go

@@ -1,6 +1,7 @@
 package github
 
 import (
+	"fmt"
 	"log"
 	"time"
 
@@ -48,14 +49,14 @@ func (p *Poller) pollRepositories() {
 }
 
 func (p *Poller) pollWorkflows(repo models.Repository) {
-	workflows, err := p.client.ListWorkflows(repo.Owner, repo.Name)
+	workflows, err := p.client.ListWorkflows(repo.Owner.Login, repo.Name)
 	if err != nil {
-		log.Printf("Error listing workflows for %s/%s: %v", repo.Owner, repo.Name, err)
+		log.Printf("Error listing workflows for %s/%s: %v", repo.Owner.Login, repo.Name, err)
 		return
 	}
 
 	for _, workflow := range workflows {
-		p.pollWorkflowRuns(repo.Owner, repo.Name, workflow)
+		p.pollWorkflowRuns(repo.Owner.Login, repo.Name, workflow)
 	}
 }
 
@@ -67,5 +68,5 @@ func (p *Poller) pollWorkflowRuns(owner, repoName string, workflow *gh.Workflow)
 		return
 	}
 
-	// Process runs...
+	fmt.Println(runs)
 }