refactoring the haircut messaging

Yavsc/Models/Messaging/BaseEvent.cs

@@ -19,15 +19,13 @@
 //  You should have received a copy of the GNU Lesser General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-using System.ComponentModel.DataAnnotations;
 
 namespace Yavsc.Models.Messaging
 {
     using Interfaces.Workflow;
-    using Yavsc;
 
     /// <summary>
-    /// Base event.
+    /// /// Base event.
     /// </summary>
 
     public class BaseEvent : IEvent {
@@ -37,29 +35,12 @@ namespace Yavsc.Models.Messaging
          }
          public BaseEvent(string topic)
         {
-            Topic = topic;
+            Topic = GetType().Name+"/"+topic;
         }
-        public string Topic { get; set; }
+        public string Topic { get; private set; }
         public string Sender { get; set; }
-
         public string Message { get; set; }
     }
 
-	public class GeneralEvent: BaseEvent, ITitle
-	{
-		/// <summary>
-		/// The title.
-		/// </summary>
-		[Required(ErrorMessageResourceName="ChooseATitle")]
-		[Display(Name="Title")]
-		public string Title { get; set; }
-		/// <summary>
-		/// The description.
-		/// </summary>
-		[Required(ErrorMessageResourceName="ChooseADescription")]
-		[Display(Name="Description")]
-		public string Description { get; set; }
-
-	}
 
 }

Yavsc/Models/Messaging/GeneralEvent.cs

@@ -0,0 +1,43 @@
+//
+//  BaseEvent.cs
+//
+//  Author:
+//       Paul Schneider <paul@pschneider.fr>
+//
+//  Copyright (c) 2015 GNU GPL
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace Yavsc.Models.Messaging
+{
+public class GeneralEvent: BaseEvent, ITitle
+	{
+		/// <summary>
+		/// The title.
+		/// </summary>
+		[Required(ErrorMessageResourceName="ChooseATitle")]
+		[Display(Name="Title")]
+		public string Title { get; set; }
+		/// <summary>
+		/// The description.
+		/// </summary>
+		[Required(ErrorMessageResourceName="ChooseADescription")]
+		[Display(Name="Description")]
+		public string Description { get; set; }
+
+	}
+
+}

Yavsc/Models/Messaging/RdvQueryEvent.cs

@@ -27,9 +27,10 @@ using Interfaces.Workflow;
 
 public class RdvQueryEvent: RdvQueryProviderInfo, IEvent
 	{
-        public RdvQueryEvent()
+
+        public RdvQueryEvent(string subTopic)
         {
-            Topic = "RdvQuery";
+             Topic = GetType().Name+"/"+subTopic;
         }
 
         public string Message
@@ -44,7 +45,7 @@ public class RdvQueryEvent: RdvQueryProviderInfo, IEvent
 
         public string Topic
         {
-            get; set;
+            get; private set;
         }
     }