Skip to content
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

Jump to bottom

fix: resolved apps-business endpoint empty results #172

Merged
merged 2 commits into from
Jul 27, 2023
Merged

fix: resolved apps-business endpoint empty results #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c59ef5f
fix: resolved apps-business endpoint empty
VPrasannaK94 Jul 27, 2023
8dfd780
fix authorization
ntruchsess Jul 27, 2023
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
4 changes: 2 additions & 2 deletions src/marketplace/Apps.Service/BusinessLogic/AppsBusinessLogic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ public IAsyncEnumerable<AppData> GetAllActiveAppsAsync(string? languageShortName
app.UseCaseNames));

/// <inheritdoc/>
public IAsyncEnumerable<BusinessAppData> GetAllUserUserBusinessAppsAsync(Guid companyId) =>
public IAsyncEnumerable<BusinessAppData> GetAllUserUserBusinessAppsAsync(Guid userId) =>
_portalRepositories.GetInstance<IOfferSubscriptionsRepository>()
.GetAllBusinessAppDataForUserIdAsync(companyId)
.GetAllBusinessAppDataForUserIdAsync(userId)
.Select(x =>
new BusinessAppData(
x.OfferId,
Expand Down
4 changes: 2 additions & 2 deletions src/marketplace/Apps.Service/BusinessLogic/IAppsBusinessLogic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ public interface IAppsBusinessLogic
/// <summary>
/// Get all apps that a user has been assigned roles in.
/// </summary>
/// <param name="companyId">Id of the user to get available apps for.</param>
/// <param name="userId">Id of the user to get available apps for.</param>
/// <returns>List of available apps for user.</returns>
public IAsyncEnumerable<BusinessAppData> GetAllUserUserBusinessAppsAsync(Guid companyId);
public IAsyncEnumerable<BusinessAppData> GetAllUserUserBusinessAppsAsync(Guid userId);

/// <summary>
/// Get detailed application data for a single app by id.
Expand Down
4 changes: 2 additions & 2 deletions src/marketplace/Apps.Service/Controllers/AppsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ public IAsyncEnumerable<AppData> GetAllActiveAppsAsync([FromQuery] string? lang
[HttpGet]
[Route("business")]
[Authorize(Roles = "view_apps")]
[Authorize(Policy = PolicyTypes.ValidCompany)]
[Authorize(Policy = PolicyTypes.CompanyUser)]
[ProducesResponseType(typeof(IAsyncEnumerable<BusinessAppData>), StatusCodes.Status200OK)]
[ProducesResponseType(typeof(ErrorResponse), StatusCodes.Status400BadRequest)]
public IAsyncEnumerable<BusinessAppData> GetAllBusinessAppsForCurrentUserAsync() =>
this.WithCompanyId(companyId => _appsBusinessLogic.GetAllUserUserBusinessAppsAsync(companyId));
this.WithUserId(userId => _appsBusinessLogic.GetAllUserUserBusinessAppsAsync(userId));

/// <summary>
/// Retrieves app details for an app referenced by id.
Expand Down
2 changes: 1 addition & 1 deletion tests/marketplace/Apps.Service.Tests/Controllers/AppsControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public async Task GetAllBusinessAppsForCurrentUserAsync_ReturnsExpectedCount()
var result = await this._controller.GetAllBusinessAppsForCurrentUserAsync().ToListAsync().ConfigureAwait(false);

//Assert
A.CallTo(() => _logic.GetAllUserUserBusinessAppsAsync(_identity.CompanyId)).MustHaveHappenedOnceExactly();
A.CallTo(() => _logic.GetAllUserUserBusinessAppsAsync(_identity.UserId)).MustHaveHappenedOnceExactly();
result.Should().HaveCount(5);
}

Expand Down
Loading