prevent to create wallets with duplicate name for same user

hsharghi · Aug 16, 2023 · 333a639 · 333a639
1 parent 0ea427d
commit 333a639
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/Sources/VaporWallet/Errors/WalletErrors.swift b/Sources/VaporWallet/Errors/WalletErrors.swift
@@ -2,6 +2,7 @@ import Vapor
 
 enum WalletError: DebuggableError {
     case walletNotFound(name: String)
+    case duplicateWalletType(name: String)
     case insufficientBalance
     case invalidTransaction(reason: String)
     case transactionFailed(reason: String)
@@ -13,10 +14,10 @@ extension WalletError: AbortError {
         case .walletNotFound(_):
             return .notFound
         case .insufficientBalance,
+                .transactionFailed(_),
+                .duplicateWalletType(_),
                 .invalidTransaction(_):
             return .badRequest
-        case .transactionFailed(_):
-            return .badRequest
         }
     }
 
@@ -28,6 +29,8 @@ extension WalletError: AbortError {
             return "Insufficient balance"
         case .transactionFailed(let reason):
             return "Transaction failed. Reason: \(reason)"
+        case .duplicateWalletType(let name):
+            return "Duplicate wallet type. Wallet type `\(name)` allready exists."
         case .invalidTransaction(reason: let reason):
             return "Transaction failed. Reason: \(reason)"
         }
@@ -41,6 +44,8 @@ extension WalletError: AbortError {
             return "insufficient_balance"
         case .transactionFailed(_):
             return "transaction_failed"
+        case .duplicateWalletType(_):
+            return "duplicate_wallet"
         case .invalidTransaction(_):
             return "invalid_transaction"
         }

diff --git a/Sources/VaporWallet/WalletRepository.swift b/Sources/VaporWallet/WalletRepository.swift
@@ -41,6 +41,13 @@ extension WalletsRepository {
     }
 
     public func create(type name: WalletType = .default, decimalPlaces: UInt8 = 2, minAllowedBalance: Int = 0) async throws {
+        guard try await Wallet.query(on: db)
+            .filter(\.$ownerType == self.type)
+            .filter(\.$owner == self.id)
+            .filter(\.$name == name.value)
+            .count() == 0 else {
+            throw WalletError.duplicateWalletType(name: name.value)
+        }
         let wallet: Wallet = Wallet(ownerType: self.type,
                                     ownerID: self.id,
                                     name: name.value,
@@ -65,9 +72,7 @@ extension WalletsRepository {
         if (withTransactions) {
             walletQuery = walletQuery.with(\.$transactions)
         }
-        let wallet = try await walletQuery.first()
-
-        guard let wallet = wallet else {
+        guard let wallet = try await walletQuery.first() else {
             throw WalletError.walletNotFound(name: name.value)
         }
         return wallet

diff --git a/Tests/VaporWalletTests/VaporWalletTests.swift b/Tests/VaporWalletTests/VaporWalletTests.swift
@@ -102,6 +102,14 @@ class VaporWalletTests: XCTestCase {
 
     }
 
+    func testCreateWalletWithDuplicateName() async throws {
+        let (_, wallets) = try await setupUserAndWalletsRepo(on: app.db)
+        try await wallets.create(type: .init(name: "savings"))
+        await XCTAssertThrowsError(try await wallets.create(type: .init(name: "savings")), "expected throw") { (error) in
+            XCTAssertEqual(error as! WalletError, WalletError.duplicateWalletType(name: "savings"))
+        }
+    }
+
     func testWalletDeposit() async throws {
         app.databases.middleware.use(WalletMiddleware<User>())
         let (_, wallets) = try await setupUserAndWalletsRepo(on: app.db)
@@ -187,7 +195,6 @@ class VaporWalletTests: XCTestCase {
         balance = try await wallets.balance(type: magical)
         XCTAssertEqual(balance, 0)
 
-        try await wallets.create(type: magical, minAllowedBalance: -50)
         try await wallets.deposit(to: magical, amount: 100)
         try await wallets.empty(magical, strategy: .toMinAllowed)
         balance = try await wallets.balance(type: magical)