fix: trace list query and clean up

Author: ItsNotGoodName

cmd/smtpbridge/main.go

@@ -101,6 +101,7 @@ func run(flags *flag.FlagSet) lieut.Executor {
 		webTestFileStore := app.NewWebTestFileStore("apple-touch-icon.png", fmt.Sprintf("http://127.0.0.1:%d", cfg.HTTPPort))
 		app, release := app.New(db, fileStore, bus, cfg.Config, cfg.EndpointFactory, webTestFileStore)
 		defer release()
+		app.Tracer("boot").Trace(ctx, "boot")
 
 		// Supervisor
 		super := suture.New("root", suture.Spec{
@@ -202,8 +203,8 @@ func run(flags *flag.FlagSet) lieut.Executor {
 
 		// Web
 		if web.DevMode {
-			web := web.NewRefresher()
-			super.Add(web)
+			viteHotReload := web.NewViteHotReload()
+			super.Add(viteHotReload)
 		}
 
 		return super.Serve(ctx)

internal/app/app.go

@@ -177,6 +177,9 @@ func (a App) EndpointTest(ctx context.Context, id int64) error {
 	env := envelope.New(envelope.NewMessage(models.DTOMessageCreate{
 		Subject: "Test Subject",
 		Text:    "Test Body",
+		From:    "from-test@example.com",
+		To:      []string{"to-test@example.com"},
+		Date:    time.Now(),
 	}), datt.Attachment)
 
 	return end.Send(ctx, a.webTestFileStore, env)

internal/repo/trace.go

@@ -3,11 +3,13 @@ package repo
 import (
 	"context"
 	"errors"
+	"fmt"
 	"time"
 
 	"github.com/ItsNotGoodName/smtpbridge/internal/database"
 	. "github.com/ItsNotGoodName/smtpbridge/internal/jet/table"
 	"github.com/ItsNotGoodName/smtpbridge/internal/models"
+	"github.com/ItsNotGoodName/smtpbridge/internal/repo/orm"
 	"github.com/ItsNotGoodName/smtpbridge/pkg/pagination"
 	. "github.com/go-jet/jet/v2/sqlite"
 	"github.com/samber/lo"
@@ -60,49 +62,48 @@ func TraceCreate(ctx context.Context, db database.Querier, r models.Trace) (int6
 
 func TraceList(ctx context.Context, db database.Querier, page pagination.Page, req models.DTOTraceListRequest) (models.DTOTraceListResult, error) {
 	subQuery := Traces.
-		SELECT(
-			Traces.RequestID.AS("request_id"),
-			COUNT(Raw("*")).OVER().AS("count"),
-		).
+		SELECT(Traces.RequestID.AS(Traces.RequestID.Name())).
 		DISTINCT()
 	// Order
-	if req.Ascending {
-		subQuery = subQuery.ORDER_BY(Traces.ID.ASC())
-	} else {
-		subQuery = subQuery.ORDER_BY(Traces.ID.DESC())
-	}
+	subQuery = traceListOrder(subQuery, req)
 	// Pagination
 	subQuery = subQuery.
 		LIMIT(int64(page.Limit())).
 		OFFSET(int64(page.Offset()))
 
-	var res struct {
-		Count int `sql:"primary_key"`
-		Trace []models.Trace
-	}
-	query := SELECT(tracePJ, Raw("t.count").AS("count")).
+	var res []models.Trace
+	query := SELECT(tracePJ).
 		FROM(subQuery.AsTable("t").
-			LEFT_JOIN(Traces, RawString("t.request_id").EQ(Traces.RequestID)))
+			LEFT_JOIN(Traces, RawString(fmt.Sprintf("t.%s", Traces.RequestID.Name())).EQ(Traces.RequestID)))
 	// Order
-	if req.Ascending {
-		query = query.ORDER_BY(Traces.Seq.ASC())
-	} else {
-		query = query.ORDER_BY(Traces.Seq.DESC())
-	}
+	query = traceListOrder(query, req)
 	err := query.QueryContext(ctx, db, &res)
 	if err != nil && !errors.Is(err, ErrNoRows) {
 		return models.DTOTraceListResult{}, err
 	}
 
-	traces := lo.PartitionBy(res.Trace, func(t models.Trace) string { return t.RequestID })
+	traces := lo.PartitionBy(res, func(t models.Trace) string { return t.RequestID })
+
+	count, err := orm.CountQuery(ctx, db, Traces.
+		SELECT(COUNT(Raw(fmt.Sprintf("DISTINCT %s", Traces.RequestID.Name()))).AS("count")))
+	if err != nil {
+		return models.DTOTraceListResult{}, err
+	}
 
-	pageResult := pagination.NewPageResult(page, res.Count)
+	pageResult := pagination.NewPageResult(page, count)
 	return models.DTOTraceListResult{
 		PageResult: pageResult,
 		Traces:     traces,
 	}, nil
 }
 
+func traceListOrder(s SelectStatement, req models.DTOTraceListRequest) SelectStatement {
+	if req.Ascending {
+		return s.ORDER_BY(Traces.ID.ASC())
+	}
+	return s.ORDER_BY(Traces.ID.DESC())
+}
+
 func TraceDrop(ctx context.Context, db database.Querier) (int64, error) {
 	res, err := Traces.
 		DELETE().

web/web.go

@@ -30,18 +30,18 @@ func mustSubFS(currentFs fs.FS, fsRoot string) fs.FS {
 	return subFs
 }
 
-type Refresher struct {
+type ViteHotReload struct {
 }
 
-func NewRefresher() Refresher {
-	return Refresher{}
+func NewViteHotReload() ViteHotReload {
+	return ViteHotReload{}
 }
 
-func (r Refresher) String() string {
-	return "web.Refresher"
+func (r ViteHotReload) String() string {
+	return "web.ViteHotReloader"
 }
 
-func (r Refresher) Serve(ctx context.Context) error {
+func (r ViteHotReload) Serve(ctx context.Context) error {
 	reloadVite()
 	return suture.ErrDoNotRestart
 }