Get bets won

Apple

@@ -0,0 +1 @@
+Subproject commit 5d1ea8492aa6d4be39036165d00016d6951ae91a

Sources/AllInApp/AllIn/Components/ReviewCard.swift

@@ -91,16 +91,7 @@ struct ReviewCard: View {
             }
             .frame(width: .infinity)
             .padding(.all,2)
-            .background({
-                switch betDetail.bet.status {
-                case .inProgress, .waiting, .closing:
-                    return AllInColors.grey50Color
-                case .finished:
-                    return Color.black
-                case .cancelled:
-                    return Color.red
-                }
-            }())
+            .background(backgroundColor())
 
             .cornerRadius(20, corners: [.bottomLeft,.bottomRight])
             .border(width: 1, edges: [.top], color: AllInColors.delimiterGrey)
@@ -111,4 +102,15 @@ struct ReviewCard: View {
             DetailsView(isModalPresented: $showDetails, isModalParticipated: $showPartipated, id: betDetail.bet.id)
         }
     }
+    
+    private func backgroundColor() -> Color {
+        switch betDetail.bet.status {
+        case .inProgress, .waiting, .closing:
+            return AllInColors.grey50Color
+        case .finished:
+            return Color.black
+        case .cancelled:
+            return Color.red
+        }
+    }
 }

Sources/AllInApp/AllIn/ViewModels/BetViewModel.swift

@@ -17,7 +17,9 @@ class BetViewModel: ObservableObject {
     @Published var popularBet: Bet?
     @Published private(set) var bets: [Bet] = []
     @Published var betsOver: [BetDetail] = []
-    @Published var showingSheet: Bool  = false
+    @Published var betsWon: [BetResultDetail] = []
+    @Published var showingSheetOver: Bool  = false
+    @Published var showingSheetWon: Bool  = false
     @Published var filters: Set<BetFilter> = [] {
         didSet {
             getItems()
@@ -43,7 +45,18 @@ class BetViewModel: ObservableObject {
             DispatchQueue.main.async {
                 self.betsOver = bets
                 if !self.betsOver.isEmpty {
-                    self.showingSheet = true
+                    self.showingSheetOver = true
+                }
+            }
+        }
+    }
+    
+    func getBetsWon() {
+        manager.getBetsWon() { bets in
+            DispatchQueue.main.async {
+                self.betsWon = bets
+                if !self.betsWon.isEmpty {
+                    self.showingSheetWon = true
                 }
             }
         }

Sources/AllInApp/AllIn/Views/BetView.swift

@@ -59,14 +59,22 @@ struct BetView: View {
             .refreshable {
                 viewModel.getItems()
             }
-            .sheet(isPresented: $viewModel.showingSheet, onDismiss: {
+            .sheet(isPresented: $viewModel.showingSheetOver, onDismiss: {
                 viewModel.betsOver.removeFirst()
-                viewModel.showingSheet = !viewModel.betsOver.isEmpty
+                viewModel.showingSheetOver = !viewModel.betsOver.isEmpty
             }) {
                 if let firstBetDetail = viewModel.betsOver.first {
                     BetEndingValidationView(bet: firstBetDetail)
                 }
             }
+            .sheet(isPresented: $viewModel.showingSheetWon, onDismiss: {
+                viewModel.betsWon.removeFirst()
+                viewModel.showingSheetWon = !viewModel.betsWon.isEmpty
+            }) {
+                if let firstBetResultDetail = viewModel.betsWon.first {
+                    WinModal()
+                }
+            }
             Spacer()
         }
         .edgesIgnoringSafeArea(.bottom)

Sources/Api/Sources/Api/Factory/FactoryApiBet.swift

@@ -88,20 +88,51 @@ public class FactoryApiBet: FactoryBet {
             do {
                 wonParticipation = try JSONDecoder().decode(Participation.self, from: JSONSerialization.data(withJSONObject: participationJson))
             } catch {
-                print("Error decoding participations: \(error)")
+                print("Error decoding participation: \(error)")
             }
         }
         if let participationUserJson = json["userParticipation"] as? [String: Any] {
             do {
                 userParticipation = try JSONDecoder().decode(Participation.self, from: JSONSerialization.data(withJSONObject: participationUserJson))
             } catch {
-                print("Error decoding participations: \(error)")
+                print("Error decoding participation: \(error)")
             }
         }
         
         return BetDetail(bet: bet, answers: answers, participations: participations, wonParticipation: wonParticipation, userParticipation: userParticipation)
     }
     
+    public func toBetResultDetail(from json: [String: Any]) -> BetResultDetail? {
+        
+        guard let amount = json["amount"] as? Int,
+              let won = json["won"] as? Bool else {
+            return nil
+        }
+        
+        guard let betJson = json["bet"] as? [String: Any],
+              let bet = self.toBet(from: betJson) else {
+            return nil
+        }
+        
+        let decoder = JSONDecoder()
+        
+        guard let betResultJson = json["betResult"] as? [String: Any],
+              let betResultData = try? JSONSerialization.data(withJSONObject: betResultJson),
+              let betResult = try? decoder.decode(BetResult.self, from: betResultData) else {
+            print("Error decoding bet result")
+            return nil
+        }
+        
+        guard let participationJson = json["participation"] as? [String: Any],
+              let participationData = try? JSONSerialization.data(withJSONObject: participationJson),
+              let participation = try? decoder.decode(Participation.self, from: participationData) else {
+            print("Error decoding participation")
+            return nil
+        }
+        
+        return BetResultDetail(betResult: betResult, bet: bet, participation: participation, amount: amount, won: won)
+    }
+    
     public func betTypeString(fromType type: String) -> String {
         switch type {
         case "BinaryBet":

Sources/Api/Sources/Api/UserApiManager.swift

@@ -52,6 +52,36 @@ public struct UserApiManager: UserDataManager {
         }.resume()
     }
     
+    public func getBetsWon(completion : @escaping ([BetResultDetail])-> ()) {
+        let url = URL(string: url + "bets/getWon")!
+        
+        var request = URLRequest(url: url)
+        request.httpMethod = "GET"
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
+        
+        var bets: [BetResultDetail] = []
+        
+        URLSession.shared.dataTask(with: request) { data, response, error in
+            if let data = data {
+                print ("ALLIN : get bets won")
+                do {
+                    if let httpResponse = response as? HTTPURLResponse, let jsonArray = try JSONSerialization.jsonObject(with: data, options: []) as? [[String: Any]] {
+                        for json in jsonArray {
+                            if let bet = FactoryApiBet().toBetResultDetail(from: json) {
+                                bets.append(bet)
+                            }
+                        }
+                        print(httpResponse.statusCode)
+                        completion(bets)
+                    }
+                } catch {
+                    print("Error parsing JSON: \(error)")
+                }
+            }
+        }.resume()
+    }
+    
     public func addBet(bet: Bet, completion : @escaping (Int)-> ()) {
         
         let url = URL(string: url + "bets/add")!

Sources/Model/Sources/Model/BetResult.swift

@@ -0,0 +1,21 @@
+//
+//  BetResult.swift
+//  
+//
+//  Created by Emre on 06/06/2024.
+//
+
+import Foundation
+
+public class BetResult: Codable {
+    
+    public private(set) var id: String
+    
+    public private(set) var result: String
+    
+    public init(id: String, result: String) {
+        self.id = id
+        self.result = result
+    }
+
+}

Sources/Model/Sources/Model/BetResultDetail.swift

@@ -0,0 +1,30 @@
+//
+//  BetResultDetail.swift
+//  
+//
+//  Created by Emre on 06/06/2024.
+//
+
+import Foundation
+
+public class BetResultDetail: Codable {
+        
+    public private(set) var betResult: BetResult
+
+    public private(set) var bet: Bet
+    
+    public private(set) var participation: Participation
+    
+    public private(set) var amount: Int
+
+    public private(set) var won: Bool
+    
+    public init(betResult: BetResult, bet: Bet, participation: Participation, amount: Int, won: Bool) {
+        self.betResult = betResult
+        self.bet = bet
+        self.participation = participation
+        self.amount = amount
+        self.won = won
+    }
+    
+}

Sources/Model/Sources/Model/Factory/FactoryBet.swift

@@ -11,4 +11,5 @@ public protocol FactoryBet {
     func toResponse(bet: Bet) -> [String: Any]
     func toBet(from json: [String: Any]) -> Bet?
     func toBetDetail(from json: [String: Any]) -> BetDetail?
+    func toBetResultDetail(from json: [String: Any]) -> BetResultDetail?
 }

Sources/Model/Sources/Model/Manager.swift

@@ -46,6 +46,12 @@ public struct Manager {
         }
     }
     
+    public func getBetsWon(completion: @escaping ([BetResultDetail]) -> Void) {
+        userDataManager.getBetsWon() { bets in
+            completion(bets)
+        }
+    }
+    
     public func getBet(withId id: String, completion: @escaping (BetDetail) -> Void) {
         betDataManager.getBet(withId: id) { bet in
             completion(bet)

Sources/Model/Sources/Model/UserDataManager.swift

@@ -10,6 +10,7 @@ import Foundation
 public protocol UserDataManager {
     func getBets(withIndex index: Int, withCount count: Int) -> [Bet]
     func getBetsOver(completion: @escaping ([BetDetail]) -> Void)
+    func getBetsWon(completion : @escaping ([BetResultDetail])-> ())
     func addBet(bet: Bet, completion : @escaping (Int)-> ())
     func addFriend(username: String, completion : @escaping (Int)-> ())
     func removeFriend(username: String, completion : @escaping (Int)-> ())