From fcefdc42e9bc546c26e44873959adfb1719a64f8 Mon Sep 17 00:00:00 2001 From: Simon Esposito Date: Thu, 23 May 2024 18:17:27 +0100 Subject: [PATCH] Test fix --- migrate/migrate.go | 10 +++++++++- server/api_test.go | 3 +-- server/core_notification.go | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/migrate/migrate.go b/migrate/migrate.go index ffdb5563bb..961e76e61f 100644 --- a/migrate/migrate.go +++ b/migrate/migrate.go @@ -22,9 +22,10 @@ import ( "github.com/heroiclabs/nakama/v3/server" sqlmigrate "github.com/heroiclabs/sql-migrate" "github.com/jackc/pgx/v5" - _ "github.com/jackc/pgx/v5/stdlib" // Blank import to register SQL driver "go.uber.org/zap" "go.uber.org/zap/zapcore" + + _ "github.com/jackc/pgx/v5/stdlib" // Blank import to register SQL driver ) const ( @@ -62,6 +63,7 @@ func Check(ctx context.Context, logger *zap.Logger, db *pgx.Conn) { if err != nil { logger.Fatal("Could not find migrations", zap.Error(err)) } + records, err := sqlmigrate.GetMigrationRecords(ctx, db) if err != nil { logger.Fatal("Could not get migration records, run `nakama migrate up`", zap.Error(err)) @@ -104,6 +106,8 @@ func (ms *migrationService) up(ctx context.Context, logger *zap.Logger, db *pgx. ms.limit = 0 } + logger.Info("Applying database migrations", zap.Int("limit", ms.limit)) + appliedMigrations, err := sqlmigrate.ExecMax(ctx, db, ms.migrations, sqlmigrate.Up, ms.limit) if err != nil { logger.Fatal("Failed to apply migrations", zap.Int("count", appliedMigrations), zap.Error(err)) @@ -117,6 +121,8 @@ func (ms *migrationService) down(ctx context.Context, logger *zap.Logger, db *pg ms.limit = 1 } + logger.Info("Reverting database migrations", zap.Int("limit", ms.limit)) + appliedMigrations, err := sqlmigrate.ExecMax(ctx, db, ms.migrations, sqlmigrate.Down, ms.limit) if err != nil { logger.Fatal("Failed to migrate back", zap.Int("count", appliedMigrations), zap.Error(err)) @@ -130,6 +136,8 @@ func (ms *migrationService) redo(ctx context.Context, logger *zap.Logger, db *pg logger.Warn("Limit is ignored when redo is invoked") } + logger.Info("Reapplying database migrations", zap.Int("limit", ms.limit)) + appliedMigrations, err := sqlmigrate.ExecMax(ctx, db, ms.migrations, sqlmigrate.Down, 1) if err != nil { logger.Fatal("Failed to migrate back", zap.Int("count", appliedMigrations), zap.Error(err)) diff --git a/server/api_test.go b/server/api_test.go index 7de477ccae..2ae6e4999a 100644 --- a/server/api_test.go +++ b/server/api_test.go @@ -55,8 +55,7 @@ var ( } metrics = NewLocalMetrics(logger, logger, nil, cfg) storageIdx, _ = NewLocalStorageIndex(logger, nil, &StorageConfig{DisableIndexOnly: false}, metrics) - _ = CheckConfig(logger, cfg) - _ = ValidateConfig(logger, cfg) + _ = cfg.Validate(logger) ) type DummyMessageRouter struct{} diff --git a/server/core_notification.go b/server/core_notification.go index 9226407c32..a2ddded378 100644 --- a/server/core_notification.go +++ b/server/core_notification.go @@ -70,7 +70,7 @@ func NotificationSend(ctx context.Context, logger *zap.Logger, db *sql.DB, track } recipients := make(map[PresenceStream][]*PresenceID, len(notifications)) - for userID, _ := range notifications { + for userID := range notifications { recipients[PresenceStream{Mode: StreamModeNotifications, Subject: userID}] = make([]*PresenceID, 0, 1) } tracker.ListPresenceIDByStreams(recipients)