Fixed Bugs.

stefanDeveloper · Jun 25, 2017 · 2c9edd5 · 2c9edd5
1 parent 1c617cd
commit 2c9edd5
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/LigaManagerAdminClient/Controllers/SeasonListWindowController.cs b/LigaManagerAdminClient/Controllers/SeasonListWindowController.cs
@@ -32,7 +32,6 @@ public override async void Initialize(MainWindow mainWindow)
                 DeleteCommand = new RelayCommand(ExecuteDeleteCommand),
                 ChangeCommand = new RelayCommand(ExecuteChangeCommand),
                 Seasons = seasons.ToList(),
-                SelectedSeason = seasons.ToList().FirstOrDefault()
             };
             _view.DataContext = _viewModel;
 

diff --git a/LigaManagerAdminClient/Controllers/SetMatchDayWindowController.cs b/LigaManagerAdminClient/Controllers/SetMatchDayWindowController.cs
@@ -30,7 +30,7 @@ public int SetMatchDay()
         #region Execute Commands
         public void ExecuteOkCommand(object obj)
         {
-            if (_view.MatchDayTextBox.Equals(string.Empty))
+            if (_view.MatchDayTextBox.Text.Equals(string.Empty))
             {
                 MessageBox.Show("Spieltag ist leer!", "Kein Spieltag ausgewählt",
                     MessageBoxButton.OK, MessageBoxImage.Error);

diff --git a/LigaManagerAdminClient/Controllers/TeamListWindowController.cs b/LigaManagerAdminClient/Controllers/TeamListWindowController.cs
@@ -30,7 +30,6 @@ public override async void Initialize(MainWindow mainWindow)
             _viewModel = new TeamWindowViewModel
             {
                 Teams = teams.ToList(),
-                SelectedTeam = teams.FirstOrDefault(),
                 BackCommand = new RelayCommand(ExecuteBackCommand),
                 AddCommand = new RelayCommand(ExecuteAddCommand),
                 DeleteCommand = new RelayCommand(ExecuteDeleteCommand),

diff --git a/LigaManagerServer/Database/LigaManager.db3 b/LigaManagerServer/Database/LigaManager.db3
diff --git a/LigaManagerServer/Services/AdminClientService.cs b/LigaManagerServer/Services/AdminClientService.cs
@@ -18,7 +18,6 @@ public class AdminClientService : LigaManagerService, IAdminClientService
         private readonly IPersistenceService<Bet> _betPersistenceService = new PersistenceService<Bet>();
         private readonly IPersistenceService<Season> _seasonPersistenceService = new PersistenceService<Season>();
         private readonly IPersistenceService<Match> _matchPersistenceService = new PersistenceService<Match>();
-
         private readonly IPersistenceService<SeasonToTeamRelation> _seasonToTeamRelationService =
             new PersistenceService<SeasonToTeamRelation>();
 
@@ -38,7 +37,7 @@ public bool UpdateBettor(Bettor bettor)
             lock (StaticLock)
             {
                 var bettors = _bettorPersistenceService.GetAll();
-                var searchedBettors = bettors.FindAll(x => x.Nickname.ToUpper().Equals(bettor.Nickname.ToUpper()));
+                var searchedBettors = bettors.FindAll(x => x.Nickname.ToUpper().Equals(bettor.Nickname.ToUpper()) && x.Id != bettor.Id);
                 if (searchedBettors.Any()) return false;
                 return _bettorPersistenceService.Update(bettor);
             }
@@ -73,7 +72,7 @@ public bool UpdateTeam(Team team)
             lock (StaticLock)
             {
                 var teams = _teamPersistenceService.GetAll();
-                var searchedTeams = teams.FindAll(x => x.Name.ToUpper().Equals(team.Name.ToUpper()));
+                var searchedTeams = teams.FindAll(x => x.Name.ToUpper().Equals(team.Name.ToUpper()) && x.Id != team.Id);
                 if (searchedTeams.Any()) return false;
                 return _teamPersistenceService.Update(team);
             }
@@ -140,7 +139,7 @@ public bool UpdateSeason(Season season)
             lock (StaticLock)
             {
                 var seasons = _seasonPersistenceService.GetAll();
-                var searchedSeasons = seasons.FindAll(x => x.Name.ToUpper().Equals(season.Name.ToUpper()));
+                var searchedSeasons = seasons.FindAll(x => x.Name.ToUpper().Equals(season.Name.ToUpper()) && x.Id != season.Id);
                 if (searchedSeasons.Any()) return false;
                 return _seasonPersistenceService.Update(season);
             }

diff --git a/LigaManagerServer/Services/BettorClientService.cs b/LigaManagerServer/Services/BettorClientService.cs
@@ -13,6 +13,7 @@ public class BettorClientService : LigaManagerService, IBettorClientService
         private static readonly object StaticLock = new object();
         private readonly IPersistenceService<Bettor> _bettorPersistenceService = new PersistenceService<Bettor>();
         private readonly IPersistenceService<Bet> _betPersistenceService = new PersistenceService<Bet>();
+        private readonly IPersistenceService<Match> _matchPersistenceService = new PersistenceService<Match>();
 
         public bool IsValidNickname(string name)
         {
@@ -28,7 +29,11 @@ public bool AddBet(Bet bet)
         {
             lock (StaticLock)
             {
-                if (!(DateTime.Now.AddMinutes(30) < bet.Match.DateTime))
+                var matches = _matchPersistenceService.GetAll();
+                var filteredMatches = matches.FindAll(x => x.AwayTeam.Equals(bet.Match.AwayTeam) && x.HomeTeam.Equals(bet.Match.HomeTeam) &&
+                                                   x.Season.Equals(bet.Match.Season));
+                if (filteredMatches.Count > 0) return false;
+                if (!(DateTime.Now.AddMinutes(30) < filteredMatches.First().DateTime))
                     return false;
                 return _betPersistenceService.Add(bet);
             }
@@ -38,7 +43,11 @@ public bool ChangeBet(Bet bet)
         {
             lock (StaticLock)
             {
-                if (!(DateTime.Now.AddMinutes(30) < bet.Match.DateTime))
+                var matches = _matchPersistenceService.GetAll();
+                var filteredMatches = matches.FindAll(x => x.AwayTeam.Equals(bet.Match.AwayTeam) && x.HomeTeam.Equals(bet.Match.HomeTeam) &&
+                                                           x.Season.Equals(bet.Match.Season));
+                if (filteredMatches.Count > 0) return false;
+                if (!(DateTime.Now.AddMinutes(30) < filteredMatches.First().DateTime))
                     return false;
                 return _betPersistenceService.Update(bet);
             }