refactoring messages

Yavsc/Models/HairCut/HairCutPaymentEvent.cs

@@ -0,0 +1,76 @@
+using Microsoft.Extensions.Localization;
+using System.Linq;
+
+using Yavsc.Interfaces.Workflow;
+using Yavsc.Models.Haircut;
+using Yavsc.ViewModels.PayPal;
+using Yavsc.Helpers;
+
+namespace Yavsc.Models.HairCut
+{
+    public class HairCutPayementEvent: IEvent
+    {
+        public HairCutPayementEvent(string sender, PaymentInfo info, HairCutQuery query, IStringLocalizer localizer)
+        {
+            Sender = sender;
+            this.query = query;
+            invoiceId = info.DetailsFromPayPal.GetExpressCheckoutDetailsResponseDetails.InvoiceID;
+            payerName = info.DetailsFromPayPal.GetExpressCheckoutDetailsResponseDetails.PayerInfo.Address.Name;
+            phone = info.DetailsFromPayPal.GetExpressCheckoutDetailsResponseDetails.PayerInfo.Address.Phone;
+            payerEmail = info.DetailsFromPayPal.GetExpressCheckoutDetailsResponseDetails.PayerInfo.Payer;
+            amount = string.Join(", ",
+                info.DetailsFromPayPal.GetExpressCheckoutDetailsResponseDetails.PaymentDetails.Select(
+                    p => $"{p.OrderTotal.value} {p.OrderTotal.currencyID}"));
+             gender = query.Prestation.Gender;
+             date = query.EventDate?.ToString("dd MM yyyy hh:mm");
+             lieu = query.Location.Address;
+             clientFinal = (gender == HairCutGenders.Women) ? localizer["Women"] +
+                " " + localizer[query.Prestation.Length.ToString()] : localizer[gender.ToString()];
+             token = info.DetailsFromPayPal.GetExpressCheckoutDetailsResponseDetails.Token;
+             payerId = info.DetailsFromPayPal.GetExpressCheckoutDetailsResponseDetails.PayerInfo.PayerID;
+        }
+
+        public string Topic => "/topic/HaircutPayment";
+
+        public string Sender { get; set; }
+
+        HairCutQuery query;
+
+        private string invoiceId;
+        private string payerName;
+        private string phone;
+        private string payerEmail;
+        private string amount;
+        private HairCutGenders gender;
+        private string date;
+        private string lieu;
+        private string clientFinal;
+        private string token;
+        private string payerId;
+
+        public string CreateBody()
+        {
+            return $@"# Paiment confirmé: {amount}
+
+Effectué par : {payerName} [{payerEmail}]
+Identifiant PayPal du paiment: {token}
+Identifiant PayPal du payeur: {payerId}
+Identifiant de la facture sur site: {invoiceId}
+
+
+# La prestation concernée:
+
+Demandeur: {query.Client.UserName}
+
+Date: {date}
+
+Lieu: {lieu}
+
+Le client final: {clientFinal}
+
+{query.GetBillText()}
+
+";
+        }
+    }
+}

Yavsc/Models/HairCut/HairCutQuery.cs

@@ -10,6 +10,9 @@ using System.Globalization;
 using Yavsc.Helpers;
 using Yavsc.Models.Messaging;
 using System.Linq;
+using Microsoft.Extensions.Localization;
+using Yavsc.ViewModels.PayPal;
+using Yavsc.Models.HairCut;
 
 namespace Yavsc.Models.Haircut
 {
@@ -369,9 +372,15 @@ Prestation.Gender == HairCutGenders.Women ?
             return bill;
         }
 
+        public HairCutPayementEvent CreatePaymentEvent(PaymentInfo info, IStringLocalizer localizer)
+        {
+            
+            return new HairCutPayementEvent(Client.UserName,info,this, localizer);
+        }
+
         public virtual BrusherProfile SelectedProfile { get; set; }
 
-        public HairCutQueryEvent CreateEvent(string subTopic, string reason, string sender, string message) {
+        public HairCutQueryEvent CreateEvent(string subTopic, string reason, string sender) {
 
             string evdate = EventDate?.ToString("dddd dd/MM/yyyy à HH:mm")??"[pas de date spécifiée]";
             string address = Location?.Address??"[pas de lieu spécifié]";
@@ -393,8 +402,7 @@ Prestation.Gender == HairCutGenders.Women ?
                 Id = Id,
                 ActivityCode = ActivityCode,
                 Reason = reason,
-                Sender = sender,
-                Message = message
+                Sender = Client.GetSender()
             };
             return yaev;
         }

Yavsc/Models/HairCut/HairCutQueryEvent.cs

@@ -6,14 +6,20 @@ namespace Yavsc.Models.Haircut
     {
         public HairCutQueryEvent(string subTopic)
         {
-
-            Topic = GetType().Name+"/"+subTopic;
+            Topic = "/topic/HairCutQuery";
+            if (subTopic!=null) Topic+="/"+subTopic;
         }
-        public string Message
+        public string CreateBody()
         {
-            get;
+            return $"{Reason}\r\n-- \r\n{Previsional}\r\n{EventDate}\r\n";
+        }
 
-            set;
+        public string CreateBoby()
+        {
+            return string.Format(Startup.GlobalLocalizer["RdvToPerf"], Client.UserName,
+            EventDate?.ToString("dddd dd/MM/yyyy à HH:mm"),
+            Location.Address,
+            ActivityCode);
         }
 
         public string Sender