From ce7ee1dc0bcbc248555e3ec8209de8b0231e76e4 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Fri, 28 Jan 2022 20:21:01 +0100
Subject: [PATCH] feat(db): use userOSVersion & revID from session structure
 feat(db): session structure annotate more attributes

---
 backend/pkg/db/postgres/session.go | 18 +++++++++---------
 backend/pkg/db/types/session.go    | 22 +++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/backend/pkg/db/postgres/session.go b/backend/pkg/db/postgres/session.go
index fe7f2c506..4f9a1fea6 100644
--- a/backend/pkg/db/postgres/session.go
+++ b/backend/pkg/db/postgres/session.go
@@ -9,7 +9,7 @@ import (
 
 func (conn *Conn) GetSession(sessionID uint64) (*Session, error) {
 	s := &Session{ SessionID: sessionID }
-	var revID, userOSVersion *string
+	//var revID, userOSVersion *string
 	if err := conn.queryRow(`
 		SELECT platform,
 			duration, project_id, start_ts,
@@ -25,9 +25,9 @@ func (conn *Conn) GetSession(sessionID uint64) (*Session, error) {
 		sessionID,
 	).Scan(&s.Platform,
 			&s.Duration, &s.ProjectID, &s.Timestamp,
-			&s.UserUUID, &s.UserOS, &userOSVersion,
+			&s.UserUUID, &s.UserOS, &s.UserOSVersion,
 			&s.UserDevice, &s.UserDeviceType, &s.UserCountry,
-			&revID, &s.TrackerVersion,
+			&s.RevID, &s.TrackerVersion,
 			&s.UserID, &s.UserAnonymousID, 
 			&s.Metadata1, &s.Metadata2, &s.Metadata3, &s.Metadata4, &s.Metadata5,
 			&s.Metadata6, &s.Metadata7, &s.Metadata8, &s.Metadata9, &s.Metadata10); err != nil {
@@ -36,12 +36,12 @@ func (conn *Conn) GetSession(sessionID uint64) (*Session, error) {
 		log.Println(err)
 		return nil, err
 	}
-	if userOSVersion != nil { // TODO: choose format, make f
-		s.UserOSVersion = *userOSVersion
-	}
-	if revID != nil {
-		s.RevID = *revID
-	} 
+	//if userOSVersion != nil { // TODO: choose format, make f
+	//	s.UserOSVersion = *userOSVersion
+	//}
+	//if revID != nil {
+	//	s.RevID = *revID
+	//}
 	return s, nil
 }
 
diff --git a/backend/pkg/db/types/session.go b/backend/pkg/db/types/session.go
index d9c63cb94..f9d696223 100644
--- a/backend/pkg/db/types/session.go
+++ b/backend/pkg/db/types/session.go
@@ -1,18 +1,18 @@
 package types
 
 type Session struct {
-	SessionID      uint64
-	Timestamp      uint64
-	ProjectID      uint32
-	TrackerVersion string
-	RevID          string
-	UserUUID       string
-	UserOS         string
-	UserOSVersion  string
-	UserDevice     string
-	UserCountry    string
+	SessionID      uint64 `db:"session_id" json:"session_id;omitempty"`
+	Timestamp      uint64 `db:"start_ts" json:"start_ts;omitempty"`
+	ProjectID      uint32 `db:"project_id" json:"project_id;omitempty"`
+	TrackerVersion string `db:"tracker_version" json:"tracker_version;omitempty"`
+	RevID          string `db:"rev_id" json:"rev_id;omitempty"`
+	UserUUID       string `db:"user_uuid" json:"user_uuid;omitempty"`
+	UserOS         string `db:"user_os" json:"user_os;omitempty"`
+	UserOSVersion  string `db:"user_os_version" json:"user_os_version;omitempty"`
+	UserDevice     string `db:"user_device" json:"user_device;omitempty"`
+	UserCountry    string `db:"user_country" json:"user_country;omitempty"`
 
-	Duration        *uint64
+	Duration        *uint64 `db:"duration" json:"duration;omitempty"`
 	PagesCount      int
 	EventsCount     int
 	ErrorsCount     int