Browse Source

refactor: remove `model.UserSessions` struct

Julien Voisin 7 months ago
parent
commit
f2976bff5d
3 changed files with 5 additions and 13 deletions
  1. 0 10
      internal/model/user_session.go
  2. 2 2
      internal/storage/user_session.go
  3. 3 1
      internal/ui/session_list.go

+ 0 - 10
internal/model/user_session.go

@@ -28,13 +28,3 @@ func (u *UserSession) String() string {
 func (u *UserSession) UseTimezone(tz string) {
 	u.CreatedAt = timezone.Convert(tz, u.CreatedAt)
 }
-
-// UserSessions represents a list of sessions.
-type UserSessions []UserSession
-
-// UseTimezone converts creation date of all sessions to the given timezone.
-func (u UserSessions) UseTimezone(tz string) {
-	for _, session := range u {
-		session.UseTimezone(tz)
-	}
-}

+ 2 - 2
internal/storage/user_session.go

@@ -13,7 +13,7 @@ import (
 )
 
 // UserSessions returns the list of sessions for the given user.
-func (s *Storage) UserSessions(userID int64) (model.UserSessions, error) {
+func (s *Storage) UserSessions(userID int64) ([]model.UserSession, error) {
 	query := `
 		SELECT
 			id,
@@ -33,7 +33,7 @@ func (s *Storage) UserSessions(userID int64) (model.UserSessions, error) {
 	}
 	defer rows.Close()
 
-	var sessions model.UserSessions
+	var sessions []model.UserSession
 	for rows.Next() {
 		var session model.UserSession
 		err := rows.Scan(

+ 3 - 1
internal/ui/session_list.go

@@ -25,7 +25,9 @@ func (h *handler) showSessionsPage(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	sessions.UseTimezone(user.Timezone)
+	for _, sess := range sessions {
+		sess.UseTimezone(user.Timezone)
+	}
 
 	sess := session.New(h.store, request.SessionID(r))
 	view := view.New(h.tpl, r, sess)