notazof/yavsc
Watch
1
1
Fork
You've already forked yavsc
 0
Code Issues 4 Pull requests Projects 2 Releases 31 Packages Wiki Activity Actions

Notify performers of API bookings and client-signed estimates

Browse source 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Paul Schneider 2026-10-11 00:14:33 +01:00
commit f9d95fd98f
Signed by: notazof
GPG key ID: AD4B9B545FBD7D12
13 changed files with 390 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/Yavsc.Server/Helpers/RdvQueryEventHelpers.cs Normal file
View file

@ -0,0 +1,29 @@
using Yavsc.Abstract.Identity;
using Yavsc.Models;
using Yavsc.Models.Billing;
using Yavsc.Models.Messaging;
using Yavsc.Models.Workflow;
namespace Yavsc.Helpers;
public static class RdvQueryEventHelpers
{
public static RdvQueryEvent CreateEvent(this RdvQuery query, string subtopic)
=> new(subtopic)
{
Sender = query.ClientId,
Reason = query.Reason,
Client = new ClientProviderInfo
{
UserName = query.Client.UserName,
UserId = query.ClientId,
Avatar = query.Client.Avatar
},
Previsional = query.Provisional,
EventDate = query.EventDate,
Location = query.Location,
Id = query.Id,
ActivityCode = query.ActivityCode,
BillingCode = BillingCodes.Rdv
};
}

23
src/Yavsc.Server/Models/Messaging/ClientEstimateSignedEvent.cs Normal file
View file

@ -0,0 +1,23 @@
using Yavsc.Interfaces.Workflow;
using Yavsc.Models.Billing;
namespace Yavsc.Models.Messaging;
public sealed class ClientEstimateSignedEvent : IEvent
{
public ClientEstimateSignedEvent(Estimate estimate, string sender)
{
EstimateId = estimate.Id;
EstimateTitle = estimate.Title;
PerformerId = estimate.OwnerId;
Sender = sender;
}
public long EstimateId { get; }
public string EstimateTitle { get; }
public string PerformerId { get; }
public string Topic => "ClientEstimateSigned";
public string Sender { get; set; }
public string Title => "Devis signé par le client";
public string CreateBody() => $"{Sender} a signé le devis n°{EstimateId} : {EstimateTitle}.";
}

53
src/Yavsc.Server/Services/YavscMessageSender.cs
View file

@ -9,6 +9,7 @@ using Yavsc.Models.Google.Messaging;
using Yavsc.Models.Haircut;
using Yavsc.Models.Messaging;
using Yavsc.Server.Hubs;
using Yavsc.Abstract.Models.Messaging;
namespace Yavsc.Services
{
@ -30,7 +31,7 @@ namespace Yavsc.Services
IHubContext<ChatHub> hubContext
)
{
_logger = loggerFactory.CreateLogger<MailSender>();
_logger = loggerFactory.CreateLogger<YavscMessageSender>();
_emailSender = emailSender;
siteSettings = sitesOptions?.Value;
this.hubContext = hubContext;
@ -70,34 +71,51 @@ namespace Yavsc.Services
};
var user = _dbContext.Users.FirstOrDefault(u => u.Id == userId);
results.Add(result);
if (user == null)
{
response.failure++;
result.error = "no such user.";
continue;
}
if (!user.EmailConfirmed)
{
response.failure++;
result.error = "user has not confirmed his email address.";
continue;
}
if (user.Email == null)
{
response.failure++;
result.error = "user has no legacy email address.";
continue;
}
var body = ev.CreateBody();
var subject = ev is ClientEstimateSignedEvent signed
? signed.Title
: $"{ev.Sender} (un client) vous demande un rendez-vous";
if (ev is RdvQueryEvent || ev is ClientEstimateSignedEvent)
{
_dbContext.Notification.Add(new Notification
{
title = subject.Length > 1024 ? subject[..1024] : subject,
body = body.Length > 512 ? body[..512] : body,
Target = $"user/{userId}",
tag = ev switch
{
ClientEstimateSignedEvent estimateEvent => $"estimate/{estimateEvent.EstimateId}/client-signed",
RdvQueryEvent rdvEvent => $"rdv/{rdvEvent.Id}",
_ => throw new InvalidOperationException("Unsupported persistent notification event.")
},
click_action = "Fermer"
});
await _dbContext.SaveChangesAsync(ev.Sender);
}
_logger.LogDebug($"Sending to {user.UserName} <{user.Email}> : {body}");
if (!user.EmailConfirmed || string.IsNullOrWhiteSpace(user.Email))
{
response.failure++;
result.error = !user.EmailConfirmed
? "user has not confirmed his email address."
: "user has no legacy email address.";
_logger.LogWarning("Email notification not sent to {UserId}: {Reason}", userId, result.error);
}
else
{
result.message_id = await _emailSender.SendEmailAsync(user.UserName, user.Email,
$"{ev.Sender} (un client) vous demande un rendez-vous",
subject,
body + Environment.NewLine);
response.success++;
}
var cxIds = _cxManager.GetConnexionIds(user.UserName);
if (cxIds == null)
@ -125,7 +143,6 @@ namespace Yavsc.Services
response.success++;
}
results.Add(result);
}
response.results = results.ToArray();
return response;