Merge pull request #97 from CSCfi/CSCTTV-3503-funding_call-date

DimCallProgramme must have both date properties or continuous application
CSCfi · Nov 14, 2023 · 81afb1d · 81afb1d
2 parents 9fd9a42 + 8e49800
commit 81afb1d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/aspnetcore/src/Repositories/FundingCallIndexRepository.cs b/aspnetcore/src/Repositories/FundingCallIndexRepository.cs
@@ -25,7 +25,7 @@ protected override IQueryable<FundingCall> GetAll()
         return _context.DimCallProgrammes
             .AsNoTracking()
             .AsSplitQuery()
-            .Where(callProgramme => callProgramme.Id != -1 && callProgramme.DimOrganizations.Count > 0)
+            .Where(callProgramme => callProgramme.Id != -1 && callProgramme.DimOrganizations.Count > 0 && (callProgramme.DimDateIdOpen != -1 && callProgramme.DimDateIdDue != -1 || callProgramme.ContinuousApplicationPeriod == true))
             .ProjectTo<FundingCall>(_mapper.ConfigurationProvider);
     }
 
@@ -37,7 +37,7 @@ protected override IQueryable<FundingCall> GetChunk(int skipAmount, int takeAmou
             .Take(takeAmount)
             .AsNoTracking()
             .AsSplitQuery()
-            .Where(callProgramme => callProgramme.Id != -1 && callProgramme.DimOrganizations.Count > 0)
+            .Where(callProgramme => callProgramme.Id != -1 && callProgramme.DimOrganizations.Count > 0 && (callProgramme.DimDateIdOpen != -1 && callProgramme.DimDateIdDue != -1 || callProgramme.ContinuousApplicationPeriod == true))
             .ProjectTo<FundingCall>(_mapper.ConfigurationProvider);
     }