From 0495d4c72f45254f05cf77633717f1f57fcccacc Mon Sep 17 00:00:00 2001
From: Maxim Lebedev <git@toby3d.me>
Date: Sun, 30 Jan 2022 00:56:27 +0500
Subject: [PATCH] :card_file_box: Added Get method for sessions repository

---
 internal/session/repository.go                |  4 ++--
 .../repository/memory/memory_session.go       | 23 +++++++++++++++----
 .../repository/sqlite3/sqlite3_session.go     | 12 ++++++++++
 .../sqlite3/sqlite3_session_test.go           | 18 +++++++++++++++
 4 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/internal/session/repository.go b/internal/session/repository.go
index 9645ea4..adb885e 100644
--- a/internal/session/repository.go
+++ b/internal/session/repository.go
@@ -2,15 +2,15 @@ package session
 
 import (
 	"context"
-	"errors"
 
 	"source.toby3d.me/website/indieauth/internal/domain"
 )
 
 type Repository interface {
+	Get(ctx context.Context, code string) (*domain.Session, error)
 	Create(ctx context.Context, session *domain.Session) error
 	GetAndDelete(ctx context.Context, code string) (*domain.Session, error)
 	GC()
 }
 
-var ErrNotExist = errors.New("session not exist")
+var ErrNotExist error = domain.NewError(domain.ErrorCodeServerError, "session with this code not exist", "")
diff --git a/internal/session/repository/memory/memory_session.go b/internal/session/repository/memory/memory_session.go
index 9f69a20..13b20f1 100644
--- a/internal/session/repository/memory/memory_session.go
+++ b/internal/session/repository/memory/memory_session.go
@@ -2,6 +2,7 @@ package memory
 
 import (
 	"context"
+	"fmt"
 	"path"
 	"sync"
 	"time"
@@ -40,15 +41,29 @@ func (repo *memorySessionRepository) Create(_ context.Context, state *domain.Ses
 	return nil
 }
 
-func (repo *memorySessionRepository) GetAndDelete(_ context.Context, code string) (*domain.Session, error) {
-	src, ok := repo.store.LoadAndDelete(path.Join(DefaultPathPrefix, code))
+func (repo *memorySessionRepository) Get(_ context.Context, code string) (*domain.Session, error) {
+	src, ok := repo.store.Load(path.Join(DefaultPathPrefix, code))
 	if !ok {
-		return nil, session.ErrNotExist
+		return nil, fmt.Errorf("cannot find session in store: %w", session.ErrNotExist)
 	}
 
 	result, ok := src.(*Session)
 	if !ok {
-		return nil, session.ErrNotExist
+		return nil, fmt.Errorf("cannot decode session in store: %w", session.ErrNotExist)
+	}
+
+	return result.Session, nil
+}
+
+func (repo *memorySessionRepository) GetAndDelete(_ context.Context, code string) (*domain.Session, error) {
+	src, ok := repo.store.LoadAndDelete(path.Join(DefaultPathPrefix, code))
+	if !ok {
+		return nil, fmt.Errorf("cannot find session in store: %w", session.ErrNotExist)
+	}
+
+	result, ok := src.(*Session)
+	if !ok {
+		return nil, fmt.Errorf("cannot decode session in store: %w", session.ErrNotExist)
 	}
 
 	return result.Session, nil
diff --git a/internal/session/repository/sqlite3/sqlite3_session.go b/internal/session/repository/sqlite3/sqlite3_session.go
index d81cd1c..90b4132 100644
--- a/internal/session/repository/sqlite3/sqlite3_session.go
+++ b/internal/session/repository/sqlite3/sqlite3_session.go
@@ -71,6 +71,18 @@ func (repo *sqlite3SessionRepository) Create(ctx context.Context, session *domai
 	return nil
 }
 
+func (repo *sqlite3SessionRepository) Get(ctx context.Context, code string) (*domain.Session, error) {
+	s := new(Session)
+	if err := repo.db.GetContext(ctx, s, QueryTable+QueryGet, code); err != nil {
+		return nil, fmt.Errorf("cannot find session in db: %w", err)
+	}
+
+	result := new(domain.Session)
+	s.Populate(result)
+
+	return result, nil
+}
+
 func (repo *sqlite3SessionRepository) GetAndDelete(ctx context.Context, code string) (*domain.Session, error) {
 	s := new(Session)
 
diff --git a/internal/session/repository/sqlite3/sqlite3_session_test.go b/internal/session/repository/sqlite3/sqlite3_session_test.go
index c8cb9d2..c3aa7b2 100644
--- a/internal/session/repository/sqlite3/sqlite3_session_test.go
+++ b/internal/session/repository/sqlite3/sqlite3_session_test.go
@@ -32,6 +32,22 @@ func TestCreate(t *testing.T) {
 	assert.Equal(t, session.Code, result.Code)
 }
 
+func TestGet(t *testing.T) {
+	t.Parallel()
+
+	db, cleanup := sqltest.Open(t)
+	t.Cleanup(cleanup)
+
+	session := domain.TestSession(t)
+	_, err := db.NamedExec(repository.QueryTable+repository.QueryCreate, repository.NewSession(session))
+	require.NoError(t, err)
+
+	result, err := repository.NewSQLite3SessionRepository(domain.TestConfig(t), db).
+		Get(context.Background(), session.Code)
+	require.NoError(t, err)
+	assert.Equal(t, session.Code, result.Code)
+}
+
 func TestGetAndDelete(t *testing.T) {
 	t.Parallel()
 
@@ -46,4 +62,6 @@ func TestGetAndDelete(t *testing.T) {
 		GetAndDelete(context.Background(), session.Code)
 	require.NoError(t, err)
 	assert.Equal(t, session.Code, result.Code)
+
+	assert.Error(t, db.Get(result, repository.QueryGet, session.Code), "session MUST be destroyed after successful"+" query")
 }