disposition merge to dev, dotnet 8 update, ef update.

.github/workflows/api-dotnetcore.yml

@@ -1,4 +1,4 @@
-name: API (.NET 6)
+name: API (.NET 8)
 
 on:
   push:
@@ -39,10 +39,10 @@ jobs:
         run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
         id: extract_branch
 
-      - name: Setup .NET 6
+      - name: Setup .NET 8
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
 
       - name: Install dependencies
         run: dotnet restore
@@ -120,7 +120,7 @@ jobs:
           # Specify whether or not CI build should fail if Codecov runs into an error during upload
           fail_ci_if_error: true
 
-      - name: SonarScanner for .NET 6 with pull request decoration support
+      - name: SonarScanner for .NET 8 with pull request decoration support
         id: scan
         uses: highbyte/sonarscan-dotnet@v2.1.2
         if: ${{ github.event_name == 'push' }}

openshift/4.0/templates/api/build.yaml

@@ -38,11 +38,11 @@ parameters:
   - name: BUILDIMAGE_NAME
     displayName: "Source Image Name"
     description: "The image to use as the Builder Image."
-    value: "dotnet-60"
+    value: "dotnet-80"
   - name: BUILDIMAGE_TAG
     displayName: "Source Image Tag"
     description: "The s2i image tag which is used to build the code."
-    value: "6.0"
+    value: "8.0"
 
   - name: GIT_URL
     displayName: Git Repository URL

source/backend/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <LangVersion>9.0</LangVersion>
+        <TargetFramework>net8.0</TargetFramework>
+        <LangVersion>11.0</LangVersion>
         <AnalysisMode>Minimum</AnalysisMode>
         <WarningLevel>4</WarningLevel>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>
@@ -17,19 +17,19 @@
         <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis" Version="4.1.0" />
-        <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.1.0" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.1.0">
+        <PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.8.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.8.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Net.Compilers" Version="4.1.0">
+        <PackageReference Include="Microsoft.Net.Compilers" Version="4.2.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.1.0">
+        <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.8.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers;</IncludeAssets>
         </PackageReference>

source/backend/api/Areas/Disposition/Controllers/DispositionFileController.cs

@@ -0,0 +1,224 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MapsterMapper;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Pims.Api.Areas.Acquisition.Controllers;
+using Pims.Api.Models.Concepts.DispositionFile;
+using Pims.Api.Models.Models.Concepts.DispositionFile;
+using Pims.Api.Policies;
+using Pims.Api.Services;
+using Pims.Core.Extensions;
+using Pims.Core.Json;
+using Pims.Dal.Exceptions;
+using Pims.Dal.Security;
+using Swashbuckle.AspNetCore.Annotations;
+
+namespace Pims.Api.Areas.Disposition.Controllers
+{
+    /// <summary>
+    /// DispositionFileController class, provides endpoints for interacting with disposition files.
+    /// </summary>
+    [Authorize]
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Area("dispositionfiles")]
+    [Route("v{version:apiVersion}/[area]")]
+    [Route("[area]")]
+    public class DispositionFileController : ControllerBase
+    {
+        #region Variables
+        private readonly IDispositionFileService _dispositionService;
+        private readonly IMapper _mapper;
+        private readonly ILogger _logger;
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates a new instance of a DispositionFileController class, initializes it with the specified arguments.
+        /// </summary>
+        /// <param name="dispositionService"></param>
+        /// <param name="mapper"></param>
+        /// <param name="logger"></param>
+        ///
+        public DispositionFileController(IDispositionFileService dispositionService, IMapper mapper, ILogger<DispositionFileController> logger)
+        {
+            _dispositionService = dispositionService;
+            _mapper = mapper;
+            _logger = logger;
+        }
+        #endregion
+
+        #region Endpoints
+
+        /// <summary>
+        /// Gets the specified disposition file.
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("{id:long}")]
+        [HasPermission(Permissions.DispositionView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(DispositionFileModel), 200)]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult GetDispositionFile(long id)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(GetDispositionFile),
+                User.GetUsername(),
+                DateTime.Now);
+
+            _logger.LogInformation("Dispatching to service: {Service}", _dispositionService.GetType());
+
+            var dispositionFile = _dispositionService.GetById(id);
+            return new JsonResult(_mapper.Map<DispositionFileModel>(dispositionFile));
+        }
+
+        /// <summary>
+        /// Creates a new Disposition File entity.
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        [HasPermission(Permissions.DispositionAdd)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(DispositionFileModel), 200)]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        public IActionResult AddDispositionFile([FromBody] DispositionFileModel model, [FromQuery] string[] userOverrideCodes)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(AcquisitionFileController),
+                nameof(AddDispositionFile),
+                User.GetUsername(),
+                DateTime.Now);
+
+            _logger.LogInformation("Dispatching to service: {Service}", _dispositionService.GetType());
+
+            var dispositionFileEntity = _mapper.Map<Dal.Entities.PimsDispositionFile>(model);
+            var dispositionFile = _dispositionService.Add(dispositionFileEntity, userOverrideCodes.Select(oc => UserOverrideCode.Parse(oc)));
+
+            return new JsonResult(_mapper.Map<DispositionFileModel>(dispositionFile));
+        }
+
+        /// <summary>
+        /// Gets the specified disposition file last updated-by information.
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("{id:long}/updateInfo")]
+        [HasPermission(Permissions.DispositionView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(Dal.Entities.Models.LastUpdatedByModel), 200)]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult GetLastUpdatedBy(long id)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(GetLastUpdatedBy),
+                User.GetUsername(),
+                DateTime.Now);
+
+            var lastUpdated = _dispositionService.GetLastUpdateInformation(id);
+            return new JsonResult(lastUpdated);
+        }
+
+        /// <summary>
+        /// Get the disposition file properties.
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("{id:long}/properties")]
+        [HasPermission(Permissions.DispositionView, Permissions.PropertyView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(IEnumerable<DispositionFilePropertyModel>), 200)]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult GetDispositionFileProperties(long id)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(GetDispositionFileProperties),
+                User.GetUsername(),
+                DateTime.Now);
+
+            var dispositionfileProperties = _dispositionService.GetProperties(id);
+
+            return new JsonResult(_mapper.Map<IEnumerable<DispositionFilePropertyModel>>(dispositionfileProperties));
+        }
+
+        /// <summary>
+        /// Get all unique persons and organizations that belong to at least one disposition file as a team member.
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("team-members")]
+        [HasPermission(Permissions.DispositionView)]
+        [HasPermission(Permissions.ContactView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(IEnumerable<DispositionFileTeamModel>), 200)]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        public IActionResult GetDispositionTeamMembers()
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(GetDispositionTeamMembers),
+                User.GetUsername(),
+                DateTime.Now);
+
+            var team = _dispositionService.GetTeamMembers();
+
+            return new JsonResult(_mapper.Map<IEnumerable<DispositionFileTeamModel>>(team));
+        }
+
+        [HttpGet("{id:long}/offers")]
+        [HasPermission(Permissions.DispositionView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(IEnumerable<DispositionFileOfferModel>), 200)]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult GetDispositionFileOffers([FromRoute]long id)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(GetDispositionFileOffers),
+                User.GetUsername(),
+                DateTime.Now);
+
+            _logger.LogInformation("Dispatching to service: {Service}", _dispositionService.GetType());
+
+            var dispositionOffers = _dispositionService.GetOffers(id);
+            return new JsonResult(_mapper.Map<IEnumerable<DispositionFileOfferModel>>(dispositionOffers));
+        }
+
+        [HttpGet("{id:long}/sale")]
+        [HasPermission(Permissions.DispositionView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(DispositionFileSaleModel), 200)]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult GetDispositionFileSales([FromRoute]long id)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(GetDispositionFileSales),
+                User.GetUsername(),
+                DateTime.Now);
+
+            _logger.LogInformation("Dispatching to service: {Service}", _dispositionService.GetType());
+
+            var dispositionSale = _dispositionService.GetDispositionFileSale(id);
+            return new JsonResult(_mapper.Map<DispositionFileSaleModel>(dispositionSale));
+        }
+
+        #endregion
+    }
+}