[template] Improve last articles from week (#4)

* Add changelogs

* Add author name to the latest articles from week

* Add count of days since last article in DB

changelogs/v0.2.0.md

@@ -0,0 +1,3 @@
+## Changelog v0.2.0
+
+* The date of generation and a link to the utility have been added to the header of the document. ([#3](https://github.com/Zhbert/colligendis/pull/3))

internal/common/structs/structs.go

@@ -22,6 +22,7 @@
 package structs
 
 import (
+	"colligendis/internal/db_service/domain"
 	"time"
 )
 
@@ -46,11 +47,13 @@ type HabrArticle struct {
 }
 
 type StatsArticle struct {
-	Id     int
-	Name   string
-	Date   time.Time
-	Views  int
-	Growth int
+	Id        int
+	Name      string
+	Date      time.Time
+	Views     int
+	Growth    int
+	Author    domain.HabrAuthor
+	DayBefore int
 }
 
 type TemplateStruct struct {

internal/date_service/date_service.go

@@ -0,0 +1,12 @@
+package date_service
+
+import (
+	"time"
+)
+
+func GetDaysBefore(dateOfArticle time.Time, todayDate time.Time) int {
+
+	diff := todayDate.Sub(dateOfArticle).Hours() / 24
+
+	return int(diff)
+}

internal/db_service/habr_sqlite.go

@@ -25,6 +25,7 @@ import (
 	"colligendis/cmd/common"
 	"colligendis/internal/common/structs"
 	"colligendis/internal/common/text"
+	"colligendis/internal/date_service"
 	"colligendis/internal/db_service/domain"
 	"errors"
 	"gorm.io/driver/sqlite"
@@ -135,6 +136,22 @@ func getAuthor(db *gorm.DB, name string, flags *common.ColligendisFlags) domain.
 	}
 }
 
+func getAuthorByID(id uint) domain.HabrAuthor {
+	var author domain.HabrAuthor
+
+	db, err := gorm.Open(sqlite.Open("colligendis.db"),
+		&gorm.Config{Logger: logger.Default.LogMode(getLogger())})
+	if err != nil {
+		log.Fatal("Error opening db!")
+	} else {
+		result := db.Where("id = ?", id).First(&author)
+		if errors.Is(result.Error, gorm.ErrRecordNotFound) {
+			log.Println("There is no such author")
+		}
+	}
+	return author
+}
+
 func getHubs(db *gorm.DB, hubs []string, flags *common.ColligendisFlags) []domain.HabrHub {
 	createHubsIfNotExists(db, hubs, flags)
 	var hubsForDB []domain.HabrHub
@@ -339,6 +356,8 @@ func GetArticlesFormLastPeriod(dt time.Time, getAll bool, global bool) (int, []s
 			stat.Id = i
 			stat.Name = text.CleanText(a.Name)
 			stat.Date = a.DateOfPublication
+			stat.Author = getAuthorByID(a.Author.ID)
+			stat.DayBefore = date_service.GetDaysBefore(a.DateOfPublication, time.Now())
 			if len(stats) > 1 {
 				stat.Views = stats[1].Views
 				stat.Growth = stats[1].Views - stats[0].Views

templates/tex/preamble

@@ -18,6 +18,7 @@
 \usepackage[left=10mm, top=10mm, right=10mm, bottom=15mm, footskip=7mm]{geometry} % настройки полей документа
 \usepackage[active]{srcltx}
 \usepackage{indentfirst}
+\usepackage{awesomebox}
 \usepackage{listings}
 \usepackage{float}
 \usepackage{longtable}

templates/tex/stats.tmpl

@@ -26,13 +26,14 @@
         \subsubsection{Опубликованные на этой неделе статьи}
             \begin{table}[H]
             \begin{threeparttable}
-            \begin{tabularx}{\textwidth}{|X|l|l|}
+            \begin{tabularx}{\textwidth}{|X|l|l|l|l|}
             \hline
-            \textbf{Название статьи} & \textbf{Дата публикации} &  \textbf{Кол-во просмотров} \\ \hline
+            \textbf{Название статьи} & \textbf{Автор} & \textbf{Дата публикации} & \textbf{Дней назад*} & \textbf{Кол-во просмотров} \\ \hline
             {{ range .LatestArticlesFromWeek }}
-            {{ .Name }} & {{ .Date.Format "2006-01-02" }} & {{ .Growth }} \\ \hline
+            {{ .Name }} & {{ .Author.Name }} & {{ .Date.Format "2006-01-02" }} & {{ .DayBefore }} & {{ .Growth }} \\ \hline
             {{ end }}
             \end{tabularx}
+            \notebox{\textbf{*} — с даты генерации страницы. \newline Дата генерации страницы может отличаться от даты последней загрузки статистики в БД.}
             \caption{Статьи, опубликованные на этой неделе}
             \end{threeparttable}
             \end{table}