Chris/FlexitimeTracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '#95-RefactorSQLiteRepository' into Release0.2

Browse Source
This commit is contained in:
Chris.Watts90@outlook.com 2018-06-06 10:55:45 +01:00
commit 5413b2e63a
10 changed files with 469 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
DataCenter_Windows/WindowsDataCenter/SQLiteRepository/Converters/LogDirectionConverter.cs Normal file
View File

@ -0,0 +1,51 @@
using Interfaces;
namespace SQLiteRepository.Converters
{
static class LogDirectionConverter
{
public static LogDirection ConvertToLogDirectionDto(LogDirectionDb direction)
{
switch (direction)
{
case LogDirectionDb.IN:
return LogDirection.IN;
case LogDirectionDb.OUT:
return LogDirection.OUT;
default:
return LogDirection.UNKNOWN;
}
}
public static LogDirectionDb ConvertFromLogDirectionDto(LogDirection direction)
{
switch (direction)
{
case LogDirection.IN:
return LogDirectionDb.IN;
case LogDirection.OUT:
return LogDirectionDb.OUT;
default:
return LogDirectionDb.UNKNOWN;
}
}
public static LogDirectionDb InvertLogDirectionDb(LogDirectionDb direction)
{
return (LogDirectionDb)(int)InvertLogDirection((LogDirection)(int)direction);
}
public static LogDirection InvertLogDirection(LogDirection direction)
{
switch (direction)
{
case LogDirection.IN:
return LogDirection.OUT;
case LogDirection.OUT:
return LogDirection.IN;
default:
return LogDirection.UNKNOWN;
}
}
}
}

37
DataCenter_Windows/WindowsDataCenter/SQLiteRepository/Converters/LogSourceConverter.cs Normal file
View File

@ -0,0 +1,37 @@
using Interfaces;
namespace SQLiteRepository.Converters
{
static class LogSourceConverter
{
public static LogSource ConvertToLogSourceDto(LogSourceDb source)
{
switch (source)
{
case LogSourceDb.IDENTIFIER:
return LogSource.IDENTIFIER;
case LogSourceDb.TRAYAPP:
return LogSource.TRAYAPP;
case LogSourceDb.UI:
return LogSource.UI;
default:
return LogSource.UNKNOWN;
}
}
public static LogSourceDb ConvertFromLogSourceDto(LogSource source)
{
switch (source)
{
case LogSource.IDENTIFIER:
return LogSourceDb.IDENTIFIER;
case LogSource.TRAYAPP:
return LogSourceDb.TRAYAPP;
case LogSource.UI:
return LogSourceDb.UI;
default:
return LogSourceDb.UNKNOWN;
}
}
}
}

42
DataCenter_Windows/WindowsDataCenter/SQLiteRepository/Converters/TimeLogConverter.cs Normal file
View File

@ -0,0 +1,42 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Interfaces;
namespace SQLiteRepository.Converters
{
static class TimeLogConverter
{
public static TimeLog ConvertToTimeLogDto(TimeLogDb log)
{
return new TimeLog
{
CalendarWeek = log.CalendarWeek,
Direction = LogDirectionConverter.ConvertToLogDirectionDto(log.Direction),
EventTime = log.SwipeEventDateTime,
Id = log.Id,
IdentifierId = log.IdentifierId,
UserId = log.UserId_FK,
Source = LogSourceConverter.ConvertToLogSourceDto(log.Source),
Year = log.Year
};
}
public static TimeLogDb ConvertFromTimeLogDto(TimeLog log)
{
return new TimeLogDb
{
CalendarWeek = log.CalendarWeek,
Year = log.Year,
UserId_FK = log.UserId,
IdentifierId = log.IdentifierId,
Direction = LogDirectionConverter.ConvertFromLogDirectionDto(log.Direction),
Id = log.Id,
Source = LogSourceConverter.ConvertFromLogSourceDto(log.Source),
SwipeEventDateTime = log.EventTime
};
}
}
}

57
DataCenter_Windows/WindowsDataCenter/SQLiteRepository/Converters/UserConverter.cs Normal file
View File

@ -0,0 +1,57 @@
using System;
using Interfaces;
namespace SQLiteRepository.Converters
{
static class UserConverter
{
public static User ConvertToUserDto(UserIdentity user)
{
return new User
{
UserId = user.Id,
FirstName = user.FirstName,
LastName = user.LastName,
IsContractor = user.IsContractor,
HoursPerWeek = user.HoursPerWeek,
};
}
public static UserIdentity ConvertFromUserDto(User user)
{
return new UserIdentity
{
Id = user.UserId,
FirstName = user.FirstName,
LastName = user.LastName,
HoursPerWeek = user.HoursPerWeek,
IsContractor = user.IsContractor
};
}
}
static class IdentifierConverter
{
public static Identifier ConvertToIdentifierDto(CardUniqueId ident)
{
return new Identifier
{
Id = ident.Id,
UniqueId = ident.CardUId,
IsAssociatedToUser = ident.UserId_FK != Constants.UNASSIGNED_CARD_USER_ID,
LastUsed = ident.LastUsed.DateTime
};
}
public static CardUniqueId ConvertFromIdentifierDto(Identifier ident, int userId)
{
return new CardUniqueId
{
CardUId = ident.UniqueId,
Id = ident.Id,
UserId_FK = userId,
LastUsed = ident.LastUsed
};
}
}
}

70
DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteProcedures.cs
View File

@ -1,3 +1,8 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.Design;
using System.Linq;
namespace SQLiteRepository namespace SQLiteRepository
{ {
internal static class SQLiteProcedures internal static class SQLiteProcedures
@ -60,6 +65,9 @@ namespace SQLiteRepository
public const string GET_CARDS_BY_UNIQUE_ID = public const string GET_CARDS_BY_UNIQUE_ID =
"select * from " + nameof(CardUniqueId) + " where " + nameof(CardUniqueId.CardUId) + "=?"; "select * from " + nameof(CardUniqueId) + " where " + nameof(CardUniqueId.CardUId) + "=?";
public const string GET_CARDS_BY_UNIQUE_ID_LIST =
"select * from " + nameof(CardUniqueId) + " where " + nameof(CardUniqueId.CardUId) + " in (#IN#)";
public const string GET_UNASSIGNED_CARD_LIST = public const string GET_UNASSIGNED_CARD_LIST =
"select * from " + nameof(CardUniqueId) + " where " + nameof(CardUniqueId.UserId_FK) + "=?"; "select * from " + nameof(CardUniqueId) + " where " + nameof(CardUniqueId.UserId_FK) + "=?";
@ -92,5 +100,67 @@ namespace SQLiteRepository
public const string GET_USER_CONTRACTED_HOURS = public const string GET_USER_CONTRACTED_HOURS =
"select " + nameof(UserIdentity.HoursPerWeek) + " From UserIdentity where " + nameof(UserIdentity.Id) + "=?"; "select " + nameof(UserIdentity.HoursPerWeek) + " From UserIdentity where " + nameof(UserIdentity.Id) + "=?";
public const string GET_GROUPS = "select gp."+ nameof(GroupDb.GroupId)+ ", gp."+nameof(GroupDb.GroupName)+", " +
"sum(case when gp." + nameof(GroupDb.GroupId) + " = ujdb." + nameof(UserGroupJoinDb.GroupId_FK) + " then 1 else 0 end) as " + nameof(GroupDb.AssignedUserCount) +
" from " + nameof(GroupDb) + " gp" +
" left join " + nameof(UserGroupJoinDb) + " ujdb " +
"on ujdb." + nameof(UserGroupJoinDb.GroupId_FK) + " = gp." + nameof(GroupDb.GroupId) +
" group by gp." + nameof(GroupDb.GroupId);
public const string GET_GROUPS_FOR_USER = "select gdb." + nameof(GroupDb.GroupId) + ", gdb." + nameof(GroupDb.GroupName) + ", gdb.AssignedUserCount" +
" from " + nameof(GroupDb) + " gdb" +
" left join " + nameof(UserGroupJoinDb) + " ujdb" +
" on gdb." + nameof(GroupDb.GroupId) + " = ujdb." + nameof(UserGroupJoinDb.GroupId_FK) +
" where ujdb." + nameof(UserGroupJoinDb.UserId_FK) + " = ?";
public const string GET_GROUP_BY_ID =
"select * from " + nameof(GroupDb) + " where " + nameof(GroupDb.GroupId) + " =?";
public const string UPDATE_GROUP = "update " + nameof(GroupDb) + " set " + nameof(GroupDb.GroupName) +
"=? where " + nameof(GroupDb.GroupId) + "=?";
public const string GET_GROUP_BY_NAME =
"select 1 from " + nameof(GroupDb)+" where "+nameof(GroupDb.GroupName)+"= ?";
public const string GET_TIMELOG_ENTRY =
"select * from " + nameof(TimeLogDb) + " where " + nameof(TimeLogDb.Id) + "=?";
public const string DELETE_TIMELOG_ENTRY =
"delete from " + nameof(TimeLogDb) + " where " + nameof(TimeLogDb.Id) + "=?";
public const string DELETE_TIMELOG_ENTRIES =
"delete from " + nameof(TimeLogDb) + " where " + nameof(TimeLogDb.Id) + "in (#IN#)";
public const string UPDATE_TIMELOG_ENTRY = "update " + nameof(TimeLogDb)
+ " set " + nameof(TimeLogDb.UserId_FK) + "=?, "
+ nameof(TimeLogDb.Direction) + "=?,"
+ nameof(TimeLogDb.SwipeEventDateTime) + "=?,"
+ nameof(TimeLogDb.CalendarWeek) + "=?,"
+ nameof(TimeLogDb.Year) + "=?,"
+ nameof(TimeLogDb.Source) + "=? "
+ "where " + nameof(TimeLogDb.Id) + "=?";
public const string GET_DB_VERSION = "select * from DbVersion";
/// <summary>
/// This works on the tokenisation of the query string.
/// where the list of params is to be inserted, the query should have #IN#
/// </summary>
/// <param name="query">the query to add the list of parameters to</param>
/// <param name="args">the parameters to add to the query.</param>
/// <returns></returns>
public static string FormatInQuery(string query, List<string> args)
{
if (!query.Contains("#IN#"))
{
throw new ArgumentException("query doesnt contain any #IN# tokenisation");
}
//Convert to a comma separated list e.g.: val1,val2,val3
//but we need to use string.. so.. enclose in single quotes 'val1','val2'..etc
var argsFormatted = string.Join(",", args.Select(x=>$"'{x}'"));
return query.Replace("#IN#", argsFormatted);
}
} }
} }

425
DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs
View File

@ -8,6 +8,7 @@ using System.Reflection;
using Interfaces; using Interfaces;
using SQLite.Net; using SQLite.Net;
using SQLite.Net.Platform.Win32; using SQLite.Net.Platform.Win32;
using SQLiteRepository.Converters;
using SQLiteRepository.Properties; using SQLiteRepository.Properties;
namespace SQLiteRepository namespace SQLiteRepository
@ -16,12 +17,14 @@ namespace SQLiteRepository
{ {
private readonly SQLiteConnection _connection; private readonly SQLiteConnection _connection;
private readonly ILogger _logger; private readonly ILogger _logger;
private string _path = "flexitimedb.db"; private readonly string _path;
private const string DATABASE_NAME = "flexitimedb.db";
private const string UPGRADE_SCRIPT_PREFIX = "SQLiteRepository.UpgradeScripts.";
public SQLiteRepository(ILogger logger) public SQLiteRepository(ILogger logger)
{ {
_path = _path =
new Uri(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().CodeBase), "flexitimedb.db")) new Uri(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().CodeBase), DATABASE_NAME))
.LocalPath; .LocalPath;
if (logger == null) throw new ArgumentNullException(nameof(logger)); if (logger == null) throw new ArgumentNullException(nameof(logger));
_logger = logger; _logger = logger;
@ -39,91 +42,13 @@ namespace SQLiteRepository
CheckForDbUpgrade(); CheckForDbUpgrade();
} }
private void CheckForDbUpgrade()
{
var data = _connection.Query<DbVersion>("select * from DbVersion");
if (!data.Any())
{
//Pre-Upgrade database, need upgrading
_logger.Trace("Pre version 0.2 RC database found, performing update..");
ExecuteUpgradeFromVersion("0.1"); //execute 0.2 upgrade scripts onwards.
}
else
{
var installedVersion = new Version(data.First().VersionNumber);
var currentVersion = new Version(AssemblyInfo.ASSEMBLY_VERSION);
if (currentVersion.CompareTo(installedVersion) > 0) //greater than 0 - current version is newer
{
_logger.Trace("Installed Database Version: {0} is older than current version {1}");
ExecuteUpgradeFromVersion(installedVersion.ToString());
}
}
}
private void ExecuteUpgradeFromVersion(string installedVersion)
{
const string PREFIX = "SQLiteRepository.UpgradeScripts.";
var instVers = new Version(installedVersion);
//so we have established that each script for upgrade will be <version>.sql, so now start at lowest version and work up!
var assembly = Assembly.GetExecutingAssembly();
var upgradeScripts = assembly.GetManifestResourceNames()
.Where(x=>x.StartsWith(PREFIX))
.OrderBy(x=>new Version(Path.GetFileNameWithoutExtension(x.Replace(PREFIX, ""))))
.Where(x =>
{
var scriptVersion = new Version(Path.GetFileNameWithoutExtension(x.Replace(PREFIX, ""))).CompareTo(instVers);
return scriptVersion > 0;
}
)
.ToList();
//now have an ordered list of upgrade script files, so execute in order!
foreach (var upgradeScript in upgradeScripts)
{
using (var stream = assembly.GetManifestResourceStream(upgradeScript))
using(var str = new StreamReader(stream))
{
var script = str.ReadToEnd();
_logger.Trace("Executing upgrade script with name: {0}", upgradeScript);
_connection.Execute(script);
}
}
SetDbVersion(AssemblyInfo.ASSEMBLY_VERSION);
}
private void SetDbVersion(string vers)
{
_connection.DeleteAll<DbVersion>();
_connection.Insert(new DbVersion {VersionNumber = vers});
_logger.Trace("Set Database version to: {0}", vers);
}
public UserList GetUsers(int pageNumber = -1, int pageSize = -1, int groupId = -1) public UserList GetUsers(int pageNumber = -1, int pageSize = -1, int groupId = -1)
{ {
var ret = new UserList(); var ret = new UserList();
List<UserIdentity> users; List<UserIdentity> users = GetUserList(groupId, pageSize, pageNumber);
int userCount;
if (pageNumber != -1 && pageSize != -1) var userCount = GetUserCount();
{
users = _connection.Query<UserIdentity>(SQLiteProcedures.GET_ALL_USERS_PAGINATE,
pageSize, (pageNumber - 1) * pageSize);
userCount = _connection.ExecuteScalar<int>(SQLiteProcedures.GET_TOTAL_USER_COUNT);
}
else if (groupId != -1)
{
users =
_connection.Query<UserIdentity>(
SQLiteProcedures.GET_ALL_USERS_BY_GROUP,
groupId);
userCount = users.Count;
}
else
{
users = _connection.Query<UserIdentity>(SQLiteProcedures.GET_ALL_USERS);
userCount = users.Count;
}
if (!users.Any())
{
if (pageNumber == -1 && pageSize == -1) if (pageNumber == -1 && pageSize == -1)
{ {
ret.PageNumber = 1; ret.PageNumber = 1;
@ -134,12 +59,15 @@ namespace SQLiteRepository
ret.PageNumber = pageNumber; ret.PageNumber = pageNumber;
ret.PageSize = pageSize; ret.PageSize = pageSize;
} }
if (!users.Any())
{
return ret; return ret;
} }
foreach (var user in users) foreach (var user in users)
{ {
var userObj = ChangeToUserObject(user); var userObj = UserConverter.ConvertToUserDto(user);
userObj.AssociatedIdentifiers = GetAssociatedIdentifiers(user.Id); userObj.AssociatedIdentifiers = GetAssociatedIdentifiers(user.Id);
userObj.State = GetUserState(GetLogDirection(user.Id)); userObj.State = GetUserState(GetLogDirection(user.Id));
@ -147,16 +75,7 @@ namespace SQLiteRepository
userObj.Groups = GetGroups(user.Id); userObj.Groups = GetGroups(user.Id);
ret.Users.Add(userObj); ret.Users.Add(userObj);
} }
if (pageNumber == -1 && pageSize == -1)
{
ret.PageSize = 10;
ret.PageNumber = 1;
}
else
{
ret.PageSize = pageSize;
ret.PageNumber = pageNumber;
}
ret.TotalUserCount = userCount; ret.TotalUserCount = userCount;
return ret; return ret;
} }
@ -180,26 +99,20 @@ namespace SQLiteRepository
foreach (var user in users) foreach (var user in users)
{ {
var userObj = ChangeToUserObject(user); var userObj = UserConverter.ConvertToUserDto(user);
var cards = _connection.Query<CardUniqueId>( var cards = _connection.Query<CardUniqueId>(
SQLiteProcedures.GET_CARDS_BY_USER_ID, SQLiteProcedures.GET_CARDS_BY_USER_ID,
user.Id); user.Id);
foreach (var card in cards) foreach (var card in cards)
{ {
userObj.AssociatedIdentifiers.Add(new Identifier() userObj.AssociatedIdentifiers.Add(IdentifierConverter.ConvertToIdentifierDto(card));
{
UniqueId = card.CardUId,
IsAssociatedToUser = true,
Id = card.Id
});
} }
userObj.State = GetUserState(GetLogDirection(user.Id)); userObj.State = GetUserState(GetLogDirection(user.Id));
ret.Users.Add(userObj); ret.Users.Add(userObj);
} }
//TODO: figure out paging here. - should there be any?
ret.PageSize = 20; ret.PageSize = 20;
ret.PageNumber = 1; ret.PageNumber = (int)Math.Ceiling((double)ret.Users.Count/(double)ret.PageSize);
return ret; return ret;
} }
@ -217,7 +130,7 @@ namespace SQLiteRepository
if (!users.Any()) return ret; if (!users.Any()) return ret;
var user = users.First(); var user = users.First();
ret = ChangeToUserObject(user); ret = UserConverter.ConvertToUserDto(user);
ret.Groups = GetGroups(); ret.Groups = GetGroups();
var usersGroups = GetGroups(user.Id); var usersGroups = GetGroups(user.Id);
foreach (var group in usersGroups) foreach (var group in usersGroups)
@ -230,7 +143,7 @@ namespace SQLiteRepository
foreach (var card in cards) foreach (var card in cards)
{ {
ret.AssociatedIdentifiers.Add(new Identifier { UniqueId = card.CardUId, IsAssociatedToUser = true, Id = card.Id }); ret.AssociatedIdentifiers.Add(IdentifierConverter.ConvertToIdentifierDto(card));
} }
} }
catch (Exception ex) catch (Exception ex)
@ -298,86 +211,54 @@ namespace SQLiteRepository
foreach (var card in cardQuery) foreach (var card in cardQuery)
{ {
ret.data.Add(new Identifier ret.data.Add(IdentifierConverter.ConvertToIdentifierDto(card));
{ // new Identifier
Id = card.Id, //{
IsAssociatedToUser = card.UserId_FK != Constants.UNASSIGNED_CARD_USER_ID, // Id = card.Id,
UniqueId = card.CardUId, // IsAssociatedToUser = card.UserId_FK != Constants.UNASSIGNED_CARD_USER_ID,
LastUsed = card.LastUsed.DateTime // UniqueId = card.CardUId,
}); // LastUsed = card.LastUsed.DateTime
//});
} }
return ret; return ret;
} }
public void ClearUnassignedIdentifiers() public void ClearUnassignedIdentifiers()
{ {
var unassignedIdentifiers = _connection.Query<CardUniqueId>(SQLiteProcedures.GET_UNASSIGNED_CARD_LIST);
//remove the logs from the timelog db
_connection.Query<TimeLogDb>(
SQLiteProcedures.FormatInQuery(SQLiteProcedures.DELETE_TIMELOG_ENTRIES,
unassignedIdentifiers.Select(x => x.Id.ToString()).ToList()));
//now remove the unassigned identifiers/cards
_connection.Execute( _connection.Execute(
SQLiteProcedures.CLEAR_UNASSIGNED_CARDS, SQLiteProcedures.CLEAR_UNASSIGNED_CARDS,
Constants.UNASSIGNED_CARD_USER_ID); Constants.UNASSIGNED_CARD_USER_ID);
} }
//TODO: Check time logs table on update to ensure associated cards/unique identifiers are removed/added as appropriate.
public OperationResponse UpdateUser(User user, out int userIdResult) public OperationResponse UpdateUser(User user, out int userIdResult)
{ {
//if(user.UserId <=0) return OperationResponse.FAILED;
var ret = OperationResponse.NONE; var ret = OperationResponse.NONE;
var cardIds = new List<int>();
//Get a list of current associated identifiers, convert into a list of Identifier Objects.. //Get a list of current associated identifiers, convert into a list of Identifier Objects..
var currentCards = var currentCards =
_connection.Query<CardUniqueId>(SQLiteProcedures.GET_CARDS_BY_USER_ID, user.UserId) _connection.Query<CardUniqueId>(SQLiteProcedures.GET_CARDS_BY_USER_ID, user.UserId)
.Select(x => new Identifier { Id = x.Id, IsAssociatedToUser = true, UniqueId = x.CardUId }); .Select(IdentifierConverter.ConvertToIdentifierDto);
var cardsToRemove = currentCards.Except(user.AssociatedIdentifiers).Select(x => x.Id).ToList(); var cardsToRemove = currentCards.Except(user.AssociatedIdentifiers).Select(x => x.Id).ToList();
#region GetUnique Identifiers
foreach (var card in user.AssociatedIdentifiers)
{
var existingCard = _connection.Query<CardUniqueId>(
SQLiteProcedures.GET_CARDS_BY_UNIQUE_ID, card.UniqueId);
if (!existingCard.Any())
{
var cardInsert = new CardUniqueId { CardUId = card.UniqueId, UserId_FK = -1 };
_connection.Insert(cardInsert);
cardIds.Add(cardInsert.Id);
if (ret < OperationResponse.CREATED)
ret = OperationResponse.CREATED; //only change it if my status supercedes.
}
else
{
cardIds.Add(existingCard.First().Id);
if (ret < OperationResponse.UPDATED)
ret = OperationResponse.UPDATED;
}
}
#endregion
#region Update/Create User #region Update/Create User
int userId; int userId;
if (user.UserId != -1) if (user.UserId != -1)
{ {
//edit.. UpdateUserDetails(user.FirstName, user.LastName, user.HoursPerWeek, user.IsContractor, user.UserId);
_connection.Query<UserIdentity>(
SQLiteProcedures.UPDATE_USER_DETAILS,
user.FirstName,
user.LastName,
user.HoursPerWeek,
user.IsContractor,
user.UserId
);
userId = user.UserId; userId = user.UserId;
} }
else else
{ {
var userInsert = new UserIdentity var userInsert = UserConverter.ConvertFromUserDto(user);
{
FirstName = user.FirstName,
LastName = user.LastName,
HoursPerWeek = user.HoursPerWeek,
IsContractor = user.IsContractor
};
_connection.Insert(userInsert); _connection.Insert(userInsert);
userId = userInsert.Id; userId = userInsert.Id;
if (ret < OperationResponse.CREATED) if (ret < OperationResponse.CREATED)
@ -385,19 +266,32 @@ namespace SQLiteRepository
} }
#endregion #endregion
#region Update Card/Unique Id entries. #region GetUnique Identifiers
foreach (var cardId in cardIds)
var existingCards = _connection.Query<CardUniqueId>(SQLiteProcedures.FormatInQuery(
SQLiteProcedures.GET_CARDS_BY_UNIQUE_ID_LIST,
user.AssociatedIdentifiers.Select(x => x.UniqueId.ToString()).ToList()));
foreach (var card in user.AssociatedIdentifiers)
{ {
_connection.Query<CardUniqueId>( if (existingCards.All(x => x.CardUId != card.UniqueId))
SQLiteProcedures.UPDATE_CARD_USER_ID,
userId, cardId);
}
foreach (var card in cardsToRemove)
{ {
_connection.Query<CardUniqueId>( //this card is not currently in the system..
SQLiteProcedures.UPDATE_CARD_USER_ID, var cardInsert = IdentifierConverter.ConvertFromIdentifierDto(card, user.UserId);
-1, card); _connection.Insert(cardInsert);
existingCards.Add(cardInsert);
if (ret < OperationResponse.CREATED)
ret = OperationResponse.CREATED; //only change it if my status supercedes.
} }
}
#endregion
#region Update Card/Unique Id entries/associations
//make sure all identifiers are associated to the right user
UpdateIdentifierUserId(existingCards.Select(x=>x.Id).ToList(), userId);
//make sure to remove all identifiers that have been deselected in edit are removed from user
UpdateIdentifierUserId(cardsToRemove, Constants.UNASSIGNED_CARD_USER_ID);
#endregion #endregion
#region Update Group Associations #region Update Group Associations
@ -432,11 +326,11 @@ namespace SQLiteRepository
ret.Direction = LogDirection.UNKNOWN; ret.Direction = LogDirection.UNKNOWN;
return ret; return ret;
} }
else
{
//TODO: log when more than one comes back. should NEVER happen but....
ident = cardIdQuery.First(); ident = cardIdQuery.First();
} _logger.Warn("More than 1 Identifier returned with ID {0}, card ids returned: {2}",
ident.CardUId,
string.Join(",", cardIdQuery.Select(x => x.CardUId).ToList()));
#endregion #endregion
// Get The User Direction (are they going in or out)? // Get The User Direction (are they going in or out)?
@ -490,10 +384,14 @@ namespace SQLiteRepository
return ret; return ret;
} }
/*Groups*/
//TODO: check group name can only be entered once.
public OperationResponse CreateGroup(Group group, out int groupId) public OperationResponse CreateGroup(Group group, out int groupId)
{ {
var query = _connection.Query<GroupDb>(SQLiteProcedures.GET_GROUP_BY_NAME, group.Name);
if (query.Any())
{
groupId = query[0].GroupId;
return OperationResponse.NONE;
}
var groupDb = new GroupDb { GroupName = group.Name }; var groupDb = new GroupDb { GroupName = group.Name };
var resp = _connection.Insert(groupDb); var resp = _connection.Insert(groupDb);
groupId = groupDb.GroupId; groupId = groupDb.GroupId;
@ -506,22 +404,12 @@ namespace SQLiteRepository
List<GroupDb> query; List<GroupDb> query;
if (userId == -1) if (userId == -1)
{ {
query = _connection.Query<GroupDb>("select gp.GroupId, gp.GroupName, " + query = _connection.Query<GroupDb>(SQLiteProcedures.GET_GROUPS);
"sum(case when gp.GroupId = ujdb.GroupId_FK then 1 else 0 end) as AssignedUserCount " +
"from GroupDb gp " +
"left join UserGroupJoinDb ujdb " +
"on ujdb.GroupId_FK = gp.GroupId " +
"group by gp.GroupId");
} }
else else
{ {
query = query =
_connection.Query<GroupDb>( _connection.Query<GroupDb>(SQLiteProcedures.GET_GROUPS_FOR_USER,
"select gdb.GroupId, gdb.GroupName, gdb.AssignedUserCount" +
" from GroupDb gdb" +
" left join UserGroupJoinDb ujdb" +
" on gdb.GroupId = ujdb.GroupId_FK" +
" where ujdb.UserId_FK = ?",
userId); userId);
} }
foreach (var group in query) foreach (var group in query)
@ -538,7 +426,7 @@ namespace SQLiteRepository
public Group GetGroup(int groupId) public Group GetGroup(int groupId)
{ {
var query = _connection.Query<GroupDb>("select * from GroupDb where GroupId = ?", groupId); var query = _connection.Query<GroupDb>(SQLiteProcedures.GET_GROUP_BY_ID, groupId);
if (query.Any()) if (query.Any())
{ {
var group = query.First(); var group = query.First();
@ -554,8 +442,7 @@ namespace SQLiteRepository
public OperationResponse UpdateGroup(Group group) public OperationResponse UpdateGroup(Group group)
{ {
//TODO: I would probably prefer to do this manually.... _connection.Query<GroupDb>(SQLiteProcedures.UPDATE_GROUP, @group.Name, @group.Id);
var resp = _connection.Query<GroupDb>("update GroupDb set GroupName=? where GroupId=?", group.Name, group.Id);
return OperationResponse.UPDATED; return OperationResponse.UPDATED;
} }
@ -569,34 +456,26 @@ namespace SQLiteRepository
public OperationResponse DeleteLog(TimeLog log) public OperationResponse DeleteLog(TimeLog log)
{ {
var query = _connection.Query<TimeLogDb>( var query = _connection.Query<TimeLogDb>(
"select * from TimeLogDb where Id=?", log.Id); SQLiteProcedures.GET_TIMELOG_ENTRY, log.Id);
if (!query.Any()) if (!query.Any())
return OperationResponse.FAILED; return OperationResponse.FAILED;
UpdateExistingLogDirections(log); UpdateExistingLogDirections(log);
_connection.ExecuteScalar<TimeLogDb>("delete from TimeLogDb where Id=?", log.Id); _connection.ExecuteScalar<TimeLogDb>(SQLiteProcedures.DELETE_TIMELOG_ENTRY, log.Id);
return OperationResponse.DELETED; return OperationResponse.DELETED;
} }
public OperationResponse CreateLog(TimeLog log) public OperationResponse CreateLog(TimeLog log)
{ {
var calendarWeek = GetIso8601CalendarWeek(log.EventTime.UtcDateTime); log.CalendarWeek = GetIso8601CalendarWeek(log.EventTime.UtcDateTime);
var year = log.EventTime.Year; log.Year= log.EventTime.Year;
log.CalendarWeek = calendarWeek;
log.Year = year; var dbLog = TimeLogConverter.ConvertFromTimeLogDto(log);
var dbLog = new TimeLogDb dbLog.IdentifierId = ConvertSourceToIdentifierId(log.Source);
{
SwipeEventDateTime = log.EventTime,
Direction = (LogDirectionDb)(int)log.Direction,
Year = year,
CalendarWeek = calendarWeek,
Source = (LogSourceDb)(int)log.Source,
UserId_FK = log.UserId,
IdentifierId = ConvertSourceToIdentifierId(log.Source),
};
#region update in/out directions for manual logs. #region update in/out directions for manual logs.
UpdateExistingLogDirections(log); UpdateExistingLogDirections(log);
#endregion #endregion
@ -608,7 +487,8 @@ namespace SQLiteRepository
public OperationResponse UpdateLog(TimeLog log) public OperationResponse UpdateLog(TimeLog log)
{ {
var query = _connection.Query<TimeLogDb>( var query = _connection.Query<TimeLogDb>(
"select * from TimeLogDb where Id=?", log.Id); SQLiteProcedures.GET_TIMELOG_ENTRY, log.Id);
if(!query.Any()) if(!query.Any())
return OperationResponse.FAILED; return OperationResponse.FAILED;
@ -621,13 +501,100 @@ namespace SQLiteRepository
log.Year = log.EventTime.Year; log.Year = log.EventTime.Year;
} }
_connection.ExecuteScalar<TimeLogDb>( _connection.ExecuteScalar<TimeLogDb>(
"update TimeLogDb set UserId_FK=?, Direction=?,SwipeEventDateTime=?,CalendarWeek=?,Year=?,Source=? where Id=?", SQLiteProcedures.UPDATE_TIMELOG_ENTRY,
log.UserId, (LogDirectionDb) (int) log.Direction, log.EventTime, log.CalendarWeek, log.Year, log.UserId, (LogDirectionDb) (int) log.Direction, log.EventTime, log.CalendarWeek, log.Year,
(LogSourceDb) (int) log.Source, log.Id); (LogSourceDb) (int) log.Source, log.Id);
return OperationResponse.UPDATED; return OperationResponse.UPDATED;
} }
private int GetUserCount()
{
return _connection.ExecuteScalar<int>(SQLiteProcedures.GET_TOTAL_USER_COUNT);
}
private List<UserIdentity> GetUserList(int groupId = -1, int pageSize=-1, int pageNumber=-1)
{
List<UserIdentity> users;
if (pageNumber != -1 && pageSize != -1)
{
users = _connection.Query<UserIdentity>(SQLiteProcedures.GET_ALL_USERS_PAGINATE,
pageSize, (pageNumber - 1) * pageSize);
}
else if (groupId != -1)
{
users =
_connection.Query<UserIdentity>(
SQLiteProcedures.GET_ALL_USERS_BY_GROUP,
groupId);
}
else
{
users = _connection.Query<UserIdentity>(SQLiteProcedures.GET_ALL_USERS);
}
return users;
}
private void CheckForDbUpgrade()
{
var data = _connection.Query<DbVersion>(SQLiteProcedures.GET_DB_VERSION);
if (!data.Any())
{
//Pre-Upgrade database, need upgrading
_logger.Trace("Pre version 0.2 RC database found, performing update..");
ExecuteUpgradeFromVersion("0.1"); //execute 0.2 upgrade scripts onwards.
}
else
{
var installedVersion = new Version(data.First().VersionNumber);
var currentVersion = new Version(AssemblyInfo.ASSEMBLY_VERSION);
if (currentVersion.CompareTo(installedVersion) > 0) //greater than 0 - current version is newer
{
_logger.Trace("Installed Database Version: {0} is older than current version {1}");
ExecuteUpgradeFromVersion(installedVersion.ToString());
}
}
}
private void ExecuteUpgradeFromVersion(string installedVersion)
{
var instVers = new Version(installedVersion);
//so we have established that each script for upgrade will be <version>.sql, so now start at lowest version and work up!
var assembly = Assembly.GetExecutingAssembly();
var upgradeScripts = assembly.GetManifestResourceNames()
.Where(x => x.StartsWith(UPGRADE_SCRIPT_PREFIX))
.OrderBy(x =>
new Version(Path.GetFileNameWithoutExtension(x.Replace(UPGRADE_SCRIPT_PREFIX, string.Empty))))
.Where(x =>
{
var scriptVersion =
new Version(Path.GetFileNameWithoutExtension(x.Replace(UPGRADE_SCRIPT_PREFIX, string.Empty)))
.CompareTo(instVers);
return scriptVersion > 0;
})
.ToList();
//now have an ordered list of upgrade script files, so execute in order!
foreach (var upgradeScript in upgradeScripts)
{
using (var stream = assembly.GetManifestResourceStream(upgradeScript))
using(var str = new StreamReader(stream))
{
var script = str.ReadToEnd();
_logger.Trace("Executing upgrade script with name: {0}", upgradeScript);
_connection.Execute(script);
}
}
SetDbVersion(AssemblyInfo.ASSEMBLY_VERSION);
}
private void SetDbVersion(string vers)
{
_connection.DeleteAll<DbVersion>();
_connection.Insert(new DbVersion {VersionNumber = vers});
_logger.Trace("Set Database version to: {0}", vers);
}
private DateTime GetLastLogDateTime(TimeLogDb timeLog) private DateTime GetLastLogDateTime(TimeLogDb timeLog)
{ {
if (timeLog != null) if (timeLog != null)
@ -797,7 +764,7 @@ namespace SQLiteRepository
else else
{ {
// we have a time log from today already, so just do the opposite of what we last did! // we have a time log from today already, so just do the opposite of what we last did!
logDirection = InvertLogDirectionDb(lastEntry.Direction); logDirection = LogDirectionConverter.InvertLogDirectionDb(lastEntry.Direction);
} }
} }
else else
@ -823,7 +790,7 @@ namespace SQLiteRepository
private void UpdateIdentifierLastUsed(DateTimeOffset dt, int cardId) private void UpdateIdentifierLastUsed(DateTimeOffset dt, int cardId)
{ {
var res = _connection.ExecuteScalar<CardUniqueId>(SQLiteProcedures.UPDATE_CARD_LAST_USED, _connection.ExecuteScalar<CardUniqueId>(SQLiteProcedures.UPDATE_CARD_LAST_USED,
dt, dt,
cardId); cardId);
} }
@ -872,18 +839,6 @@ namespace SQLiteRepository
return dt.Date.CompareTo(DateTime.Today.Date) < 0; return dt.Date.CompareTo(DateTime.Today.Date) < 0;
} }
private User ChangeToUserObject(UserIdentity user)
{
return new User
{
UserId = user.Id,
FirstName = user.FirstName,
LastName = user.LastName,
HoursPerWeek = user.HoursPerWeek,
IsContractor = user.IsContractor
};
}
private void UpdateExistingLogDirections(TimeLog log) private void UpdateExistingLogDirections(TimeLog log)
{ {
//need to make this generic so that both create and delete will update the log directions.. but ARGH. //need to make this generic so that both create and delete will update the log directions.. but ARGH.
@ -901,29 +856,35 @@ namespace SQLiteRepository
var currentlogDirection = log.Direction; var currentlogDirection = log.Direction;
for (var i = 0; i < logs.Count; i++) for (var i = 0; i < logs.Count; i++)
{ {
logs[i].Direction = InvertLogDirection(currentlogDirection); logs[i].Direction = LogDirectionConverter.InvertLogDirection(currentlogDirection);
UpdateLog(logs[i]); UpdateLog(logs[i]);
currentlogDirection = logs[i].Direction; currentlogDirection = logs[i].Direction;
} }
} }
} }
private LogDirectionDb InvertLogDirectionDb(LogDirectionDb direction) private void UpdateIdentifierUserId(List<int> cardsToUpdate, int userId)
{ {
return (LogDirectionDb) (int) InvertLogDirection((LogDirection) (int) direction); foreach (var card in cardsToUpdate)
{
_connection.Query<CardUniqueId>(
SQLiteProcedures.UPDATE_CARD_USER_ID,
userId, card);
}
} }
private LogDirection InvertLogDirection(LogDirection direction) private void UpdateUserDetails(string firstName, string lastName, float hoursPerWeek, bool isContractor,
int userId)
{ {
switch (direction) _connection.Query<UserIdentity>(
{ SQLiteProcedures.UPDATE_USER_DETAILS,
case LogDirection.IN: firstName,
return LogDirection.OUT; lastName,
case LogDirection.OUT: hoursPerWeek,
return LogDirection.IN; isContractor,
default: userId
return LogDirection.UNKNOWN; );
}
} }
} }
} }

4
DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.csproj
View File

@ -78,6 +78,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="CardUniqueId.cs" /> <Compile Include="CardUniqueId.cs" />
<Compile Include="Converters\LogDirectionConverter.cs" />
<Compile Include="Converters\LogSourceConverter.cs" />
<Compile Include="Converters\TimeLogConverter.cs" />
<Compile Include="Converters\UserConverter.cs" />
<Compile Include="DBVersion.cs" /> <Compile Include="DBVersion.cs" />
<Compile Include="GroupDb.cs" /> <Compile Include="GroupDb.cs" />
<Compile Include="LogSourceDb.cs" /> <Compile Include="LogSourceDb.cs" />

4
DataCenter_Windows/WindowsDataCenter/SQLiteRepository/UpgradeScripts/0.2.sql
View File

@ -1 +1,3 @@
insert into GroupDb values ((select max(groupId) from GroupDb)+1,'Archived',0) insert into GroupDb(GroupId, GroupName, AssignedUserCount)
select (select max(GroupId) from GroupDb)+1, 'Archived', 0
WHERE NOT EXISTS(select * from GroupDb where GroupName='Archived');

3
DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/UsersController.cs
View File

@ -93,8 +93,7 @@ namespace WindowsDataCenter
{ {
int userId; int userId;
_repo.UpdateUser(user, out userId); _repo.UpdateUser(user, out userId);
//TODO return ID. return ResponseMessage(new HttpResponseMessage(HttpStatusCode.OK) {Content = new StringContent(userId.ToString())});
return ResponseMessage(new HttpResponseMessage(HttpStatusCode.OK) {Content = new StringContent("unknownIdTODO")});
} }
[HttpPost] [HttpPost]

1
DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/WindowsDataCenter.csproj
View File

@ -55,6 +55,7 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit> <Prefer32Bit>true</Prefer32Bit>
<DocumentationFile>bin\ReleaseInstallers\WindowsDataCenter.XML</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DalSoft.WebApi.HelpPage, Version=0.0.7.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DalSoft.WebApi.HelpPage, Version=0.0.7.0, Culture=neutral, processorArchitecture=MSIL">