From 64018ef8db8fb3923d0d7b922c4fe27f72d20f00 Mon Sep 17 00:00:00 2001
From: Watts <Chris.Watts@edwardsvacuum.com>
Date: Thu, 13 Apr 2017 20:58:52 +0100
Subject: [PATCH] moved update group and update user details procedures to
 SQLiteProcedures

---
 .../SQLiteRepository/SQLiteProcedures.cs            | 13 +++++++++++++
 .../SQLiteRepository/SQLiteRepository.cs            | 10 ++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteProcedures.cs b/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteProcedures.cs
index ac5e79c..b38588e 100644
--- a/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteProcedures.cs
+++ b/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteProcedures.cs
@@ -18,6 +18,14 @@ namespace SQLiteRepository
             "select * from " + nameof(UserIdentity) + " order by " + nameof(UserIdentity.LastName) + " collate nocase, " +
             nameof(UserIdentity.FirstName) + " collate nocase limit ? offset ?";
 
+        public const string GET_ALL_USERS_BY_GROUP =
+            "select u." + nameof(UserIdentity.Id) + ", u." + nameof(UserIdentity.FirstName) + ", u." +
+            nameof(UserIdentity.LastName) + ", u." + nameof(UserIdentity.HoursPerWeek) + ", u." +
+            nameof(UserIdentity.IsContractor) + " from " + nameof(UserIdentity) + " u left join " +
+            nameof(UserGroupJoinDb) + " ugj on ugj." + nameof(UserGroupJoinDb.UserId_FK) + " = u." +
+            nameof(UserIdentity.Id) + " where ugj." + nameof(UserGroupJoinDb.GroupId_FK) + "=? order by u." +
+            nameof(UserIdentity.LastName) + " collate nocase, u." + nameof(UserIdentity.LastName) + " collate nocase";
+
         public const string GET_USER_BY_ID =
             "select * from " + nameof(UserIdentity) + " where " + nameof(UserIdentity.Id) + "=?";
 
@@ -38,6 +46,11 @@ namespace SQLiteRepository
             "update " + nameof(CardUniqueId) + " set " + nameof(CardUniqueId.LastUsed) + " = ? where " +
             nameof(CardUniqueId.Id) + " = ?";
 
+        public const string UPDATE_USER_DETAILS =
+            "update " + nameof(UserIdentity) + " set " + nameof(UserIdentity.FirstName) + "=?, " +
+            nameof(UserIdentity.LastName) + "=?, " + nameof(UserIdentity.HoursPerWeek) + "=?," +
+            nameof(UserIdentity.IsContractor) + "=? where " + nameof(UserIdentity.Id) + "=?";
+
         public const string SEARCH_USER_LIST =
             "SELECT * FROM " + nameof(UserIdentity) + " where(" + nameof(UserIdentity.FirstName) + " Like ? OR " +
             nameof(UserIdentity.LastName) + " Like ?)";
diff --git a/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs b/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs
index df983fb..3e2d97d 100644
--- a/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs
+++ b/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs
@@ -50,7 +50,7 @@ namespace SQLiteRepository
             {
                 users =
                     _connection.Query<UserIdentity>(
-                        "select u.Id, u.FirstName, u.LastName, u.HoursPerWeek, u.IsContractor from UserIdentity u left join UserGroupJoinDb ugj on ugj.UserId_FK = u.Id where ugj.GroupId_FK=?",
+                        SQLiteProcedures.GET_ALL_USERS_BY_GROUP,
                         groupId);
                 userCount = users.Count;
             }
@@ -311,7 +311,7 @@ namespace SQLiteRepository
             {
                 //edit..
                 _connection.Query<UserIdentity>(
-                    "update UserIdentity set FirstName=?, LastName=?, HoursPerWeek=?,IsContractor=? where Id=?",
+                    SQLiteProcedures.UPDATE_USER_DETAILS,
                     user.FirstName,
                     user.LastName,
                     user.HoursPerWeek,
@@ -460,7 +460,6 @@ namespace SQLiteRepository
             }
             else
             {
-                var t = new UserGroupJoinDb();
                 query =
                     _connection.Query<GroupDb>(
                         "select gdb.GroupId, gdb.GroupName, gdb.AssignedUserCount" +
@@ -501,11 +500,6 @@ namespace SQLiteRepository
         public OperationResponse UpdateGroup(Group group)
         {
             //TODO: I would probably prefer to do this manually.... 
-            var groupDb = new GroupDb
-            {
-                GroupId = group.Id,
-                GroupName = group.Name
-            };
             var resp = _connection.Query<GroupDb>("update GroupDb set GroupName=? where GroupId=?", group.Name, group.Id);
             //var resp = _connection.Update(groupDb);
             return OperationResponse.UPDATED;