Govor-team/Govor
2
2
Fork 0
mirror of https://github.com/Govor-team/Govor.git synced 2026-09-22 10:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to SmartRes Result/Error, upgrade to .NET 10

Browse Source 
Migrate codebase to use SmartRes Result<T, Error> (and Unit) across services and interfaces, replacing previous Result usage and updating many method signatures and implementations. Add ResultExtensions to convert SmartRes results to ASP.NET ActionResult and refactor AuthController to use functional Bind/Tap chains for registration/login flows. Upgrade projects to .NET 10 and bump related NuGet packages; add libs/SmartRes.dll and project references. Simplify DbContext registration to use Npgsql only with retry policies and enable detailed logging. Update Swagger/launch settings and other minor fixes (AutoMapper registration change, whitespace/exception handling, and removal of the Govor.ConsoleClient files).
This commit is contained in:
Artemy
2026-07-25 20:20:45 +07:00
parent 6d1c53beeb
commit 3c785d5c89
65 changed files with 376 additions and 838 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Govor.Application/PushNotifications/IPushNotificationService.cs
+4 -3
View File
@@ -1,12 +1,13 @@
using Govor.Domain.Common;
using SmartRes;
namespace Govor.Application.PushNotifications;
public interface IPushNotificationService
{
Task<Result> SendToUserAsync(Guid userId, string title, string body, string channelId, string tag = "", Dictionary<string, string>? data = null);
Task<Result<Unit, Error>> SendToUserAsync(Guid userId, string title, string body, string channelId, string tag = "", Dictionary<string, string>? data = null);
Task<Result> SendToUsersAsync(IEnumerable<Guid> userIds, string title, string body, string channelId, string tag = "", Dictionary<string, string>? data = null);
Task<Result<Unit, Error>> SendToUsersAsync(IEnumerable<Guid> userIds, string title, string body, string channelId, string tag = "", Dictionary<string, string>? data = null);
Task<Result> SendToSessionAsync(Guid sessionId, string title, string body, string channelId, string tag = "", Dictionary<string, string>? data = null);
Task<Result<Unit, Error>> SendToSessionAsync(Guid sessionId, string title, string body, string channelId, string tag = "", Dictionary<string, string>? data = null);
}
Govor.Application/PushNotifications/IPushTokenService.cs
+8 -7
View File
@@ -1,14 +1,15 @@
using Govor.Domain.Common;
using SmartRes;
namespace Govor.Application.PushNotifications;
public interface IPushTokenService
{
Task<Result> DeactivateTokenBySessionAsync(Guid sessionId);
Task<Result> DeactivateAllTokensByUserIdAsync(Guid userId);
Task<Result<List<string>>> GetStringsActiveTokensAsync(Guid userId);
Task<Result<List<string>>> GetUsersStringsActiveTokensAsync(IEnumerable<Guid> userIds);
Task<Result<string?>> GetActiveTokenBySessionAsync(Guid sessionId);
Task<Result> RemoveTokensAsync(IEnumerable<string> tokens);
Task<Result> AddOrUpdateTokenAsync(Guid userId, Guid sessionId, string token, string platform);
Task<Result<Unit, Error>> DeactivateTokenBySessionAsync(Guid sessionId);
Task<Result<Unit, Error>> DeactivateAllTokensByUserIdAsync(Guid userId);
Task<Result<List<string>, Error>> GetStringsActiveTokensAsync(Guid userId);
Task<Result<List<string>, Error>> GetUsersStringsActiveTokensAsync(IEnumerable<Guid> userIds);
Task<Result<string?, Error>> GetActiveTokenBySessionAsync(Guid sessionId);
Task<Result<Unit, Error>> RemoveTokensAsync(IEnumerable<string> tokens);
Task<Result<Unit, Error>> AddOrUpdateTokenAsync(Guid userId, Guid sessionId, string token, string platform);
}
Govor.Application/PushNotifications/PushNotificationService.cs
+6 -5
View File
@@ -2,6 +2,7 @@ using Govor.Application.Interfaces.PushNotifications.Models;
using Govor.Application.PushNotifications.Providers;
using Govor.Domain.Common;
using Microsoft.Extensions.Logging;
using SmartRes;
namespace Govor.Application.PushNotifications;
@@ -21,7 +22,7 @@ public class PushNotificationService : IPushNotificationService
_logger = logger;
}
public async Task<Result> SendToUserAsync(Guid userId, string title, string body, string channelId, string tag = "", Dictionary<string, string>? data = null)
public async Task<Result<Unit, Error>> SendToUserAsync(Guid userId, string title, string body, string channelId, string tag = "", Dictionary<string, string>? data = null)
{
var resultTokens = await _tokenService.GetStringsActiveTokensAsync(userId);
if (resultTokens.IsFailure)
@@ -37,10 +38,10 @@ public class PushNotificationService : IPushNotificationService
return await SendMulticastInternalAsync(tokens, title, body, channelId, tag, data, userId.ToString());
}
public async Task<Result> SendToUsersAsync(IEnumerable<Guid> userIds, string title, string body, string channelId, string tag = "", Dictionary<string, string>? data = null)
public async Task<Result<Unit, Error>> SendToUsersAsync(IEnumerable<Guid> userIds, string title, string body, string channelId, string tag = "", Dictionary<string, string>? data = null)
{
if (userIds == null || !userIds.Any())
return Result.Failure(new Error("Push.InvalidArgs", "User IDs collection cannot be empty."));
return Result.Failure(Error.Failure("Push.InvalidArgs", "User IDs collection cannot be empty."));
var tokensResult = await _tokenService.GetUsersStringsActiveTokensAsync(userIds);
if (tokensResult.IsFailure)
@@ -53,7 +54,7 @@ public class PushNotificationService : IPushNotificationService
return await SendMulticastInternalAsync(tokens, title, body, channelId, tag, data, "bulk_request");
}
public async Task<Result> SendToSessionAsync(Guid sessionId, string title, string body, string channelId, string tag = "", Dictionary<string, string>? data = null)
public async Task<Result<Unit, Error>> SendToSessionAsync(Guid sessionId, string title, string body, string channelId, string tag = "", Dictionary<string, string>? data = null)
{
var tokenResult = await _tokenService.GetActiveTokenBySessionAsync(sessionId);
if (tokenResult.IsFailure)
@@ -83,7 +84,7 @@ public class PushNotificationService : IPushNotificationService
}
}
private async Task<Result> SendMulticastInternalAsync(List<string> tokens, string title, string body, string channelId, string tag, Dictionary<string, string>? data, string targetInfo)
private async Task<Result<Unit, Error>> SendMulticastInternalAsync(List<string> tokens, string title, string body, string channelId, string tag, Dictionary<string, string>? data, string targetInfo)
{
try
{
Govor.Application/PushNotifications/PushTokenService.cs
+12 -11
View File
@@ -3,6 +3,7 @@ using Govor.Domain.Common;
using Govor.Domain.Models.Users;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using SmartRes;
namespace Govor.Application.PushNotifications;
@@ -17,7 +18,7 @@ public class PushTokenService : IPushTokenService
_logger = logger;
}
public async Task<Result> DeactivateTokenBySessionAsync(Guid sessionId)
public async Task<Result<Unit, Error>> DeactivateTokenBySessionAsync(Guid sessionId)
{
try
{
@@ -34,7 +35,7 @@ public class PushTokenService : IPushTokenService
}
}
public async Task<Result> DeactivateAllTokensByUserIdAsync(Guid userId)
public async Task<Result<Unit, Error>> DeactivateAllTokensByUserIdAsync(Guid userId)
{
try
{
@@ -51,7 +52,7 @@ public class PushTokenService : IPushTokenService
}
}
public async Task<Result<List<string>>> GetStringsActiveTokensAsync(Guid userId)
public async Task<Result<List<string>, Error>> GetStringsActiveTokensAsync(Guid userId)
{
try
{
@@ -66,11 +67,11 @@ public class PushTokenService : IPushTokenService
catch (Exception ex)
{
_logger.LogError(ex, "Failed to fetch active push tokens for user {UserId}", userId);
return Result<List<string>>.Failure(ex);
return Result.Failure<List<string>>(ex);
}
}
public async Task<Result<List<string>>> GetUsersStringsActiveTokensAsync(IEnumerable<Guid> userIds)
public async Task<Result<List<string>, Error>> GetUsersStringsActiveTokensAsync(IEnumerable<Guid> userIds)
{
try
{
@@ -85,11 +86,11 @@ public class PushTokenService : IPushTokenService
catch (Exception ex)
{
_logger.LogError(ex, "Failed to fetch active push tokens for bulk users");
return Result<List<string>>.Failure(ex);
return Result.Failure<List<string>>(ex);
}
}
public async Task<Result<string?>> GetActiveTokenBySessionAsync(Guid sessionId)
public async Task<Result<string?, Error>> GetActiveTokenBySessionAsync(Guid sessionId)
{
try
{
@@ -104,11 +105,11 @@ public class PushTokenService : IPushTokenService
catch (Exception ex)
{
_logger.LogError(ex, "Failed to fetch active push token for session {SessionId}", sessionId);
return Result<string?>.Failure(ex);
return Result.Failure<string?>(ex);
}
}
public async Task<Result> RemoveTokensAsync(IEnumerable<string> tokens)
public async Task<Result<Unit, Error>> RemoveTokensAsync(IEnumerable<string> tokens)
{
if (tokens is null || !tokens.Any())
return Result.Success();
@@ -128,11 +129,11 @@ public class PushTokenService : IPushTokenService
}
}
public async Task<Result> AddOrUpdateTokenAsync(Guid userId, Guid sessionId, string token, string platform)
public async Task<Result<Unit, Error>> AddOrUpdateTokenAsync(Guid userId, Guid sessionId, string token, string platform)
{
if (string.IsNullOrWhiteSpace(token))
{
return new Error("PushToken.Empty", "Push token cannot be empty.");
return Result<Unit, Error>.Failure(Error.Failure("PushToken.Empty", "Push token cannot be empty."));
}
var existingToken = await _context.UserPushTokens