intent: remove prisma from postgres store

Author: Jeff Yanta

chat/postgres/server_test.go

@@ -6,12 +6,11 @@ import (
 	"context"
 	"testing"
 
-	prismatest "github.com/code-payments/flipchat-server/database/prisma/test"
 	"github.com/stretchr/testify/require"
 
 	account "github.com/code-payments/flipchat-server/account/postgres"
 	intent "github.com/code-payments/flipchat-server/intent/postgres"
-	messaging "github.com/code-payments/flipchat-server/messaging/memory"
+	messaging "github.com/code-payments/flipchat-server/messaging/postgres"
 	profile "github.com/code-payments/flipchat-server/profile/postgres"
 
 	"github.com/code-payments/flipchat-server/chat/tests"
@@ -25,19 +24,17 @@ func TestChat_PostgresServer(t *testing.T) {
 	require.NoError(t, err)
 	defer pool.Close()
 
-	client, disconnect := prismatest.NewTestClient(testEnv.DatabaseUrl, t)
-	defer disconnect()
-
 	chats := NewInPostgres(pool)
 	accounts := account.NewInPostgres(pool)
 	profiles := profile.NewInPostgres(pool)
-	intents := intent.NewInPostgres(client)
-	messages := messaging.NewInMemory() // TODO: Implement Postgres messaging
+	intents := intent.NewInPostgres(pool)
+	messages := messaging.NewInPostgresMessages(pool)
+	pointers := messaging.NewInPostgresPointers(pool)
 
 	teardown := func() {
 		chats.(*store).reset()
 	}
 
 	tests.RunServerTests(
-		t, accounts, profiles, chats, messages, messages, intents, teardown)
+		t, accounts, profiles, chats, messages, pointers, intents, teardown)
 }

intent/postgres/model.go

@@ -0,0 +1,39 @@
+package postgres
+
+import (
+	"context"
+
+	"github.com/georgysavva/scany/v2/pgxscan"
+	"github.com/jackc/pgx/v5/pgxpool"
+
+	commonpb "github.com/code-payments/flipchat-protobuf-api/generated/go/common/v1"
+
+	pg "github.com/code-payments/flipchat-server/database/postgres"
+)
+
+const (
+	intentsTableName = `flipchat_intents`
+	allIntentFields  = `"id", "isFulfilled", "createdAt", "updatedAt"`
+)
+
+func dbIsFulfilled(ctx context.Context, pool *pgxpool.Pool, id *commonpb.IntentId) (bool, error) {
+	var res bool
+	query := `SELECT "isFulfilled" FROM ` + intentsTableName + ` WHERE "id" = $1`
+	err := pgxscan.Get(
+		ctx,
+		pool,
+		&res,
+		query,
+		pg.Encode(id.Value),
+	)
+	if pgxscan.NotFound(err) {
+		return false, nil
+	}
+	return res, err
+}
+
+func dbMarkFulfilled(ctx context.Context, pool *pgxpool.Pool, id *commonpb.IntentId) error {
+	query := `INSERT INTO ` + intentsTableName + ` (` + allIntentFields + `) VALUES ($1, true, NOW(), NOW()) ON CONFLICT ("id") DO NOTHING`
+	_, err := pool.Exec(ctx, query, pg.Encode(id.Value))
+	return err
+}

intent/postgres/store.go

@@ -2,14 +2,10 @@ package postgres
 
 import (
 	"context"
-	"errors"
 
 	commonpb "github.com/code-payments/flipchat-protobuf-api/generated/go/common/v1"
-	pg "github.com/code-payments/flipchat-server/database/postgres"
+	"github.com/jackc/pgx/v5/pgxpool"
 
-	"github.com/code-payments/code-server/pkg/metrics"
-
-	"github.com/code-payments/flipchat-server/database/prisma/db"
 	"github.com/code-payments/flipchat-server/intent"
 )
 
@@ -18,79 +14,32 @@ const (
 )
 
 type store struct {
-	client *db.PrismaClient
+	pool *pgxpool.Pool
 }
 
-func NewInPostgres(client *db.PrismaClient) intent.Store {
+func NewInPostgres(pool *pgxpool.Pool) intent.Store {
 	return &store{
-		client,
-	}
-}
-
-func (s *store) reset() {
-	ctx := context.Background()
-
-	intents := s.client.Intent.FindMany().Delete().Tx()
-
-	err := s.client.Prisma.Transaction(intents).Exec(ctx)
-	if err != nil {
-		panic(err)
+		pool: pool,
 	}
 }
 
 func (s *store) IsFulfilled(ctx context.Context, id *commonpb.IntentId) (bool, error) {
-	tracer := metrics.TraceMethodCall(ctx, metricsStructName, "GetChatID")
-	defer tracer.End()
-
-	res, err := func() (bool, error) {
-		encodedIntentID := pg.Encode(id.Value, pg.Base58)
-
-		intent, err := s.client.Intent.FindFirst(
-			db.Intent.ID.Equals(encodedIntentID),
-		).Exec(ctx)
-
-		if errors.Is(err, db.ErrNotFound) || intent == nil {
-			return false, nil
-		}
-
-		return intent.IsFulfilled, nil
-	}()
-
-	tracer.OnError(err)
-
-	return res, err
+	return dbIsFulfilled(ctx, s.pool, id)
 }
 
 func (s *store) MarkFulfilled(ctx context.Context, id *commonpb.IntentId) error {
-	tracer := metrics.TraceMethodCall(ctx, metricsStructName, "MarkFulfilled")
-	defer tracer.End()
-
-	err := func() error {
-		encodedIntentID := pg.Encode(id.Value, pg.Base58)
-
-		ok, err := s.IsFulfilled(ctx, id)
-		if err != nil {
-			return err
-		}
-
-		if ok {
-			return intent.ErrAlreadyFulfilled
-		}
-
-		// Upsert the intent with the new fulfilled status
-		_, err = s.client.Intent.UpsertOne(
-			db.Intent.ID.Equals(encodedIntentID),
-		).Create(
-			db.Intent.ID.Set(encodedIntentID),
-			db.Intent.IsFulfilled.Set(true),
-		).Update(
-			db.Intent.IsFulfilled.Set(true),
-		).Exec(ctx)
-
+	isFulfilled, err := dbIsFulfilled(ctx, s.pool, id)
+	if err != nil {
 		return err
-	}()
-
-	tracer.OnError(err)
+	} else if isFulfilled {
+		return intent.ErrAlreadyFulfilled
+	}
+	return dbMarkFulfilled(ctx, s.pool, id)
+}
 
-	return err
+func (s *store) reset() {
+	_, err := s.pool.Exec(context.Background(), "DELETE FROM "+intentsTableName)
+	if err != nil {
+		panic(err)
+	}
 }

intent/postgres/store_test.go

@@ -3,20 +3,23 @@
 package postgres
 
 import (
+	"context"
 	"testing"
 
-	prismatest "github.com/code-payments/flipchat-server/database/prisma/test"
+	"github.com/stretchr/testify/require"
 
 	"github.com/code-payments/flipchat-server/intent/tests"
 
+	"github.com/jackc/pgx/v5/pgxpool"
 	_ "github.com/jackc/pgx/v5/stdlib"
 )
 
 func TestIntent_PostgresStore(t *testing.T) {
-	client, disconnect := prismatest.NewTestClient(testEnv.DatabaseUrl, t)
-	defer disconnect()
+	pool, err := pgxpool.New(context.Background(), testEnv.DatabaseUrl)
+	require.NoError(t, err)
+	defer pool.Close()
 
-	testStore := NewInPostgres(client)
+	testStore := NewInPostgres(pool)
 	teardown := func() {
 		testStore.(*store).reset()
 	}

messaging/postgres/server_test.go

@@ -10,7 +10,6 @@ import (
 
 	account "github.com/code-payments/flipchat-server/account/postgres"
 	chat "github.com/code-payments/flipchat-server/chat/postgres"
-	prismatest "github.com/code-payments/flipchat-server/database/prisma/test"
 	intent "github.com/code-payments/flipchat-server/intent/postgres"
 
 	"github.com/code-payments/flipchat-server/messaging/tests"
@@ -24,12 +23,9 @@ func TestMessaging_PostgresServer(t *testing.T) {
 	require.NoError(t, err)
 	defer pool.Close()
 
-	client, disconnect := prismatest.NewTestClient(testEnv.DatabaseUrl, t)
-	defer disconnect()
-
 	accounts := account.NewInPostgres(pool)
 	chats := chat.NewInPostgres(pool)
-	intents := intent.NewInPostgres(client)
+	intents := intent.NewInPostgres(pool)
 	messages := NewInPostgresMessages(pool)
 	pointers := NewInPostgresPointers(pool)