Add template for index page, fix loading metrics from file

Efim27 · Efim27 · commit 5ee1567f6a97 · 2022-06-24T00:09:18.000+03:00
diff --git a/internal/server/config/config.go b/internal/server/config/config.go
@@ -15,8 +15,9 @@ type StoreConfig struct {
 }
 
 type Config struct {
-	ServerAddr string `env:"ADDRESS"` //host:port
-	Store      StoreConfig
+	ServerAddr       string `env:"ADDRESS"` //host:port
+	TemplatesAbsPath string `env:"TEMPLATES_ABS_PATH"`
+	Store            StoreConfig
 }
 
 func newConfig() *Config {
@@ -28,6 +29,7 @@ func newConfig() *Config {
 
 func (config *Config) initDefaultValues() {
 	config.ServerAddr = "127.0.0.1:8080"
+	config.TemplatesAbsPath = "./templates/index.html"
 	config.Store = StoreConfig{
 		Interval: time.Duration(300) * time.Second,
 		File:     "/tmp/devops-metrics-db.json",
diff --git a/internal/server/handlers/handlers.go b/internal/server/handlers/handlers.go
@@ -3,6 +3,7 @@ package handlers
 import (
 	"encoding/json"
 	"fmt"
+	"html/template"
 	"log"
 	"net/http"
 	"strconv"
@@ -103,7 +104,7 @@ func UpdateNotImplementedPost(rw http.ResponseWriter, request *http.Request) {
 	rw.Write([]byte("Not implemented"))
 }
 
-func PrintStatsValues(rw http.ResponseWriter, request *http.Request, metricsMemoryRepo storage.MetricStorager) {
+func PrintStatsValuesOld(rw http.ResponseWriter, request *http.Request, metricsMemoryRepo storage.MetricStorager) {
 	htmlTemplate := `
 <html>
     <head>
@@ -126,6 +127,16 @@ func PrintStatsValues(rw http.ResponseWriter, request *http.Request, metricsMemo
 	rw.Write([]byte(htmlPage))
 }
 
+func PrintStatsValues(rw http.ResponseWriter, request *http.Request, metricsMemoryRepo storage.MetricStorager, templatesPath string) {
+	t, err := template.ParseFiles(templatesPath)
+	if err != nil {
+		fmt.Println("Cant parse template ", err)
+		return
+	}
+
+	err = t.Execute(rw, metricsMemoryRepo.ReadAll())
+}
+
 //JSONStatValue get stat value via json
 func JSONStatValue(rw http.ResponseWriter, request *http.Request, metricsMemoryRepo storage.MetricStorager) {
 	var InputMetricsJSON struct {
diff --git a/internal/server/server/server.go b/internal/server/server/server.go
@@ -19,7 +19,7 @@ type Server struct {
 	startTime time.Time
 }
 
-func newRouter(metricsMemoryRepo storage.MetricStorager) chi.Router {
+func newRouter(metricsMemoryRepo storage.MetricStorager, templatesPath string) chi.Router {
 	router := chi.NewRouter()
 
 	router.Use(chimiddleware.RequestID)
@@ -30,7 +30,7 @@ func newRouter(metricsMemoryRepo storage.MetricStorager) chi.Router {
 
 	//Маршруты
 	router.Get("/", func(writer http.ResponseWriter, request *http.Request) {
-		handlers.PrintStatsValues(writer, request, metricsMemoryRepo)
+		handlers.PrintStatsValues(writer, request, metricsMemoryRepo, templatesPath)
 	})
 
 	//json handler
@@ -74,7 +74,7 @@ func (server *Server) Run() {
 	if server.config.Store.Restore {
 		metricsMemoryRepo.InitFromFile()
 	}
-	server.chiRouter = newRouter(metricsMemoryRepo)
+	server.chiRouter = newRouter(metricsMemoryRepo, server.config.TemplatesAbsPath)
 
 	log.Fatal(http.ListenAndServe(server.config.ServerAddr, server.chiRouter))
 }
diff --git a/internal/server/storage/metricsMemoryRepo.go b/internal/server/storage/metricsMemoryRepo.go
@@ -176,10 +176,12 @@ func (metricsMemoryRepo MetricsMemoryRepo) InitFromFile() {
 	}
 	defer file.Close()
 
-	var stateValues map[string]MetricValue
-	json.NewDecoder(file).Decode(&stateValues)
+	var metricsDump map[string]MetricMap
+	json.NewDecoder(file).Decode(&metricsDump)
 
-	metricsMemoryRepo.InitStateValues(stateValues)
+	for _, metricList := range metricsDump {
+		metricsMemoryRepo.InitStateValues(metricList)
+	}
 }
 
 func (metricsMemoryRepo MetricsMemoryRepo) InitStateValues(DBSchema map[string]MetricValue) {
diff --git a/templates/index.html b/templates/index.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>All metrics</title>
+</head>
+<body>
+    {{ range $metricType, $metricList := . }}
+    <div class="metrics-list">
+        <h3 class="metrics-list__header">{{ $metricType }} values:</h3>
+        <div class="metrics-list__values" style="margin-left: 20px;">
+            {{ range $metricID, $metricValue := $metricList }}
+                <div class="metrics-list__value"><b>{{ $metricID }}</b>: {{ $metricValue.GetStringValue }}</div>
+            {{ end }}
+        </div>
+    </div>
+    {{ end }}
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -176,10 +176,12 @@ func (metricsMemoryRepo MetricsMemoryRepo) InitFromFile() {`
`176`	`176`	`}`
`177`	`177`	`defer file.Close()`
`178`	`178`
`179`		`- var stateValues map[string]MetricValue`
`180`		`- json.NewDecoder(file).Decode(&stateValues)`
	`179`	`+ var metricsDump map[string]MetricMap`
	`180`	`+ json.NewDecoder(file).Decode(&metricsDump)`
`181`	`181`
`182`		`- metricsMemoryRepo.InitStateValues(stateValues)`
	`182`	`+ for _, metricList := range metricsDump {`
	`183`	`+ metricsMemoryRepo.InitStateValues(metricList)`
	`184`	`+ }`
`183`	`185`	`}`
`184`	`186`
`185`	`187`	`func (metricsMemoryRepo MetricsMemoryRepo) InitStateValues(DBSchema map[string]MetricValue) {`