Error handling

grulex · Oct 28, 2023 · 82f99bb · 82f99bb
1 parent 39ce383
commit 82f99bb
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 16 deletions.
diff --git a/http/httputil/wrapper.go b/http/httputil/wrapper.go
@@ -32,7 +32,7 @@ func ResponseWrapper(f HttpUseCase) http.HandlerFunc {
 
 func responseError(handleError *HandleError, w http.ResponseWriter) {
 	if handleError.Type == ErrorInternal {
-		log.Println("Handler Error: ", string(handleError.JsonEncode()), "err", handleError.Err)
+		log.Printf("Handler Error: %+v\n", handleError)
 		http.Error(w, "Internal server error", http.StatusInternalServerError)
 		return
 	}
@@ -42,7 +42,7 @@ func responseError(handleError *HandleError, w http.ResponseWriter) {
 	}{handleError}
 	responseJson, err := json.Marshal(errorResp)
 	if err != nil {
-		log.Println("can't encode json", err, "error", handleError.Err.Error())
+		log.Printf("Handler Error: %+v\n json: %+v\n", err, errorResp)
 		http.Error(w, "can't encode json response error", handleError.GetHttpStatus())
 		return
 	}

diff --git a/http/usecase/wishlists/add_product_to_wishlist/add_product_to_wishlist.go b/http/usecase/wishlists/add_product_to_wishlist/add_product_to_wishlist.go
@@ -112,6 +112,7 @@ func MakeAddProductToWishlistUsecase(
 					Error: &httputil.HandleError{
 						Type:    httputil.ErrorInternal,
 						Message: "Error getting product",
+						Err:     err,
 					},
 				}
 			}
@@ -128,6 +129,7 @@ func MakeAddProductToWishlistUsecase(
 				Error: &httputil.HandleError{
 					Type:    httputil.ErrorInternal,
 					Message: "Error creating product",
+					Err:     err,
 				},
 			}
 		}

diff --git a/http/usecase/wishlists/book_wishlist_item/book_wishlist_item.go b/http/usecase/wishlists/book_wishlist_item/book_wishlist_item.go
@@ -71,6 +71,7 @@ func MakeBookWishlistItemUsecase(wService wishlistService) httputil.HttpUseCase
 				Error: &httputil.HandleError{
 					Type:    httputil.ErrorInternal,
 					Message: "Error getting wishlist item",
+					Err:     err,
 				},
 			}
 		}
@@ -90,6 +91,7 @@ func MakeBookWishlistItemUsecase(wService wishlistService) httputil.HttpUseCase
 				Error: &httputil.HandleError{
 					Type:    httputil.ErrorInternal,
 					Message: "Error booking wishlist item",
+					Err:     err,
 				},
 			}
 		}
@@ -105,6 +107,7 @@ func isValidWishlist(r *http.Request, wService wishlistService, wishlistID strin
 			Error: &httputil.HandleError{
 				Type:    httputil.ErrorInternal,
 				Message: "Error getting wishlist",
+				Err:     err,
 			},
 		}, false
 	}

diff --git a/http/usecase/wishlists/get_wishlist/get_wishlist.go b/http/usecase/wishlists/get_wishlist/get_wishlist.go
@@ -55,6 +55,7 @@ func MakeGetWishlistUsecase(sService subscribeService, wService wishlistService,
 				Error: &httputil.HandleError{
 					Type:    httputil.ErrorInternal,
 					Message: "Error getting wishlist",
+					Err:     err,
 				},
 			}
 		}
@@ -78,6 +79,7 @@ func MakeGetWishlistUsecase(sService subscribeService, wService wishlistService,
 					Error: &httputil.HandleError{
 						Type:    httputil.ErrorInternal,
 						Message: "Error getting subscribe",
+						Err:     err,
 					},
 				}
 			}
@@ -91,6 +93,7 @@ func MakeGetWishlistUsecase(sService subscribeService, wService wishlistService,
 					Error: &httputil.HandleError{
 						Type:    httputil.ErrorInternal,
 						Message: "Error getting avatar",
+						Err:     err,
 					},
 				}
 			}

diff --git a/http/usecase/wishlists/get_wishlist_items/get_wishlist_items.go b/http/usecase/wishlists/get_wishlist_items/get_wishlist_items.go
@@ -68,6 +68,7 @@ func MakeGetWishlistItemsUsecase(wService wishlistService, productService produc
 				Error: &httputil.HandleError{
 					Type:    httputil.ErrorInternal,
 					Message: "Error getting wishlist items",
+					Err:     err,
 				},
 			}
 		}
@@ -83,6 +84,7 @@ func MakeGetWishlistItemsUsecase(wService wishlistService, productService produc
 				Error: &httputil.HandleError{
 					Type:    httputil.ErrorInternal,
 					Message: "Error getting products",
+					Err:     err,
 				},
 			}
 		}
@@ -102,6 +104,7 @@ func MakeGetWishlistItemsUsecase(wService wishlistService, productService produc
 				Error: &httputil.HandleError{
 					Type:    httputil.ErrorInternal,
 					Message: "Error getting images",
+					Err:     err,
 				},
 			}
 		}

diff --git a/http/usecase/wishlists/remove_product_from_wishlist/remove_product_from_wishlist.go b/http/usecase/wishlists/remove_product_from_wishlist/remove_product_from_wishlist.go
@@ -69,6 +69,7 @@ func MakeRemoveProductFromWishlistUsecase(wService wishlistService) httputil.Htt
 				Error: &httputil.HandleError{
 					Type:    httputil.ErrorInternal,
 					Message: "Error removing item from wishlist",
+					Err:     err,
 				},
 			}
 		}

diff --git a/http/usecase/wishlists/subscribe_wishlist/subscribe_wishlist.go b/http/usecase/wishlists/subscribe_wishlist/subscribe_wishlist.go
@@ -55,6 +55,7 @@ func MakeSubscribeWishlistUsecase(wService wishlistService, sService subscribeSe
 				Error: &httputil.HandleError{
 					Type:    httputil.ErrorInternal,
 					Message: "Error subscribing to wishlist",
+					Err:     err,
 				},
 			}
 		}
@@ -70,6 +71,7 @@ func isValidWishlist(r *http.Request, wService wishlistService, wishlistID strin
 			Error: &httputil.HandleError{
 				Type:    httputil.ErrorInternal,
 				Message: "Error getting wishlist",
+				Err:     err,
 			},
 		}, false
 	}

diff --git a/http/usecase/wishlists/unbook_wishlist_item/unbook_wishlist_item.go b/http/usecase/wishlists/unbook_wishlist_item/unbook_wishlist_item.go
@@ -70,6 +70,7 @@ func MakeUnBookWishlistItemUsecase(wService wishlistService) httputil.HttpUseCas
 				Error: &httputil.HandleError{
 					Type:    httputil.ErrorInternal,
 					Message: "Error getting wishlist item",
+					Err:     err,
 				},
 			}
 		}
@@ -80,6 +81,7 @@ func MakeUnBookWishlistItemUsecase(wService wishlistService) httputil.HttpUseCas
 				Error: &httputil.HandleError{
 					Type:    httputil.ErrorInternal,
 					Message: "Error getting wishlist",
+					Err:     err,
 				},
 			}
 		}
@@ -101,6 +103,7 @@ func MakeUnBookWishlistItemUsecase(wService wishlistService) httputil.HttpUseCas
 				Error: &httputil.HandleError{
 					Type:    httputil.ErrorInternal,
 					Message: "Error unBooking wishlist item",
+					Err:     err,
 				},
 			}
 		}
@@ -116,6 +119,7 @@ func isValidWishlist(r *http.Request, wService wishlistService, wishlistID strin
 			Error: &httputil.HandleError{
 				Type:    httputil.ErrorInternal,
 				Message: "Error getting wishlist",
+				Err:     err,
 			},
 		}, false
 	}

diff --git a/http/usecase/wishlists/unsubscribe_wishlist/unsubscribe_wishlist.go b/http/usecase/wishlists/unsubscribe_wishlist/unsubscribe_wishlist.go
@@ -55,6 +55,7 @@ func MakeUnSubscribeWishlistUsecase(wService wishlistService, sService subscribe
 				Error: &httputil.HandleError{
 					Type:    httputil.ErrorInternal,
 					Message: "Error subscribing to wishlist",
+					Err:     err,
 				},
 			}
 		}
@@ -70,6 +71,7 @@ func isValidWishlist(r *http.Request, wService wishlistService, wishlistID strin
 			Error: &httputil.HandleError{
 				Type:    httputil.ErrorInternal,
 				Message: "Error getting wishlist",
+				Err:     err,
 			},
 		}, false
 	}

diff --git a/http/usecase/wishlists/update_wishlist/update_wishlist.go b/http/usecase/wishlists/update_wishlist/update_wishlist.go
@@ -65,6 +65,7 @@ func MakeUpdateWishlistUsecase(wService wishlistService, fService fileService, i
 				Error: &httputil.HandleError{
 					Type:    httputil.ErrorInternal,
 					Message: "Error getting wishlist",
+					Err:     err,
 				},
 			}
 		}

diff --git a/http/usecase/wishlists/upload_image.go b/http/usecase/wishlists/upload_image.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/base64"
-	"fmt"
 	"github.com/corona10/goimagehash"
 	"github.com/grulex/go-wishlist/http/httputil"
 	filePkg "github.com/grulex/go-wishlist/pkg/file"
@@ -33,29 +32,45 @@ func UploadBase64Image(ctx context.Context, fService fileService, iService image
 			},
 		}
 	}
-	invalidJpegResult := httputil.HandleResult{
-		Error: &httputil.HandleError{
-			Type:    httputil.ErrorBadData,
-			Message: "invalid jpeg image",
-			Err:     err,
-		},
-	}
-	imageObject, format, err := image.Decode(bytes.NewReader(decodedSrc))
+	imageObject, _, err := image.Decode(bytes.NewReader(decodedSrc))
 	if err != nil {
-		fmt.Println(format)
-		return nil, invalidJpegResult
+		return nil, httputil.HandleResult{
+			Error: &httputil.HandleError{
+				Type:    httputil.ErrorBadData,
+				Message: "invalid jpeg image",
+				Err:     err,
+			},
+		}
 	}
 	aHash, err := goimagehash.AverageHash(imageObject)
 	if err != nil {
-		return nil, invalidJpegResult
+		return nil, httputil.HandleResult{
+			Error: &httputil.HandleError{
+				Type:    httputil.ErrorBadData,
+				Message: "invalid jpeg image",
+				Err:     err,
+			},
+		}
 	}
 	pHash, err := goimagehash.PerceptionHash(imageObject)
 	if err != nil {
-		return nil, invalidJpegResult
+		return nil, httputil.HandleResult{
+			Error: &httputil.HandleError{
+				Type:    httputil.ErrorBadData,
+				Message: "invalid jpeg image",
+				Err:     err,
+			},
+		}
 	}
 	dHash, err := goimagehash.DifferenceHash(imageObject)
 	if err != nil {
-		return nil, invalidJpegResult
+		return nil, httputil.HandleResult{
+			Error: &httputil.HandleError{
+				Type:    httputil.ErrorBadData,
+				Message: "invalid jpeg image",
+				Err:     err,
+			},
+		}
 	}
 
 	avatarLink, err := fService.UploadPhoto(ctx, bytes.NewReader(decodedSrc))

diff --git a/http/usecase/wishlists/wishlist_validate.go b/http/usecase/wishlists/wishlist_validate.go
@@ -19,6 +19,7 @@ func IsValidWishlistAccess(ctx context.Context, wService wishlistService, wishli
 			Error: &httputil.HandleError{
 				Type:    httputil.ErrorInternal,
 				Message: "Error getting wishlist",
+				Err:     err,
 			},
 		}, false
 	}