refactoring

Yavsc/Models/Billing/NominativeServiceCommand.cs

@@ -5,7 +5,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Yavsc.Models.Billing
 {
-    using Interfaces.Workflow;
     using Newtonsoft.Json;
     using Workflow;
     using YavscLib;
@@ -67,4 +66,4 @@ namespace Yavsc.Models.Billing
         [ForeignKey("ActivityCode"),JsonIgnore]
         public virtual Activity Context  { get; set ; }
  }
-}
+}

Yavsc/Models/Haircut/HairCutQuery.cs

@@ -4,11 +4,10 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Yavsc.Models.Billing;
 using Yavsc.Models.Relationship;
-using YavscLib.HairCut;
 
 namespace Yavsc.Models.Haircut
 {
-    public class HairCutQuery : NominativeServiceCommand, IHairCutQuery
+    public class HairCutQuery : NominativeServiceCommand
     {
         [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public long Id { get; set; }

Yavsc/Models/Haircut/Views/HaircutQueryInfo.cs

@@ -0,0 +1,47 @@
+using System;
+using Yavsc.Models.Auth;
+using Yavsc.Models.Relationship;
+using YavscLib;
+
+namespace Yavsc.Models.Haircut.Views
+{
+    public class HaircutQueryProviderInfo : HaircutQueryComonInfo {
+        public HaircutQueryProviderInfo(HairCutQuery query) : base (query)
+        {
+            ClientInfo = new UserInfo(query.Client);
+        }
+        public UserInfo ClientInfo { get; set; }
+
+    }
+    public class HaircutQueryClientInfo : HaircutQueryComonInfo {
+        public HaircutQueryClientInfo(HairCutQuery query) : base (query)
+        {
+            ProviderInfo = new UserInfo(query.PerformerProfile.Performer);
+        }
+           public UserInfo ProviderInfo { get; set; }
+
+    }
+    public class HaircutQueryComonInfo
+    {
+        public HaircutQueryComonInfo(HairCutQuery query)
+        {
+            Id = query.Id;
+            Prestation = query.Prestation;
+            Status = query.Status;
+            Location = query.Location;
+            EventDate = query.EventDate;
+        }
+        public long Id { get; set; }
+        public HairPrestation Prestation { get; set; }
+
+        public QueryStatus Status { get; set; }
+
+        public virtual Location Location { get; set; }
+        public DateTime? EventDate
+        {
+            get;
+            set;
+        }
+
+    }
+}

Yavsc/Models/Workflow/Query.cs

@@ -1,8 +1,7 @@
 namespace Yavsc.Models.Workflow
 {
-    using Interfaces.Workflow;
     using YavscLib;
-    
+
     public interface IQuery: IBaseTrackedEntity
     {
         QueryStatus Status { get; set; }