AgileWebs/Core.Thalos.DAL.API
6
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Avoid null values in update and change status services #10

Merged
sergio_matias merged 1 commits from bugfix/adjust-services into development 2025-08-08 18:05:54 +00:00
Conversation 2 Commits 1 Files Changed 17 +105 -64
17 changed files with 105 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Core.Thalos.DAL.API/Controllers/ModuleController.cs
View File

@@ -66,7 +66,7 @@ namespace LSA.Core.Thalos.API.Controllers
var result = await service.GetModuleById(_id, cancellationToken);
if (result == null)
return NotFound("Entity not found");
return NotFound("Module not found");
return Ok(result);
}
@@ -112,6 +112,10 @@ namespace LSA.Core.Thalos.API.Controllers
public async Task<IActionResult> ChangeModuleStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken)
{
var result = await service.ChangeModuleStatus(_id, newStatus, cancellationToken);
if (result == null)
return NotFound("Module not found");
return Ok(result);
}
@@ -133,7 +137,7 @@ namespace LSA.Core.Thalos.API.Controllers
{
var result = await service.DeleteModule(_id, cancellationToken);
if (result == null)
return NotFound("Entity not found");
return NotFound("Module not found");
return Ok(result);
}

7
Core.Thalos.DAL.API/Controllers/PermissionController.cs
View File

@@ -9,7 +9,6 @@ using Core.Thalos.BuildingBlocks;
using Core.Thalos.Provider.Contracts;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Graph;
using PermissionRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.PermissionRequest;
using StatusEnum = Core.Blueprint.Mongo.StatusEnum;
@@ -91,7 +90,7 @@ namespace LSA.Core.Thalos.API.Controllers
if (result == null)
{
return NotFound("Entity not found");
return NotFound("Permission not found");
}
return Ok(result);
@@ -162,6 +161,10 @@ namespace LSA.Core.Thalos.API.Controllers
public async Task<IActionResult> ChangePermissionStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken)
{
var result = await service.ChangePermissionStatus(_id, newStatus, cancellationToken).ConfigureAwait(false);
if (result == null)
return NotFound("Permission not found");
return Ok(result);
}

6
Core.Thalos.DAL.API/Controllers/RoleController.cs
View File

@@ -60,7 +60,7 @@ namespace LSA.Core.Thalos.API.Controllers
if (result == null)
{
return NotFound("Entity not found");
return NotFound("Role not found");
}
return Ok(result);
@@ -126,6 +126,10 @@ namespace LSA.Core.Thalos.API.Controllers
public async Task<IActionResult> ChangeRoleStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken)
{
var result = await service.ChangeRoleStatus(_id, newStatus, cancellationToken).ConfigureAwait(false);
if (result == null)
return NotFound("Role not found");
return Ok(result);
}

25
Core.Thalos.DAL.API/Controllers/TenantController.cs
View File

@@ -7,6 +7,7 @@
using Asp.Versioning;
using Core.Thalos.BuildingBlocks;
using Core.Thalos.Provider.Contracts;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using StatusEnum = Core.Blueprint.Mongo.StatusEnum;
using TenantRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.TenantRequest;
@@ -21,7 +22,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Produces(MimeTypes.ApplicationJson)]
[Consumes(MimeTypes.ApplicationJson)]
[ApiController]
// [Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
[Authorize(AuthenticationSchemes = Schemes.DefaultScheme)]
public class TenantController(ITenantProvider service) : ControllerBase
{
/// <summary>
@@ -35,7 +36,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Consumes(MimeTypes.ApplicationJson)]
[Produces(MimeTypes.ApplicationJson)]
[ProducesResponseType(typeof(IEnumerable<TenantAdapter>), StatusCodes.Status200OK)]
// [Permission("TenantManagement.Read, RoleManagement.Read")]
[Permission("TenantManagement.Read, RoleManagement.Read")]
public async Task<IActionResult> GetAllTenantsAsync(CancellationToken cancellationToken)
{
var result = await service.GetAllTenants(cancellationToken).ConfigureAwait(false);
@@ -56,14 +57,14 @@ namespace LSA.Core.Thalos.API.Controllers
[Consumes(MimeTypes.ApplicationJson)]
[Produces(MimeTypes.ApplicationJson)]
[ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status200OK)]
// [Permission("TenantManagement.Read")]
[Permission("TenantManagement.Read")]
public async Task<IActionResult> GetTenantByIdAsync([FromRoute] string _id, CancellationToken cancellationToken)
{
var result = await service.GetTenantById(_id, cancellationToken).ConfigureAwait(false);
if (result == null)
{
return NotFound("Entity not found");
return NotFound("Tenant not found");
}
return Ok(result);
@@ -80,7 +81,7 @@ namespace LSA.Core.Thalos.API.Controllers
/// <response code="500">The service internal error.</response>
[HttpPost]
[ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status201Created)]
// [Permission("TenantManagement.Write")]
[Permission("TenantManagement.Write")]
public async Task<IActionResult> CreateTenantAsync([FromBody] TenantRequest newTenant, CancellationToken cancellationToken)
{
var result = await service.CreateTenant(newTenant, cancellationToken).ConfigureAwait(false);
@@ -103,7 +104,7 @@ namespace LSA.Core.Thalos.API.Controllers
[Consumes(MimeTypes.ApplicationJson)]
[Produces(MimeTypes.ApplicationJson)]
[ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status200OK)]
// [Permission("TenantManagement.Write")]
[Permission("TenantManagement.Write")]
public async Task<IActionResult> UpdateTenantAsync([FromRoute] string _id, [FromBody] TenantAdapter entity, CancellationToken cancellationToken)
{
if (_id != entity._Id)
@@ -112,7 +113,9 @@ namespace LSA.Core.Thalos.API.Controllers
}
var result = await service.UpdateTenant(entity, cancellationToken).ConfigureAwait(false);
return Ok(result);
if (result is not null) return Ok(result);
else return NotFound("Tenant not found");
}
/// <summary>
@@ -129,10 +132,14 @@ namespace LSA.Core.Thalos.API.Controllers
[Consumes(MimeTypes.ApplicationJson)]
[Produces(MimeTypes.ApplicationJson)]
[ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status200OK)]
// [Permission("TenantManagement.Write")]
[Permission("TenantManagement.Write")]
public async Task<IActionResult> ChangeTenantStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken)
{
var result = await service.ChangeTenantStatus(_id, newStatus, cancellationToken).ConfigureAwait(false);
if (result == null)
return NotFound("Tenant not found");
return Ok(result);
}
@@ -148,7 +155,7 @@ namespace LSA.Core.Thalos.API.Controllers
[HttpDelete]
[Route(Routes.Id)]
[ProducesResponseType(typeof(TenantAdapter), StatusCodes.Status200OK)]
// [Permission("TenantManagement.Write")]
[Permission("TenantManagement.Write")]
public async Task<IActionResult> DeleteTenantAsync([FromRoute] string _id, CancellationToken cancellationToken)
{
var result = await service.DeleteTenant(_id, cancellationToken).ConfigureAwait(false);

7
Core.Thalos.DAL.API/Controllers/UserController.cs
View File

@@ -9,7 +9,6 @@ using Core.Thalos.BuildingBlocks;
using Core.Thalos.Provider.Contracts;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Graph;
using StatusEnum = Core.Blueprint.Mongo.StatusEnum;
using UserRequest = Core.Thalos.Domain.Contexts.Onboarding.Request.UserRequest;
@@ -54,7 +53,7 @@ namespace LSA.Core.Thalos.API.Controllers
public async Task<IActionResult> GetUserById([FromRoute] string _id, CancellationToken cancellationToken)
{
var result = await service.GetUserById(_id, cancellationToken).ConfigureAwait(false);
return result == null ? NotFound("Entity not found") : Ok(result);
return result == null ? NotFound("User not found") : Ok(result);
}
/// <summary>
@@ -171,6 +170,10 @@ namespace LSA.Core.Thalos.API.Controllers
public async Task<IActionResult> ChangeUserStatus([FromRoute] string _id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken)
{
var result = await service.ChangeUserStatus(_id, newStatus, cancellationToken).ConfigureAwait(false);
if (result == null)
return NotFound("User not found");
return Ok(result);
}

2
Core.Thalos.Domain/Core.Thalos.Domain.csproj
View File

@@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="Core.Blueprint.KeyVault" Version="1.0.3" />
<PackageReference Include="Core.Thalos.BuildingBlocks" Version="1.1.1" />
<PackageReference Include="Core.Thalos.BuildingBlocks" Version="1.1.2" />
</ItemGroup>
</Project>

4
Core.Thalos.Provider/Contracts/IModuleProvider.cs
View File

@@ -62,7 +62,7 @@ namespace Core.Thalos.Provider.Contracts
/// <returns>
/// A <see cref="ValueTask{ModuleAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
ValueTask<ModuleAdapter> ChangeModuleStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken);
ValueTask<ModuleAdapter?> ChangeModuleStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken);
/// <summary>
/// Updates a Module by its identifier.
@@ -72,7 +72,7 @@ namespace Core.Thalos.Provider.Contracts
/// <returns>
/// A <see cref="ValueTask{ModuleAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
ValueTask<ModuleAdapter> UpdateModule(ModuleAdapter entity, CancellationToken cancellationToken);
ValueTask<ModuleAdapter?> UpdateModule(ModuleAdapter entity, CancellationToken cancellationToken);
/// <summary>
/// Deletes a Module by its identifier.

4
Core.Thalos.Provider/Contracts/IPermissionProvider.cs
View File

@@ -62,7 +62,7 @@ namespace Core.Thalos.Provider.Contracts
/// <returns>
/// A <see cref="ValueTask{PermissionAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
ValueTask<PermissionAdapter> ChangePermissionStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken);
ValueTask<PermissionAdapter?> ChangePermissionStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken);
/// <summary>
/// Updates a Permission.
@@ -72,7 +72,7 @@ namespace Core.Thalos.Provider.Contracts
/// <returns>
/// A <see cref="ValueTask{PermissionAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
ValueTask<PermissionAdapter> UpdatePermission(PermissionAdapter entity, CancellationToken cancellationToken);
ValueTask<PermissionAdapter?> UpdatePermission(PermissionAdapter entity, CancellationToken cancellationToken);
/// <summary>
/// Deletes a Permission by its identifier.

4
Core.Thalos.Provider/Contracts/IRoleProvider.cs
View File

@@ -52,7 +52,7 @@ namespace Core.Thalos.Provider.Contracts
/// <returns>
/// A <see cref="ValueTask{RoleAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
ValueTask<RoleAdapter> ChangeRoleStatus(string _id, Core.Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken);
ValueTask<RoleAdapter?> ChangeRoleStatus(string _id, Core.Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken);
/// <summary>
/// Updates a Role.
@@ -62,7 +62,7 @@ namespace Core.Thalos.Provider.Contracts
/// <returns>
/// A <see cref="ValueTask{RoleAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
ValueTask<RoleAdapter> UpdateRole(RoleAdapter entity, CancellationToken cancellationToken);
ValueTask<RoleAdapter?> UpdateRole(RoleAdapter entity, CancellationToken cancellationToken);
/// <summary>
/// Adds an application to the Role's list of applications.

4
Core.Thalos.Provider/Contracts/ITenantProvider.cs
View File

@@ -52,7 +52,7 @@ namespace Core.Thalos.Provider.Contracts
/// <returns>
/// A <see cref="ValueTask{TenantAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
ValueTask<TenantAdapter> ChangeTenantStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken);
ValueTask<TenantAdapter?> ChangeTenantStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken);
/// <summary>
/// Updates a Tenant.
@@ -62,7 +62,7 @@ namespace Core.Thalos.Provider.Contracts
/// <returns>
/// A <see cref="ValueTask{TenantAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
ValueTask<TenantAdapter> UpdateTenant(TenantAdapter entity, CancellationToken cancellationToken);
ValueTask<TenantAdapter?> UpdateTenant(TenantAdapter entity, CancellationToken cancellationToken);
/// <summary>
/// Deletes a Tenant by its identifier.

4
Core.Thalos.Provider/Contracts/IUserProvider.cs
View File

@@ -72,7 +72,7 @@ namespace Core.Thalos.Provider.Contracts
/// <returns>
/// A <see cref="ValueTask{UserAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
ValueTask<UserAdapter> ChangeUserStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken);
ValueTask<UserAdapter?> ChangeUserStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken);
/// <summary>
/// Updates a User.
@@ -82,7 +82,7 @@ namespace Core.Thalos.Provider.Contracts
/// <returns>
/// A <see cref="ValueTask{UserAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
ValueTask<UserAdapter> UpdateUser(UserAdapter entity, CancellationToken cancellationToken);
ValueTask<UserAdapter?> UpdateUser(UserAdapter entity, CancellationToken cancellationToken);
/// <summary>
/// Logs in the User.

2
Core.Thalos.Provider/Core.Thalos.Provider.csproj
View File

@@ -11,7 +11,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Core.Blueprint.Mongo" Version="1.0.0" />
<PackageReference Include="Core.Blueprint.Mongo" Version="1.0.1" />
<PackageReference Include="Core.Blueprint.Redis" Version="1.0.2" />
<PackageReference Include="Mapster" Version="7.4.2-pre02" />
</ItemGroup>

19
Core.Thalos.Provider/Providers/Onboarding/ModuleProvider.cs
View File

@@ -131,12 +131,17 @@ namespace Core.Thalos.Provider.Providers.Onboarding
/// <returns>
/// A <see cref="ValueTask{ModuleAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
public async ValueTask<ModuleAdapter> ChangeModuleStatus(string _id, StatusEnum newStatus, CancellationToken cancellationToken)
public async ValueTask<ModuleAdapter?> ChangeModuleStatus(string _id, StatusEnum newStatus, CancellationToken cancellationToken)
{
var entity = await repository.FindByIdAsync(_id);
entity.Status = newStatus;
await repository.ReplaceOneAsync(entity);
return entity;
if (entity is not null)
{
entity.Status = newStatus;
return repository.ReplaceOneAsync(entity).Result;
}
else return null;
}
/// <summary>
@@ -147,10 +152,10 @@ namespace Core.Thalos.Provider.Providers.Onboarding
/// <returns>
/// A <see cref="ValueTask{ModuleAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
public async ValueTask<ModuleAdapter> UpdateModule(ModuleAdapter entity, CancellationToken cancellationToken)
public async ValueTask<ModuleAdapter?> UpdateModule(ModuleAdapter entity, CancellationToken cancellationToken)
{
await repository.ReplaceOneAsync(entity);
return entity;
var updatedEntity = await repository.ReplaceOneAsync(entity);
return updatedEntity;
}
/// <summary>

19
Core.Thalos.Provider/Providers/Onboarding/PermissionProvider.cs
View File

@@ -130,12 +130,17 @@ namespace Core.Thalos.Provider.Providers.Onboarding
/// <returns>
/// A <see cref="ValueTask{PermissionAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
public async ValueTask<PermissionAdapter> ChangePermissionStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken)
public async ValueTask<PermissionAdapter?> ChangePermissionStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken)
{
var entity = await repository.FindByIdAsync(_id);
entity.Status = newStatus;
await repository.ReplaceOneAsync(entity);
return entity;
if (entity is not null)
{
entity.Status = newStatus;
return repository.ReplaceOneAsync(entity).Result;
}
else return null;
}
/// <summary>
@@ -146,10 +151,10 @@ namespace Core.Thalos.Provider.Providers.Onboarding
/// <returns>
/// A <see cref="ValueTask{PermissionAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
public async ValueTask<PermissionAdapter> UpdatePermission(PermissionAdapter entity, CancellationToken cancellationToken)
public async ValueTask<PermissionAdapter?> UpdatePermission(PermissionAdapter entity, CancellationToken cancellationToken)
{
await repository.ReplaceOneAsync(entity);
return entity;
var updatedEntity = await repository.ReplaceOneAsync(entity);
return updatedEntity;
}
/// <summary>

18
Core.Thalos.Provider/Providers/Onboarding/RoleProvider.cs
View File

@@ -100,13 +100,17 @@ namespace Core.Thalos.Provider.Providers.Onboarding
/// <returns>
/// A <see cref="ValueTask{RoleAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
public async ValueTask<RoleAdapter> ChangeRoleStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken)
public async ValueTask<RoleAdapter?> ChangeRoleStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken)
{
var entity = await repository.FindByIdAsync(_id);
entity.Status = newStatus;
await repository.ReplaceOneAsync(entity);
return entity;
if (entity is not null)
{
entity.Status = newStatus;
return repository.ReplaceOneAsync(entity).Result;
}
else return null;
}
/// <summary>
@@ -117,10 +121,10 @@ namespace Core.Thalos.Provider.Providers.Onboarding
/// <returns>
/// A <see cref="ValueTask{RoleAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
public async ValueTask<RoleAdapter> UpdateRole(RoleAdapter entity, CancellationToken cancellationToken)
public async ValueTask<RoleAdapter?> UpdateRole(RoleAdapter entity, CancellationToken cancellationToken)
{
await repository.ReplaceOneAsync(entity);
return entity;
var updatedEntity = await repository.ReplaceOneAsync(entity);
return updatedEntity;
}
/// <summary>

18
Core.Thalos.Provider/Providers/Onboarding/TenantProvider.cs
View File

@@ -99,13 +99,17 @@ namespace Core.Thalos.Provider.Providers.Onboarding
/// <returns>
/// A <see cref="ValueTask{TenantAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
public async ValueTask<TenantAdapter> ChangeTenantStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken)
public async ValueTask<TenantAdapter?> ChangeTenantStatus(string _id, Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken)
{
var entity = await repository.FindByIdAsync(_id);
entity.Status = newStatus;
await repository.ReplaceOneAsync(entity);
return entity;
if (entity is not null)
{
entity.Status = newStatus;
return repository.ReplaceOneAsync(entity).Result;
}
else return null;
}
/// <summary>
@@ -116,10 +120,10 @@ namespace Core.Thalos.Provider.Providers.Onboarding
/// <returns>
/// A <see cref="ValueTask{TenantAdapter}"/> representing the asynchronous execution of the service.
/// </returns>
public async ValueTask<TenantAdapter> UpdateTenant(TenantAdapter entity, CancellationToken cancellationToken)
public async ValueTask<TenantAdapter?> UpdateTenant(TenantAdapter entity, CancellationToken cancellationToken)
{
await repository.ReplaceOneAsync(entity);
return entity;
var updatedEntity = await repository.ReplaceOneAsync(entity);
return updatedEntity;
}
/// <summary>

18
Core.Thalos.Provider/Providers/Onboarding/UserProvider.cs
View File

@@ -146,14 +146,17 @@ namespace Core.Thalos.Provider.Providers.Onboarding
/// <param name="newStatus">The new status of the user.</param>
/// <returns>A <see cref="{Task{UserAdapter}}"/> representing
/// the asynchronous execution of the service.</returns>
public async ValueTask<UserAdapter> ChangeUserStatus(string _id, Core.Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken)
public async ValueTask<UserAdapter?> ChangeUserStatus(string _id, Core.Blueprint.Mongo.StatusEnum newStatus, CancellationToken cancellationToken)
{
var entity = await repository.FindByIdAsync(_id);
entity.Status = newStatus;
await repository.ReplaceOneAsync(entity);
if (entity is not null)
{
entity.Status = newStatus;
return entity;
return repository.ReplaceOneAsync(entity).Result;
}
else return null;
}
/// <summary>
@@ -163,11 +166,10 @@ namespace Core.Thalos.Provider.Providers.Onboarding
/// <param name="_id">The User mongo identifier.</param>
/// <returns>A <see cref="{Task{UserAdapter}}"/> representing
/// the asynchronous execution of the service.</returns>
public async ValueTask<UserAdapter> UpdateUser(UserAdapter entity, CancellationToken cancellationToken)
public async ValueTask<UserAdapter?> UpdateUser(UserAdapter entity, CancellationToken cancellationToken)
{
await repository.ReplaceOneAsync(entity);
return entity;
var updatedEntity = await repository.ReplaceOneAsync(entity);
return updatedEntity;
}
/// <summary>