From df8aed34647cdfcb4ce5b431eb185180ed96a2dc Mon Sep 17 00:00:00 2001
From: Alexander Zavorotynskiy <zavorotynskiy@pm.me>
Date: Fri, 4 Nov 2022 09:40:11 +0100
Subject: [PATCH] feat(backend): get fresh session from db only on SessionEnd
 message

---
 backend/cmd/db/main.go                     | 11 ++++++++++-
 backend/pkg/db/cache/cache.go              |  1 -
 backend/pkg/db/cache/messages-common.go    |  7 +------
 backend/pkg/db/cache/session.go            | 17 -----------------
 backend/pkg/db/postgres/messages-common.go |  9 ++-------
 5 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/backend/cmd/db/main.go b/backend/cmd/db/main.go
index bc25191c8..c9916b03d 100644
--- a/backend/cmd/db/main.go
+++ b/backend/cmd/db/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"errors"
 	"log"
+	types2 "openreplay/backend/pkg/db/types"
 	"openreplay/backend/pkg/queue/types"
 	"os"
 	"os/signal"
@@ -77,7 +78,15 @@ func main() {
 			return
 		}
 
-		session, err := pg.Cache.GetSession(msg.SessionID())
+		var (
+			session *types2.Session
+			err     error
+		)
+		if msg.TypeID() == messages.MsgSessionEnd {
+			session, err = pg.GetSession(msg.SessionID())
+		} else {
+			session, err = pg.Cache.GetSession(msg.SessionID())
+		}
 		if session == nil {
 			if err != nil && !errors.Is(err, cache.NilSessionInCacheError) {
 				log.Printf("Error on session retrieving from cache: %v, SessionID: %v, Message: %v", err, msg.SessionID(), msg)
diff --git a/backend/pkg/db/cache/cache.go b/backend/pkg/db/cache/cache.go
index 7913547a6..99ec50724 100644
--- a/backend/pkg/db/cache/cache.go
+++ b/backend/pkg/db/cache/cache.go
@@ -22,7 +22,6 @@ type Cache interface {
 	SetSession(sess *types.Session)
 	HasSession(sessID uint64) bool
 	GetSession(sessID uint64) (*types.Session, error)
-	SetSessionDuration(sessID, duration uint64) error
 	GetProject(projectID uint32) (*types.Project, error)
 	GetProjectByKey(projectKey string) (*types.Project, error)
 }
diff --git a/backend/pkg/db/cache/messages-common.go b/backend/pkg/db/cache/messages-common.go
index 717922756..3fc52f395 100644
--- a/backend/pkg/db/cache/messages-common.go
+++ b/backend/pkg/db/cache/messages-common.go
@@ -15,13 +15,8 @@ func (c *PGCache) InsertSessionEncryptionKey(sessionID uint64, key []byte) error
 }
 
 func (c *PGCache) HandleSessionEnd(sessionID uint64) error {
-	dur, err := c.Conn.HandleSessionEnd(sessionID)
-	if err != nil {
+	if err := c.Conn.HandleSessionEnd(sessionID); err != nil {
 		log.Printf("can't handle session end: %s", err)
-		return nil
-	}
-	if err := c.Cache.SetSessionDuration(sessionID, dur); err != nil {
-		log.Printf("can't update session duration: %s", err)
 	}
 	return nil
 }
diff --git a/backend/pkg/db/cache/session.go b/backend/pkg/db/cache/session.go
index 0647531d6..f03f1e955 100644
--- a/backend/pkg/db/cache/session.go
+++ b/backend/pkg/db/cache/session.go
@@ -2,7 +2,6 @@ package cache
 
 import (
 	"errors"
-	"fmt"
 	"github.com/jackc/pgx/v4"
 	. "openreplay/backend/pkg/db/types"
 	"time"
@@ -50,19 +49,3 @@ func (c *cacheImpl) GetSession(sessionID uint64) (*Session, error) {
 	c.sessions[sessionID] = &SessionMeta{s, time.Now()}
 	return s, nil
 }
-
-func (c *cacheImpl) SetSessionDuration(sessID, duration uint64) error {
-	if duration <= 0 {
-		return fmt.Errorf("session duration wrong value, val: %d", duration)
-	}
-
-	c.mutex.Lock()
-	defer c.mutex.Unlock()
-
-	// Updating session duration to avoid insert errors in CH
-	sess, ok := c.sessions[sessID]
-	if ok && sess.Session != nil {
-		sess.Session.Duration = &duration
-	}
-	return nil
-}
diff --git a/backend/pkg/db/postgres/messages-common.go b/backend/pkg/db/postgres/messages-common.go
index e2bb73241..fca11ce88 100644
--- a/backend/pkg/db/postgres/messages-common.go
+++ b/backend/pkg/db/postgres/messages-common.go
@@ -86,8 +86,7 @@ func (conn *Conn) InsertSessionEncryptionKey(sessionID uint64, key []byte) error
 	return conn.c.Exec(`UPDATE sessions SET file_key = $2 WHERE session_id = $1`, sessionID, string(key))
 }
 
-func (conn *Conn) HandleSessionEnd(sessionID uint64) (uint64, error) {
-	var dur uint64
+func (conn *Conn) HandleSessionEnd(sessionID uint64) error {
 	sqlRequest := `
 	UPDATE sessions
 		SET issue_types=(SELECT 
@@ -100,12 +99,8 @@ func (conn *Conn) HandleSessionEnd(sessionID uint64) (uint64, error) {
 		INNER JOIN issues AS ps USING (issue_id)
 		WHERE session_id = $1)
 	WHERE session_id = $1
-	RETURNING duration
 	`
-	if err := conn.c.QueryRow(sqlRequest, sessionID).Scan(&dur); err != nil {
-		return 0, err
-	}
-	return dur, nil
+	return conn.c.Exec(sqlRequest, sessionID)
 }
 
 func (conn *Conn) InsertRequest(sessionID uint64, timestamp uint64, index uint32, url string, duration uint64, success bool) error {