From 5decb8555295794d8e6ac8130085e9b4e7c6ceea Mon Sep 17 00:00:00 2001
From: Francesco Minnocci <ad17fmin@uwcad.it>
Date: Sun, 28 Aug 2022 11:16:07 +0200
Subject: [PATCH] chore: Refactor storia.go into its own module.

---
 cmd/phc-website-server/main.go | 5 +++--
 handler/handler.go             | 3 ++-
 storia.go => storia/storia.go  | 2 +-
 utenti.go                      | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename storia.go => storia/storia.go (99%)

diff --git a/cmd/phc-website-server/main.go b/cmd/phc-website-server/main.go
index 82bbf35..97a4f43 100644
--- a/cmd/phc-website-server/main.go
+++ b/cmd/phc-website-server/main.go
@@ -9,6 +9,7 @@ import (
 	"git.phc.dm.unipi.it/phc/website/config"
 	"git.phc.dm.unipi.it/phc/website/handler"
 	"git.phc.dm.unipi.it/phc/website/server"
+	"git.phc.dm.unipi.it/phc/website/storia"
 	"git.phc.dm.unipi.it/phc/website/templates"
 )
 
@@ -24,10 +25,10 @@ func main() {
 		),
 		NewsArticlesRegistry:  articles.NewRegistry("./_content/news"),
 		GuideArticlesRegistry: articles.NewRegistry("./_content/guide"),
-		ListaUtenti: &website.JsonFileListUtenti{
+		ListaUtenti: &website.JsonFileListaUtenti{
 			Path: "./utenti-poisson-2022.local.json",
 		},
-		Storia: &website.JsonFileStoria{
+		Storia: &storia.JsonFileStoria{
 			Path: "./storia.json",
 		},
 	}
diff --git a/handler/handler.go b/handler/handler.go
index 6227514..e76c889 100644
--- a/handler/handler.go
+++ b/handler/handler.go
@@ -10,6 +10,7 @@ import (
 	"git.phc.dm.unipi.it/phc/website/auth"
 	"git.phc.dm.unipi.it/phc/website/model"
 	"git.phc.dm.unipi.it/phc/website/rss"
+	"git.phc.dm.unipi.it/phc/website/storia"
 	"git.phc.dm.unipi.it/phc/website/templates"
 	"git.phc.dm.unipi.it/phc/website/util"
 )
@@ -51,7 +52,7 @@ type DefaultHandler struct {
 	NewsArticlesRegistry  *articles.Registry
 	GuideArticlesRegistry *articles.Registry
 	ListaUtenti           website.ListaUtentiService
-	Storia                website.StoriaService
+	Storia                storia.StoriaService
 }
 
 func (h *DefaultHandler) HandleStaticPage(w io.Writer, view string, ctx Context) error {
diff --git a/storia.go b/storia/storia.go
similarity index 99%
rename from storia.go
rename to storia/storia.go
index 7c13701..e163b35 100644
--- a/storia.go
+++ b/storia/storia.go
@@ -1,4 +1,4 @@
-package website
+package storia
 
 import (
 	"encoding/json"
diff --git a/utenti.go b/utenti.go
index 6cba391..c87e721 100644
--- a/utenti.go
+++ b/utenti.go
@@ -19,11 +19,11 @@ type ListaUtentiService interface {
 	GetUtenti() ([]UserInfo, error)
 }
 
-type JsonFileListUtenti struct {
+type JsonFileListaUtenti struct {
 	Path string
 }
 
-func (j *JsonFileListUtenti) GetUtenti() ([]UserInfo, error) {
+func (j *JsonFileListaUtenti) GetUtenti() ([]UserInfo, error) {
 	var users []UserInfo
 
 	usersJsonData, err := os.ReadFile(j.Path)