Merge branch 'deploy' of github.com:go-park-mail-ru/2023_2_Hamster in…

…to develop
go-park-mail-ru · Dec 19, 2023 · ea2b55f · ea2b55f
2 parents 06c98ed + c8a36b0
commit ea2b55f
Show file tree

Hide file tree

Showing 23 changed files with 2,123 additions and 116 deletions.
diff --git a/internal/common/http/response.go b/internal/common/http/response.go
@@ -1,7 +1,7 @@
 package http
 
 import (
-	"encoding/json"
+	"github.com/mailru/easyjson"
 	"net/http"
 
 	"github.com/go-park-mail-ru/2023_2_Hamster/internal/common/logger"
@@ -15,11 +15,13 @@ const (
 
 const minErrorToLogCode = 500
 
-type Response[T any] struct {
-	Status int `json:"status"`
-	Body   T   `json:"body"`
+//easyjson:json
+type Response struct {
+	Status int         `json:"status"`
+	Body   interface{} `json:"body"`
 }
 
+//easyjson:json
 type ResponseError struct {
 	Status int    `json:"status"`
 	ErrMes string `json:"message"`
@@ -46,8 +48,9 @@ func ErrorResponse(w http.ResponseWriter, code int, err error, message string, l
 		log.Error(err.Error())
 	}
 
-	encoder := json.NewEncoder(w)
-	if err := encoder.Encode(errorMsg); err != nil {
+	// Marshal response using easyjson
+	_, _, err = easyjson.MarshalToHTTPResponseWriter(errorMsg, w)
+	if err != nil {
 		log.Errorf("Error failed to marshal error message: %s", err.Error())
 		w.WriteHeader(http.StatusInternalServerError)
 
@@ -58,13 +61,15 @@ func ErrorResponse(w http.ResponseWriter, code int, err error, message string, l
 }
 
 func SuccessResponse[T any](w http.ResponseWriter, status int, response T) {
-	date := Response[T]{Status: status, Body: response}
-	encoder := json.NewEncoder(w)
-	if err := encoder.Encode(date); err != nil {
-		w.WriteHeader(status)
-		return
-	}
+	date := Response{Status: status, Body: response}
 
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(status)
+
+	// Marshal response using easyjson
+	_, _, err := easyjson.MarshalToHTTPResponseWriter(date, w)
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
 }
diff --git a/internal/common/http/response_easyjson.go b/internal/common/http/response_easyjson.go
diff --git a/internal/microservices/account/delivery/http/handler.go b/internal/microservices/account/delivery/http/handler.go
@@ -1,8 +1,8 @@
 package http
 
 import (
-	"encoding/json"
 	"errors"
+	"github.com/mailru/easyjson"
 	"net/http"
 
 	commonHttp "github.com/go-park-mail-ru/2023_2_Hamster/internal/common/http"
@@ -51,7 +51,7 @@ func (h *Handler) Create(w http.ResponseWriter, r *http.Request) {
 
 	var accountInput CreateAccount
 
-	if err := json.NewDecoder(r.Body).Decode(&accountInput); err != nil {
+	if err := easyjson.UnmarshalFromReader(r.Body, &accountInput); err != nil {
 		commonHttp.ErrorResponse(w, http.StatusBadRequest, err, commonHttp.InvalidBodyRequest, h.logger)
 		return
 	}
@@ -99,7 +99,7 @@ func (h *Handler) Update(w http.ResponseWriter, r *http.Request) {
 
 	var updateAccountInput UpdateAccount
 
-	if err := json.NewDecoder(r.Body).Decode(&updateAccountInput); err != nil {
+	if err := easyjson.UnmarshalFromReader(r.Body, &updateAccountInput); err != nil {
 		commonHttp.ErrorResponse(w, http.StatusBadRequest, err, commonHttp.InvalidBodyRequest, h.logger)
 		return
 	}

diff --git a/internal/microservices/account/delivery/http/handlers_models.go b/internal/microservices/account/delivery/http/handlers_models.go
@@ -20,13 +20,15 @@ type AccountCreateResponse struct {
 	AccountID uuid.UUID `json:"account_id"`
 }
 
+//easyjson:json
 type CreateAccount struct {
 	Balance        float64 `json:"balance" valid:"-"`
 	Accumulation   bool    `json:"accumulation" valid:"-"`
 	BalanceEnabled bool    `json:"balance_enabled" valid:"-"`
 	MeanPayment    string  `json:"mean_payment" valid:"required,length(1|30)"`
 }
 
+//easyjson:json
 type UpdateAccount struct {
 	ID             uuid.UUID `json:"id" valid:"required"`
 	Balance        float64   `json:"balance" valid:""`