From 8f0fc8b58feb70715091f3c017945495dbb04b04 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Thu, 17 Oct 2019 16:13:14 +0200
Subject: [PATCH] Unify error handling in findOneBy() fn

---
 compose/repository/attachment.go | 4 +++-
 compose/repository/chart.go      | 4 +++-
 compose/repository/module.go     | 6 +++---
 compose/repository/namespace.go  | 4 +++-
 compose/repository/page.go       | 6 ++++--
 compose/repository/record.go     | 4 +++-
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/compose/repository/attachment.go b/compose/repository/attachment.go
index 76844d07c..ef93051cf 100644
--- a/compose/repository/attachment.go
+++ b/compose/repository/attachment.go
@@ -83,7 +83,9 @@ func (r attachment) findOneBy(namespaceID uint64, field string, value interface{
 		err = rh.FetchOne(r.db(), q, p)
 	)
 
-	if err == nil && p.ID == 0 {
+	if err != nil {
+		return nil, err
+	} else if p.ID == 0 {
 		return nil, ErrAttachmentNotFound
 	}
 
diff --git a/compose/repository/chart.go b/compose/repository/chart.go
index ed29f4e81..4474e3051 100644
--- a/compose/repository/chart.go
+++ b/compose/repository/chart.go
@@ -86,7 +86,9 @@ func (r chart) findOneBy(namespaceID uint64, field string, value interface{}) (*
 		err = rh.FetchOne(r.db(), q, c)
 	)
 
-	if err == nil && c.ID == 0 {
+	if err != nil {
+		return nil, err
+	} else if c.ID == 0 {
 		return nil, ErrChartNotFound
 	}
 
diff --git a/compose/repository/module.go b/compose/repository/module.go
index 25e9541b6..90d2ddec3 100644
--- a/compose/repository/module.go
+++ b/compose/repository/module.go
@@ -102,10 +102,10 @@ func (r module) findOneBy(namespaceID uint64, field string, value interface{}) (
 		err = rh.FetchOne(r.db(), q, m)
 	)
 
-	if m.ID == 0 {
-		return nil, ErrModuleNotFound
-	} else if err != nil {
+	if err != nil {
 		return nil, err
+	} else if m.ID == 0 {
+		return nil, ErrModuleNotFound
 	}
 
 	return m, nil
diff --git a/compose/repository/namespace.go b/compose/repository/namespace.go
index f7158a3a8..5abc7d178 100644
--- a/compose/repository/namespace.go
+++ b/compose/repository/namespace.go
@@ -88,7 +88,9 @@ func (r *namespace) findOneBy(field string, value interface{}) (*types.Namespace
 		err = rh.FetchOne(r.db(), q, ns)
 	)
 
-	if err == nil && ns.ID == 0 {
+	if err != nil {
+		return nil, err
+	} else if ns.ID == 0 {
 		return nil, ErrNamespaceNotFound
 	}
 
diff --git a/compose/repository/page.go b/compose/repository/page.go
index 8fbb864e6..d73fc21c8 100644
--- a/compose/repository/page.go
+++ b/compose/repository/page.go
@@ -72,7 +72,7 @@ func (r page) columns() []string {
 
 func (r page) query() squirrel.SelectBuilder {
 	return squirrel.
-		Select().
+		Select(r.columns()...).
 		From(r.table()).
 		Where("deleted_at IS NULL")
 }
@@ -99,7 +99,9 @@ func (r page) findOneBy(namespaceID uint64, field string, value interface{}) (*t
 		err = rh.FetchOne(r.db(), q, p)
 	)
 
-	if err == nil && p.ID == 0 {
+	if err != nil {
+		return nil, err
+	} else if p.ID == 0 {
 		return nil, ErrPageNotFound
 	}
 
diff --git a/compose/repository/record.go b/compose/repository/record.go
index 1da19edd6..d1d806532 100644
--- a/compose/repository/record.go
+++ b/compose/repository/record.go
@@ -96,7 +96,9 @@ func (r record) findOneBy(namespaceID uint64, field string, value interface{}) (
 		err = rh.FetchOne(r.db(), q, rec)
 	)
 
-	if err == nil && rec.ID == 0 {
+	if err != nil {
+		return nil, err
+	} else if rec.ID == 0 {
 		return nil, ErrRecordNotFound
 	}