Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
namespace Hermes.SituationRoom.Domain.Services;

using System.Security.Cryptography;
using Hermes.SituationRoom.Data.Interface;
using Hermes.SituationRoom.Shared.BusinessObjects;
using Hermes.SituationRoom.Shared.DataTransferObjects;
using Interfaces;

public class ActivistService(IActivistRepository activistRepository, IEncryptionService encryptionService) : IActivistService
{
public Task<ActivistBo> GetActivistAsync(Guid activistUid) => activistRepository.GetActivistBoAsync(activistUid);
public async Task<ActivistBo> GetActivistAsync(Guid activistUid)
{
var activist = await activistRepository.GetActivistBoAsync(activistUid);

return activist with { Password = null, PasswordHash = null, PasswordSalt = null };
}

public Task<IReadOnlyList<ActivistBo>> GetActivistsAsync() => activistRepository.GetAllActivistBosAsync();
public async Task<IReadOnlyList<ActivistBo>> GetActivistsAsync()
{
var activists = await activistRepository.GetAllActivistBosAsync();

return [.. activists.Select((activist) => activist with { Password = null, PasswordHash = null, PasswordSalt = null })];
}

public Task<Guid> CreateActivistAsync(ActivistBo activistBo)
{
Expand All @@ -24,11 +33,19 @@ public Task<Guid> CreateActivistAsync(ActivistBo activistBo)
public Task<Guid?> FindActivistIdByUsernameAsync(string username) =>
activistRepository.FindActivistIdByUsernameAsync(username);

public Task<ActivistBo> UpdateActivistAsync(ActivistBo updatedActivist) =>
activistRepository.UpdateAsync(updatedActivist);
public async Task<ActivistBo> UpdateActivistAsync(ActivistBo updatedActivist)
{
var activist = await activistRepository.UpdateAsync(updatedActivist);

public Task<ActivistBo> UpdateActivistVisibilityAsync(Guid activistUid, UpdateActivistPrivacyLevelDto updateActivistPrivacyLevelDto) =>
activistRepository.UpdateActivistVisibilityAsync(activistUid, updateActivistPrivacyLevelDto);
return activist with { Password = null, PasswordHash = null, PasswordSalt = null };
}

public async Task<ActivistBo> UpdateActivistVisibilityAsync(Guid activistUid, UpdateActivistPrivacyLevelDto updateActivistPrivacyLevelDto)
{
var activist = await activistRepository.UpdateActivistVisibilityAsync(activistUid, updateActivistPrivacyLevelDto);

return activist with { Password = null, PasswordHash = null, PasswordSalt = null };
}

public Task DeleteActivistAsync(Guid activistUid) => activistRepository.DeleteAsync(activistUid);
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,18 @@

public class JournalistService(IJournalistRepository journalistRepository, IEncryptionService encryptionService) : IJournalistService
{
public Task<JournalistBo> GetJournalistAsync(Guid journalistUid) =>
journalistRepository.GetJournalistBoAsync(journalistUid);
public async Task<JournalistBo> GetJournalistAsync(Guid journalistUid)
{
var journalist = await journalistRepository.GetJournalistBoAsync(journalistUid);

return journalist with { Password = null, PasswordHash = null, PasswordSalt = null };
}

public Task<IReadOnlyList<JournalistBo>> GetJournalistsAsync() => journalistRepository.GetAllJournalistBosAsync();
public async Task<IReadOnlyList<JournalistBo>> GetJournalistsAsync()
{
var journalists = await journalistRepository.GetAllJournalistBosAsync();
return [ ..journalists.Select(journalist => journalist with { Password = null, PasswordHash = null, PasswordSalt = null })];
}

public Task<Guid> CreateJournalistAsync(JournalistBo journalistBo)
{
Expand All @@ -22,8 +30,10 @@ public Task<Guid> CreateJournalistAsync(JournalistBo journalistBo)
return journalistRepository.AddAsync(journalistBo);
}

public Task<JournalistBo> UpdateJournalistAsync(JournalistBo updatedJournalist) =>
journalistRepository.UpdateAsync(updatedJournalist);
public async Task<JournalistBo> UpdateJournalistAsync(JournalistBo updatedJournalist) {
var journalist = await journalistRepository.UpdateAsync(updatedJournalist);
return journalist with { Password = null, PasswordHash = null, PasswordSalt = null };
}

public Task DeleteJournalistAsync(Guid journalistUid) => journalistRepository.DeleteAsync(journalistUid);
}
17 changes: 14 additions & 3 deletions src/backend/Hermes.SituationRoom.Domain/Services/UserService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@

public class UserService(IUserRepository userRepository, IActivistRepository activistRepository, IEncryptionService encryptionService) : IUserService
{
public Task<UserBo> GetUserAsync(Guid userUid) => userRepository.GetUserBoAsync(userUid);
public async Task<UserBo> GetUserAsync(Guid userUid) {
var user = await userRepository.GetUserBoAsync(userUid);
return user with { Password = null, PasswordHash = null, PasswordSalt = null };
}

public Task<UserProfileBo> GetUserProfileAsync(Guid userUid, Guid consumerUid) => userRepository.GetUserProfileBoAsync(userUid, consumerUid);

public Task<string> GetDisplayNameAsync(Guid userUid) => userRepository.GetDisplayNameAsync(userUid);

public Task<IReadOnlyList<UserBo>> GetUsersAsync() => userRepository.GetAllUserBosAsync();
public async Task<IReadOnlyList<UserBo>> GetUsersAsync()
{
var users = await userRepository.GetAllUserBosAsync();
return [ ..users.Select(user => user with {Password = null, PasswordHash = null, PasswordSalt = null})];
}

public Task<Guid> CreateUserAsync(UserBo userBo)
{
Expand Down Expand Up @@ -42,7 +49,11 @@ public async Task<Guid> GetUserIdByEmailOrUsernameAsync(string usernameOrEmail)
throw new KeyNotFoundException($"No user with the username or email '{usernameOrEmail}' was found.");
}

public Task<UserBo> UpdateUserAsync(UserBo updatedUser) => userRepository.Update(updatedUser);
public async Task<UserBo> UpdateUserAsync(UserBo updatedUser)
{
var user = await userRepository.Update(updatedUser);
return user with { Password = null, PasswordHash = null, PasswordSalt = null };
}

public Task DeleteUserAsync(Guid userUid)
{
Expand Down
Loading