.gitmodules

@@ -0,0 +1,4 @@
+[submodule "Library.System"]
+	path = Library.System
+	url = https://git.oerkfitz.com/DMCDynamics/Library.System.git
+	branch = net6.0

Library.System

@@ -0,0 +1 @@
+Subproject commit edf4b22c16749e165bff4529c81cc3ab5f96b968

OSI-API.DAL/Base/MySQL.cs

@@ -1,216 +0,0 @@
-using System;
-using System.Data;
-using System.IO;
-using MySql.Data.MySqlClient;
-
-namespace OSI.API.DAL.Base
-{
-    public class MySQL : SQLBase
-    {
-        protected MySqlConnection? DBConnection {get;set;}
-        protected MySqlCommand? DBCommand {get;set;}
-        protected MySqlDataReader? DBReader {get;set;}
-
-        public MySQL(string server, string database, string username, string password)
-        {
-            DBConnectionInfo = new DBConnectionInformation()
-            {
-                DBHost = server,
-                DBUserName = username,
-                DBName = database,
-                DBPassword = password,
-                DBType = DBType.MYSQL
-            };
-        }
-
-        public MySQL(DBConnectionInformation connectionInformation)
-        {
-            DBConnectionInfo = connectionInformation;
-        }
-    
-        protected override void InitConnection()
-        {
-            DBConnection = new MySqlConnection(DBConnectionInfo.GetConnectionString());
-            DBConnection.Open();
-            DBCommand = DBConnection.CreateCommand();
-        }
-
-        protected override void DisposeConnection()
-        {
-            if(DBConnection.State == ConnectionState.Open)
-            {
-                DBConnection.Close();
-            }
-        }
-
-        protected override int GetOrdinal(string columnName)
-        {
-            return DBReader.GetOrdinal(columnName);
-        }
-
-        protected override int? GetInt(int columnID)
-        {
-            int? rv = null;
-
-            if(!DBReader.IsDBNull(columnID))
-            {
-                rv = DBReader.GetInt32(columnID);
-            }
-
-            return rv;
-        }
-
-        protected override int? GetInt(string columnName)
-        {
-            return GetInt(GetOrdinal(columnName));
-        }
-
-        protected override byte? GetByte(int columnID)
-        {
-            byte? rv = null;
-
-            if(!DBReader.IsDBNull(columnID))
-            {
-                rv = DBReader.GetByte(columnID);
-            }
-
-            return rv;
-        }
-
-        protected override byte? GetByte(string columnName)
-        {
-            return GetByte(GetOrdinal(columnName));
-        }
-
-        protected override byte[] GetBytes(int columnID)
-        {
-            byte[] rv = null;
-
-            if (!DBReader.IsDBNull(columnID))
-            {
-                rv = (byte[])DBReader[columnID];
-            }
-
-            return rv;
-        }
-
-        protected override byte[] GetBytes(string columnName)
-        {
-            return GetBytes(GetOrdinal(columnName));
-        }
-
-        protected override decimal? GetDecimal(int columnID)
-        {
-            decimal? rv = null;
-
-            if(!DBReader.IsDBNull(columnID))
-            {
-                rv = DBReader.GetDecimal(columnID);
-            }
-
-            return rv;
-        }
-
-        protected override decimal? GetDecimal(string columnName)
-        {
-            return GetDecimal(GetOrdinal(columnName));
-        }
-
-        protected override long? GetLong(int columnID)
-        {
-            long? rv = null;
-
-            if(!DBReader.IsDBNull(columnID))
-            {
-                rv = DBReader.GetInt64(columnID);
-            }
-
-            return rv;
-        }
-
-        protected override long? GetLong(string columnName)
-        {
-            return GetLong(GetOrdinal(columnName));
-        }
-
-        protected override short? GetShort(int columnID)
-        {
-            short? rv = null;
-
-            if(!DBReader.IsDBNull(columnID))
-            {
-                rv = DBReader.GetInt16(columnID);
-            }
-
-            return rv;
-        }
-
-        protected override short? GetShort(string columnName)
-        {
-            return GetShort(GetOrdinal(columnName));
-        }
-
-        protected override string GetString(int columnID)
-        {
-            string rv = string.Empty;
-
-            if(!DBReader.IsDBNull(columnID))
-            {
-                rv = DBReader.GetString(columnID);
-            }
-
-            return rv;
-        }
-
-        protected override string GetString(string columnName)
-        {
-            return GetString(GetOrdinal(columnName));
-        }
-
-        protected override bool? GetBool(int columnID)
-        {
-            bool? rv = null;
-
-            if(!DBReader.IsDBNull(columnID))
-            {
-                rv = DBReader.GetBoolean(columnID);
-            }
-
-            return rv;
-        }
-
-        protected override bool? GetBool(string columnName)
-        {
-            return GetBool(GetOrdinal(columnName));
-        }
-
-        protected override DateTime? GetDateTime(int columnID)
-        {
-            DateTime? rv = null;
-
-            if(!DBReader.IsDBNull(columnID))
-            {
-                rv = GetDateTime(columnID);
-            }
-
-            return rv;
-        }
-
-        protected override DateTime? GetDateTime(string columnName)
-        {
-            return GetDateTime(GetOrdinal(columnName));
-        }
-
-
-        //new MySqlParameter("GUID", MySqlDbType.VarChar, 255, ParameterDirection.Input, false, 0, 0, string.Empty, DataRowVersion.Proposed, guid)
-        protected MySqlParameter GetParameter(string columnName, MySqlDbType dataType, ParameterDirection direction, object data)
-        {
-            return null;
-        }
-
-        protected MySqlParameter GetParameter(string columnName, MySqlDbType dataType, int size, ParameterDirection direction, object data)
-        {
-            return new MySqlParameter(columnName, dataType, size, direction, false, 0, 0, string.Empty, DataRowVersion.Proposed, data);
-        }
-    }
-}

OSI-API.DAL/Base/SQLBase.cs

@@ -1,100 +0,0 @@
-using System;
-using System.Text;
-
-namespace OSI.API.DAL.Base
-{
-    public abstract class SQLBase : IDisposable
-    {
-        protected DBConnectionInformation DBConnectionInfo;
-
-        public enum DBType
-        {
-            MSSQL,
-            MYSQL
-        }
-        public struct DBConnectionInformation
-        {
-            public string DBHost {get;set;}
-            public string DBName {get;set;}
-            public string DBUserName {get;set;}
-            public string DBPassword {get;set;}
-            public DBType DBType {get;set;}
-
-            public string GetConnectionString()
-            {
-                string rv = string.Empty;
-
-                switch(DBType)
-                {
-                    case DBType.MSSQL:
-                        break;
-                    case DBType.MYSQL:
-                        rv = string.Format("Server={0};Database={1};Uid={2};Pwd={3}", DBHost, DBName, DBUserName, DBPassword);
-                        break;
-                }
-
-                return rv;
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                // free managed resources
-            }
-            // free native resources if there are any.
-        }
-
-        protected string FormatNewLineForHTML(string input)
-        {
-            return input.Replace("\\r\\n", "<br/>");
-        }
-
-        protected string FormatNewLineForHTML(string input, int numberOfBreaksToAdd)
-        {
-            StringBuilder breaks = new();
-            for (int x = 0; x < numberOfBreaksToAdd; x++)
-            {
-                breaks.Append("<br/>");
-            }
-
-            return input.Replace("\\r\\n", breaks.ToString());
-        }
-
-        protected string FormatBoldForHTML(string input)
-        {
-            return input.Replace("[b]", "<strong>").Replace("[/b]", "</strong>");
-        }
-
-        protected abstract void InitConnection();
-        protected abstract void DisposeConnection();
-
-        protected abstract int GetOrdinal(string columnName);
-        protected abstract int? GetInt(int columnID);
-        protected abstract int? GetInt(string columnName);
-        protected abstract byte? GetByte(int columnID);
-        protected abstract byte? GetByte(string columnName);
-        protected abstract byte[] GetBytes(int columnID);
-        protected abstract byte[] GetBytes(string columnName);
-        protected abstract decimal? GetDecimal(int columnID);
-        protected abstract decimal? GetDecimal(string columnName);
-        protected abstract long? GetLong(int columnID);
-        protected abstract long? GetLong(string columnName);
-        protected abstract short? GetShort(int columnID);
-        protected abstract short? GetShort(string columnName);
-        protected abstract string GetString(int columnID);
-        protected abstract string GetString(string columnName);
-        protected abstract bool? GetBool(int columnID);
-        protected abstract bool? GetBool(string columnName);
-        protected abstract DateTime? GetDateTime(int columnID);
-        protected abstract DateTime? GetDateTime(string columnName);
-
-    }
-}

OSI-API.DAL/Client/ClientObjects.cs

@@ -1,12 +0,0 @@
-using OSI.API.DAL.Common;
-
-namespace OSI.API.DAL.Client
-{
-    public class ClientObject
-    {
-        public int ClientID { get; set; }
-        public string? ClientName { get; set; }
-
-        public AddressObject? ClientAddress { get; set; }
-    }
-}

OSI-API.DAL/Common/CommonObjects.cs

@@ -1,81 +0,0 @@
-namespace OSI.API.DAL.Common
-{
-    public class AddressObject
-    {
-        public string? Name { get; set; }
-        public string? AddressLine1 { get; set; }
-        public string? AddressLine2 { get; set; }
-        public string? AddressLine3 { get; set; }
-        public string? City { get; set; }
-        public string? State { get; set; }
-        public string? Zip { get; set; }
-
-        public string CSZ { get => $"{City}, {StateNameFromAbbreviation(State)} {Zip}"; }
-
-        private string? StateNameFromAbbreviation(string? abbr)
-        {
-            string? rv = abbr;
-
-            Dictionary<string, string> states = new Dictionary<string, string>()
-            {
-                {"AL", "Alabama"},
-                {"AK", "Alaska"},
-                {"AZ", "Arizona"},
-                {"AR", "Arkansas"},
-                {"CA", "California"},
-                {"CO", "Colorado"},
-                {"CT", "Connecticut"},
-                {"DE", "Delaware"},
-                {"DC", "District of Columbia"},
-                {"FL", "Florida"},
-                {"GA", "Georgia"},
-                {"HI", "Hawaii"},
-                {"ID", "Idaho"},
-                {"IL", "Illinois"},
-                {"IN", "Indiana"},
-                {"IA", "Iowa"},
-                {"KS", "Kansas"},
-                {"KY", "Kentucky"},
-                {"LA", "Louisiana"},
-                {"ME", "Maine"},
-                {"MD", "Maryland"},
-                {"MA", "Massachusetts"},
-                {"MI", "Michigan"},
-                {"MN", "Minnesota"},
-                {"MS", "Mississippi"},
-                {"MO", "Missouri"},
-                {"MT", "Montana"},
-                {"NE", "Nebraska"},
-                {"NV", "Nevada"},
-                {"NH", "New Hampshire"},
-                {"NJ", "New Jersey"},
-                {"NM", "New Mexico"},
-                {"NY", "New York"},
-                {"NC", "North Carolina"},
-                {"ND", "North Dakota"},
-                {"OH", "Ohio"},
-                {"OK", "Oklahoma"},
-                {"OR", "Oregon"},
-                {"PA", "Pennsylvania"},
-                {"RI", "Rhode Island"},
-                {"SC", "South Carolina"},
-                {"SD", "South Dakota"},
-                {"TN", "Tennessee"},
-                {"TX", "Texas"},
-                {"UT", "Utah"},
-                {"VT", "Vermont"},
-                {"VA", "Virginia"},
-                {"WA", "Washington"},
-                {"WV", "West Virginia"},
-                {"WI", "Wisconsin"},
-                {"WY", "Wyoming"}
-            };
-
-            if ((abbr != null) && states.ContainsKey(abbr))
-                rv = states[abbr];
-
-            return rv;
-        }
-
-    }
-}

OSI-API.DAL/OSI-API.DAL.csproj

@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>OSI_API.DAL</RootNamespace>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Mysql.Data" Version="8.0.33" />
-  </ItemGroup>
-
-</Project>

OSI-API/Business/DAO/DAOBase.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
-namespace OSI.API.DAL.Base
+using OSI.API.Business.Objects;
+using Common.Library.SQL.MySQL;
+
+namespace OSI.API.Business.DAO
 {
 
     public abstract class DAOBase<T> : MySQL

OSI-API/Business/DAO/InvoiceDAO.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
-using OSI.API.DAL.Base;
+using OSI.API.Business.Database;
+using OSI.API.Business.Objects;
 
-namespace OSI.API.DAL.Invoice
+namespace OSI.API.Business.DAO
 {
 
     public class InvoiceDAO : DAOBase<InvoiceObject>

OSI-API/Business/Objects/ClientObjects.cs

@@ -0,0 +1,9 @@
+namespace OSI.API.Business.Objects
+{
+    public class ClientObject
+    {
+        public int ClientID { get; set; }
+        public string ClientName { get; set; }
+
+    }
+}

OSI-API/Business/Objects/InvoiceObjects.cs

@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using System;
-using OSI.API.DAL.Client;
 
-namespace OSI.API.DAL.Invoice
+namespace OSI.API.Business.Objects
 {
     public class InvoiceObject
     {
@@ -10,17 +9,17 @@ namespace OSI.API.DAL.Invoice
         public float InvoiceAmount { get; set; }
         public float Discount { get; set; }
         public float Tax { get; set; }
-        public List<InvoiceObjectLineItems>? InvoiceLineItems { get; set; }
+        public List<InvoiceObjectLineItems> InvoiceLineItems { get; set; }
-        public Notes? Notes { get; set; }
+        public Notes Notes { get; set; }
         public DateTime InvoiceDate { get; set; }
         public DateTime DueDate { get; set; }
-        public ClientObject? Client { get; set; }
+        public ClientObject Client { get; set; }
     }
 
     public class InvoiceObjectLineItems
     {
-        public string? Item { get; set; }
+        public string Item { get; set; }
-        public string? Description { get; set; }
+        public string Description { get; set; }
         public float Cost { get; set; }
         public float Quantity { get; set; }
         public float Tax { get; set; }
@@ -31,9 +30,9 @@ namespace OSI.API.DAL.Invoice
 
     public class Notes
     {
-        public string? PublicNotes { get; set; }
+        public string PublicNotes { get; set; }
-        public string? PrivateNotes { get; set; }
+        public string PrivateNotes { get; set; }
-        public string? Terms { get; set; }
+        public string Terms { get; set; }
 
     }
 }

OSI-API/Controllers/InvoicesController.cs

@@ -4,7 +4,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using OSI.API.DAL.Invoice;
+using OSI.API.Business.Objects;
+using OSI.API.Business.DAO;
 
 namespace OSI.API.Controllers
 {
@@ -20,13 +21,13 @@ namespace OSI.API.Controllers
         public override IActionResult Get()
         {
             //> get all invoices as a list of InvoiceObjects
-            using InvoiceDAO dao = new(new OSI.API.DAL.Base.SQLBase.DBConnectionInformation());
+            using InvoiceDAO dao = new(new Common.Library.SQL.Base.SQLBase.DBConnectionInformation());
             return new JsonResult(dao.GetAll());
         }
 
         public override IActionResult Get(int id)
         {
-            using InvoiceDAO dao = new(new OSI.API.DAL.Base.SQLBase.DBConnectionInformation());
+            using InvoiceDAO dao = new(new Common.Library.SQL.Base.SQLBase.DBConnectionInformation());
             return new JsonResult(dao.Get(id));
         }
 

OSI-API/OSI-API.csproj

@@ -10,12 +10,12 @@
     <PackageReference Include="dbup-mysql" Version="4.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
-    <PackageReference Include="Mysql.Data" Version="8.0.33" />
+    <PackageReference Include="Mysql.Data" Version="8.0.25" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\OSI-API.DAL\OSI-API.DAL.csproj" />
+    <ProjectReference Include="..\Library.System\Common.Library\Common.Library.csproj" />
   </ItemGroup>
 
 </Project>