Skip to content

Heedls 1035 bulk resource json endpoint #1351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 18, 2022
Merged

Heedls 1035 bulk resource json endpoint #1351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
206658f
HEEDLS-1035 Modify bulk endpoint to pass a json to the API
Aug 12, 2022
d4c63c8
HEEDLS-1035 Fix request string
Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions DigitalLearningSolutions.Data/ApiClients/LearningHubApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using JsonSerializer = System.Text.Json.JsonSerializer;

public interface ILearningHubApiClient
{
Expand Down Expand Up @@ -75,18 +76,19 @@ public async Task<BulkResourceReferences> GetBulkResourcesByReferenceIds(
IEnumerable<int> resourceReferenceIds
)
{
var referenceIdQueryStrings =
resourceReferenceIds.Select(id => GetQueryString("resourceReferenceIds", id.ToString()));
var queryString = string.Join("&", referenceIdQueryStrings);
var referenceIds = resourceReferenceIds.ToList();
var objectWithReferenceIds = new { referenceIds = referenceIds.ToList() };

var jsonString = JsonSerializer.Serialize(objectWithReferenceIds);
var response = await GetStringAsync($"/Resource/BulkJson?{jsonString}");

var response = await GetStringAsync($"/Resource/Bulk?{queryString}");
var result = JsonConvert.DeserializeObject<BulkResourceReferences>(response);
return result;
}

public async Task<CataloguesResult> GetCatalogues()
{
var response = await GetStringAsync($"/Catalogues");
var response = await GetStringAsync("/Catalogues");
var result = JsonConvert.DeserializeObject<CataloguesResult>(response);
return result;
}
Expand All @@ -104,7 +106,8 @@ private static string GetSearchQueryString(
var offSetQueryString = GetQueryString("offset", offset?.ToString());
var limitQueryString = GetQueryString("limit", limit?.ToString());

var queryStrings = new List<string> { textQueryString, catalogueIdString, offSetQueryString, limitQueryString };
var queryStrings = new List<string>
{ textQueryString, catalogueIdString, offSetQueryString, limitQueryString };

if (resourceTypes != null)
{
Expand Down