Merge pull request #75 from code4romania/fix-turnout

Fixed turnout
code4romania · Oct 5, 2020 · bcf046f · bcf046f
2 parents 228eb1c + 3691dbc
commit bcf046f
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/ElectionResults.Core/Elections/ResultsAggregator.cs b/src/ElectionResults.Core/Elections/ResultsAggregator.cs
@@ -215,24 +215,27 @@ private async Task<Turnout> GetDivisionTurnout(ElectionResultsQuery query, Appli
 
             }
             var turnout = new Turnout();
-            var division = ElectionDivision.Locality;
-            IQueryable<Turnout> queryable;
-            if (query.Division == ElectionDivision.National && (ballot.BallotType == BallotType.CountyCouncilPresident || ballot.BallotType == BallotType.CountyCouncil))
+            IQueryable<Turnout> queryable = dbContext.Turnouts
+                .Where(t =>
+                    t.BallotId == ballot.BallotId);
+            if (ballot.BallotType == BallotType.CountyCouncilPresident || ballot.BallotType == BallotType.CountyCouncil)
             {
-                queryable = dbContext.Turnouts
+                queryable = queryable
                     .Where(t =>
-                        t.BallotId == ballot.BallotId &&
                         t.Division == ElectionDivision.County);
             }
             else
             {
-                queryable = dbContext.Turnouts
+                queryable = queryable
                     .Where(t =>
-                        t.BallotId == ballot.BallotId &&
-                        t.CountyId == query.CountyId &&
-                        t.Division == division);
+                        t.Division == ElectionDivision.Locality);
             }
 
+
+            if (query.CountyId != null)
+                queryable = queryable.Where(c => c.CountyId == query.CountyId);
+
+
             if (ballot.Election.Live)
             {
                 if (query.Division == ElectionDivision.County)