Merge pull request #102 from CSCfi/qa

Modify fundingcall continous period
CSCfi · Nov 20, 2023 · 1fd7f23 · 1fd7f23
2 parents 246c8f8 + 127b9cc
commit 1fd7f23
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 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 && (callProgramme.DimDateIdOpen != -1 && callProgramme.DimDateIdDue != -1 || callProgramme.ContinuousApplicationPeriod == true))
+            .Where(callProgramme => callProgramme.Id != -1 && callProgramme.DimOrganizations.Count > 0)
             .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 && (callProgramme.DimDateIdOpen != -1 && callProgramme.DimDateIdDue != -1 || callProgramme.ContinuousApplicationPeriod == true))
+            .Where(callProgramme => callProgramme.Id != -1 && callProgramme.DimOrganizations.Count > 0)
             .ProjectTo<FundingCall>(_mapper.ConfigurationProvider);
     }
 

diff --git a/aspnetcore/src/Repositories/Maps/FundingCallProfile.cs b/aspnetcore/src/Repositories/Maps/FundingCallProfile.cs
@@ -29,7 +29,7 @@ public FundingCallProfile()
             .ForMember(dst => dst.ContactInformation, opt => opt.MapFrom(src => src.ContactInformation))
             .ForMember(dst => dst.Categories, opt => opt.MapFrom(src => src.DimReferencedata))
             .ForMember(dst => dst.Foundations, opt => opt.MapFrom(src => src.DimOrganizations))
-            .ForMember(dst => dst.ContinuousApplication, opt => opt.MapFrom(src => src.ContinuousApplicationPeriod))
+            .ForMember(dst => dst.ContinuousApplication, opt => opt.MapFrom(src => src.DimDateIdOpen == -1 && src.DimDateIdDue == -1)) // src.ContinuousApplicationPeriod is not populated in DB!
             .ForMember(dst => dst.ApplicationUrlFi, opt => opt.MapFrom(src => src.DimWebLinks.SingleOrDefault(webLink => webLink.LinkType == "ApplicationURL" && webLink.LanguageVariant == "fi")))
             .ForMember(dst => dst.ApplicationUrlSv, opt => opt.MapFrom(src => src.DimWebLinks.SingleOrDefault(webLink => webLink.LinkType == "ApplicationURL" && webLink.LanguageVariant == "sv")))
             .ForMember(dst => dst.ApplicationUrlEn, opt => opt.MapFrom(src => src.DimWebLinks.SingleOrDefault(webLink => webLink.LinkType == "ApplicationURL" && webLink.LanguageVariant == "en")))

diff --git a/aspnetcore/test/Indexer.Tests/Maps/FundingCallProfileTest.cs b/aspnetcore/test/Indexer.Tests/Maps/FundingCallProfileTest.cs
@@ -126,8 +126,7 @@ private static DimCallProgramme GetEntity()
                 }
             },
             ContactInformation = "contact info",
-            ContinuousApplicationPeriod = true
-
+            ContinuousApplicationPeriod = null
         };
     }
 
@@ -150,7 +149,7 @@ private static FundingCall GetModel()
             ContactInformation = "contact info",
             CallProgrammeOpenDate = new DateTime(2020, 1, 1),
             CallProgrammeDueDate = new DateTime(2021, 1, 1),
-            ContinuousApplication = true,
+            ContinuousApplication = false,
             Categories = new List<ReferenceData>
             {
                 new()