Skip to content

Commit

Permalink
Fix ManagedWorkshops returned value (#836)
Browse files Browse the repository at this point in the history
  • Loading branch information
valerabad authored Sep 1, 2022
1 parent 2fae57c commit 2529129
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public async Task<IActionResult> GetRelatedProviderAdmins()
/// Method to Get data about managed Workshops.
/// </summary>
/// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
[ProducesResponseType(StatusCodes.Status200OK, Type = typeof(IEnumerable<WorkshopCard>))]
[ProducesResponseType(StatusCodes.Status200OK, Type = typeof(IEnumerable<WorkshopProviderViewCard>))]
[ProducesResponseType(StatusCodes.Status204NoContent)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Task<Either<ErrorResponse, ActionResult>> BlockProviderAdminAsync(
/// <param name="userId">Key in the table.</param>
/// <param name="isProviderDeputy">Is providerAdmin deputy or no.</param>
/// <returns>List of the workshops that providerAdmin can manage.</returns>
Task<IEnumerable<WorkshopBaseCard>> GetWorkshopsThatProviderAdminCanManage(string userId, bool isProviderDeputy);
Task<IEnumerable<WorkshopProviderViewCard>> GetWorkshopsThatProviderAdminCanManage(string userId, bool isProviderDeputy);

/// <summary>
/// Get entity by it's key.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ public async Task<IEnumerable<Guid>> GetRelatedWorkshopIdsForProviderAdmins(stri
}

/// <inheritdoc/>
public async Task<IEnumerable<WorkshopBaseCard>> GetWorkshopsThatProviderAdminCanManage(
public async Task<IEnumerable<WorkshopProviderViewCard>> GetWorkshopsThatProviderAdminCanManage(
string userId,
bool isProviderDeputy)
{
Expand All @@ -261,18 +261,18 @@ public async Task<IEnumerable<WorkshopBaseCard>> GetWorkshopsThatProviderAdminCa

if (!providersAdmins.Any())
{
return new List<WorkshopBaseCard>();
return new List<WorkshopProviderViewCard>();
}

if (isProviderDeputy)
{
var providerAdmin = providersAdmins.SingleOrDefault(x => x.IsDeputy);

return await workshopService.GetByProviderId<WorkshopBaseCard>(providerAdmin.ProviderId).ConfigureAwait(false);
return await workshopService.GetByProviderId<WorkshopProviderViewCard>(providerAdmin.ProviderId).ConfigureAwait(false);
}

return providersAdmins.SingleOrDefault().ManagedWorkshops
.Select(workshop => mapper.Map<WorkshopBaseCard>(workshop));
.Select(workshop => mapper.Map<WorkshopProviderViewCard>(workshop));
}

/// <inheritdoc/>
Expand Down

0 comments on commit 2529129

Please sign in to comment.