re-Tick · re-Tick · Jan 4, 2023 · Jan 4, 2023 · Jan 4, 2023 · Jan 4, 2023
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -0,0 +1,29 @@
+name: Go
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.17
+
+      - name: Install-Keploy
+        run: |
+          cat config.toml.sample > config.toml
+
+      - name: Test
+        run: |
+          curl --silent --location "https://github.com/keploy/keploy/releases/latest/download/keploy_linux_amd64.tar.gz" | tar xz -C /tmp 
+          sudo mv /tmp/keploy /usr/local/bin && keploy &
+          make test
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,6 @@ frontend/build/
 config.toml
 node_modules
 listmonk
-dist/*
+dist/*
+coverage.tmp.txt
+coverage.txt
diff --git a/Makefile b/Makefile
@@ -43,7 +43,8 @@ $(BIN): $(shell find . -type f -name "*.go")
 # Run the backend in dev mode. The frontend assets in dev mode are loaded from disk from frontend/dist.
 .PHONY: run
 run:
-	CGO_ENABLED=0 go run -ldflags="-s -w -X 'main.buildString=${BUILDSTR}' -X 'main.versionString=${VERSION}' -X 'main.frontendDir=frontend/dist'" cmd/*.go
+	CGO_ENABLED=0 go build -o ${BIN} -ldflags="-s -w -X 'main.buildString=${BUILDSTR}' -X 'main.versionString=${VERSION}' -X 'main.frontendDir=frontend/dist'" cmd/*.go
+	./listmonk
 
 # Build the JS frontend into frontend/dist.
 $(FRONTEND_DIST): $(FRONTEND_DEPS)
@@ -62,7 +63,13 @@ run-frontend:
 # Run Go tests.
 .PHONY: test
 test:
-	go test ./...
+#	go test ./...
+	mkdir uploads
+	CGO_ENABLED=0 export KEPLOY_MODE="test" && go test -coverpkg=./... -coverprofile=coverage.tmp.txt -covermode=atomic ./... -buildString '${BUILDSTR}' -versionString ${VERSION}
+#	the files with inmemory state are excluded. Since the state are not mocked therefore, testrun fails.
+	cat coverage.tmp.txt | grep -v -e "cmd/import.go" -e "cmd/tx.go" | grep -v -e "migrations" > coverage.txt
+	go tool cover -func coverage.txt
+	rm -r uploads
 
 # Bundle all static assets including the JS frontend into the ./listmonk binary
 # using stuffbin (installed with make deps).

diff --git a/cmd/admin.go b/cmd/admin.go
@@ -62,7 +62,7 @@ func handleGetDashboardCharts(c echo.Context) error {
 		app = c.Get("app").(*App)
 	)
 
-	out, err := app.core.GetDashboardCharts()
+	out, err := app.core.GetDashboardCharts(c.Request().Context())
 	if err != nil {
 		return err
 	}
@@ -76,7 +76,7 @@ func handleGetDashboardCounts(c echo.Context) error {
 		app = c.Get("app").(*App)
 	)
 
-	out, err := app.core.GetDashboardCounts()
+	out, err := app.core.GetDashboardCounts(c.Request().Context())
 	if err != nil {
 		return err
 	}

diff --git a/cmd/archive.go b/cmd/archive.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"html/template"
 	"net/http"
@@ -28,7 +29,7 @@ func handleGetCampaignArchives(c echo.Context) error {
 		pg  = app.paginator.NewFromURL(c.Request().URL.Query())
 	)
 
-	camps, total, err := getCampaignArchives(pg.Offset, pg.Limit, app)
+	camps, total, err := getCampaignArchives(c.Request().Context(), pg.Offset, pg.Limit, app)
 	if err != nil {
 		return err
 	}
@@ -55,7 +56,7 @@ func handleGetCampaignArchivesFeed(c echo.Context) error {
 		pg  = app.paginator.NewFromURL(c.Request().URL.Query())
 	)
 
-	camps, _, err := getCampaignArchives(pg.Offset, pg.Limit, app)
+	camps, _, err := getCampaignArchives(c.Request().Context(), pg.Offset, pg.Limit, app)
 	if err != nil {
 		return err
 	}
@@ -91,7 +92,7 @@ func handleCampaignArchivesPage(c echo.Context) error {
 		pg  = app.paginator.NewFromURL(c.Request().URL.Query())
 	)
 
-	out, total, err := getCampaignArchives(pg.Offset, pg.Limit, app)
+	out, total, err := getCampaignArchives(c.Request().Context(), pg.Offset, pg.Limit, app)
 	if err != nil {
 		return err
 	}
@@ -114,7 +115,7 @@ func handleCampaignArchivePage(c echo.Context) error {
 		uuid = c.Param("uuid")
 	)
 
-	pubCamp, err := app.core.GetArchivedCampaign(0, uuid)
+	pubCamp, err := app.core.GetArchivedCampaign(c.Request().Context(), 0, uuid)
 	if err != nil || pubCamp.Type != models.CampaignTypeRegular {
 		notFound := false
 		if er, ok := err.(*echo.HTTPError); ok {
@@ -134,7 +135,7 @@ func handleCampaignArchivePage(c echo.Context) error {
 			makeMsgTpl(app.i18n.T("public.errorTitle"), "", app.i18n.Ts("public.errorFetchingCampaign")))
 	}
 
-	out, err := compileArchiveCampaigns([]models.Campaign{pubCamp}, app)
+	out, err := compileArchiveCampaigns(c.Request().Context(), []models.Campaign{pubCamp}, app)
 	if err != nil {
 		return c.Render(http.StatusInternalServerError, tplMessage,
 			makeMsgTpl(app.i18n.T("public.errorTitle"), "", app.i18n.Ts("public.errorFetchingCampaign")))
@@ -152,13 +153,13 @@ func handleCampaignArchivePage(c echo.Context) error {
 	return c.HTML(http.StatusOK, string(msg.Body()))
 }
 
-func getCampaignArchives(offset, limit int, app *App) ([]campArchive, int, error) {
-	pubCamps, total, err := app.core.GetArchivedCampaigns(offset, limit)
+func getCampaignArchives(ctx context.Context, offset, limit int, app *App) ([]campArchive, int, error) {
+	pubCamps, total, err := app.core.GetArchivedCampaigns(ctx, offset, limit)
 	if err != nil {
 		return []campArchive{}, total, echo.NewHTTPError(http.StatusInternalServerError, app.i18n.T("public.errorFetchingCampaign"))
 	}
 
-	msgs, err := compileArchiveCampaigns(pubCamps, app)
+	msgs, err := compileArchiveCampaigns(ctx, pubCamps, app)
 	if err != nil {
 		return []campArchive{}, total, err
 	}
@@ -178,15 +179,15 @@ func getCampaignArchives(offset, limit int, app *App) ([]campArchive, int, error
 	return out, total, nil
 }
 
-func compileArchiveCampaigns(camps []models.Campaign, app *App) ([]manager.CampaignMessage, error) {
+func compileArchiveCampaigns(ctx context.Context, camps []models.Campaign, app *App) ([]manager.CampaignMessage, error) {
 	var (
 		b = bytes.Buffer{}
 	)
 
 	out := make([]manager.CampaignMessage, 0, len(camps))
 	for _, c := range camps {
 		camp := c
-		if err := camp.CompileTemplate(app.manager.TemplateFuncs(&camp)); err != nil {
+		if err := camp.CompileTemplate(app.manager.TemplateFuncs(ctx, &camp)); err != nil {
 			app.log.Printf("error compiling template: %v", err)
 			return nil, echo.NewHTTPError(http.StatusInternalServerError, app.i18n.T("public.errorFetchingCampaign"))
 		}

diff --git a/cmd/bounce.go b/cmd/bounce.go
@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 	"net/http"
 	"strconv"
-	"time"
 
+	"github.com/keploy/go-sdk/integrations/kclock"
 	"github.com/knadh/listmonk/models"
 	"github.com/labstack/echo/v4"
 )
@@ -26,14 +26,14 @@ func handleGetBounces(c echo.Context) error {
 
 	// Fetch one bounce.
 	if id > 0 {
-		out, err := app.core.GetBounce(id)
+		out, err := app.core.GetBounce(c.Request().Context(), id)
 		if err != nil {
 			return err
 		}
 		return c.JSON(http.StatusOK, okResp{out})
 	}
 
-	res, total, err := app.core.QueryBounces(campID, 0, source, orderBy, order, pg.Offset, pg.Limit)
+	res, total, err := app.core.QueryBounces(c.Request().Context(), campID, 0, source, orderBy, order, pg.Offset, pg.Limit)
 	if err != nil {
 		return err
 	}
@@ -65,7 +65,7 @@ func handleGetSubscriberBounces(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusBadRequest, app.i18n.T("globals.messages.invalidID"))
 	}
 
-	out, _, err := app.core.QueryBounces(0, subID, "", "", "", 0, 1000)
+	out, _, err := app.core.QueryBounces(c.Request().Context(), 0, subID, "", "", "", 0, 1000)
 	if err != nil {
 		return err
 	}
@@ -104,7 +104,7 @@ func handleDeleteBounces(c echo.Context) error {
 		IDs = i
 	}
 
-	if err := app.core.DeleteBounces(IDs); err != nil {
+	if err := app.core.DeleteBounces(c.Request().Context(), IDs); err != nil {
 		return err
 	}
 
@@ -146,7 +146,7 @@ func handleBounceWebhook(c echo.Context) error {
 		}
 
 		if b.CreatedAt.Year() == 0 {
-			b.CreatedAt = time.Now()
+			b.CreatedAt = kclock.Now(c.Request().Context())
 		}
 
 		bounces = append(bounces, b)