renamed and reorganized solution file

completed isInputValid method

Source Code/TeamHobby.HobbyProjectGenerator.DataAccess/RDSFactory.cs

@@ -7,7 +7,7 @@ using TeamHobby.HobbyProjectGenerator.DataAccess;
 
 namespace TeamHobby.HobbyProjectGenerator.DataAccess
 {
-    public class RelationalDataSourceFactory
+    public class RDSFactory
     {
         // Mehthod to create a specific data source suitable to the need
         public IDataSource<string> getDataSource(string name, string info)

Source Code/TeamHobby.HobbyProjectGenerator.UserManagement/SystemAccountManager.cs

@@ -3,11 +3,69 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using TeamHobby.HobbyProjectGenerator.UserManagement;
+using TeamHobby.HobbyProjectGenerator.Implementations;
 
-namespace main
+namespace TeamHobby.HobbyProjectGenerator.UserManagement
 {
-    internal class SystemAccountManager
+    public class SystemAccountManager
     {
+        public string IsInputValid(string checkUN, string checkPWD)
+        {
+            // Create bool variables to check if username and password are valid
+            bool ValidUN = checkUN.All(un=>Char.IsLetterOrDigit(un) || un=='@' 
+            || un == '.' || un == ',' || un == '!');
+
+            bool ValidPwd = checkPWD.All(Char.IsLetterOrDigit);
+
+
+            if (checkUN == null || checkPWD == null)
+            {
+                return "Invalid input\n";
+            }
+            else if (checkUN.Length > 15 || checkUN.Length <= 0
+                || ValidUN is false)
+            {
+                return "Invalid Username\n";
+            }
+            else if (checkPWD.Length > 18 || checkPWD.Length <= 0
+                || ValidPwd is false)
+            {
+                return "Invalid Password\n";
+            }
+            else if (checkUN.Length <= 15 && checkUN.Length > 0
+                || ValidUN is true && checkPWD.Length <= 18 
+                && checkPWD.Length > 0 || ValidPwd is true)
+            {
+                return "Username and password is valid.\n";
+            }
+            else if (checkUN.Length <= 15 && checkUN.Length > 0
+                || ValidUN is true)
+            {
+                return "Valid Username\n";
+            }
+            else if (checkPWD.Length <= 18 && checkPWD.Length > 0
+                || ValidPwd is true)
+            {
+                return "Valid Password\n";
+            }
+            else
+            {
+                return "Invalid Input\n";
+            }
+        }
+        public bool isAdmin()
+        {
+            return false;
+        }
+        public void CreateUserRecord(UserAccount user)
+        {
+            Console.Write(IsInputValid(user.username, user.password));
+
+        }
+
+
+
         /*public NewUserName()
         {
 
@@ -60,7 +118,7 @@ namespace main
         public void AccountController()
         {
             // Create objects
-            UserAccount user = new UserAccount();
+            //UserAccount user = new UserAccount();
             UiPrint ui = new UiPrint();
             
             bool foo = true;

Source Code/TeamHobby.HobbyProjectGenerator.UserManagement/TeamHobby.HobbyProjectGenerator.UserManagement.csproj

@@ -6,4 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\TeamHobby.HobbyProjectGenerator\TeamHobby.HobbyProjectGenerator.csproj" />
+  </ItemGroup>
+
 </Project>

Source Code/TeamHobby.HobbyProjectGenerator/Implementations/Database_Users.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TeamHobby.HobbyProjectGenerator.Implementations
-{
-    internal class Database_Users : IUserService
-    {
-        public IList<string> GetAllUsers()
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool User(string username)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

Source Code/TeamHobby.HobbyProjectGenerator/Implementations/InMemoryUserService.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace TeamHobby.HobbyProjectGenerator.Implementations
 {
-    public class InMemoryUserService : IUserService
+    public class InMemoryUserService 
     {
         // Make it readonly so it can't be changed
         private readonly IList<string> _logstore;

Source Code/TeamHobby.HobbyProjectGenerator/Implementations/UiPrint.cs

@@ -6,9 +6,9 @@ using System.Threading.Tasks;
 
 // Print Statements used throughout the program.
 
-namespace main
+namespace TeamHobby.HobbyProjectGenerator
 {
-    internal class UiPrint
+    public class UiPrint
     {
         public void InitialMenu()
         {

Source Code/TeamHobby.HobbyProjectGenerator/Implementations/User_Authentication.cs

@@ -1,6 +1,6 @@
 namespace TeamHobby.HobbyProjectGenerator
 {
-    public class User_Authentication : IUserService
+    public class User_Authentication 
     {
         public IList<string> GetAllUsers()
         {

Source Code/TeamHobby.HobbyProjectGenerator/Implementations/User_Manager.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace TeamHobby.HobbyProjectGenerator.Implementations
 {
-    public class User_Manager : IUserService
+    public class User_Manager 
     {
         public IList<string> GetAllUsers()
         {

Source Code/TeamHobby.HobbyProjectGenerator/TeamHobby.HobbyProjectGenerator.csproj

@@ -6,4 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Folder Include="Contracts\" />
+  </ItemGroup>
+
 </Project>

Source Code/TeamHobby.HobbyProjectGenerator/TeamHobby.HobbyProjectGenerator.sln

@@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeamHobby.Main", "..\TeamHo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeamHobby.HobbyProjectGenerator.DataAccess", "..\TeamHobby.HobbyProjectGenerator.DataAccess\TeamHobby.HobbyProjectGenerator.DataAccess.csproj", "{AA48A66C-FA36-4AF9-A782-CEC22838EB8F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeamHobby.HobbyProjectGenerator.UserManagement", "..\TeamHobby.HobbyProjectGenerator.UserManagement\TeamHobby.HobbyProjectGenerator.UserManagement.csproj", "{2E7193B8-86B6-48DA-9671-CD84615A5F5D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeamHobby.HobbyProjectGenerator.UserManagement", "..\TeamHobby.HobbyProjectGenerator.UserManagement\TeamHobby.HobbyProjectGenerator.UserManagement.csproj", "{2E7193B8-86B6-48DA-9671-CD84615A5F5D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,12 +26,14 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{C75B6909-FD9E-4382-94B6-7CA2CE371C9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C75B6909-FD9E-4382-94B6-7CA2CE371C9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C75B6909-FD9E-4382-94B6-7CA2CE371C9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C75B6909-FD9E-4382-94B6-7CA2CE371C9A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5C5A44B4-EC3C-44F2-8F39-F917F8ED932F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5C5A44B4-EC3C-44F2-8F39-F917F8ED932F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5C5A44B4-EC3C-44F2-8F39-F917F8ED932F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{75DED6C2-D404-4E71-A58B-0F616DB5C062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75DED6C2-D404-4E71-A58B-0F616DB5C062}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{75DED6C2-D404-4E71-A58B-0F616DB5C062}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75DED6C2-D404-4E71-A58B-0F616DB5C062}.Release|Any CPU.Build.0 = Release|Any CPU
 		{30C7EBF3-3957-46E5-86C1-C13356841ECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -43,7 +45,6 @@ Global
 		{B88ED0D9-72E2-4245-BD8F-856FF42E500C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B88ED0D9-72E2-4245-BD8F-856FF42E500C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ED126EFB-B337-42F9-BE4B-65A5AE90503B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED126EFB-B337-42F9-BE4B-65A5AE90503B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ED126EFB-B337-42F9-BE4B-65A5AE90503B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED126EFB-B337-42F9-BE4B-65A5AE90503B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AA48A66C-FA36-4AF9-A782-CEC22838EB8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

Source Code/main/Controller.cs

@@ -1,8 +1,8 @@
-using main;
+using System;
-using System;
 using System.Data.Odbc;
 using TeamHobby.HobbyProjectGenerator.Archive;
 using TeamHobby.HobbyProjectGenerator.DataAccess;
+using TeamHobby.HobbyProjectGenerator.UserManagement;
 
 
 namespace TeamHobby.HobbyProjectGenerator.Main
@@ -24,19 +24,11 @@ namespace TeamHobby.HobbyProjectGenerator.Main
     }
     public class Controller 
     {
-
         public static void Main(string[] args)
         {
-            GetCredentials credentials = new GetCredentials();
-            string? username = credentials.GetUserName();
-            string? password = credentials.GetPassword();
-
-
-            Console.WriteLine(value: $"username is {username}\npassword is {password}");
-
             /*// Creating the Factory class
             string dbType = "sql";
-            RelationalDataSourceFactory dbFactory = new RelationalDataSourceFactory();
+            RDSFactory factory = new RDSFactory();
 
             // Testing Data Access Layer
             string dbInfo = "DRIVER={MariaDB ODBC 3.1 Driver};" +
@@ -45,9 +37,27 @@ namespace TeamHobby.HobbyProjectGenerator.Main
               "UID=root;" +
               "PASSWORD=Teamhobby;" +
               "OPTION=3";
-            IDataSource<string> datasource = dbFactory.getDataSource(dbType,dbInfo);
+            IDataSource<string> datasource = factory.getDataSource(dbType, dbInfo);*/
 
-            string sqlQuery = "Select * from log;";
+            // Create manager class from UserManagement
+            SystemAccountManager manager = new SystemAccountManager();
+            
+            // Admin Sign in
+            GetCredentials credentials = new GetCredentials();
+            string? username = credentials.GetUserName();
+            string? password = credentials.GetPassword();
+
+            // Get time of login attempt
+            DateTime TimeStamp = DateTime.UtcNow;
+
+            // Create UserAccount class
+            UserAccount user = new UserAccount(username, password, TimeStamp);
+
+            manager.CreateUserRecord(user);
+            
+            //Console.WriteLine(value: $"Welcome {username}\n");
+
+           /* string sqlQuery = "Select * from log;";
             Object result = datasource.ReadData(sqlQuery);
             Console.WriteLine("type of Result: " + result.GetType());
             OdbcDataReader reader = null;
@@ -73,13 +83,13 @@ namespace TeamHobby.HobbyProjectGenerator.Main
             // Testing archive Manager
             //while (true)
             //{
-                string currentDate = DateTime.Now.ToString("dd");
+              /*  string currentDate = DateTime.Now.ToString("dd");
                 string currentTime = DateTime.Now.ToString("T");
                 Console.WriteLine("Current date: {0}, Current Time: {1}", currentDate, currentTime);
                 if (String.Equals(currentDate, "1") && String.Equals(currentTime, "00:00:00 AM")){            
                     ArchiveManager archive = new ArchiveManager(datasource);
                     archive.Controller();
-                }
+                }*/
             //}
 
 
@@ -129,10 +139,6 @@ namespace TeamHobby.HobbyProjectGenerator.Main
             //datasource.WriteData(sqlRemove);
             //Console.WriteLine("Writing completed. ");
 
-
-            /* ExampleDAO z = new ExampleDAO();
-             z.UserData("Tomato");
-             Console.Read();*/
            /* bool MainMenu = true;
 
             // Set up menu loop
@@ -149,7 +155,6 @@ namespace TeamHobby.HobbyProjectGenerator.Main
 
                 // Create class objects
                 UiPrint menu = new UiPrint();
-                UserAccount user = new UserAccount();
 
 
                 // Print main menu
@@ -207,8 +212,8 @@ namespace TeamHobby.HobbyProjectGenerator.Main
                 catch
                 {
                     MainMenu = false;
-                };
+                };*/
-            }*/
+            //}
 
         }
     }

Source Code/main/main.csproj

@@ -14,6 +14,9 @@
   <ItemGroup>
     <ProjectReference Include="..\TeamHobby.HobbyProjectGenerator.Archive\TeamHobby.HobbyProjectGenerator.Archive.csproj" />
     <ProjectReference Include="..\TeamHobby.HobbyProjectGenerator.DataAccess\TeamHobby.HobbyProjectGenerator.DataAccess.csproj" />
+    <ProjectReference Include="..\TeamHobby.HobbyProjectGenerator.Models\TeamHobby.HobbyProjectGenerator.Models.csproj" />
+    <ProjectReference Include="..\TeamHobby.HobbyProjectGenerator.UserManagement\TeamHobby.HobbyProjectGenerator.UserManagement.csproj" />
+    <ProjectReference Include="..\TeamHobby.HobbyProjectGenerator\TeamHobby.HobbyProjectGenerator.csproj" />
   </ItemGroup>
 
 </Project>