From 7678e9d056a26ae267ae65a892f09ad329045f50 Mon Sep 17 00:00:00 2001
From: Alexander Zavorotynskiy <alexander@openreplay.com>
Date: Tue, 7 Jun 2022 13:44:20 +0200
Subject: [PATCH] fix(backend/db): fixed loss of sessions

---
 backend/cmd/db/main.go | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/backend/cmd/db/main.go b/backend/cmd/db/main.go
index 046862154..c46abd3f1 100644
--- a/backend/cmd/db/main.go
+++ b/backend/cmd/db/main.go
@@ -51,15 +51,6 @@ func main() {
 	handler := func(sessionID uint64, msg messages.Message, meta *types.Meta) {
 		statsLogger.Collect(sessionID, meta)
 
-		// Check if session in db and get session info for the following stats insertion (actually for CH case only)
-		session, err := pg.GetSession(sessionID)
-		if session == nil {
-			if err != nil {
-				log.Printf("Error on session retrieving from cache: %v, SessionID: %v, Message: %v", err, sessionID, msg)
-			}
-			return
-		}
-
 		// Just save session data into db without additional checks
 		if err := saver.InsertMessage(sessionID, msg); err != nil {
 			if !postgres.IsPkeyViolation(err) {
@@ -68,6 +59,14 @@ func main() {
 			return
 		}
 
+		session, err := pg.GetSession(sessionID)
+		if session == nil {
+			if err != nil {
+				log.Printf("Error on session retrieving from cache: %v, SessionID: %v, Message: %v", err, sessionID, msg)
+			}
+			return
+		}
+
 		// Save statistics to db
 		err = saver.InsertStats(session, msg)
 		if err != nil {