Implement GitHub service

cmd/main.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/joshsoftware/code-curiosity-2025/internal/app"
+	"github.com/joshsoftware/code-curiosity-2025/internal/app/cronJob"
 	"github.com/joshsoftware/code-curiosity-2025/internal/config"
 )
 
@@ -43,6 +44,9 @@ func main() {
 
 	router := app.NewRouter(dependencies)
 
+	newCronSchedular := cronJob.NewCronSchedular()
+	newCronSchedular.InitCronJobs(dependencies.ContributionService)
+
 	server := http.Server{
 		Addr:    fmt.Sprintf(":%s", cfg.HTTPServer.Port),
 		Handler: router,

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/ilyakaznacheev/cleanenv v1.5.0
 	github.com/jmoiron/sqlx v1.4.0
 	github.com/lib/pq v1.10.9
+	github.com/robfig/cron/v3 v3.0.1
 	golang.org/x/oauth2 v0.29.0
 	google.golang.org/api v0.231.0
 )

go.sum

@@ -133,6 +133,8 @@ github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgm
 github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/spiffe/go-spiffe/v2 v2.5.0 h1:N2I01KCUkv1FAjZXJMwh95KK1ZIQLYbPfhaxw8WS0hE=

internal/app/bigquery/domain.go

@@ -2,6 +2,35 @@ package bigquery
 
 import "time"
 
+const DailyQuery = `SELECT 
+  id,
+  type,
+  public,
+  actor.id AS actor_id,
+  actor.login AS actor_login,
+  actor.gravatar_id AS actor_gravatar_id,
+  actor.url AS actor_url,
+  actor.avatar_url AS actor_avatar_url,
+  repo.id AS repo_id,
+  repo.name AS repo_name,
+  repo.url AS repo_url,
+  payload,
+  created_at,
+  other
+FROM 
+  githubarchive.day.%s
+WHERE 
+  type IN (
+    'IssuesEvent', 
+    'PullRequestEvent', 
+    'PullRequestReviewEvent', 
+    'IssueCommentEvent', 
+    'PullRequestReviewCommentEvent'
+  )
+  AND (
+    actor.id IN (%s) 
+  )`
+
 type ContributionResponse struct {
 	ID         string    `bigquery:"id"`
 	Type       string    `bigquery:"type"`

internal/app/bigquery/service.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
-	"strings"
 	"time"
 
 	bq "cloud.google.com/go/bigquery"
 	"github.com/joshsoftware/code-curiosity-2025/internal/config"
 	"github.com/joshsoftware/code-curiosity-2025/internal/pkg/apperrors"
+	"github.com/joshsoftware/code-curiosity-2025/internal/pkg/utils"
 	"github.com/joshsoftware/code-curiosity-2025/internal/repository"
 )
 
@@ -30,51 +30,17 @@ func NewService(bigqueryInstance config.Bigquery, userRepository repository.User
 }
 
 func (s *service) FetchDailyContributions(ctx context.Context) (*bq.RowIterator, error) {
-	YesterdayDate := time.Now().AddDate(0, 0, -1)
-	YesterdayYearMonthDay := YesterdayDate.Format("20060102")
-
-	usersNamesList, err := s.userRepository.GetAllUsersGithubUsernames(ctx, nil)
+	usersGithubId, err := s.userRepository.GetAllUsersGithubId(ctx, nil)
 	if err != nil {
 		slog.Error("error fetching users github usernames")
 		return nil, apperrors.ErrInternalServer
 	}
 
-	var quotedUsernamesList []string
-	for _, username := range usersNamesList {
-		quotedUsernamesList = append(quotedUsernamesList, fmt.Sprintf("'%s'", username))
-	}
+	formattedGithubIds := utils.FormatIntSliceForQuery(usersGithubId)
 
-	githubUsernames := strings.Join(quotedUsernamesList, ",")
-	fetchDailyContributionsQuery := fmt.Sprintf(` 
-SELECT 
-  id,
-  type,
-  public,
-  actor.id AS actor_id,
-  actor.login AS actor_login,
-  actor.gravatar_id AS actor_gravatar_id,
-  actor.url AS actor_url,
-  actor.avatar_url AS actor_avatar_url,
-  repo.id AS repo_id,
-  repo.name AS repo_name,
-  repo.url AS repo_url,
-  payload,
-  created_at,
-  other
-FROM 
-  githubarchive.day.%s
-WHERE 
-  type IN (
-    'IssuesEvent', 
-    'PullRequestEvent', 
-    'PullRequestReviewEvent', 
-    'IssueCommentEvent', 
-    'PullRequestReviewCommentEvent'
-  )
-  AND (
-    actor.login IN (%s) 
-  )
-`, YesterdayYearMonthDay, githubUsernames)
+	YesterdayDate := time.Now().AddDate(0, 0, -1)
+	YesterdayYearMonthDay := YesterdayDate.Format("20060102")
+	fetchDailyContributionsQuery := fmt.Sprintf(DailyQuery, YesterdayYearMonthDay, formattedGithubIds)
 
 	bigqueryQuery := s.bigqueryInstance.Client.Query(fetchDailyContributionsQuery)
 	contributionRows, err := bigqueryQuery.Read(ctx)

internal/app/contribution/domain.go

@@ -36,6 +36,7 @@ type Contribution struct {
 	ContributionType    string
 	BalanceChange       int
 	ContributedAt       time.Time
+	GithubEventId       string
 	CreatedAt           time.Time
 	UpdatedAt           time.Time
 }

internal/app/contribution/handler.go

@@ -13,8 +13,7 @@ type handler struct {
 }
 
 type Handler interface {
-	FetchUserLatestContributions(w http.ResponseWriter, r *http.Request)
-	FetchUsersAllContributions(w http.ResponseWriter, r *http.Request)
+	FetchUserContributions(w http.ResponseWriter, r *http.Request)
 }
 
 func NewHandler(contributionService Service) Handler {
@@ -23,30 +22,16 @@ func NewHandler(contributionService Service) Handler {
 	}
 }
 
-func (h *handler) FetchUserLatestContributions(w http.ResponseWriter, r *http.Request) {
+func (h *handler) FetchUserContributions(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
-	err := h.contributionService.ProcessFetchedContributions(ctx)
+	userContributions, err := h.contributionService.FetchUserContributions(ctx)
 	if err != nil {
-		slog.Error("error fetching latest contributions")
+		slog.Error("error fetching user contributions")
 		status, errorMessage := apperrors.MapError(err)
 		response.WriteJson(w, status, errorMessage, nil)
 		return
 	}
 
-	response.WriteJson(w, http.StatusOK, "contribution fetched successfully", nil)
-}
-
-func (h *handler) FetchUsersAllContributions(w http.ResponseWriter, r *http.Request) {
-	ctx := r.Context()
-
-	usersAllContributions, err := h.contributionService.FetchUsersAllContributions(ctx)
-	if err != nil {
-		slog.Error("error fetching all contributions for user")
-		status, errorMessage := apperrors.MapError(err)
-		response.WriteJson(w, status, errorMessage, nil)
-		return
-	}
-
-	response.WriteJson(w, http.StatusOK, "all contributions for user fetched successfully", usersAllContributions)
+	response.WriteJson(w, http.StatusOK, "user contributions fetched successfully", userContributions)
 }