fix also list update function

Author: lucarin91

internal/api/handlers/update.go

@@ -16,7 +16,6 @@
 package handlers
 
 import (
-	"errors"
 	"net/http"
 	"strings"
 
@@ -43,14 +42,19 @@ func HandleCheckUpgradable(updater *update.Manager) http.HandlerFunc {
 
 		pkgs, err := updater.ListUpgradablePackages(r.Context(), filterFunc)
 		if err != nil {
-			if errors.Is(err, update.ErrOperationAlreadyInProgress) {
-				render.EncodeResponse(w, http.StatusConflict, models.ErrorResponse{Details: err.Error()})
+			code := update.GetUpdateErrorCode(err)
+			if code == update.ErrOperationAlreadyInProgress.Code {
+				render.EncodeResponse(w, http.StatusConflict, models.ErrorResponse{
+					Code:    string(code),
+					Details: err.Error(),
+				})
 				return
 			}
-			render.EncodeResponse(w, http.StatusBadRequest, models.ErrorResponse{Details: "Error checking for upgradable packages: " + err.Error()})
-			return
+			render.EncodeResponse(w, http.StatusBadRequest, models.ErrorResponse{
+				Code:    string(code),
+				Details: err.Error(),
+			})
 		}
-
 		if len(pkgs) == 0 {
 			render.EncodeResponse(w, http.StatusNoContent, nil)
 			return
@@ -79,27 +83,40 @@ func HandleUpdateApply(updater *update.Manager) http.HandlerFunc {
 
 		pkgs, err := updater.ListUpgradablePackages(r.Context(), filterFunc)
 		if err != nil {
-			if errors.Is(err, update.ErrOperationAlreadyInProgress) {
-				render.EncodeResponse(w, http.StatusConflict, models.ErrorResponse{Details: err.Error()})
+			code := update.GetUpdateErrorCode(err)
+			if code == update.ErrOperationAlreadyInProgress.Code {
+				render.EncodeResponse(w, http.StatusConflict, models.ErrorResponse{
+					Code:    string(code),
+					Details: err.Error(),
+				})
 				return
 			}
 			slog.Error("Unable to get upgradable packages", slog.String("error", err.Error()))
-			render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "Error checking for upgradable packages"})
+			render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{
+				Code:    string(code),
+				Details: err.Error(),
+			})
 			return
 		}
-
 		if len(pkgs) == 0 {
-			render.EncodeResponse(w, http.StatusNoContent, models.ErrorResponse{Details: "System is up to date, no upgradable packages found"})
+			render.EncodeResponse(w, http.StatusNoContent, nil)
 			return
 		}
 
 		err = updater.UpgradePackages(r.Context(), pkgs)
 		if err != nil {
-			if errors.Is(err, update.ErrOperationAlreadyInProgress) {
-				render.EncodeResponse(w, http.StatusConflict, models.ErrorResponse{Details: err.Error()})
+			code := update.GetUpdateErrorCode(err)
+			if code == update.ErrOperationAlreadyInProgress.Code {
+				render.EncodeResponse(w, http.StatusConflict, models.ErrorResponse{
+					Code:    string(code),
+					Details: err.Error(),
+				})
 				return
 			}
-			render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "Error upgrading packages"})
+			render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{
+				Code:    string(code),
+				Details: err.Error(),
+			})
 			return
 		}
 

internal/api/models/errors.go

@@ -16,5 +16,6 @@
 package models
 
 type ErrorResponse struct {
+	Code    string `json:"code,omitempty"`
 	Details string `json:"details"`
 }

internal/update/errors.go

@@ -38,7 +38,6 @@ func (e *UpdateError) Unwrap() error {
 
 func NewUnkownError(err error) *UpdateError {
 	return &UpdateError{
-		Code:    "UNKNOWN_ERROR",
 		Details: err.Error(),
 		err:     err,
 	}