Release 5.10

.github/workflows/api-dotnetcore.yml

@@ -30,12 +30,16 @@ jobs:
       matrix:
         services:
           [
-            { directory: ./source/backend/api, solution: "Pims.sln" },
-            { directory: ./source/backend/proxy, solution: "Proxy.sln" },
+            { directory: ./source/backend/api, solution: "Pims.Api.csproj" },
+            {
+              directory: ./source/backend/proxy,
+              solution: "Pims.Proxy.csproj",
+            },
             {
               directory: ./source/backend/scheduler,
-              solution: "Scheduler.sln",
+              solution: "Pims.Scheduler.csproj",
             },
+            { directory: ./source/backend/tests, solution: "PimsUnitTest.sln" },
           ]
     env:
       working-directory: ${{ matrix.services.directory }}
@@ -65,12 +69,13 @@ jobs:
         working-directory: ${{env.working-directory}}
 
       - name: Install coverlet for code coverage
+        if: ${{ env.solution-name == 'PimsUnitTest.sln' }}
         run: dotnet tool install -g coverlet.console --version 1.7.2
         working-directory: ${{env.working-directory}}
 
       - name: Test
-        if: ${{ env.solution-name == 'Pims.sln' }}
-        run: dotnet test Pims.sln --no-restore --verbosity normal
+        if: ${{ env.solution-name == 'PimsUnitTest.sln' }}
+        run: dotnet test PimsUnitTest.sln --no-restore --verbosity normal
         working-directory: ${{env.working-directory}}
 
         # For future reference, if we have N test projects the flow of events would be:
@@ -97,41 +102,44 @@ jobs:
         #
         # The final `coverage.opencover.xml` is the one we want
       - name: Generate code coverage
-        if: ${{ env.solution-name == 'Pims.sln' }}
-        working-directory: ${{env.working-directory}}/../tests/unit
+        if: ${{ env.solution-name == 'PimsUnitTest.sln' }}
+        working-directory: ${{env.working-directory}}
         run: |
           pwd
           mkdir -p TestResults
           rm -rf api/TestResults
           rm -rf dal/TestResults
           rm -rf mockdal/TestResults
+          rm -rf scheduler/TestResults
           cd api
-          dotnet test --collect:"XPlat Code Coverage" --settings coverlet.runsettings --no-restore > out.txt
-          ls
-          cat out.txt
+          dotnet test --collect:"XPlat Code Coverage" --settings coverlet.runsettings --no-restore
           mv TestResults/*/* ../TestResults/
           cd ..
           cd dal
           dotnet test --collect:"XPlat Code Coverage" --settings coverlet.runsettings --no-restore
-          ls
           mv TestResults/*/* ../TestResults/
           cd ..
           cd mockdal
           dotnet test --collect:"XPlat Code Coverage" --settings coverlet.runsettings --no-restore
-          ls
           mv TestResults/*/* ../TestResults/
           cd ..
+          cd scheduler
+          dotnet test --collect:"XPlat Code Coverage" --settings coverlet.runsettings --no-restore
+          mv TestResults/*/* ../TestResults/
+          cd ..
+          echo "TestResults folder"
+          ls TestResults
           head TestResults/coverage.opencover.xml
 
       - name: Save PR number and scan results
-        if: ${{ env.solution-name == 'Pims.sln' }}
+        if: ${{ env.solution-name == 'PimsUnitTest.sln' }}
         run: |
           mkdir -p ./pr
           echo ${{ github.event.pull_request.number }} > ./pr/NR
-          cp ${{env.working-directory}}/../tests/unit/TestResults/coverage.opencover.xml ./pr
+          cp ${{env.working-directory}}/TestResults/coverage.opencover.xml ./pr
 
       - uses: actions/upload-artifact@v4
-        if: ${{ env.solution-name == 'Pims.sln' }}
+        if: ${{ env.solution-name == 'PimsUnitTest.sln' }}
         with:
           name: pr-codecov
           path: pr/

.github/workflows/deploy-prod-start-argo.yml

@@ -153,4 +153,4 @@ jobs:
       - name: call scripts to sync keycloak
         shell: bash
         run: |
-          oc process -f ./openshift/4.0/templates/jobs/keycloak-sync-pipeline-run.yaml -p ASPNETCORE_ENVIRONMENT=$ASPNETCORE_ENVIRONMENT -p NAMESPACE=3cd915-prod -p BRANCH=$GIT_BRANCH -p API_URL=http://pims-api-prod:8080/api  | oc create -f - | grep -oP "(?<=\/)[^\s]*" | (read PIPELINE_NAME; oc wait --for=condition=succeeded pipelineruns/$PIPELINE_NAME --timeout=500s)
+          oc process -f ./openshift/4.0/templates/jobs/keycloak-sync-pipeline-run.yaml -p ASPNETCORE_ENVIRONMENT=$ASPNETCORE_ENVIRONMENT -p NAMESPACE=3cd915-prod -p BRANCH=$GIT_BRANCH -p API_URL=http://pims-api-prod:8080/api  | oc create -f - | grep -oP "(?<=\/)[^\s]*" | (read PIPELINE_NAME; oc wait --for=condition=succeeded pipelineruns/$PIPELINE_NAME --timeout=720s)

source/backend/Dockerfile

@@ -6,7 +6,6 @@ EXPOSE 5001 5000
 # Copy csproj and restore as distinct layers
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
-COPY api/*.sln api/
 COPY Directory.Build.props .
 COPY api/*.csproj api/
 COPY apimodels/*.csproj apimodels/

source/backend/Dockerfile.proxy

@@ -14,7 +14,7 @@ COPY core.api core.api/
 COPY keycloak keycloak/
 COPY proxy/*.csproj proxy/
 
-RUN dotnet restore proxy/Proxy.sln
+RUN dotnet restore proxy/Pims.Proxy.csproj
 ENV PATH="$PATH:/root/.dotnet/tools"
 # Copy everything else and build
 WORKDIR /src/proxy

source/backend/Dockerfile.scheduler

@@ -15,7 +15,7 @@ COPY core.api core.api/
 COPY keycloak keycloak/
 COPY scheduler/*.csproj scheduler/
 
-RUN dotnet restore scheduler/Scheduler.sln
+RUN dotnet restore scheduler/Pims.Scheduler.csproj
 ENV PATH="$PATH:/root/.dotnet/tools"
 # Copy everything else and build
 WORKDIR /src/scheduler

source/backend/PimsBackend.sln

@@ -0,0 +1,91 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.13.35828.75
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pims.Api", "api\Pims.Api.csproj", "{16BC0468-78F6-4C91-87DA-7403C919E646}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pims.Dal", "dal\Pims.Dal.csproj", "{6DFFF5E1-1B87-403B-99D0-A9E03D8A8EB3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pims.Proxy", "proxy\Pims.Proxy.csproj", "{826D3B92-8D74-43F4-AD22-398632247E37}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pims.Dal.Entities", "entities\Pims.Dal.Entities.csproj", "{1C724CD5-CD24-46CD-835A-A83F673F97B5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pims.Api.Models", "apimodels\Pims.Api.Models.csproj", "{58C42283-68DA-477F-915D-C67597543546}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pims.Scheduler", "scheduler\Pims.Scheduler.csproj", "{AC4336C5-5631-4D9D-B78F-6C2DF79A6F1F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pims.Keycloak", "keycloak\Pims.Keycloak.csproj", "{970903E9-BC53-436F-BA77-C62349546425}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pims.Dal.Keycloak", "dal.keycloak\Pims.Dal.Keycloak.csproj", "{5697DD19-62CC-4377-ABA8-1E192376F4F6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pims.Core", "core\Pims.Core.csproj", "{AC8F04FF-3164-41FB-9EDF-E468B8B77837}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pims.Core.Api", "core.api\Pims.Core.Api.csproj", "{89A99CC5-ADFB-4FC2-9136-7B0029EEA2D8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pims.Geocoder", "geocoder\Pims.Geocoder.csproj", "{BF7450E8-B3C5-46FB-BEC1-C5FC1C5964DC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pims.Ltsa", "ltsa\Pims.Ltsa.csproj", "{1ED5DF03-7784-44EC-B02B-516167210CCF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{16BC0468-78F6-4C91-87DA-7403C919E646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16BC0468-78F6-4C91-87DA-7403C919E646}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16BC0468-78F6-4C91-87DA-7403C919E646}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16BC0468-78F6-4C91-87DA-7403C919E646}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6DFFF5E1-1B87-403B-99D0-A9E03D8A8EB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DFFF5E1-1B87-403B-99D0-A9E03D8A8EB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DFFF5E1-1B87-403B-99D0-A9E03D8A8EB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6DFFF5E1-1B87-403B-99D0-A9E03D8A8EB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{826D3B92-8D74-43F4-AD22-398632247E37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{826D3B92-8D74-43F4-AD22-398632247E37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{826D3B92-8D74-43F4-AD22-398632247E37}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{826D3B92-8D74-43F4-AD22-398632247E37}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C724CD5-CD24-46CD-835A-A83F673F97B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C724CD5-CD24-46CD-835A-A83F673F97B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C724CD5-CD24-46CD-835A-A83F673F97B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C724CD5-CD24-46CD-835A-A83F673F97B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58C42283-68DA-477F-915D-C67597543546}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58C42283-68DA-477F-915D-C67597543546}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58C42283-68DA-477F-915D-C67597543546}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58C42283-68DA-477F-915D-C67597543546}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC4336C5-5631-4D9D-B78F-6C2DF79A6F1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC4336C5-5631-4D9D-B78F-6C2DF79A6F1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC4336C5-5631-4D9D-B78F-6C2DF79A6F1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC4336C5-5631-4D9D-B78F-6C2DF79A6F1F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{970903E9-BC53-436F-BA77-C62349546425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{970903E9-BC53-436F-BA77-C62349546425}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{970903E9-BC53-436F-BA77-C62349546425}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{970903E9-BC53-436F-BA77-C62349546425}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5697DD19-62CC-4377-ABA8-1E192376F4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5697DD19-62CC-4377-ABA8-1E192376F4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5697DD19-62CC-4377-ABA8-1E192376F4F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5697DD19-62CC-4377-ABA8-1E192376F4F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC8F04FF-3164-41FB-9EDF-E468B8B77837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC8F04FF-3164-41FB-9EDF-E468B8B77837}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC8F04FF-3164-41FB-9EDF-E468B8B77837}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC8F04FF-3164-41FB-9EDF-E468B8B77837}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89A99CC5-ADFB-4FC2-9136-7B0029EEA2D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89A99CC5-ADFB-4FC2-9136-7B0029EEA2D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89A99CC5-ADFB-4FC2-9136-7B0029EEA2D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89A99CC5-ADFB-4FC2-9136-7B0029EEA2D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF7450E8-B3C5-46FB-BEC1-C5FC1C5964DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF7450E8-B3C5-46FB-BEC1-C5FC1C5964DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF7450E8-B3C5-46FB-BEC1-C5FC1C5964DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF7450E8-B3C5-46FB-BEC1-C5FC1C5964DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1ED5DF03-7784-44EC-B02B-516167210CCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1ED5DF03-7784-44EC-B02B-516167210CCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1ED5DF03-7784-44EC-B02B-516167210CCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1ED5DF03-7784-44EC-B02B-516167210CCF}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {2198DDB0-E914-4A28-B5A7-64ED4CC99E98}
+	EndGlobalSection
+EndGlobal

source/backend/api/Areas/Acquisition/Controllers/AcquisitionFileController.cs

@@ -15,6 +15,7 @@
 using Pims.Core.Security;
 using Pims.Dal.Entities;
 using Pims.Dal.Exceptions;
+using Pims.Dal.Repositories;
 using Swashbuckle.AspNetCore.Annotations;
 
 namespace Pims.Api.Areas.Acquisition.Controllers
@@ -32,6 +33,7 @@ public class AcquisitionFileController : ControllerBase
     {
         #region Variables
         private readonly IAcquisitionFileService _acquisitionService;
+        private readonly IAcquisitionFileRepository _acquisitionRepository;
         private readonly IMapper _mapper;
         private readonly ILogger _logger;
         #endregion
@@ -45,9 +47,10 @@ public class AcquisitionFileController : ControllerBase
         /// <param name="mapper"></param>
         /// <param name="logger"></param>
         ///
-        public AcquisitionFileController(IAcquisitionFileService acquisitionService, IMapper mapper, ILogger<AcquisitionFileController> logger)
+        public AcquisitionFileController(IAcquisitionFileService acquisitionService, IAcquisitionFileRepository acquisitionFileRepository, IMapper mapper, ILogger<AcquisitionFileController> logger)
         {
             _acquisitionService = acquisitionService;
+            _acquisitionRepository = acquisitionFileRepository;
             _mapper = mapper;
             _logger = logger;
         }
@@ -292,6 +295,25 @@ public IActionResult GetAcquisitionFileSubFiles(long id)
             return new JsonResult(_mapper.Map<List<AcquisitionFileModel>>(subFiles));
         }
 
+        [HttpGet("{id:long}/historical")]
+        [Produces("application/json")]
+        [HasPermission(Permissions.AcquisitionFileView)]
+        [ProducesResponseType(typeof(AcquisitionFileModel), 200)]
+        [SwaggerOperation(Tags = new[] { "acquisition" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult GetAcquisitionAtTime([FromRoute] long id, [FromQuery] DateTime time)
+        {
+            _logger.LogInformation(
+               "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+               nameof(AcquisitionFileController),
+               nameof(GetAcquisitionAtTime),
+               User.GetUsername(),
+               DateTime.Now);
+
+            var pimsAcquisition = _acquisitionRepository.GetAcquisitionAtTime(id, time);
+            return new JsonResult(_mapper.Map<AcquisitionFileModel>(pimsAcquisition));
+        }
+
         #endregion
     }
 }

source/backend/api/Areas/Acquisition/Controllers/AgreementController.cs

@@ -111,7 +111,7 @@ public IActionResult AddAcquisitionFileAgreement([FromRoute] long id, [FromBody]
         [Produces("application/json")]
         [ProducesResponseType(typeof(AgreementModel), 200)]
         [SwaggerOperation(Tags = new[] { "acquisitionfile" })]
-        public IActionResult GetAcquisitionFileAgreementById([FromRoute]long id, [FromRoute]long agreementId)
+        public IActionResult GetAcquisitionFileAgreementById([FromRoute] long id, [FromRoute] long agreementId)
         {
             _logger.LogInformation(
                 "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",

source/backend/api/Areas/Acquisition/Controllers/SearchController.cs

@@ -8,16 +8,16 @@ namespace Pims.Api.Areas.Acquisition.Controllers
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Logging;
     using Pims.Api.Areas.Acquisition.Models.Search;
-    using Pims.Core.Api.Exceptions;
     using Pims.Api.Helpers.Extensions;
     using Pims.Api.Models.Base;
     using Pims.Api.Models.Concepts.AcquisitionFile;
-    using Pims.Core.Api.Policies;
     using Pims.Api.Services;
+    using Pims.Core.Api.Exceptions;
+    using Pims.Core.Api.Policies;
     using Pims.Core.Extensions;
     using Pims.Core.Json;
-    using Pims.Dal.Entities.Models;
     using Pims.Core.Security;
+    using Pims.Dal.Entities.Models;
     using Swashbuckle.AspNetCore.Annotations;
 
     /// <summary>

source/backend/api/Areas/Admin/Controllers/AccessRequestController.cs

@@ -5,8 +5,8 @@
 using Pims.Api.Models.Concepts.AccessRequest;
 using Pims.Core.Api.Policies;
 using Pims.Core.Json;
-using Pims.Dal.Repositories;
 using Pims.Core.Security;
+using Pims.Dal.Repositories;
 using Swashbuckle.AspNetCore.Annotations;
 using EModel = Pims.Dal.Entities.Models;
 using Entity = Pims.Dal.Entities;

source/backend/api/Areas/Admin/Controllers/FinancialCodeController.cs

@@ -2,8 +2,8 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Pims.Api.Models.Concepts.FinancialCode;
-using Pims.Core.Api.Policies;
 using Pims.Api.Services;
+using Pims.Core.Api.Policies;
 using Pims.Core.Exceptions;
 using Pims.Core.Json;
 using Pims.Core.Security;

source/backend/api/Areas/Admin/Controllers/RoleController.cs

@@ -5,8 +5,8 @@
 using Pims.Api.Models.Concepts.Role;
 using Pims.Core.Api.Policies;
 using Pims.Core.Json;
-using Pims.Dal.Repositories;
 using Pims.Core.Security;
+using Pims.Dal.Repositories;
 using Swashbuckle.AspNetCore.Annotations;
 
 namespace Pims.Api.Areas.Admin.Controllers

source/backend/api/Areas/Admin/Controllers/UserController.cs

@@ -6,10 +6,10 @@
 using Pims.Api.Models.Concepts.User;
 using Pims.Core.Api.Policies;
 using Pims.Core.Json;
+using Pims.Core.Security;
 using Pims.Dal.Entities;
 using Pims.Dal.Entities.Models;
 using Pims.Dal.Repositories;
-using Pims.Core.Security;
 using Swashbuckle.AspNetCore.Annotations;
 
 namespace Pims.Api.Areas.Admin.Controllers

source/backend/api/Areas/Autocomplete/Controllers/AutocompleteController.cs

@@ -4,12 +4,12 @@
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using Pims.Api.Areas.Autocomplete.Models;
-using Pims.Core.Api.Exceptions;
 using Pims.Api.Helpers.Extensions;
+using Pims.Core.Api.Exceptions;
 using Pims.Core.Api.Policies;
+using Pims.Core.Security;
 using Pims.Dal.Entities.Models;
 using Pims.Dal.Repositories;
-using Pims.Core.Security;
 using Swashbuckle.AspNetCore.Annotations;
 
 namespace Pims.Api.Areas.Autocomplete.Controllers