From efd2b6b1870ad6dc086ca85d56881279ee41f244 Mon Sep 17 00:00:00 2001 From: Tigor Hutasuhut Date: Mon, 5 Aug 2024 23:20:07 +0700 Subject: [PATCH] refactor(api): sqlite error check uses new for type assertion --- go/api/devices_create.go | 3 +-- go/api/devices_get_by_slug.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/go/api/devices_create.go b/go/api/devices_create.go index 4a68257..16f5f72 100644 --- a/go/api/devices_create.go +++ b/go/api/devices_create.go @@ -33,8 +33,7 @@ func (api *API) DevicesCreate(ctx context.Context, params *models.Device) (devic }) }) if err != nil { - var sqliteErr sqlite3.Error - if errors.As(err, &sqliteErr) { + if sqliteErr := new(sqlite3.Error); errors.As(err, sqliteErr) { if sqliteErr.Code == sqlite3.ErrConstraint { return nil, errs. Wrapw(sqliteErr, "device already exists", "params", params). diff --git a/go/api/devices_get_by_slug.go b/go/api/devices_get_by_slug.go index 4cd18f0..08e2c6b 100644 --- a/go/api/devices_get_by_slug.go +++ b/go/api/devices_get_by_slug.go @@ -12,10 +12,10 @@ func (api *API) GetDevice(ctx context.Context, slug string) (device *models.Devi device, err = models.FindDevice(ctx, api.db, slug) if err != nil { if err.Error() == "sql: no rows in result set" { - return device, errs.Wrapw(err, "device not found", "device", device).Code(connect.CodeNotFound) + return device, errs.Wrapw(err, "device not found", "slug", slug).Code(connect.CodeNotFound) } - return device, errs.Wrapw(err, "failed to find device", "device", device) + return device, errs.Wrapw(err, "failed to find device", "slug", slug) } return device, nil