From fdabe47dc3c93e6ee49ff8645085315de727f878 Mon Sep 17 00:00:00 2001 From: Corban Beaird Date: Thu, 30 May 2024 11:50:23 -0600 Subject: [PATCH] chore: handle failure to resolve key->id + adjust testing assert --- master/internal/project/postgres_project.go | 4 +++- master/internal/project/postgres_project_intg_test.go | 2 +- ...up.sql => 20240530112249_add-custom-project-key.tx.up.sql} | 0 3 files changed, 4 insertions(+), 2 deletions(-) rename master/static/migrations/{20240508154139_add-custom-project-key.tx.up.sql => 20240530112249_add-custom-project-key.tx.up.sql} (100%) diff --git a/master/internal/project/postgres_project.go b/master/internal/project/postgres_project.go index bde0b565bfe5..e12c3fac53de 100644 --- a/master/internal/project/postgres_project.go +++ b/master/internal/project/postgres_project.go @@ -147,7 +147,9 @@ func GetProjectByKey(ctx context.Context, key string) (*model.Project, error) { Table("projects"). Where("key = ?", key). Scan(ctx, &projectID) - if err != nil { + if err != nil && errors.Is(err, sql.ErrNoRows) { + return db.ErrNotFound + } else if err != nil { return err } diff --git a/master/internal/project/postgres_project_intg_test.go b/master/internal/project/postgres_project_intg_test.go index 07a6a5a77a4a..1561a7d36a9e 100644 --- a/master/internal/project/postgres_project_intg_test.go +++ b/master/internal/project/postgres_project_intg_test.go @@ -67,7 +67,7 @@ func TestGetProjectByKey(t *testing.T) { t.Run("non-existent project key", func(t *testing.T) { _, err := GetProjectByKey(context.Background(), "bogus") require.Error(t, err) - require.True(t, strings.Contains(err.Error(), "not found")) + require.ErrorContains(t, err, "not found") }) } diff --git a/master/static/migrations/20240508154139_add-custom-project-key.tx.up.sql b/master/static/migrations/20240530112249_add-custom-project-key.tx.up.sql similarity index 100% rename from master/static/migrations/20240508154139_add-custom-project-key.tx.up.sql rename to master/static/migrations/20240530112249_add-custom-project-key.tx.up.sql