Add valitation to DELETE method

rfinochi · May 15, 2020 · 450aba5 · 450aba5
1 parent 084e56c
commit 450aba5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/cmd/web/handlers.go b/cmd/web/handlers.go
@@ -161,7 +161,10 @@ func (app *application) deleteItemEndpoint(c *gin.Context) {
 	}
 
 	err = app.itemModel.DeleteItem(id)
-	if err != nil {
+	if err == models.ErrNoRecord {
+		app.notFound(c.Writer)
+		return
+	} else if err != nil {
 		app.serverError(c.Writer, err)
 		return
 	}

diff --git a/cmd/web/main_test.go b/cmd/web/main_test.go
@@ -166,6 +166,7 @@ func TestValidations(t *testing.T) {
 	doError(app.router, t, "POST", "/api/", `{"id":8,"title":"Test_8","isdone":true}`, http.StatusConflict)
 	doError(app.router, t, "PUT", "/api/", `{"id":8,"title":"Test_8","isdone":true}`, http.StatusConflict)
 	doError(app.router, t, "PATCH", "/api/9", `{"id":9,"title":"Test_9","isdone":true}`, http.StatusNotFound)
+	doError(app.router, t, "DELETE", "/api/9", "", http.StatusNotFound)
 }
 
 func doAllAPIRequests(t *testing.T, a *application) {

diff --git a/pkg/models/models.go b/pkg/models/models.go
@@ -76,5 +76,11 @@ func (model ItemModel) UpdateItem(updatedItem Item) error {
 
 // DeleteItem godoc
 func (model ItemModel) DeleteItem(id int) error {
+	i, e := model.Repository.GetItem(id)
+
+	if i == (Item{}) && e == nil {
+		return ErrNoRecord
+	}
+
 	return model.Repository.DeleteItem(id)
 }