fix: ensure to run golangci-linter for eventstore/postgres (#60)

* fix: make sure linter runs for eventstore/postgres

* fix: linter complaints

* chore: update github actions to run on postgres

Author: ar3s3ru

.github/workflows/main.yml

@@ -61,3 +61,9 @@ jobs:
         uses: golangci/golangci-lint-action@v2
         with:
           version: latest
+      - name: Run golangci-lint (postgres)
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: latest
+          working-directory: ./eventstore/postgres
+          args: -c ../../.golangci.yml

.golangci.yml

@@ -3,6 +3,7 @@ run:
   skip-dirs:
     - .github
     - resources
+    - migrations # NOTE: this is relative to eventstore/postgres
 
 linters-settings:
   dupl:

Makefile

@@ -1,5 +1,9 @@
-PKG = github.com/get-eventually/go-eventually
 GO_TEST_FLAGS := -race -v
+GOLANGCI_YML  ?= $(shell find ~+ -name .golangci.yml)
+
+.PHONY: run-linter
+run-linter:
+	@find . -name "go.mod" | sed "s/\/go.mod//g" | xargs -I % bash -c 'echo -e "Checking: %"; cd %; golangci-lint run -c $(GOLANGCI_YML)'
 
 .PHONY: postgres-tests
 postgres-tests:

eventstore/postgres/migration.go

@@ -11,7 +11,7 @@ import (
 	"github.com/get-eventually/go-eventually/eventstore/postgres/migrations"
 )
 
-// RunMigration performs the migrations for the Postgres database.
+// RunMigrations performs the migrations for the Postgres database.
 func RunMigrations(dsn string) error {
 	u, err := url.Parse(dsn)
 	if err != nil {

eventstore/postgres/store.go

@@ -6,12 +6,13 @@ import (
 	"encoding/json"
 	"fmt"
 
+	// Postgres driver for migrate.
+	_ "github.com/golang-migrate/migrate/database/postgres"
+	"github.com/lib/pq"
+
 	"github.com/get-eventually/go-eventually"
 	"github.com/get-eventually/go-eventually/eventstore"
 	"github.com/get-eventually/go-eventually/eventstore/stream"
-	"github.com/lib/pq"
-
-	_ "github.com/golang-migrate/migrate/database/postgres" // postgres driver for migrate
 )
 
 var (
@@ -26,6 +27,7 @@ type EventStore struct {
 	registry eventstore.Registry
 }
 
+// NewEventStore creates a new EventStore using the database connection pool provided.
 func NewEventStore(db *sql.DB) EventStore {
 	return EventStore{
 		db:       db,
@@ -59,28 +61,28 @@ func (st EventStore) Stream(
 
 	switch t := target.(type) {
 	case stream.All:
+		args = append(args, selectt.From)
 		query = `SELECT * FROM events
 		         WHERE global_sequence_number >= $1
 		         ORDER BY global_sequence_number ASC`
-		args = append(args, selectt.From)
 
 	case stream.ByType:
+		args = append(args, selectt.From, string(t))
 		query = `SELECT * FROM events
 		         WHERE global_sequence_number >= $1 AND stream_type = $2
 		         ORDER BY global_sequence_number ASC`
-		args = append(args, selectt.From, string(t))
 
 	case stream.ByTypes:
+		args = append(args, selectt.From, pq.Array(t))
 		query = `SELECT * FROM events
 		         WHERE global_sequence_number >= $1 AND stream_type = ANY($2)
 		         ORDER BY global_sequence_number ASC`
-		args = append(args, selectt.From, pq.Array(t))
 
 	case stream.ByID:
+		args = append(args, selectt.From, t.Type, t.Name)
 		query = `SELECT * FROM events
 				 WHERE "version" >= $1 AND stream_type = $2 AND stream_id = $3
 				 ORDER BY "version" ASC`
-		args = append(args, selectt.From, t.Type, t.Name)
 
 	default:
 		return fmt.Errorf("postgres.EventStore: unsupported stream target: %T", t)

eventstore/postgres/store_test.go

@@ -97,6 +97,7 @@ func TestLatestSequenceNumber(t *testing.T) {
 	}
 
 	ch := make(chan eventstore.Event, 1)
+
 	go func() {
 		require.NoError(t, store.Stream(ctx, ch, stream.All{}, eventstore.SelectFromBeginning))
 	}()