Feature #42: Active Directory Interop Upgrade

AD Interop moved to Disco.Services; Supports multi-domain environments,
sites, and searching restricted with OUs.

Disco.Models/Services/Jobs/JobLists/JobTableItemModel.cs

@@ -6,7 +6,8 @@ namespace Disco.Models.Services.Jobs.JobLists
     public class JobTableItemModel : JobSearchResultItem
     {
         public int JobId { get; set; }
-        
+
+#pragma warning disable 809
         [Obsolete("Use [int] JobId instead")]
         public override string Id
         {
@@ -20,6 +21,7 @@ namespace Disco.Models.Services.Jobs.JobLists
                 this.JobId = int.Parse(value);
             }
         }
+#pragma warning restore 618
         public DateTime OpenedDate { get; set; }
         public DateTime? ClosedDate { get; set; }
         public string JobTypeId { get; set; }
@@ -30,6 +32,7 @@ namespace Disco.Models.Services.Jobs.JobLists
         public int? DeviceAddressId { get; set; }
         public string DeviceAddress { get; set; }
         public string OpenedTechUserId { get; set; }
+        public string OpenedTechUserFriendlyId { get; set; }
         public string OpenedTechUserDisplayName { get; set; }
         public string StatusDescription { get; set; }
         public string StatusId { get; set; }

Disco.Models/Services/Searching/DeviceSearchResultItem.cs

@@ -13,7 +13,7 @@ namespace Disco.Models.Services.Searching
         public string Id { get; set; }
         public string Type { get { return type; } }
         public string Description { get { return string.Format("{0} ({1})", this.Id, this.ComputerName); } }
-        public string ScoreValue { get { return string.Format("{0} {1} {2} {3}", this.Id, this.AssignedUserId, this.AssignedUserDisplayName, this.AssetNumber); } }
+        public string ScoreValue { get { return string.Format("{0} {1} {2} {3} {4}", this.Id, this.AssignedUserId.Substring(0, this.AssignedUserId.IndexOf('\\')), this.AssignedUserId, this.AssignedUserDisplayName, this.AssetNumber); } }
 
         public string AssetNumber { get; set; }
         public string AssignedUserDescription

Disco.Models/Services/Searching/JobSearchResultItem.cs

@@ -13,11 +13,12 @@ namespace Disco.Models.Services.Searching
         public virtual string Id { get; set; }
         public string Type { get { return type; } }
         public string Description { get { return string.Format("{0} ({1}; {2})", this.Id, this.UserId, this.DeviceSerialNumber); } }
-        public string ScoreValue { get { return string.Format("{0} {1} {2} {3}", this.Id, this.UserId, this.DeviceSerialNumber, this.UserDisplayName); } }
+        public string ScoreValue { get { return string.Format("{0} {1} {2} {3} {4}", this.Id, this.UserId.Substring(0, this.UserId.IndexOf('\\')), this.UserId, this.DeviceSerialNumber, this.UserDisplayName); } }
 
         public string DeviceSerialNumber { get; set; }
 
         public string UserId { get; set; }
+        public string UserFriendlyId { get; set; }
         public string UserDisplayName { get; set; }
     }
 }

Disco.Models/Services/Searching/UserSearchResultItem.cs

@@ -13,7 +13,7 @@ namespace Disco.Models.Services.Searching
         public string Id { get; set; }
         public string Type { get { return type; } }
         public string Description { get { return string.Format("{0} ({1})", this.DisplayName, this.Id); } }
-        public string ScoreValue { get { return string.Format("{0} {1}", this.Id, this.DisplayName); } }
+        public string ScoreValue { get { return string.Format("{0} {1} {2}", this.Id.Substring(0, this.Id.IndexOf('\\')), this.Id, this.DisplayName); } }
 
         public int AssignedDevicesCount { get; set; }
         public string DisplayName { get; set; }