jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature: MS Excel (xlsx) Import/Export

Browse Source 
Microsoft Excel files can be used to import/export devices. Several
import bugs were also fixed in the process.
This commit is contained in:
Gary Sharp
2017-03-25 15:37:28 +11:00
parent ed66f4f285
commit 5ce9e51ae7
51 changed files with 1959 additions and 1083 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Devices/Importing/Fields/AssignedUserIdImportField.cs
+49 -27
View File
@@ -22,18 +22,18 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return friendlyValue; } }
public override string FriendlyPreviousValue { get { return friendlyPreviousValue; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
friendlyValue = Value;
var value = friendlyValue = DataReader.GetString(ColumnIndex);
if (string.IsNullOrWhiteSpace(Value))
if (string.IsNullOrWhiteSpace(value))
{
friendlyValue = null;
parsedValue = null;
}
else
{
parsedValue = Value.Trim();
parsedValue = value.Trim();
parsedValue = ActiveDirectory.ParseDomainAccountId(parsedValue);
@@ -48,25 +48,32 @@ namespace Disco.Services.Devices.Importing.Fields
// Check User Exists
// Try Database
User user = Database.Users.FirstOrDefault(u => u.UserId == parsedValue);
try
using (var database = new DiscoDataContext())
{
// Try Updating from AD
user = UserService.GetUser(parsedValue, Database);
User user = database.Users.FirstOrDefault(u => u.UserId == parsedValue);
try
{
// Try Updating from AD
user = UserService.GetUser(parsedValue, database);
}
catch (Exception ex)
{
if (user == null)
return Error(ex.Message);
}
parsedValue = user.UserId;
friendlyValue = $"{user.DisplayName} [{user.UserId}]";
}
catch (Exception ex)
{
if (user == null)
return Error(ex.Message);
}
parsedValue = user.UserId;
friendlyValue = string.Format("{0} [{1}]", user.DisplayName, user.UserId);
// Check Decommissioned
bool? importDecommissioning = null;
if (Values.ContainsKey(DeviceImportFieldTypes.DeviceDecommissionedDate) || Values.ContainsKey(DeviceImportFieldTypes.DeviceDecommissionedReason))
importDecommissioning = Values.ContainsKey(DeviceImportFieldTypes.DeviceDecommissionedDate) && !string.IsNullOrWhiteSpace(Values[DeviceImportFieldTypes.DeviceDecommissionedDate]) ||
Values.ContainsKey(DeviceImportFieldTypes.DeviceDecommissionedReason) && !string.IsNullOrWhiteSpace(Values[DeviceImportFieldTypes.DeviceDecommissionedReason]);
int? decommissionedDateIndex = Context.GetColumnByType(DeviceImportFieldTypes.DeviceDecommissionedDate);
int? decommissionedReasonIndex = Context.GetColumnByType(DeviceImportFieldTypes.DeviceDecommissionedReason);
if (decommissionedDateIndex.HasValue || decommissionedReasonIndex.HasValue)
{
importDecommissioning = (decommissionedDateIndex.HasValue && !string.IsNullOrWhiteSpace(DataReader.GetString(decommissionedDateIndex.Value))) ||
(decommissionedReasonIndex.HasValue && !string.IsNullOrWhiteSpace(DataReader.GetString(decommissionedReasonIndex.Value)));
}
if (importDecommissioning.HasValue && importDecommissioning.Value)
return Error("Cannot assign a user to a device being decommissioned");
@@ -84,7 +91,7 @@ namespace Disco.Services.Devices.Importing.Fields
else if (ExistingDevice != null && ExistingDevice.AssignedUserId != parsedValue)
{
if (ExistingDevice.AssignedUserId != null)
friendlyPreviousValue = string.Format("{0} [{1}]", ExistingDevice.AssignedUser.DisplayName, ExistingDevice.AssignedUser.UserId);
friendlyPreviousValue = $"{ExistingDevice.AssignedUser.DisplayName} [{ExistingDevice.AssignedUser.UserId}]";
else
friendlyPreviousValue = null;
@@ -96,7 +103,7 @@ namespace Disco.Services.Devices.Importing.Fields
public override bool Apply(DiscoDataContext Database, Device Device)
{
if (this.FieldAction == EntityState.Modified)
if (FieldAction == EntityState.Modified)
{
// Remove Current Assignments
var currentAssignments = Device.DeviceUserAssignments.Where(dua => !dua.UnassignedDate.HasValue);
@@ -130,16 +137,31 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override void Applied(DiscoDataContext Database, Device Device, ref bool DeviceADDescriptionSet)
{
if (!DeviceADDescriptionSet)
{
if (ActiveDirectory.IsValidDomainAccountId(Device.DeviceDomainId))
{
var adAccount = Device.ActiveDirectoryAccount();
if (adAccount != null && !adAccount.IsCriticalSystemObject)
{
adAccount.SetDescription(Device);
DeviceADDescriptionSet = true;
}
}
}
}
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn &&
h.Item1.Item1.IndexOf("user", System.StringComparison.OrdinalIgnoreCase) >= 0
);
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn &&
h.Name.IndexOf("user", StringComparison.OrdinalIgnoreCase) >= 0);
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
}
}
Disco.Services/Devices/Importing/Fields/BatchIdImportField.cs
+23 -31
View File
@@ -20,28 +20,23 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return friendlyValue; } }
public override string FriendlyPreviousValue { get { return friendlyPreviousValue; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
friendlyValue = Value;
// Validate
if (string.IsNullOrWhiteSpace(Value))
this.parsedValue = null; // Default = null
if (DataReader.TryGetNullableInt(ColumnIndex, out parsedValue))
{
friendlyValue = parsedValue.ToString();
}
else
{
int valueInt;
if (int.TryParse(Value, out valueInt))
this.parsedValue = valueInt;
else
return Error("The Batch Identifier must be a number");
return Error("The Batch Identifier must be a number");
}
if (this.parsedValue.HasValue)
if (parsedValue.HasValue)
{
var b = Cache.DeviceBatches.FirstOrDefault(db => db.Id == parsedValue);
if (b == null)
return Error(string.Format("The identifier ({0}) does not match any Device Batch", Value));
friendlyValue = string.Format("{0} [{1}]", b.Name, b.Id);
return Error($"The identifier ({friendlyValue}) does not match any Device Batch");
friendlyValue = $"{b.Name} [{b.Id}]";
}
else
friendlyValue = null;
@@ -55,7 +50,7 @@ namespace Disco.Services.Devices.Importing.Fields
previousBatch = Cache.DeviceBatches.FirstOrDefault(db => db.Id == ExistingDevice.DeviceBatchId.Value);
if (previousBatch != null)
friendlyPreviousValue = string.Format("{0} [{1}]", previousBatch.Name, previousBatch.Id);
friendlyPreviousValue = $"{previousBatch.Name} [{previousBatch.Id}]";
return Success(EntityState.Modified);
}
@@ -65,10 +60,10 @@ namespace Disco.Services.Devices.Importing.Fields
public override bool Apply(DiscoDataContext Database, Device Device)
{
if (this.FieldAction == EntityState.Added ||
this.FieldAction == EntityState.Modified)
if (FieldAction == EntityState.Added ||
FieldAction == EntityState.Modified)
{
Device.DeviceBatchId = this.parsedValue;
Device.DeviceBatchId = parsedValue;
return true;
}
else
@@ -77,30 +72,27 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn && h.Item1.Item1.IndexOf("batch", System.StringComparison.OrdinalIgnoreCase) >= 0);
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn &&
h.Name.IndexOf("batch", StringComparison.OrdinalIgnoreCase) >= 0);
// All Integers Numbers
possibleColumns = possibleColumns.Where(h =>
{
int lastValue;
return Context.RawData.Select(v => v[h.Item2]).Take(100).Where(v => !string.IsNullOrWhiteSpace(v)).All(v => int.TryParse(v, out lastValue));
}).ToList();
// All Nullable<int> Values
possibleColumns = possibleColumns
.Where(h => DataReader.TestAllNullableInt(h.Index)).ToList();
// Multiple Columns, tighten column definition
if (possibleColumns.Count() > 1)
{
possibleColumns = possibleColumns
.Where(h =>
h.Item1.Item1.IndexOf("batchid", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("batch id", StringComparison.OrdinalIgnoreCase) >= 0);
h.Name.IndexOf("batchid", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("batch id", StringComparison.OrdinalIgnoreCase) >= 0);
}
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
}
}
Disco.Services/Devices/Importing/Fields/DetailACAdapterImportField.cs
+13 -12
View File
@@ -19,13 +19,15 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return parsedValue; } }
public override string FriendlyPreviousValue { get { return previousValue; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
if (string.IsNullOrWhiteSpace(Value))
var value = DataReader.GetString(ColumnIndex);
if (string.IsNullOrWhiteSpace(value))
parsedValue = null;
else
{
parsedValue = Value.Trim();
parsedValue = value.Trim();
}
if (ExistingDevice == null && parsedValue != null)
@@ -54,8 +56,8 @@ namespace Disco.Services.Devices.Importing.Fields
public override bool Apply(DiscoDataContext Database, Device Device)
{
if (this.FieldAction == EntityState.Added ||
this.FieldAction == EntityState.Modified)
if (FieldAction == EntityState.Added ||
FieldAction == EntityState.Modified)
{
DeviceDetail detail = Database.DeviceDetails.FirstOrDefault(dd =>
@@ -84,16 +86,15 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn &&
(h.Item1.Item1.IndexOf("ac adapter", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("acadapter", System.StringComparison.OrdinalIgnoreCase) >= 0));
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn &&
(h.Name.IndexOf("ac adapter", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("acadapter", StringComparison.OrdinalIgnoreCase) >= 0));
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
}
}
Disco.Services/Devices/Importing/Fields/DetailBatteryImportField.cs
+12 -11
View File
@@ -19,13 +19,15 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return parsedValue; } }
public override string FriendlyPreviousValue { get { return previousValue; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
if (string.IsNullOrWhiteSpace(Value))
var value = DataReader.GetString(ColumnIndex);
if (string.IsNullOrWhiteSpace(value))
parsedValue = null;
else
{
parsedValue = Value.Trim();
parsedValue = value.Trim();
}
if (ExistingDevice == null && parsedValue != null)
@@ -54,8 +56,8 @@ namespace Disco.Services.Devices.Importing.Fields
public override bool Apply(DiscoDataContext Database, Device Device)
{
if (this.FieldAction == EntityState.Added ||
this.FieldAction == EntityState.Modified)
if (FieldAction == EntityState.Added ||
FieldAction == EntityState.Modified)
{
DeviceDetail detail = Database.DeviceDetails.FirstOrDefault(dd =>
@@ -84,15 +86,14 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn &&
h.Item1.Item1.IndexOf("battery", System.StringComparison.OrdinalIgnoreCase) >= 0);
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn &&
h.Name.IndexOf("battery", StringComparison.OrdinalIgnoreCase) >= 0);
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
}
}
Disco.Services/Devices/Importing/Fields/DetailKeyboardImportField.cs
+12 -11
View File
@@ -19,13 +19,15 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return parsedValue; } }
public override string FriendlyPreviousValue { get { return previousValue; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
if (string.IsNullOrWhiteSpace(Value))
var value = DataReader.GetString(ColumnIndex);
if (string.IsNullOrWhiteSpace(value))
parsedValue = null;
else
{
parsedValue = Value.Trim();
parsedValue = value.Trim();
}
if (ExistingDevice == null && parsedValue != null)
@@ -54,8 +56,8 @@ namespace Disco.Services.Devices.Importing.Fields
public override bool Apply(DiscoDataContext Database, Device Device)
{
if (this.FieldAction == EntityState.Added ||
this.FieldAction == EntityState.Modified)
if (FieldAction == EntityState.Added ||
FieldAction == EntityState.Modified)
{
DeviceDetail detail = Database.DeviceDetails.FirstOrDefault(dd =>
@@ -84,15 +86,14 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn &&
h.Item1.Item1.IndexOf("keyboard", System.StringComparison.OrdinalIgnoreCase) >= 0);
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn &&
h.Name.IndexOf("keyboard", StringComparison.OrdinalIgnoreCase) >= 0);
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
}
}
Disco.Services/Devices/Importing/Fields/DetailLanMacAddressImportField.cs
+19 -18
View File
@@ -19,13 +19,15 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return parsedValue; } }
public override string FriendlyPreviousValue { get { return previousValue; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
if (string.IsNullOrWhiteSpace(Value))
var value = DataReader.GetString(ColumnIndex);
if (string.IsNullOrWhiteSpace(value))
parsedValue = null;
else
{
parsedValue = Value.Trim();
parsedValue = value.Trim();
}
if (ExistingDevice == null && parsedValue != null)
@@ -54,8 +56,8 @@ namespace Disco.Services.Devices.Importing.Fields
public override bool Apply(DiscoDataContext Database, Device Device)
{
if (this.FieldAction == EntityState.Added ||
this.FieldAction == EntityState.Modified)
if (FieldAction == EntityState.Added ||
FieldAction == EntityState.Modified)
{
DeviceDetail detail = Database.DeviceDetails.FirstOrDefault(dd =>
@@ -84,23 +86,22 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn && (
h.Item1.Item1.IndexOf("wlan", System.StringComparison.OrdinalIgnoreCase) < 0 &&
h.Item1.Item1.IndexOf("wireless", System.StringComparison.OrdinalIgnoreCase) < 0 && (
h.Item1.Item1.IndexOf("lan address", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("lan mac", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("lan mac address", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("lanaddress", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("lanmac", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("lanmacaddress", System.StringComparison.OrdinalIgnoreCase) >= 0
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn && (
h.Name.IndexOf("wlan", StringComparison.OrdinalIgnoreCase) < 0 &&
h.Name.IndexOf("wireless", StringComparison.OrdinalIgnoreCase) < 0 && (
h.Name.IndexOf("lan address", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("lan mac", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("lan mac address", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("lanaddress", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("lanmac", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("lanmacaddress", StringComparison.OrdinalIgnoreCase) >= 0
)));
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
}
}
Disco.Services/Devices/Importing/Fields/DetailWLanMacAddressImportField.cs
+21 -20
View File
@@ -19,13 +19,15 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return parsedValue; } }
public override string FriendlyPreviousValue { get { return previousValue; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
if (string.IsNullOrWhiteSpace(Value))
var value = DataReader.GetString(ColumnIndex);
if (string.IsNullOrWhiteSpace(value))
parsedValue = null;
else
{
parsedValue = Value.Trim();
parsedValue = value.Trim();
}
if (ExistingDevice == null && parsedValue != null)
@@ -54,8 +56,8 @@ namespace Disco.Services.Devices.Importing.Fields
public override bool Apply(DiscoDataContext Database, Device Device)
{
if (this.FieldAction == EntityState.Added ||
this.FieldAction == EntityState.Modified)
if (FieldAction == EntityState.Added ||
FieldAction == EntityState.Modified)
{
DeviceDetail detail = Database.DeviceDetails.FirstOrDefault(dd =>
@@ -84,25 +86,24 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn && (
h.Item1.Item1.IndexOf("wireless lan mac address", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("wireless lan address", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("wireless mac address", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("wireless mac", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("wlan address", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("wlan mac", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("wlan mac address", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("wlanaddress", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("wlanmac", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("wlanmacaddress", System.StringComparison.OrdinalIgnoreCase) >= 0
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn && (
h.Name.IndexOf("wireless lan mac address", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("wireless lan address", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("wireless mac address", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("wireless mac", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("wlan address", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("wlan mac", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("wlan mac address", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("wlanaddress", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("wlanmac", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("wlanmacaddress", StringComparison.OrdinalIgnoreCase) >= 0
));
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
}
}
Disco.Services/Devices/Importing/Fields/DeviceAllowUnauthenticatedEnrolImportField.cs
+35 -57
View File
@@ -1,7 +1,6 @@
using Disco.Data.Repository;
using Disco.Models.Repository;
using Disco.Models.Services.Devices.Importing;
using Disco.Services.Users;
using System;
using System.Collections.Generic;
using System.Data;
@@ -11,9 +10,7 @@ namespace Disco.Services.Devices.Importing.Fields
{
internal class DeviceAllowUnauthenticatedEnrolImportField : DeviceImportFieldBase
{
private static string[] TrueValues = { "true", "1", "yes", "-1", "on" };
private static string[] FalseValues = { "false", "0", "no", "off" };
private bool parsedValue;
private bool? parsedValue;
private string friendlyValue;
private string friendlyPreviousValue;
@@ -23,22 +20,30 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return friendlyValue; } }
public override string FriendlyPreviousValue { get { return friendlyPreviousValue; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
friendlyValue = Value;
if (!ParseBoolean(Value, out parsedValue))
if (DataReader.TryGetNullableBool(ColumnIndex, out parsedValue))
{
friendlyValue = parsedValue.ToString();
}
else
{
return Error("Expected a Boolean expression (True, 1, Yes, On, False, 0, No, Off)");
}
friendlyValue = parsedValue.ToString();
friendlyValue = parsedValue?.ToString() ?? "Not Set";
if (parsedValue == true)
if (parsedValue.HasValue && parsedValue.Value == true)
{
// Check Decommissioned
bool? importDecommissioning = null;
if (Values.ContainsKey(DeviceImportFieldTypes.DeviceDecommissionedDate) || Values.ContainsKey(DeviceImportFieldTypes.DeviceDecommissionedReason))
importDecommissioning = Values.ContainsKey(DeviceImportFieldTypes.DeviceDecommissionedDate) && !string.IsNullOrWhiteSpace(Values[DeviceImportFieldTypes.DeviceDecommissionedDate]) ||
Values.ContainsKey(DeviceImportFieldTypes.DeviceDecommissionedReason) && !string.IsNullOrWhiteSpace(Values[DeviceImportFieldTypes.DeviceDecommissionedReason]);
int? decommissionedDateIndex = Context.GetColumnByType(DeviceImportFieldTypes.DeviceDecommissionedDate);
int? decommissionedReasonIndex = Context.GetColumnByType(DeviceImportFieldTypes.DeviceDecommissionedReason);
if (decommissionedDateIndex.HasValue || decommissionedReasonIndex.HasValue)
{
importDecommissioning = (decommissionedDateIndex.HasValue && !string.IsNullOrWhiteSpace(DataReader.GetString(decommissionedDateIndex.Value))) ||
(decommissionedReasonIndex.HasValue && !string.IsNullOrWhiteSpace(DataReader.GetString(decommissionedReasonIndex.Value)));
}
if (importDecommissioning.HasValue && importDecommissioning.Value)
return Error("Cannot enrol a device being decommissioned");
@@ -49,7 +54,11 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
if (ExistingDevice == null && parsedValue != false) // Default: True
if (!parsedValue.HasValue)
{
return Success(EntityState.Unchanged);
}
else if (ExistingDevice == null && parsedValue.Value != false) // Default: True
{
return Success(EntityState.Added);
}
@@ -65,10 +74,11 @@ namespace Disco.Services.Devices.Importing.Fields
public override bool Apply(DiscoDataContext Database, Device Device)
{
if (this.FieldAction == EntityState.Modified ||
this.FieldAction == EntityState.Added)
if (parsedValue.HasValue &&
(FieldAction == EntityState.Modified ||
FieldAction == EntityState.Added))
{
Device.AllowUnauthenticatedEnrol = parsedValue;
Device.AllowUnauthenticatedEnrol = parsedValue.Value;
return true;
}
@@ -78,52 +88,20 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn &&
h.Item1.Item1.IndexOf("trust enrol", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("enrolment trusted", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("trust", System.StringComparison.OrdinalIgnoreCase) >= 0
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn &&
h.Name.IndexOf("trust enrol", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("enrolment trusted", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("trust", StringComparison.OrdinalIgnoreCase) >= 0
);
// All Boolean
possibleColumns = possibleColumns.Where(h =>
{
bool lastValue;
return Context.RawData.Select(v => v[h.Item2]).Take(100).Where(v => !string.IsNullOrWhiteSpace(v)).All(v => ParseBoolean(v, out lastValue));
}).ToList();
possibleColumns = possibleColumns.Where(h => DataReader.TestAllNullableBool(h.Index)).ToList();
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
}
private static bool ParseBoolean(string value, out bool result)
{
if (string.IsNullOrWhiteSpace(value))
{
result = false;
return false;
}
value = value.Trim();
if (TrueValues.Contains(value, StringComparer.OrdinalIgnoreCase))
{
result = true;
return true;
}
else if (FalseValues.Contains(value, StringComparer.OrdinalIgnoreCase))
{
result = false;
return true;
}
else
{
result = false;
return false;
}
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
}
}
Disco.Services/Devices/Importing/Fields/DeviceAssetNumberImportField.cs
+14 -12
View File
@@ -19,13 +19,15 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return parsedValue; } }
public override string FriendlyPreviousValue { get { return previousValue; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
if (string.IsNullOrWhiteSpace(Value))
var value = DataReader.GetString(ColumnIndex);
if (string.IsNullOrWhiteSpace(value))
parsedValue = null;
else
{
parsedValue = Value.Trim();
parsedValue = value.Trim();
if (parsedValue.Length > 40)
return Error("Cannot be more than 40 characters");
}
@@ -43,10 +45,10 @@ namespace Disco.Services.Devices.Importing.Fields
public override bool Apply(DiscoDataContext Database, Device Device)
{
if (this.FieldAction == EntityState.Added ||
this.FieldAction == EntityState.Modified)
if (FieldAction == EntityState.Added ||
FieldAction == EntityState.Modified)
{
Device.AssetNumber = this.parsedValue;
Device.AssetNumber = parsedValue;
return true;
}
else
@@ -55,14 +57,14 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// 'asset' in column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn && h.Item1.Item1.IndexOf("asset", System.StringComparison.OrdinalIgnoreCase) >= 0);
// column name
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn &&
h.Name.IndexOf("asset", StringComparison.OrdinalIgnoreCase) >= 0);
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
}
}
Disco.Services/Devices/Importing/Fields/DeviceDecommissionedDateImportField.cs
+87 -41
View File
@@ -1,6 +1,7 @@
using Disco.Data.Repository;
using Disco.Models.Repository;
using Disco.Models.Services.Devices.Importing;
using Disco.Services.Interop.ActiveDirectory;
using System;
using System.Collections.Generic;
using System.Data;
@@ -24,53 +25,67 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return parsedValue.HasValue ? parsedValue.Value.ToString(DateFormat) : rawValue; } }
public override string FriendlyPreviousValue { get { return previousValue.HasValue ? previousValue.Value.ToString(DateFormat) : null; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
if (string.IsNullOrWhiteSpace(Value))
if (!DataReader.TryGetNullableDateTime(ColumnIndex, out parsedValue))
{
rawValue = null;
parsedValue = null;
rawValue = DataReader.GetString(ColumnIndex);
return Error($"Cannot parse the value as a Date/Time using {CultureInfo.CurrentCulture.Name} culture (system default).");
}
else
if (parsedValue.HasValue)
{
DateTime valueDateTime;
if (!DateTime.TryParse(Value.Trim(), CultureInfo.CurrentCulture, System.Globalization.DateTimeStyles.AssumeLocal, out valueDateTime))
{
rawValue = Value.Trim();
return Error(string.Format("Cannot parse the value as a Date/Time using {0} culture (system default).", CultureInfo.CurrentCulture.Name));
}
else
{
// Accuracy to the second (remove any milliseconds)
parsedValue = new DateTime((valueDateTime.Ticks / 10000000L) * 10000000L);
}
// Accuracy to the second (remove any milliseconds)
parsedValue = new DateTime((parsedValue.Value.Ticks / 10000000L) * 10000000L);
}
string errorMessage;
if (parsedValue.HasValue && !CanDecommissionDevice(ExistingDevice, Values, out errorMessage))
if (parsedValue.HasValue && !CanDecommissionDevice(ExistingDevice, Context, DataReader, out errorMessage))
return Error(errorMessage);
setReason = !Values.ContainsKey(DeviceImportFieldTypes.DeviceDecommissionedReason) ||
(parsedValue.HasValue && string.IsNullOrWhiteSpace(Values[DeviceImportFieldTypes.DeviceDecommissionedReason]));
var decommissionReasonIndex = Context.GetColumnByType(DeviceImportFieldTypes.DeviceDecommissionedReason);
setReason = !decommissionReasonIndex.HasValue ||
(parsedValue.HasValue && string.IsNullOrWhiteSpace(DataReader.GetString(decommissionReasonIndex.Value)));
if (ExistingDevice != null && ExistingDevice.DecommissionedDate != parsedValue)
if (ExistingDevice != null && ExistingDevice.DecommissionedDate.HasValue)
{
// Accuracy to the second (remove any milliseconds)
previousValue = new DateTime((ExistingDevice.DecommissionedDate.Value.Ticks / 10000000L) * 10000000L);
}
else
{
previousValue = null;
}
if (previousValue != parsedValue)
{
previousValue = ExistingDevice.DecommissionedDate;
return Success(EntityState.Modified);
}
else
{
previousValue = null;
return Success(EntityState.Unchanged);
}
}
public override bool Apply(DiscoDataContext Database, Device Device)
{
if (this.FieldAction == EntityState.Modified)
if (FieldAction == EntityState.Modified)
{
// Decommission or Recommission Device
Device.DecommissionedDate = this.parsedValue;
Device.DecommissionedDate = parsedValue;
if (setReason)
Device.DecommissionReason = this.parsedValue.HasValue ? (DecommissionReasons?)DecommissionReasons.EndOfLife : null;
{
if (parsedValue.HasValue && !Device.DecommissionReason.HasValue)
{
Device.DecommissionReason = DecommissionReasons.EndOfLife;
}
else if (!parsedValue.HasValue && Device.DecommissionReason.HasValue)
{
Device.DecommissionReason = null;
}
}
return true;
}
@@ -80,22 +95,52 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override void Applied(DiscoDataContext Database, Device Device, ref bool DeviceADDescriptionSet)
{
// column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn &&
h.Item1.Item1.IndexOf("decommission date", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("decommissiondate", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("decommissioned date", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("decommissioneddate", System.StringComparison.OrdinalIgnoreCase) >= 0
);
if (ActiveDirectory.IsValidDomainAccountId(Device.DeviceDomainId))
{
var adAccount = Device.ActiveDirectoryAccount();
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
if (adAccount != null && !adAccount.IsCriticalSystemObject)
{
if (Device.DecommissionedDate.HasValue)
{
// Disable AD Account
adAccount.DisableAccount();
}
else
{
// Enable AD Account
adAccount.EnableAccount();
}
if (!DeviceADDescriptionSet)
{
adAccount.SetDescription(Device);
DeviceADDescriptionSet = true;
}
}
}
}
public static bool CanDecommissionDevice(Device Device, Dictionary<DeviceImportFieldTypes, string> Values, out string ErrorMessage)
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// column name
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn &&
h.Name.IndexOf("decommission date", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("decommissiondate", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("decommissioned date", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("decommissioneddate", StringComparison.OrdinalIgnoreCase) >= 0
);
possibleColumns = possibleColumns
.Where(h => DataReader.TestAllNullableDateTime(h.Index)).ToList();
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
public static bool CanDecommissionDevice(Device Device, IDeviceImportContext Context, IDeviceImportDataReader DataReader, out string ErrorMessage)
{
if (Device == null)
{
@@ -105,13 +150,14 @@ namespace Disco.Services.Devices.Importing.Fields
// Check device is assigned (or being removed in this import)
if ((!Values.ContainsKey(DeviceImportFieldTypes.AssignedUserId) && Device.AssignedUserId != null) ||
(Values.ContainsKey(DeviceImportFieldTypes.AssignedUserId) && !string.IsNullOrWhiteSpace(Values[DeviceImportFieldTypes.AssignedUserId])))
var assignedUserIndex = Context.GetColumnByType(DeviceImportFieldTypes.AssignedUserId);
if ((!assignedUserIndex.HasValue && Device.AssignedUserId != null) ||
(assignedUserIndex.HasValue && !string.IsNullOrWhiteSpace(DataReader.GetString(assignedUserIndex.Value))))
{
if (Device.AssignedUserId != null)
ErrorMessage = string.Format("The device is assigned to a user ({0} [{1}]) and cannot be decommissioned", Device.AssignedUser.DisplayName, Device.AssignedUser.UserId);
ErrorMessage = $"The device is assigned to a user ({Device.AssignedUser.DisplayName} [{Device.AssignedUser.UserId}]) and cannot be decommissioned";
else
ErrorMessage = string.Format("The device is being assigned to a user ({0}) and cannot be decommissioned", Values[DeviceImportFieldTypes.AssignedUserId]);
ErrorMessage = $"The device is being assigned to a user ({DataReader.GetString(assignedUserIndex.Value)}) and cannot be decommissioned";
return false;
}
@@ -119,7 +165,7 @@ namespace Disco.Services.Devices.Importing.Fields
var openJobCount = Device.Jobs.Count(j => !j.ClosedDate.HasValue);
if (openJobCount > 0)
{
ErrorMessage = string.Format("The device is associated with {0} open job{1} and cannot be decommissioned", openJobCount, openJobCount == 1 ? null : "s");
ErrorMessage = $"The device is associated with {openJobCount} open job{(openJobCount == 1 ? null : "s")} and cannot be decommissioned";
return false;
}
Disco.Services/Devices/Importing/Fields/DeviceDecommissionedReasonImportField.cs
+63 -19
View File
@@ -1,6 +1,7 @@
using Disco.Data.Repository;
using Disco.Models.Repository;
using Disco.Models.Services.Devices.Importing;
using Disco.Services.Interop.ActiveDirectory;
using System;
using System.Collections.Generic;
using System.Data;
@@ -22,9 +23,11 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return parsedValue.HasValue ? parsedValue.Value.ToString() : rawValue; } }
public override string FriendlyPreviousValue { get { return previousValue.HasValue ? previousValue.Value.ToString() : null; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
if (string.IsNullOrWhiteSpace(Value))
var value = DataReader.GetString(ColumnIndex);
if (string.IsNullOrWhiteSpace(value))
{
rawValue = null;
parsedValue = null;
@@ -32,9 +35,9 @@ namespace Disco.Services.Devices.Importing.Fields
else
{
DecommissionReasons valueReason;
if (!decommissionReasonsMap.Value.TryGetValue(Value.Trim(), out valueReason))
if (!decommissionReasonsMap.Value.TryGetValue(value.Trim(), out valueReason))
{
rawValue = Value.Trim();
rawValue = value.Trim();
return Error("Cannot parse the value as a Decommission Reason");
}
else
@@ -43,15 +46,16 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
if (parsedValue.HasValue && !Values.ContainsKey(DeviceImportFieldTypes.DeviceDecommissionedDate))
var decommissionedDateIndex = Context.GetColumnByType(DeviceImportFieldTypes.DeviceDecommissionedDate);
if (parsedValue.HasValue && !decommissionedDateIndex.HasValue)
{
string errorMessage;
if (!DeviceDecommissionedDateImportField.CanDecommissionDevice(ExistingDevice, Values, out errorMessage))
if (!DeviceDecommissionedDateImportField.CanDecommissionDevice(ExistingDevice, Context, DataReader, out errorMessage))
return Error(errorMessage);
setDate = true;
}
else if (parsedValue.HasValue && string.IsNullOrWhiteSpace(Values[DeviceImportFieldTypes.DeviceDecommissionedDate]))
else if (parsedValue.HasValue && string.IsNullOrWhiteSpace(DataReader.GetString(decommissionedDateIndex.Value)))
{
setDate = true;
}
@@ -67,13 +71,22 @@ namespace Disco.Services.Devices.Importing.Fields
public override bool Apply(DiscoDataContext Database, Device Device)
{
if (this.FieldAction == EntityState.Modified)
if (FieldAction == EntityState.Modified)
{
// Decommission or Recommission Device
Device.DecommissionReason = this.parsedValue;
Device.DecommissionReason = parsedValue;
if (setDate)
Device.DecommissionedDate = this.parsedValue.HasValue ? (DateTime?)DateTime.Now : null;
{
if (parsedValue.HasValue && !Device.DecommissionedDate.HasValue)
{
Device.DecommissionedDate = DateTime.Now;
}
else if (!parsedValue.HasValue && Device.DecommissionedDate.HasValue)
{
Device.DecommissionedDate = null;
}
}
return true;
}
@@ -83,19 +96,50 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override void Applied(DiscoDataContext Database, Device Device, ref bool DeviceADDescriptionSet)
{
// Only Enable/Disable if DeviceDecommissionedDate field is not present
if (setDate)
{
if (ActiveDirectory.IsValidDomainAccountId(Device.DeviceDomainId))
{
var adAccount = Device.ActiveDirectoryAccount();
if (adAccount != null && !adAccount.IsCriticalSystemObject)
{
if (Device.DecommissionedDate.HasValue)
{
// Disable AD Account
adAccount.DisableAccount();
}
else
{
// Enable AD Account
adAccount.EnableAccount();
}
if (!DeviceADDescriptionSet)
{
adAccount.SetDescription(Device);
DeviceADDescriptionSet = true;
}
}
}
}
}
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn &&
h.Item1.Item1.IndexOf("decommission reason", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("decommissionreason", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("decommissioned reason", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("decommissionedreason", System.StringComparison.OrdinalIgnoreCase) >= 0
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn &&
h.Name.IndexOf("decommission reason", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("decommissionreason", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("decommissioned reason", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("decommissionedreason", StringComparison.OrdinalIgnoreCase) >= 0
);
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
public static Dictionary<string, DecommissionReasons> BuildDecommissionReasonsMap()
Disco.Services/Devices/Importing/Fields/DeviceLocationImportField.cs
+13 -11
View File
@@ -19,13 +19,15 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return parsedValue; } }
public override string FriendlyPreviousValue { get { return previousValue; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
if (string.IsNullOrWhiteSpace(Value))
var value = DataReader.GetString(ColumnIndex);
if (string.IsNullOrWhiteSpace(value))
parsedValue = null;
else
{
parsedValue = Value.Trim();
parsedValue = value.Trim();
if (parsedValue.Length > 250)
return Error("Cannot be more than 250 characters");
}
@@ -43,10 +45,10 @@ namespace Disco.Services.Devices.Importing.Fields
public override bool Apply(DiscoDataContext Database, Device Device)
{
if (this.FieldAction == EntityState.Added ||
this.FieldAction == EntityState.Modified)
if (FieldAction == EntityState.Added ||
FieldAction == EntityState.Modified)
{
Device.Location = this.parsedValue;
Device.Location = parsedValue;
return true;
}
else
@@ -55,14 +57,14 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn && h.Item1.Item1.IndexOf("location", System.StringComparison.OrdinalIgnoreCase) >= 0);
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn &&
h.Name.IndexOf("location", StringComparison.OrdinalIgnoreCase) >= 0);
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
}
}
Disco.Services/Devices/Importing/Fields/DeviceSerialNumberImportField.cs
+17 -20
View File
@@ -19,14 +19,16 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return parsedValue; } }
public override string FriendlyPreviousValue { get { return parsedValue; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
var value = DataReader.GetString(ColumnIndex);
// Validate
if (string.IsNullOrWhiteSpace(Value))
if (string.IsNullOrWhiteSpace(value))
return Error("The Device Serial Number is required");
else
{
parsedValue = Value.Trim();
parsedValue = value.Trim();
if (parsedValue.Length > maxLength)
return Error($"Cannot be more than {maxLength} characters");
if (parsedValue.Contains(@"/"))
@@ -36,13 +38,11 @@ namespace Disco.Services.Devices.Importing.Fields
}
// Duplicate
var duplicate = Context.RawData
.Take(RecordIndex)
.Select((r, i) => Tuple.Create(i, ParseRawDeviceSerialNumber(r[Context.HeaderDeviceSerialNumberIndex])))
.Where(r => IsDeviceSerialNumberValid(r.Item2))
.FirstOrDefault(r => r.Item2.Equals(parsedValue, StringComparison.OrdinalIgnoreCase));
var duplicate = PreviousRecords
.Where(r => IsDeviceSerialNumberValid(r.DeviceSerialNumber))
.FirstOrDefault(r => r.DeviceSerialNumber.Equals(parsedValue, StringComparison.OrdinalIgnoreCase));
if (duplicate != null)
return Error($"This Device Serial Number was already present on Row {duplicate.Item1 + 1}");
return Error($"This Device Serial Number was already present on Row {DataReader.GetRowNumber(duplicate.Index)}");
// No action required
return Success(EntityState.Unchanged);
@@ -54,18 +54,14 @@ namespace Disco.Services.Devices.Importing.Fields
return false;
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// 'serial' in column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn && h.Item1.Item1.IndexOf("serial", System.StringComparison.OrdinalIgnoreCase) >= 0);
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn && h.Name.IndexOf("serial", StringComparison.OrdinalIgnoreCase) >= 0);
// All Values
possibleColumns = possibleColumns.Where(h =>
{
return Context.RawData.Select(v => v[h.Item2]).All(v => !string.IsNullOrWhiteSpace(v));
}).ToList();
possibleColumns = possibleColumns.Where(h => DataReader.TestAllNotEmpty(h.Index)).ToList();
if (possibleColumns.Count() > 1)
{
@@ -74,17 +70,17 @@ namespace Disco.Services.Devices.Importing.Fields
{
try
{
var top50SerialNumbers = Context.RawData.Select(v => v[h.Item2]).Take(50).ToArray();
var top50SerialNumbers = DataReader.GetStrings(h.Index).Take(50).ToList();
return Database.Devices.Count(d => top50SerialNumbers.Contains(d.SerialNumber)) > 0;
}
catch (Exception) { return false; }
}).Select(h => (int?)h.Item2).FirstOrDefault();
}).Select(h => (int?)h.Index).FirstOrDefault();
if (possibleColumnIndex.HasValue)
return possibleColumnIndex;
}
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
public static string ParseRawDeviceSerialNumber(string DeviceSerialNumber)
@@ -98,5 +94,6 @@ namespace Disco.Services.Devices.Importing.Fields
{
return DeviceSerialNumber != null && DeviceSerialNumber.Length <= maxLength;
}
}
}
Disco.Services/Devices/Importing/Fields/ModelIdImportField.cs
+54 -26
View File
@@ -1,6 +1,7 @@
using Disco.Data.Repository;
using Disco.Models.Repository;
using Disco.Models.Services.Devices.Importing;
using Disco.Services.Interop.ActiveDirectory;
using System;
using System.Collections.Generic;
using System.Data;
@@ -20,23 +21,37 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return friendlyValue; } }
public override string FriendlyPreviousValue { get { return friendlyPreviousValue; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
friendlyValue = Value;
int? intValue;
if (DataReader.TryGetNullableInt(ColumnIndex, out intValue))
{
if (!intValue.HasValue)
{
if (ExistingDevice == null)
{
intValue = 1; // Default Model for new devices
}
else
{
return Error("The Model Identifier cannot be blank");
}
}
// Validate
if (string.IsNullOrWhiteSpace(Value))
this.parsedValue = 1; // Default Model
parsedValue = intValue.Value;
friendlyValue = parsedValue.ToString();
}
else
if (!int.TryParse(Value, out parsedValue))
return Error("The Model Identifier must be a number");
{
return Error("The Model Identifier must be a number");
}
var m = Cache.DeviceModels.FirstOrDefault(dm => dm.Id == parsedValue);
if (m == null)
return Error(string.Format("The identifier ({0}) does not match any Device Model", Value));
return Error($"The identifier ({parsedValue}) does not match any Device Model");
friendlyValue = string.Format("{0} [{1}]", m.Description, m.Id);
friendlyValue = $"{m.Description} [{m.Id}]";
if (ExistingDevice == null)
return Success(EntityState.Added);
@@ -46,7 +61,7 @@ namespace Disco.Services.Devices.Importing.Fields
if (ExistingDevice.DeviceModelId.HasValue)
{
var previousModel = Cache.DeviceModels.FirstOrDefault(dm => dm.Id == ExistingDevice.DeviceModelId.Value);
friendlyPreviousValue = string.Format("{0} [{1}]", previousModel.Description, previousModel.Id);
friendlyPreviousValue = $"{previousModel.Description} [{previousModel.Id}]";
}
return Success(EntityState.Modified);
@@ -57,10 +72,10 @@ namespace Disco.Services.Devices.Importing.Fields
public override bool Apply(DiscoDataContext Database, Device Device)
{
if (this.FieldAction == EntityState.Added ||
this.FieldAction == EntityState.Modified)
if (FieldAction == EntityState.Added ||
FieldAction == EntityState.Modified)
{
Device.DeviceModelId = this.parsedValue;
Device.DeviceModelId = parsedValue;
return true;
}
else
@@ -69,30 +84,43 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override void Applied(DiscoDataContext Database, Device Device, ref bool DeviceADDescriptionSet)
{
// 'model' in column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn && h.Item1.Item1.IndexOf("model", System.StringComparison.OrdinalIgnoreCase) >= 0);
if (!DeviceADDescriptionSet)
{
if (ActiveDirectory.IsValidDomainAccountId(Device.DeviceDomainId))
{
var adAccount = Device.ActiveDirectoryAccount();
if (adAccount != null && !adAccount.IsCriticalSystemObject)
{
adAccount.SetDescription(Device);
DeviceADDescriptionSet = true;
}
}
}
}
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// column name
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn &&
h.Name.IndexOf("model", StringComparison.OrdinalIgnoreCase) >= 0);
// All Integers Numbers
possibleColumns = possibleColumns.Where(h =>
{
int lastValue;
return Context.RawData.Select(v => v[h.Item2]).Take(100).Where(v => !string.IsNullOrWhiteSpace(v)).All(v => int.TryParse(v, out lastValue));
}).ToList();
possibleColumns = possibleColumns.Where(h => DataReader.TestAllInt(h.Index)).ToList();
// Multiple Columns, tighten column definition
if (possibleColumns.Count() > 1)
{
possibleColumns = possibleColumns
.Where(h =>
h.Item1.Item1.IndexOf("modelid", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("model id", StringComparison.OrdinalIgnoreCase) >= 0);
h.Name.IndexOf("modelid", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("model id", StringComparison.OrdinalIgnoreCase) >= 0);
}
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
}
}
Disco.Services/Devices/Importing/Fields/ProfileIdImportField.cs
+53 -25
View File
@@ -1,6 +1,7 @@
using Disco.Data.Repository;
using Disco.Models.Repository;
using Disco.Models.Services.Devices.Importing;
using Disco.Services.Interop.ActiveDirectory;
using System;
using System.Collections.Generic;
using System.Data;
@@ -20,30 +21,44 @@ namespace Disco.Services.Devices.Importing.Fields
public override string FriendlyValue { get { return friendlyValue; } }
public override string FriendlyPreviousValue { get { return friendlyPreviousValue; } }
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, DeviceImportContext Context, int RecordIndex, string DeviceSerialNumber, Device ExistingDevice, Dictionary<DeviceImportFieldTypes, string> Values, string Value)
public override bool Parse(DiscoDataContext Database, IDeviceImportCache Cache, IDeviceImportContext Context, string DeviceSerialNumber, Device ExistingDevice, List<IDeviceImportRecord> PreviousRecords, IDeviceImportDataReader DataReader, int ColumnIndex)
{
friendlyValue = Value;
int? intValue;
if (DataReader.TryGetNullableInt(ColumnIndex, out intValue))
{
if (!intValue.HasValue)
{
if (ExistingDevice == null)
{
intValue = Database.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId; // Default Model for new devices
}
else
{
return Error("The Profile Identifier cannot be blank");
}
}
// Validate
if (string.IsNullOrWhiteSpace(Value))
this.parsedValue = Database.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId;
parsedValue = intValue.Value;
friendlyValue = parsedValue.ToString();
}
else
if (!int.TryParse(Value, out parsedValue))
return Error("The Profile Identifier must be a number");
{
return Error("The Profile Identifier must be a number");
}
var p = Cache.DeviceProfiles.FirstOrDefault(dp => dp.Id == parsedValue);
if (p == null)
return Error(string.Format("The identifier ({0}) does not match any Device Profile", Value));
return Error($"The identifier ({parsedValue}) does not match any Device Profile");
friendlyValue = string.Format("{0} [{1}]", p.Description, p.Id);
friendlyValue = $"{p.Description} [{p.Id}]";
if (ExistingDevice == null)
return Success(EntityState.Added);
else if (ExistingDevice != null && ExistingDevice.DeviceProfileId != parsedValue)
{
var previousProfile = Cache.DeviceProfiles.FirstOrDefault(dp => dp.Id == ExistingDevice.DeviceProfileId);
friendlyPreviousValue = string.Format("{0} [{1}]", previousProfile.Description, previousProfile.Id);
friendlyPreviousValue = $"{previousProfile.Description} [{previousProfile.Id}]";
return Success(EntityState.Modified);
}
@@ -53,10 +68,10 @@ namespace Disco.Services.Devices.Importing.Fields
public override bool Apply(DiscoDataContext Database, Device Device)
{
if (this.FieldAction == EntityState.Added ||
this.FieldAction == EntityState.Modified)
if (FieldAction == EntityState.Added ||
FieldAction == EntityState.Modified)
{
Device.DeviceProfileId = this.parsedValue;
Device.DeviceProfileId = parsedValue;
return true;
}
else
@@ -65,30 +80,43 @@ namespace Disco.Services.Devices.Importing.Fields
}
}
public override int? GuessHeader(DiscoDataContext Database, DeviceImportContext Context)
public override void Applied(DiscoDataContext Database, Device Device, ref bool DeviceADDescriptionSet)
{
if (!DeviceADDescriptionSet)
{
if (ActiveDirectory.IsValidDomainAccountId(Device.DeviceDomainId))
{
var adAccount = Device.ActiveDirectoryAccount();
if (adAccount != null && !adAccount.IsCriticalSystemObject)
{
adAccount.SetDescription(Device);
DeviceADDescriptionSet = true;
}
}
}
}
public override int? GuessColumn(DiscoDataContext Database, IDeviceImportContext Context, IDeviceImportDataReader DataReader)
{
// column name
var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn && h.Item1.Item1.IndexOf("profile", System.StringComparison.OrdinalIgnoreCase) >= 0);
var possibleColumns = Context.Columns
.Where(h => h.Type == DeviceImportFieldTypes.IgnoreColumn &&
h.Name.IndexOf("profile", StringComparison.OrdinalIgnoreCase) >= 0);
// All Integers Numbers
possibleColumns = possibleColumns.Where(h =>
{
int lastValue;
return Context.RawData.Select(v => v[h.Item2]).Take(100).Where(v => !string.IsNullOrWhiteSpace(v)).All(v => int.TryParse(v, out lastValue));
}).ToList();
possibleColumns = possibleColumns.Where(h => DataReader.TestAllInt(h.Index)).ToList();
// Multiple Columns, tighten column definition
if (possibleColumns.Count() > 1)
{
possibleColumns = possibleColumns
.Where(h =>
h.Item1.Item1.IndexOf("profileid", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Item1.Item1.IndexOf("profile id", StringComparison.OrdinalIgnoreCase) >= 0);
h.Name.IndexOf("profileid", StringComparison.OrdinalIgnoreCase) >= 0 ||
h.Name.IndexOf("profile id", StringComparison.OrdinalIgnoreCase) >= 0);
}
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();
return possibleColumns.Select(h => (int?)h.Index).FirstOrDefault();
}
}
}