series: factorize next/prev db access

Remove duplicated code.

Signed-off-by: Robin Jarry <robin@jarry.cc>

Author: rjarry

pkg/api/util.go

@@ -114,17 +114,13 @@ func loadSeriesDetail(ctx context.Context, database bun.IDB, base string, series
 			s.PreviousSeries = &u
 		}
 
-		var nextIDs []int
-		if err := database.NewSelect().
-			Model((*db.Series)(nil)).
-			Column("id").
-			Where("previous_series_id = ?", s.ID).
-			Scan(ctx, &nextIDs); err != nil {
+		nextSeriesList, err := q.ListNextSeries(s.ID)
+		if err != nil {
 			log.Errorf("load next series: %v", err)
 		}
-		s.NextSeries = make([]string, len(nextIDs))
-		for j, id := range nextIDs {
-			s.NextSeries[j] = fmt.Sprintf("%s/series/%d", base, id)
+		s.NextSeries = make([]string, len(nextSeriesList))
+		for j, ns := range nextSeriesList {
+			s.NextSeries[j] = fmt.Sprintf("%s/series/%d", base, ns.ID)
 		}
 	}
 }

pkg/db/series.go

@@ -204,6 +204,15 @@ func (q *Queries) GetSeriesMetadata(seriesID int) (map[string]string, error) {
 	return m, err
 }
 
+func (q *Queries) ListNextSeries(seriesID int) ([]Series, error) {
+	var series []Series
+	err := q.DB.NewSelect().Model(&series).
+		Where("previous_series_id = ?", seriesID).
+		OrderExpr("version ASC").
+		Scan(q.Ctx)
+	return series, err
+}
+
 func (q *Queries) LoadPatchSeries(patches []Patch) error {
 	var seriesIDs []int
 	for i := range patches {

pkg/web/patches.go

@@ -444,11 +444,11 @@ func (h *webHandler) PatchDetailPage(w http.ResponseWriter, r *http.Request) {
 				prevSeries = &ps
 			}
 		}
-		q.DB.NewSelect().Model(&nextSeries).
-			Column("id", "version").
-			Where("previous_series_id = ?", series.ID).
-			OrderExpr("version ASC").
-			Scan(q.Ctx)
+		nextSeries, err = q.ListNextSeries(series.ID)
+		if err != nil {
+			serverErrorPage(w, "list next series", err)
+			return
+		}
 	}
 
 	data := patchDetailData{