From 74d985b3f5a45160f51a2b132d939dff750359d5 Mon Sep 17 00:00:00 2001 From: Gleb <115395807+The-Gleb@users.noreply.github.com> Date: Tue, 12 Mar 2024 14:24:14 +0300 Subject: [PATCH] some edits --- .../http/v1/{ => handler}/example_test.go | 13 ++++++------- internal/controller/http/v1/json.go | 2 +- internal/controller/http/v1/validatior.go | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) rename internal/controller/http/v1/{ => handler}/example_test.go (90%) diff --git a/internal/controller/http/v1/example_test.go b/internal/controller/http/v1/handler/example_test.go similarity index 90% rename from internal/controller/http/v1/example_test.go rename to internal/controller/http/v1/handler/example_test.go index cf65bf6..e1734dd 100644 --- a/internal/controller/http/v1/example_test.go +++ b/internal/controller/http/v1/handler/example_test.go @@ -8,7 +8,6 @@ import ( "net/http/httptest" "os" - v1 "github.com/The-Gleb/go_metrics_and_alerting/internal/controller/http/v1/handler" "github.com/The-Gleb/go_metrics_and_alerting/internal/domain/service" "github.com/The-Gleb/go_metrics_and_alerting/internal/domain/usecase" "github.com/The-Gleb/go_metrics_and_alerting/internal/repository/memory" @@ -22,7 +21,7 @@ func Example_getAllMetricHandler_ServeHTTP() { s.UpdateMetric("counter", "PollCount", "12") metricService := service.NewMetricService(s) getAllMetricsUsecase := usecase.NewGetAllMetricsUsecase(metricService) - getAllMetricsHandler := v1.NewGetAllMetricsHandler(getAllMetricsUsecase) + getAllMetricsHandler := NewGetAllMetricsHandler(getAllMetricsUsecase) router := chi.NewRouter() getAllMetricsHandler.AddToRouter(router) @@ -54,7 +53,7 @@ func Example_getMetricJSONHandler_ServeHTTP() { s.UpdateMetric("gauge", "Alloc", "3782369280") metricService := service.NewMetricService(s) getMetricUsecase := usecase.NewGetMetricUsecase(metricService) - getMetricJSONHandler := v1.NewGetMetricJSONHandler(getMetricUsecase) + getMetricJSONHandler := NewGetMetricJSONHandler(getMetricUsecase) router := chi.NewRouter() getMetricJSONHandler.AddToRouter(router) @@ -91,7 +90,7 @@ func Example_getMetricHandler_ServeHTTP() { s.UpdateMetric("gauge", "Alloc", "123.4") metricService := service.NewMetricService(s) getMetricUsecase := usecase.NewGetMetricUsecase(metricService) - getMetricHandler := v1.NewGetMetricHandler(getMetricUsecase) + getMetricHandler := NewGetMetricHandler(getMetricUsecase) router := chi.NewRouter() getMetricHandler.AddToRouter(router) @@ -122,7 +121,7 @@ func Example_updateMetricJSONHandler_ServeHTTP() { s := memory.New() metricService := service.NewMetricService(s) updateMetricUsecase := usecase.NewUpdateMetricUsecase(metricService, nil) - updateMetricJSONHandler := v1.NewUpdateMetricJSONHandler(updateMetricUsecase) + updateMetricJSONHandler := NewUpdateMetricJSONHandler(updateMetricUsecase) router := chi.NewRouter() updateMetricJSONHandler.AddToRouter(router) @@ -158,7 +157,7 @@ func Example_updateMetricSetHandler_ServeHTTP() { s := memory.New() metricServie := service.NewMetricService(s) updateMetricSetUsecase := usecase.NewUpdateMetricSetUsecase(metricServie, nil) - updateMetricSetHandler := v1.NewUpdateMetricSetHandler(updateMetricSetUsecase) + updateMetricSetHandler := NewUpdateMetricSetHandler(updateMetricSetUsecase) router := chi.NewRouter() updateMetricSetHandler.AddToRouter(router) @@ -202,7 +201,7 @@ func Example_updateMetricHandler_ServeHTTP() { s := memory.New() metricService := service.NewMetricService(s) updateMetricUsecase := usecase.NewUpdateMetricUsecase(metricService, nil) - updateMetricHandler := v1.NewUpdateMetricHandler(updateMetricUsecase) + updateMetricHandler := NewUpdateMetricHandler(updateMetricUsecase) router := chi.NewRouter() updateMetricHandler.AddToRouter(router) diff --git a/internal/controller/http/v1/json.go b/internal/controller/http/v1/json.go index 643bab3..6be05e5 100644 --- a/internal/controller/http/v1/json.go +++ b/internal/controller/http/v1/json.go @@ -1,4 +1,4 @@ -package http +package v1 import ( "encoding/json" diff --git a/internal/controller/http/v1/validatior.go b/internal/controller/http/v1/validatior.go index 6baf5ba..3e646be 100644 --- a/internal/controller/http/v1/validatior.go +++ b/internal/controller/http/v1/validatior.go @@ -1,4 +1,4 @@ -package http +package v1 type Validator interface { Valid() (problems map[string]string)