update upload to file

devide storage json to counter/gauge values

Author: Efim27

internal/server/handlers/handlers.go

@@ -116,8 +116,8 @@ func PrintStatsValues(rw http.ResponseWriter, request *http.Request, metricsMemo
 </html>`
 	keyValuesHTML := ""
 
-	for metricKey, metric := range metricsMemoryRepo.ReadAll() {
-		keyValuesHTML += fmt.Sprintf("<div><b>%v</b>: %v</div>", metricKey, metric.GetStringValue())
+	for metricKey, _ := range metricsMemoryRepo.ReadAll() {
+		keyValuesHTML += fmt.Sprintf("<div><b>%v</b>: %v</div>", metricKey, "metric.GetStringValue()")
 	}
 
 	htmlPage := fmt.Sprintf(htmlTemplate, keyValuesHTML)

internal/server/storage/memoryStorage.go internal/server/storage/memoryRepo.go

@@ -188,17 +188,11 @@ func (metricsMemoryRepo MetricsMemoryRepo) InitStateValues(DBSchema map[string]M
 	}
 }
 
-func (metricsMemoryRepo MetricsMemoryRepo) ReadAll() map[string]MetricValue {
-	allMetrics := make(map[string]MetricValue)
-
-	for metricKey, metricValue := range metricsMemoryRepo.gaugeStorage.GetSchemaDump() {
-		allMetrics[metricKey] = metricValue
-	}
-
-	for metricKey, metricValue := range metricsMemoryRepo.counterStorage.GetSchemaDump() {
-		allMetrics[metricKey] = metricValue
+func (metricsMemoryRepo MetricsMemoryRepo) ReadAll() map[string]MetricMap {
+	return map[string]MetricMap{
+		"gauge":   metricsMemoryRepo.gaugeStorage.GetSchemaDump(),
+		"counter": metricsMemoryRepo.counterStorage.GetSchemaDump(),
 	}
-	return allMetrics
 }
 
 func (metricsMemoryRepo MetricsMemoryRepo) Close() error {

internal/server/storage/metricsMemoryRepo.go

@@ -1,8 +1,10 @@
 package storage
 
+type MetricMap map[string]MetricValue
+
 type MetricStorager interface {
 	Update(key string, value MetricValue) error
 	Read(key string, metricType string) (MetricValue, error)
-	ReadAll() map[string]MetricValue
+	ReadAll() map[string]MetricMap
 	Close() error
 }