Return empty array instead of null

polldo · Sep 14, 2023 · 28dcf05 · 28dcf05
1 parent 7cc9858
commit 28dcf05
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/core/cart/handler.go b/core/cart/handler.go
@@ -38,11 +38,6 @@ func HandleShow(db *sqlx.DB) web.Handler {
 			return err
 		}
 
-		// Return empty slice instead of nil.
-		if cart.Items == nil {
-			cart.Items = []Item{}
-		}
-
 		return web.Respond(ctx, w, cart, http.StatusOK)
 	}
 }

diff --git a/core/cart/store.go b/core/cart/store.go
@@ -136,7 +136,7 @@ func FetchItems(ctx context.Context, db sqlx.ExtContext, userID string) ([]Item,
 	ORDER BY
 		course_id`
 
-	var ci []Item
+	ci := []Item{}
 	if err := database.NamedQuerySlice(ctx, db, q, in, &ci); err != nil {
 		return nil, fmt.Errorf("selecting cart items of user[%s]: %w", userID, err)
 	}

diff --git a/core/course/store.go b/core/course/store.go
@@ -85,7 +85,7 @@ func FetchAll(ctx context.Context, db sqlx.ExtContext) ([]Course, error) {
 	ORDER BY
 		course_id`
 
-	var cs []Course
+	cs := []Course{}
 	if err := database.NamedQuerySlice(ctx, db, q, struct{}{}, &cs); err != nil {
 		return nil, fmt.Errorf("selecting all courses: %w", err)
 	}
@@ -122,7 +122,7 @@ func FetchByOwner(ctx context.Context, db sqlx.ExtContext, userID string) ([]Cou
 	ORDER BY
 		c.course_id`
 
-	var cs []Course
+	cs := []Course{}
 	if err := database.NamedQuerySlice(ctx, db, q, in, &cs); err != nil {
 		return nil, fmt.Errorf("selecting all courses: %w", err)
 	}

diff --git a/core/video/store.go b/core/video/store.go
@@ -87,7 +87,7 @@ func FetchAll(ctx context.Context, db sqlx.ExtContext) ([]Video, error) {
 	ORDER BY
 		video_id`
 
-	var videos []Video
+	videos := []Video{}
 	if err := database.NamedQuerySlice(ctx, db, q, struct{}{}, &videos); err != nil {
 		return nil, fmt.Errorf("selecting videos: %w", err)
 	}
@@ -112,7 +112,7 @@ func FetchAllByCourse(ctx context.Context, db sqlx.ExtContext, courseID string)
 	ORDER BY
 		index`
 
-	var videos []Video
+	videos := []Video{}
 	if err := database.NamedQuerySlice(ctx, db, q, in, &videos); err != nil {
 		return nil, fmt.Errorf("selecting videos: %w", err)
 	}

diff --git a/database/database.go b/database/database.go
@@ -156,7 +156,10 @@ func NamedQuerySlice[T any](ctx context.Context, db sqlx.ExtContext, query strin
 		}
 		slice = append(slice, *v)
 	}
-	*dest = slice
+
+	if slice != nil {
+		*dest = slice
+	}
 
 	return nil
 }