Packet submission data persistence

.github/linters/.jscpd.json

@@ -9,4 +9,4 @@
       "**/UDS.Net.API/Data/**"
     ],
     "absolute": true
-  }
+  }

.github/workflows/package-release.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
         source-url: https://nuget.pkg.github.com/UK-SBCoA/index.json
       env:
         NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/super-linter.yml

@@ -27,4 +27,5 @@ jobs:
           VALIDATE_ALL_CODEBASE: false
           DEFAULT_BRANCH: "main"
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VALIDATE_MARKDOWN: false
+          VALIDATE_MARKDOWN: false
+          FILTER_REGEX_EXCLUDE: (.*.github/.*|.*Properties/.*)

src/UDS.Net.API.Client/ApiClient.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Net.Http;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Configuration;
 
 namespace UDS.Net.API.Client
 {
@@ -29,6 +27,11 @@ public static void AddUDSApiClient(this IServiceCollection services, string base
                 options.BaseAddress = new Uri(baseAddress);
             });
 
+            services.AddHttpClient<IPacketClient, PacketClient>(options =>
+            {
+                options.BaseAddress = new Uri(baseAddress);
+            });
+
             // API client registered last
             services.AddSingleton<IApiClient, ApiClient>();
         }
@@ -43,12 +46,14 @@ public class ApiClient : IApiClient
         public IVisitClient VisitClient { get; }
         public IParticipationClient ParticipationClient { get; }
         public ILookupClient LookupClient { get; }
+        public IPacketClient PacketClient { get; }
 
-        public ApiClient(IVisitClient visitClient, IParticipationClient participationClient, ILookupClient lookupClient)
+        public ApiClient(IVisitClient visitClient, IParticipationClient participationClient, ILookupClient lookupClient, IPacketClient packetClient)
         {
             VisitClient = visitClient;
             ParticipationClient = participationClient;
             LookupClient = lookupClient;
+            PacketClient = packetClient;
         }
 
 

src/UDS.Net.API.Client/IApiClient.cs

@@ -1,11 +1,11 @@
-using System;
-namespace UDS.Net.API.Client
+namespace UDS.Net.API.Client
 {
     public interface IApiClient
     {
         IVisitClient VisitClient { get; }
         IParticipationClient ParticipationClient { get; }
         ILookupClient LookupClient { get; }
+        IPacketClient PacketClient { get; }
     }
 }
 

src/UDS.Net.API.Client/IBaseClient.cs

@@ -1,8 +1,5 @@
-
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using UDS.Net.Dto;
 
 namespace UDS.Net.API.Client
 {

src/UDS.Net.API.Client/IPacketClient.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using UDS.Net.Dto;
+
+namespace UDS.Net.API.Client
+{
+    public interface IPacketClient : IBaseClient<PacketDto>
+    {
+        Task<PacketDto> GetPacketWithForms(int id);
+
+        Task<int> CountByStatusAndAssignee(string[] statuses, string assignedTo);
+
+        Task<List<PacketDto>> GetPacketsByStatusAndAssignee(string[] statuses, string assignedTo, int pageSize = 10, int pageIndex = 1);
+    }
+}

src/UDS.Net.API.Client/IVisitClient.cs

@@ -1,11 +1,15 @@
-using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using UDS.Net.Dto;
 
 namespace UDS.Net.API.Client
 {
     public interface IVisitClient : IBaseClient<VisitDto>
     {
+        Task<List<VisitDto>> GetVisitsAtStatus(string[] statuses, int pageSize = 10, int pageIndex = 1);
+
+        Task<int> GetCountOfVisitsAtStatus(string[] statuses);
+
         Task<VisitDto> GetWithForm(int id, string formKind);
 
         Task PostWithForm(int id, string formKind, VisitDto dto);

src/UDS.Net.API.Client/PacketClient.cs

@@ -0,0 +1,85 @@
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Net.Http;
+using System.Text.Json;
+using System.Threading.Tasks;
+using UDS.Net.Dto;
+
+namespace UDS.Net.API.Client
+{
+    public class PacketClient : AuthenticatedClient<PacketDto>, IPacketClient
+    {
+        const string BASEPATH = "Packets";
+
+        public PacketClient(HttpClient httpClient) : base(httpClient, BASEPATH)
+        {
+        }
+
+        public async Task<PacketDto> GetPacketWithForms(int id)
+        {
+            var response = await GetRequest($"{_BasePath}/{id}/IncludeForms");
+
+            PacketDto dto = JsonSerializer.Deserialize<PacketDto>(response, options);
+
+            return dto;
+        }
+
+        public async Task<int> CountByStatusAndAssignee(string[] statuses, string assignedTo)
+        {
+            if (statuses != null && statuses.Length > 0)
+            {
+                NameValueCollection query = System.Web.HttpUtility.ParseQueryString(string.Empty);
+
+                foreach (var status in statuses)
+                {
+                    query.Add("statuses", status);
+                }
+
+                if (string.IsNullOrWhiteSpace(assignedTo))
+                {
+                    var response = await GetRequest($"{_BasePath}/Count/ByStatus?{query.ToString()}");
+
+                    return JsonSerializer.Deserialize<int>(response, options);
+                }
+                else
+                {
+                    var response = await GetRequest($"{_BasePath}/Count/ByStatus?{query.ToString()}&assignedTo={assignedTo}");
+
+                    return JsonSerializer.Deserialize<int>(response, options);
+                }
+            }
+            return 0;
+        }
+
+        public async Task<List<PacketDto>> GetPacketsByStatusAndAssignee(string[] statuses, string assignedTo, int pageSize = 10, int pageIndex = 1)
+        {
+            List<PacketDto> dto = new List<PacketDto>();
+
+            if (statuses != null && statuses.Length > 0)
+            {
+                NameValueCollection query = System.Web.HttpUtility.ParseQueryString(string.Empty);
+
+                foreach (var status in statuses)
+                {
+                    query.Add("statuses", status);
+                }
+
+                if (string.IsNullOrWhiteSpace(assignedTo))
+                {
+                    var response = await GetRequest($"{_BasePath}/ByStatus?{query.ToString()}&pageSize={pageSize}&pageIndex={pageIndex}");
+
+                    dto = JsonSerializer.Deserialize<List<PacketDto>>(response, options);
+                }
+                else
+                {
+                    var response = await GetRequest($"{_BasePath}/ByStatus?{query.ToString()}&assignedTo={assignedTo}&pageSize={pageSize}&pageIndex={pageIndex}");
+
+                    dto = JsonSerializer.Deserialize<List<PacketDto>>(response, options);
+                }
+            }
+
+            return dto;
+        }
+    }
+}
+

src/UDS.Net.API.Client/UDS.Net.API.Client.csproj

@@ -4,19 +4,19 @@
 		<TargetFramework>netstandard2.1</TargetFramework>
 		<OutputType>Library</OutputType>
 		<PackageId>UDS.Net.API.Client</PackageId>
-		<Version>4.0.1</Version>
+		<Version>4.1.0</Version>
 		<Authors>Sanders-Brown Center on Aging</Authors>
 		<Description>UDS client library for using UDS.Net.API</Description>
 		<Owners>UK-SBCoA</Owners>
 		<PackageDescription>Client library for API</PackageDescription>
 		<RepositoryUrl>https://github.com/UK-SBCoA/uniform-data-set-dotnet-api</RepositoryUrl>
-		<ReleaseVersion>4.0.1</ReleaseVersion>
+		<ReleaseVersion>4.1.0</ReleaseVersion>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="System.Text.Json" Version="7.0.2" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+		<PackageReference Include="System.Text.Json" Version="8.0.5" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\UDS.Net.Dto\UDS.Net.Dto.csproj" />

src/UDS.Net.API.Client/VisitClient.cs

@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Net.Http;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Configuration;
 using UDS.Net.Dto;
 
 namespace UDS.Net.API.Client
@@ -17,6 +15,45 @@ public VisitClient(HttpClient httpClient) : base(httpClient, BASEPATH)
         {
         }
 
+        public async Task<List<VisitDto>> GetVisitsAtStatus(string[] statuses, int pageSize = 10, int pageIndex = 1)
+        {
+            List<VisitDto> dto = new List<VisitDto>();
+
+            if (statuses != null && statuses.Length > 0)
+            {
+                NameValueCollection query = System.Web.HttpUtility.ParseQueryString(string.Empty);
+
+                foreach (var status in statuses)
+                {
+                    query.Add("statuses", status);
+                }
+
+                var response = await GetRequest($"{_BasePath}/ByStatus?{query.ToString()}&pageSize={pageSize}&pageIndex={pageIndex}");
+
+                dto = JsonSerializer.Deserialize<List<VisitDto>>(response, options);
+            }
+
+            return dto;
+        }
+
+        public async Task<int> GetCountOfVisitsAtStatus(string[] statuses)
+        {
+            if (statuses != null && statuses.Length > 0)
+            {
+                NameValueCollection query = System.Web.HttpUtility.ParseQueryString(string.Empty);
+
+                foreach (var status in statuses)
+                {
+                    query.Add("statuses", status);
+                }
+
+                var response = await GetRequest($"{_BasePath}/Count/ByStatus?{query.ToString()}");
+
+                return JsonSerializer.Deserialize<int>(response, options);
+            }
+            return 0;
+        }
+
         public async Task<VisitDto> GetWithForm(int id, string formKind)
         {
             var response = await GetRequest($"{_BasePath}/{id}/Forms/{formKind}");
@@ -32,6 +69,7 @@ public async Task PostWithForm(int id, string formKind, VisitDto dto)
 
             var response = await PostRequest($"{_BasePath}/{id}/Forms/{formKind}", json);
         }
+
     }
 }