fix: feedback fixes

Author: Dominikkq

.mockery.yaml

@@ -36,6 +36,7 @@ packages:
   github.com/rsksmart/liquidity-provider-server/internal/entities/liquidity_provider:
     interfaces:
       LiquidityProviderRepository:
+      TrustedAccountRepository:
   github.com/rsksmart/liquidity-provider-server/internal/entities/quote:
       interfaces:
         PeginQuoteRepository:

OpenApi.yml

@@ -627,16 +627,21 @@ components:
         rsk:
           type: string
       type: object
+    TrustedAccountAddressRequest:
+      properties:
+        address:
+          type: string
+      type: object
     TrustedAccountRequest:
       properties:
         address:
           type: string
         btc_locking_cap:
-          type: string
+          $ref: '#/components/schemas/'
         name:
           type: string
         rbtc_locking_cap:
-          type: string
+          $ref: '#/components/schemas/'
       type: object
     pkg.AcceptQuoteRequest:
       properties:
@@ -675,11 +680,11 @@ components:
         address:
           type: string
         btc_locking_cap:
-          type: string
+          $ref: '#/components/schemas/'
         name:
           type: string
         rbtc_locking_cap:
-          type: string
+          $ref: '#/components/schemas/'
       type: object
 info:
   title: Liquidity Provider Server
@@ -758,25 +763,24 @@ paths:
           description: ""
       summary: Management Logout
   /management/trusted-accounts:
-    get:
-      description: ' Returns all trusted accounts'
-      responses:
-        "200":
-          description: ""
-      summary: Get Trusted Accounts
-    post:
-      description: ' Updates an existing trusted account'
+    delete:
+      description: ' Deletes a trusted account'
       requestBody:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/TrustedAccountRequest'
+              $ref: '#/components/schemas/TrustedAccountAddressRequest'
         required: true
       responses:
         "204":
           description: ""
-      summary: Update Trusted Account
-  /management/trusted-accounts/add:
+      summary: Delete Trusted Account
+    get:
+      description: ' Returns all trusted accounts'
+      responses:
+        "200":
+          description: ""
+      summary: Get Trusted Accounts
     post:
       description: ' Adds a new trusted account'
       requestBody:
@@ -789,19 +793,18 @@ paths:
         "204":
           description: ""
       summary: Add Trusted Account
-  /management/trusted-accounts/delete:
-    post:
-      description: ' Deletes a trusted account'
+    put:
+      description: ' Updates an existing trusted account'
       requestBody:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/'
+              $ref: '#/components/schemas/TrustedAccountRequest'
         required: true
       responses:
         "204":
           description: ""
-      summary: Delete Trusted Account
+      summary: Update Trusted Account
   /pegin/acceptQuote:
     post:
       description: ' Accepts Quote'

internal/adapters/dataproviders/database/mongo/liquidity_provider.go

@@ -13,7 +13,6 @@ import (
 )
 
 const LiquidityProviderCollection = "liquidityProvider"
-const TrustedAccountCollection = "trustedAccounts"
 
 type ConfigurationName string
 
@@ -37,10 +36,6 @@ func NewLiquidityProviderRepository(conn *Connection) liquidity_provider.Liquidi
 	return &lpMongoRepository{conn: conn}
 }
 
-func NewTrustedAccountRepository(conn *Connection) liquidity_provider.TrustedAccountRepository {
-	return &lpMongoRepository{conn: conn}
-}
-
 func (repo *lpMongoRepository) GetPeginConfiguration(ctx context.Context) (*entities.Signed[liquidity_provider.PeginConfiguration], error) {
 	dbCtx, cancel := context.WithTimeout(ctx, repo.conn.timeout)
 	defer cancel()
@@ -105,92 +100,6 @@ func (repo *lpMongoRepository) UpsertCredentials(ctx context.Context, credential
 	return upsertConfiguration(dbCtx, repo, configToStore, false)
 }
 
-func (repo *lpMongoRepository) GetTrustedAccount(ctx context.Context, address string) (*liquidity_provider.TrustedAccountDetails, error) {
-	dbCtx, cancel := context.WithTimeout(ctx, repo.conn.timeout)
-	defer cancel()
-	account := &liquidity_provider.TrustedAccountDetails{}
-	collection := repo.conn.Collection(TrustedAccountCollection)
-	filter := bson.M{"address": address}
-	err := collection.FindOne(dbCtx, filter).Decode(account)
-	if errors.Is(err, mongo.ErrNoDocuments) {
-		return nil, liquidity_provider.ErrTrustedAccountNotFound
-	} else if err != nil {
-		return nil, err
-	}
-	logDbInteraction(Read, account)
-	return account, nil
-}
-
-func (repo *lpMongoRepository) GetAllTrustedAccounts(ctx context.Context) ([]liquidity_provider.TrustedAccountDetails, error) {
-	dbCtx, cancel := context.WithTimeout(ctx, repo.conn.timeout)
-	defer cancel()
-	collection := repo.conn.Collection(TrustedAccountCollection)
-	cursor, err := collection.Find(dbCtx, bson.M{})
-	if err != nil {
-		return nil, err
-	}
-	defer cursor.Close(dbCtx)
-	var accounts []liquidity_provider.TrustedAccountDetails
-	if err = cursor.All(dbCtx, &accounts); err != nil {
-		return nil, err
-	}
-	logDbInteraction(Read, accounts)
-	return accounts, nil
-}
-
-func (repo *lpMongoRepository) AddTrustedAccount(ctx context.Context, account liquidity_provider.TrustedAccountDetails) error {
-	dbCtx, cancel := context.WithTimeout(ctx, repo.conn.timeout)
-	defer cancel()
-	collection := repo.conn.Collection(TrustedAccountCollection)
-	existingAccount, err := repo.GetTrustedAccount(ctx, account.Address)
-	if err == nil && existingAccount != nil {
-		return liquidity_provider.ErrDuplicateAddress
-	} else if err != nil && !errors.Is(err, liquidity_provider.ErrTrustedAccountNotFound) {
-		return err
-	}
-	_, err = collection.InsertOne(dbCtx, account)
-	if err != nil {
-		return err
-	}
-	logDbInteraction(Insert, account)
-	return nil
-}
-
-func (repo *lpMongoRepository) UpdateTrustedAccount(ctx context.Context, account liquidity_provider.TrustedAccountDetails) error {
-	dbCtx, cancel := context.WithTimeout(ctx, repo.conn.timeout)
-	defer cancel()
-	collection := repo.conn.Collection(TrustedAccountCollection)
-	_, err := repo.GetTrustedAccount(ctx, account.Address)
-	if err != nil && !errors.Is(err, liquidity_provider.ErrTrustedAccountNotFound) {
-		return err
-	}
-	filter := bson.M{"address": account.Address}
-	opts := options.Update().SetUpsert(true)
-	update := bson.M{"$set": account}
-	_, err = collection.UpdateOne(dbCtx, filter, update, opts)
-	if err != nil {
-		return err
-	}
-	logDbInteraction(Insert, account)
-	return nil
-}
-
-func (repo *lpMongoRepository) DeleteTrustedAccount(ctx context.Context, address string) error {
-	dbCtx, cancel := context.WithTimeout(ctx, repo.conn.timeout)
-	defer cancel()
-	collection := repo.conn.Collection(TrustedAccountCollection)
-	filter := bson.M{"address": address}
-	result, err := collection.DeleteOne(dbCtx, filter)
-	if err != nil {
-		return err
-	}
-	if result.DeletedCount == 0 {
-		return liquidity_provider.ErrTrustedAccountNotFound
-	}
-	logDbInteraction(Delete, filter)
-	return nil
-}
-
 func upsertConfigurationVerbose[C liquidity_provider.ConfigurationType](
 	ctx context.Context,
 	repo *lpMongoRepository,