Refactor entry validation

ui/entry_update_status.go

@@ -5,27 +5,28 @@
 package ui // import "miniflux.app/ui"
 
 import (
-	"errors"
+	json_parser "encoding/json"
 	"net/http"
 
 	"miniflux.app/http/request"
 	"miniflux.app/http/response/json"
+	"miniflux.app/model"
+	"miniflux.app/validator"
 )
 
 func (h *handler) updateEntriesStatus(w http.ResponseWriter, r *http.Request) {
-	entryIDs, status, err := decodeEntryStatusPayload(r.Body)
-	if err != nil {
+	var entriesStatusUpdateRequest model.EntriesStatusUpdateRequest
+	if err := json_parser.NewDecoder(r.Body).Decode(&entriesStatusUpdateRequest); err != nil {
 		json.BadRequest(w, r, err)
 		return
 	}
 
-	if len(entryIDs) == 0 {
-		json.BadRequest(w, r, errors.New("The list of entry IDs is empty"))
+	if err := validator.ValidateEntriesStatusUpdateRequest(&entriesStatusUpdateRequest); err != nil {
+		json.BadRequest(w, r, err)
 		return
 	}
 
-	err = h.store.SetEntriesStatus(request.UserID(r), entryIDs, status)
-	if err != nil {
+	if err := h.store.SetEntriesStatus(request.UserID(r), entriesStatusUpdateRequest.EntryIDs, entriesStatusUpdateRequest.Status); err != nil {
 		json.ServerError(w, r, err)
 		return
 	}

ui/payload.go

@@ -1,33 +0,0 @@
-// Copyright 2017 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package ui  // import "miniflux.app/ui"
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-
-	"miniflux.app/model"
-)
-
-func decodeEntryStatusPayload(r io.ReadCloser) (entryIDs []int64, status string, err error) {
-	type payload struct {
-		EntryIDs []int64 `json:"entry_ids"`
-		Status   string  `json:"status"`
-	}
-
-	var p payload
-	decoder := json.NewDecoder(r)
-	defer r.Close()
-	if err = decoder.Decode(&p); err != nil {
-		return nil, "", fmt.Errorf("invalid JSON payload: %v", err)
-	}
-
-	if err := model.ValidateEntryStatus(p.Status); err != nil {
-		return nil, "", err
-	}
-
-	return p.EntryIDs, p.Status, nil
-}