Add buildStats() method, call NewInsertService() in main.go

+ slight refactor of Insert() method to use less parameters

Author: C

benchttp/service.go

@@ -4,5 +4,5 @@ package benchttp
 // data layer facade.
 type InsertionService interface {
 	// Create stores stats in database.
-	Insert(Stats, string, string, string) error
+	Insert(Stats) error
 }

benchttp/stats.go

@@ -9,6 +9,7 @@ import (
 // StatsDescriptor contains a computed stats group description information
 type StatsDescriptor struct {
 	ID         string    `json:"id"`
+	UserID     string    `json:"userID"`
 	Tag        string    `json:"tag"`
 	FinishedAt time.Time `json:"finishedAt"`
 }

cmd/main.go

@@ -0,0 +1,42 @@
+package main
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/benchttp/worker"
+	"github.com/benchttp/worker/benchttp"
+	"github.com/benchttp/worker/postgresql"
+	"github.com/benchttp/worker/stats"
+)
+
+func main() {
+	config, err := worker.EnvConfig()
+	if err != nil {
+		fmt.Println("error getting env var")
+	}
+	fmt.Println(config)
+	s, err := postgresql.NewInsertionService(config)
+	if err != nil {
+		fmt.Println("error creating service")
+	}
+
+	// set timezone,
+	now := time.Now()
+
+	fmt.Println(now)
+
+	deciles := [9]float64{5, 5, 5, 5, 5, 5, 5, 5, 5}
+
+	so := stats.Common{Min: 5, Max: 5, Mean: 5, Median: 5, StdDev: 5, Deciles: deciles}
+
+	c := stats.StatusDistribution{Status1xx: 10, Status2xx: 10, Status3xx: 10, Status4xx: 10, Status5xx: 10}
+
+	st := benchttp.Stats{Descriptor: benchttp.StatsDescriptor{UserID: "1", Tag: "test", ID: "test-fin", FinishedAt: now}, Code: c, Time: so}
+
+	// between each test, increment args number 3 and 5 (descriptor_id and tag, because they must be unique)
+	err = s.Insert(st)
+	if err != nil {
+		fmt.Println("error creating")
+	}
+}

main.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"log"
 	"os"
+	"time"
 
 	"github.com/googleapis/google-cloudevents-go/cloud/firestore/v1"
 
@@ -23,7 +24,13 @@ func Digest(ctx context.Context, e firestore.DocumentEventData) error {
 	}
 
 	cfg, err := envConfig()
+	if err != nil {
+		return err
+	}
 	insertionService, err := postgresql.NewInsertionService(cfg)
+	if err != nil {
+		return err
+	}
 
 	codes, times := r.Benchmark.Values()
 
@@ -41,6 +48,13 @@ func Digest(ctx context.Context, e firestore.DocumentEventData) error {
 
 	log.Printf("codestats: %+v", codestats)
 
+	// TO DO: get user id. Using "1" here for the moment.
+	statsToInsert := buildStats(timestats, codestats, "firestore_id", "1")
+
+	if err := insertionService.Insert(statsToInsert); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -72,3 +86,16 @@ func envConfig() (benchttp.Config, error) {
 
 	return config, nil
 }
+
+func buildStats(timestats stats.Common, codestats stats.StatusDistribution, reportID, userID string) benchttp.Stats {
+	stats := benchttp.Stats{
+		Descriptor: benchttp.StatsDescriptor{
+			ID:         reportID,
+			UserID:     userID,
+			FinishedAt: time.Now(),
+		},
+		Time: timestats,
+		Code: codestats,
+	}
+	return stats
+}

postgresql/stats.go

@@ -7,7 +7,7 @@ import (
 )
 
 // nolint:gocognit
-func (s InsertionService) Insert(stats benchttp.Stats, statsID, userID, tag string) error {
+func (s InsertionService) Insert(stats benchttp.Stats) error {
 	tx, err := s.db.Begin()
 	if err != nil {
 		return err
@@ -17,9 +17,8 @@ func (s InsertionService) Insert(stats benchttp.Stats, statsID, userID, tag stri
 	INSERT INTO public.stats_descriptor(
 		id,
 		user_id,
-		tag,
 		finished_at)
-		VALUES($1, $2, $3, '2022-03-03 17:36:38-02')`)
+		VALUES($1, $2, $3)`)
 	if err != nil {
 		if err := tx.Rollback(); err != nil {
 			return err
@@ -29,9 +28,9 @@ func (s InsertionService) Insert(stats benchttp.Stats, statsID, userID, tag stri
 	defer insertStatsDescriptor.Close()
 
 	if _, err = insertStatsDescriptor.Exec(
-		statsID,
-		userID,
-		tag,
+		stats.Descriptor.ID,
+		stats.Descriptor.UserID,
+		stats.Descriptor.FinishedAt,
 	); err != nil {
 		if err := tx.Rollback(); err != nil {
 			return err
@@ -58,7 +57,7 @@ func (s InsertionService) Insert(stats benchttp.Stats, statsID, userID, tag stri
 	defer insertTimestats.Close()
 
 	if _, err = insertTimestats.Exec(
-		statsID,
+		stats.Descriptor.ID,
 		stats.Time.Min,
 		stats.Time.Max,
 		stats.Time.Mean,
@@ -90,7 +89,7 @@ func (s InsertionService) Insert(stats benchttp.Stats, statsID, userID, tag stri
 	defer insertCodestats.Close()
 
 	if _, err = insertCodestats.Exec(
-		statsID,
+		stats.Descriptor.ID,
 		stats.Code.Status1xx,
 		stats.Code.Status2xx,
 		stats.Code.Status3xx,