fixed db operations

api/gateway/mntx/storage/mongo/store/payouts.go

@@ -2,9 +2,7 @@ package store
 
 import (
 	"context"
-	"errors"
 	"strings"
-	"time"
 
 	storage "github.com/tech/sendico/gateway/mntx/storage"
 	"github.com/tech/sendico/gateway/mntx/storage/model"
@@ -12,9 +10,7 @@ import (
 	ri "github.com/tech/sendico/pkg/db/repository/index"
 	"github.com/tech/sendico/pkg/merrors"
 	"github.com/tech/sendico/pkg/mlogger"
-	"go.mongodb.org/mongo-driver/v2/bson"
 	"go.mongodb.org/mongo-driver/v2/mongo"
-	"go.mongodb.org/mongo-driver/v2/mongo/options"
 	"go.uber.org/zap"
 )
 
@@ -25,8 +21,8 @@ const (
 )
 
 type Payouts struct {
-	logger mlogger.Logger
-	coll   *mongo.Collection
+	logger     mlogger.Logger
+	repository repository.Repository
 }
 
 func NewPayouts(logger mlogger.Logger, db *mongo.Database) (*Payouts, error) {
@@ -50,38 +46,20 @@ func NewPayouts(logger mlogger.Logger, db *mongo.Database) (*Payouts, error) {
 	}
 
 	p := &Payouts{
-		logger: logger,
-		coll:   db.Collection(payoutsCollection),
+		logger:     logger,
+		repository: repo,
 	}
 	p.logger.Debug("Payouts store initialised")
 	return p, nil
 }
 
 func (p *Payouts) findOneByField(ctx context.Context, field, value string) (*model.CardPayout, error) {
-	value = strings.TrimSpace(value)
-	if value == "" {
-		return nil, merrors.InvalidArgument("lookup key is required", field)
-	}
-
-	var result model.CardPayout
-	err := p.coll.FindOne(ctx, bson.M{field: value}).Decode(&result)
-	if err == mongo.ErrNoDocuments {
-		return nil, nil
-	}
-	if err != nil {
-		if !errors.Is(err, context.Canceled) && !errors.Is(err, context.DeadlineExceeded) {
-			p.logger.Warn("Payout record lookup failed",
-				zap.String("field", field),
-				zap.String("value", value),
-				zap.Error(err))
-		}
-		return nil, err
-	}
-	return &result, nil
+	var res model.CardPayout
+	return &res, p.repository.FindOneByFilter(ctx, repository.Filter(field, value), &res)
 }
 
 func (p *Payouts) FindByIdempotencyKey(ctx context.Context, key string) (*model.CardPayout, error) {
-	return p.findOneByField(ctx, payoutIdemField, key) // operationRef
+	return p.findOneByField(ctx, payoutIdemField, key)
 }
 
 func (p *Payouts) FindByPaymentID(ctx context.Context, paymentID string) (*model.CardPayout, error) {
@@ -103,35 +81,7 @@ func (p *Payouts) Upsert(ctx context.Context, record *model.CardPayout) error {
 		return merrors.InvalidArgument("operation ref is required", "operation_ref")
 	}
 
-	now := time.Now()
-	if record.CreatedAt.IsZero() {
-		record.CreatedAt = now
-	}
-	record.UpdatedAt = now
-
-	// critical: never let caller override _id
-	record.ID = bson.NilObjectID
-
-	update := bson.M{
-		"$set": record,
-	}
-
-	_, err := p.coll.UpdateOne(
-		ctx,
-		bson.M{payoutIdemField: record.OperationRef},
-		update,
-		options.UpdateOne().SetUpsert(true),
-	)
-	if err != nil {
-		if !errors.Is(err, context.Canceled) && !errors.Is(err, context.DeadlineExceeded) {
-			p.logger.Warn("Failed to upsert payout record",
-				zap.String("operation_ref", record.OperationRef),
-				zap.String("payout_id", record.PayoutID),
-				zap.Error(err))
-		}
-		return err
-	}
-	return nil
+	return p.repository.Insert(ctx, record, repository.Filter(payoutIdemField, record.IdempotencyKey))
 }
 
 var _ storage.PayoutsStore = (*Payouts)(nil)