From ae5e7b75c6c68ed78571966d57dfcf95df2d8a11 Mon Sep 17 00:00:00 2001
From: Razmig Sarkissian <razmig@staxriver.com>
Date: Wed, 1 May 2024 17:09:29 +0200
Subject: [PATCH] fix merge

---
 .../Screen/Components/TournamentStatusView.swift | 16 ++++++++++++----
 PadelClub/Views/Tournament/TournamentView.swift  |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/PadelClub/Views/Tournament/Screen/Components/TournamentStatusView.swift b/PadelClub/Views/Tournament/Screen/Components/TournamentStatusView.swift
index 632b254..f4efd74 100644
--- a/PadelClub/Views/Tournament/Screen/Components/TournamentStatusView.swift
+++ b/PadelClub/Views/Tournament/Screen/Components/TournamentStatusView.swift
@@ -38,9 +38,17 @@ struct TournamentStatusView: View {
             
             Section {
                 RowButtonView("Supprimer le tournoi", role: .destructive) {
-                    tournament.endDate = Date()
-                    tournament.isDeleted.toggle()
-                    tournament.navigationPath.removeAll()
+                    if tournament.currentPayment == nil {
+                        do {
+                            try dataStore.tournaments.delete(instance: tournament)
+                        } catch {
+                            Logger.error(error)
+                        }
+                    } else {
+                        tournament.endDate = Date()
+                        tournament.isDeleted.toggle()
+                        tournament.navigationPath.removeAll()
+                    }
                     navigation.path = NavigationPath()
                 }
             } footer: {
@@ -50,7 +58,7 @@ struct TournamentStatusView: View {
             if tournament.hasEnded() == false && tournament.isCanceled == false {
                 Section {
                     RowButtonView("Annuler le tournoi", role: .destructive) {
-                        tournament.isCanceled.toggle()
+                        tournament.setCanceled(true)
                         dismiss()
                     }
                 } footer: {
diff --git a/PadelClub/Views/Tournament/TournamentView.swift b/PadelClub/Views/Tournament/TournamentView.swift
index 4e7fa1d..ff7b32c 100644
--- a/PadelClub/Views/Tournament/TournamentView.swift
+++ b/PadelClub/Views/Tournament/TournamentView.swift
@@ -64,7 +64,7 @@ struct TournamentView: View {
                 case .canceled:
                     Section {
                         RowButtonView("Reprendre le tournoi", role: .destructive) {
-                            tournament.isCanceled.toggle()
+                            tournament.setCanceled(false)
                             _save()
                         }
                     } footer: {