From 20a77a4933daadfcd127c84f89493adf466c2af7 Mon Sep 17 00:00:00 2001
From: ayoubessafi <57940108+ayoubessafi@users.noreply.github.com>
Date: Tue, 2 Feb 2021 00:14:22 +0100
Subject: [PATCH] User Data Access

---
 GADataManager.Library/DataAccess/UserData.cs  | 25 +++++++++++++++++++
 .../GADataManager.Library.csproj              |  4 ++-
 .../DataAccess}/SqlDataAccess.cs              |  7 +++---
 GADataManager.Library/Models/UserModel.cs     | 18 +++++++++++++
 GADataManager.Library/UserData.cs             | 12 ---------
 YoucodeAbsenceApp.sln                         | 22 ++++++++--------
 6 files changed, 61 insertions(+), 27 deletions(-)
 create mode 100644 GADataManager.Library/DataAccess/UserData.cs
 rename GADataManager.Library/{ => Internal/DataAccess}/SqlDataAccess.cs (93%)
 create mode 100644 GADataManager.Library/Models/UserModel.cs
 delete mode 100644 GADataManager.Library/UserData.cs

diff --git a/GADataManager.Library/DataAccess/UserData.cs b/GADataManager.Library/DataAccess/UserData.cs
new file mode 100644
index 0000000..bc0c4ef
--- /dev/null
+++ b/GADataManager.Library/DataAccess/UserData.cs
@@ -0,0 +1,25 @@
+using GADataManager.Library.Internal.DataAccess;
+using GADataManager.Library.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GADataManager.Library.DataAccess
+{
+    public class UserData
+    {
+        public List<UserModel> GetUserById(string Id)
+        {
+            SqlDataAccess sql = new SqlDataAccess();
+
+            var p = new { Id = Id };
+
+            var output = sql.LoadData<UserModel, dynamic>("dbo.supUserLookup", p, "DataTest");
+
+            return output;
+
+        }
+    }
+}
diff --git a/GADataManager.Library/GADataManager.Library.csproj b/GADataManager.Library/GADataManager.Library.csproj
index b0cd2d5..ea7a1b8 100644
--- a/GADataManager.Library/GADataManager.Library.csproj
+++ b/GADataManager.Library/GADataManager.Library.csproj
@@ -45,8 +45,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DataAccess\UserData.cs" />
+    <Compile Include="Internal\DataAccess\SqlDataAccess.cs" />
+    <Compile Include="Models\UserModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SqlDataAccess.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/GADataManager.Library/SqlDataAccess.cs b/GADataManager.Library/Internal/DataAccess/SqlDataAccess.cs
similarity index 93%
rename from GADataManager.Library/SqlDataAccess.cs
rename to GADataManager.Library/Internal/DataAccess/SqlDataAccess.cs
index 510694f..2ed3430 100644
--- a/GADataManager.Library/SqlDataAccess.cs
+++ b/GADataManager.Library/Internal/DataAccess/SqlDataAccess.cs
@@ -8,9 +8,9 @@
 using System.Data.SqlClient;
 using Dapper;
 
-namespace GADataManager.Library
+namespace GADataManager.Library.Internal.DataAccess
 {
-    public class SqlDataAccess
+    internal class SqlDataAccess
     {
         public string GetConnectionString(string name)
         {
@@ -39,9 +39,8 @@ public void SaveData<T, U>(string storedProcedure, T parameters, string connecti
                 connection.Execute(storedProcedure, parameters,
                     commandType: CommandType.StoredProcedure);
 
-               
+
             }
         }
-
     }
 }
diff --git a/GADataManager.Library/Models/UserModel.cs b/GADataManager.Library/Models/UserModel.cs
new file mode 100644
index 0000000..15fe1cc
--- /dev/null
+++ b/GADataManager.Library/Models/UserModel.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GADataManager.Library.Models
+{
+    public class UserModel
+    {
+        public string user_Id { get; set; }
+        public string FirstName { get; set; }
+        public string LastName { get; set; }
+        public string EmailAdress { get; set; }
+        public DateTime CreatedDate { get; set; }
+
+    }
+}
diff --git a/GADataManager.Library/UserData.cs b/GADataManager.Library/UserData.cs
deleted file mode 100644
index f717aea..0000000
--- a/GADataManager.Library/UserData.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GADataManager.Library
-{
-    class UserData
-    {
-    }
-}
diff --git a/YoucodeAbsenceApp.sln b/YoucodeAbsenceApp.sln
index b1a25af..15ff043 100644
--- a/YoucodeAbsenceApp.sln
+++ b/YoucodeAbsenceApp.sln
@@ -5,15 +5,11 @@ VisualStudioVersion = 16.0.30804.86
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GADesktopUI", "GADesktopUI\GADesktopUI.csproj", "{85C9B41A-2855-41A7-8A3E-73B8C87EF33B}"
 EndProject
-<<<<<<< HEAD
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GADataManager.Library", "GADataManager.Library\GADataManager.Library.csproj", "{ED10A7D0-1C4B-4E87-8BBF-4C6EF3CF9BBE}"
-=======
-
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GADataManager", "GADataManager\GADataManager.csproj", "{28EC73A6-E9B0-4402-9F03-681EF1598F0A}"
-
+EndProject
 Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "GAData", "GAData\GAData.sqlproj", "{FC082EE0-2DCE-4793-A5AE-5FC9FFFD9454}"
-
->>>>>>> 615b05961a2d949e2f1187d2c16834a0f61b2194
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,14 +21,20 @@ Global
 		{85C9B41A-2855-41A7-8A3E-73B8C87EF33B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{85C9B41A-2855-41A7-8A3E-73B8C87EF33B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{85C9B41A-2855-41A7-8A3E-73B8C87EF33B}.Release|Any CPU.Build.0 = Release|Any CPU
-<<<<<<< HEAD
 		{ED10A7D0-1C4B-4E87-8BBF-4C6EF3CF9BBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ED10A7D0-1C4B-4E87-8BBF-4C6EF3CF9BBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ED10A7D0-1C4B-4E87-8BBF-4C6EF3CF9BBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED10A7D0-1C4B-4E87-8BBF-4C6EF3CF9BBE}.Release|Any CPU.Build.0 = Release|Any CPU
-=======
-
->>>>>>> 615b05961a2d949e2f1187d2c16834a0f61b2194
+		{28EC73A6-E9B0-4402-9F03-681EF1598F0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28EC73A6-E9B0-4402-9F03-681EF1598F0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28EC73A6-E9B0-4402-9F03-681EF1598F0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28EC73A6-E9B0-4402-9F03-681EF1598F0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC082EE0-2DCE-4793-A5AE-5FC9FFFD9454}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC082EE0-2DCE-4793-A5AE-5FC9FFFD9454}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC082EE0-2DCE-4793-A5AE-5FC9FFFD9454}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{FC082EE0-2DCE-4793-A5AE-5FC9FFFD9454}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC082EE0-2DCE-4793-A5AE-5FC9FFFD9454}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC082EE0-2DCE-4793-A5AE-5FC9FFFD9454}.Release|Any CPU.Deploy.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE