#232 change DBConnection to DbConnection

InUniversity · May 16, 2023 · 1396e7f · 1396e7f
1 parent 9034fe0
commit 1396e7f
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git a/CompanyManagement/CompanyManagement.csproj b/CompanyManagement/CompanyManagement.csproj
@@ -82,7 +82,7 @@
     <Compile Include="Converters\EnumDescConverter.cs" />
     <Compile Include="Database\AccountsDao.cs" />
     <Compile Include="Database\Base\BaseDao.cs" />
-    <Compile Include="Database\Base\DBConnection.cs" />
+    <Compile Include="Database\Base\DbConnection.cs" />
     <Compile Include="Database\MilestonesDao.cs" />
     <Compile Include="Database\MileTasksDao.cs" />
     <Compile Include="Database\ProjectBonusesDao.cs" />

diff --git a/CompanyManagement/Database/Base/BaseDao.cs b/CompanyManagement/Database/Base/BaseDao.cs
@@ -117,6 +117,6 @@ public abstract class BaseDao
         public const string mileTskID = "MileID";
         public const string mileTskTskID = "TaskID";
 
-        protected DBConnection dbConnection = new DBConnection();
+        protected DbConnection dbConnection = new DbConnection();
     }
 }
diff --git a/...yManagement/Database/Base/DBConnection.cs → ...yManagement/Database/Base/DbConnection.cs b/...yManagement/Database/Base/DBConnection.cs → ...yManagement/Database/Base/DbConnection.cs
@@ -5,11 +5,11 @@
 
 namespace CompanyManagement.Database.Base
 {
-    public class DBConnection
+    public class DbConnection
     {
         private SqlConnection conn;
 
-        public DBConnection()
+        public DbConnection()
         {
             conn = new SqlConnection(Properties.Settings.Default.connStr);
         }
@@ -24,12 +24,12 @@ public bool ExecuteNonQuery(string command)
                 if (cmd.ExecuteNonQuery() > 0)
                 {
                     success = true;
-                    Log.Ins.Information(nameof(DBConnection), "Completed");
+                    Log.Ins.Information(nameof(DbConnection), "Completed");
                 }
             }
             catch (Exception ex)
             {
-                Log.Ins.Error(nameof(DBConnection), ex.Message);
+                Log.Ins.Error(nameof(DbConnection), ex.Message);
             }
             finally
             {
@@ -59,7 +59,7 @@ public List<T> GetList<T>(string sqlStr, Func<SqlDataReader, T> converter)
             }
             catch (Exception ex)
             {
-                Log.Ins.Error(nameof(DBConnection), ex.Message);
+                Log.Ins.Error(nameof(DbConnection), ex.Message);
             }
             finally
             {
@@ -80,7 +80,7 @@ public decimal GetDecimal(string sqlStr)
             }
             catch (Exception ex)
             {
-                Log.Ins.Error(nameof(DBConnection), ex.Message);
+                Log.Ins.Error(nameof(DbConnection), ex.Message);
             }
             finally
             {

diff --git a/CompanyManagementMSTest/Database/AccountsDaoTest.cs b/CompanyManagementMSTest/Database/AccountsDaoTest.cs
@@ -54,7 +54,7 @@ public void SearchByUsername_Found()
 
         public Account Search(Account account)
         {
-            DBConnection dbConnection = new DBConnection();
+            DbConnection dbConnection = new DbConnection();
             string sqlStr = $"SELECT * FROM Accounts WHERE Username = '{account.Username}' ";
             return (Account)dbConnection.GetSingleObject(sqlStr, reader => new Account(reader));
         }

diff --git a/CompanyManagementMSTest/Database/MileTasksDaoTest.cs b/CompanyManagementMSTest/Database/MileTasksDaoTest.cs
@@ -42,7 +42,7 @@ public void MileTasks_Dao_Search_By_MileID_Test()
 
         private MileTask Search(MileTask mileTsk)
         {
-            DBConnection dbConnection = new DBConnection();
+            DbConnection dbConnection = new DbConnection();
             string sql = $"SELECT * FROM MileTasks WHERE MileID='{mileTsk.MileID}' AND TaskID='{mileTsk.TskID}'";
             return (MileTask)dbConnection.GetSingleObject(sql, reader => new MileTask(reader));
         }

diff --git a/CompanyManagementMSTest/Database/MilestonesDaoTest.cs b/CompanyManagementMSTest/Database/MilestonesDaoTest.cs
@@ -80,7 +80,7 @@ public void Milestones_Dao_Search_By_ProjectID()
 
         private Milestone Search(string id)
         {
-            DBConnection dbConnection = new DBConnection();
+            DbConnection dbConnection = new DbConnection();
             string sql = $"SELECT * FROM Milestones WHERE ID='{id}'";
             return (Milestone)dbConnection.GetSingleObject(sql, reader => new Milestone(reader)); 
         }

diff --git a/CompanyManagementMSTest/Database/ProjectAssignmentsDaoTest.cs b/CompanyManagementMSTest/Database/ProjectAssignmentsDaoTest.cs
@@ -77,7 +77,7 @@ public void SearchProjectByCreatorID_Found()
 
         private ProjectAssignment Search(ProjectAssignment assign)
         {
-            DBConnection dbConnection = new DBConnection();
+            DbConnection dbConnection = new DbConnection();
             string sql = $"SELECT * FROM ProjectAssignments WHERE ProjectID='{assign.ProjID}' AND DepartmentID='{assign.DeptID}'";
             return (ProjectAssignment)dbConnection.GetSingleObject(sql, reader => new ProjectAssignment(reader)); 
         }

diff --git a/CompanyManagementMSTest/Database/ProjectBonusesDaoTest.cs b/CompanyManagementMSTest/Database/ProjectBonusesDaoTest.cs
@@ -71,20 +71,20 @@ public void SearchByEmplojID_Found()
 
         public ProjectBonus Search(ProjectBonus projectBonus)
         {
-            DBConnection dbConnection = new DBConnection();
+            DbConnection dbConnection = new DbConnection();
             string sqlStr = $"Select * From ProjectBonuses Where ID = '{projectBonus.ID}'";
             return (ProjectBonus)dbConnection.GetSingleObject(sqlStr, reader => new ProjectBonus(reader));
         }
 
         public List<ProjectBonus> SearchByProjectID(string prjectID)
         {
-            DBConnection dbConnection = new DBConnection();
+            DbConnection dbConnection = new DbConnection();
             string sqlStr = $"Select * From ProjectBonuses Where ProjectID = '{prjectID}'";
             return dbConnection.GetList(sqlStr, reader => new ProjectBonus(reader));
         }
         public List<ProjectBonus> SearchByEmployeeID(string employeeID)
         {
-            DBConnection dbConnection = new DBConnection();
+            DbConnection dbConnection = new DbConnection();
             string sqlStr = $"Select * From ProjectBonuses Where EmployeeID = '{employeeID}'";
             return dbConnection.GetList(sqlStr, reader => new ProjectBonus(reader));
         }

diff --git a/CompanyManagementMSTest/Database/SalaryRecordsDaoTest.cs b/CompanyManagementMSTest/Database/SalaryRecordsDaoTest.cs
@@ -72,13 +72,13 @@ public void GetByEmployeeID_Fount()
 
         public SalaryRecord Search(SalaryRecord salaryRecord)
         {
-            DBConnection dbConnection = new DBConnection();
+            DbConnection dbConnection = new DbConnection();
             string sqlStr = $"Select * From SalaryRecords where ID = '{salaryRecord.ID}'";
             return (SalaryRecord)dbConnection.GetSingleObject(sqlStr, reader => new SalaryRecord(reader));
         }
         public List<SalaryRecord> SearchByMonthYear(int month, int year)
         {
-            DBConnection dbConnection = new DBConnection();
+            DbConnection dbConnection = new DbConnection();
             string sqlStr = $"Select * From SalaryRecords where Month(MonthYear) = '{month}' AND Year(MonthYear) = '{year}'";
             return dbConnection.GetList(sqlStr, reader => new SalaryRecord(reader));
         }

diff --git a/CompanyManagementMSTest/Database/TaskCheckOutsDaoTest.cs b/CompanyManagementMSTest/Database/TaskCheckOutsDaoTest.cs
@@ -47,14 +47,14 @@ public void SearchByProjectID_Found()
 
         private TaskCheckOut Search(string timeShtID, string tskID)
         {
-            DBConnection dbConnection = new DBConnection();
+            DbConnection dbConnection = new DbConnection();
             string sql = $"SELECT * FROM TaskCheckOuts WHERE TimeSheetID='{timeShtID}' AND TaskID='{tskID}'";
             return (TaskCheckOut)dbConnection.GetSingleObject(sql, reader => new TaskCheckOut(reader));
         }
 
         private void Delete(string timeShtID, string tskID)
         {
-            DBConnection dbConnection = new DBConnection();
+            DbConnection dbConnection = new DbConnection();
             string sql = $"DELETE FROM TaskCheckOuts WHERE TimeSheetID='{timeShtID}' AND TaskID='{tskID}'";
             dbConnection.ExecuteNonQuery(sql);
         }

diff --git a/CompanyManagementMSTest/Database/TasksDaoTest.cs b/CompanyManagementMSTest/Database/TasksDaoTest.cs
@@ -91,7 +91,7 @@ public void SearchCurrentTasksByEmployeeID_Found()
 
         private List<TaskInProject> SearchByPrjID(string PrjID)
         {
-            DBConnection dbConnection = new DBConnection();
+            DbConnection dbConnection = new DbConnection();
             string sql = $"SELECT * FROM Tasks WHERE ProjectID = '{PrjID}'";
             return dbConnection.GetList<TaskInProject>(sql, reader => new TaskInProject(reader));
         }

diff --git a/CompanyManagementMSTest/Database/TimeSheetsCIODaoTest.cs b/CompanyManagementMSTest/Database/TimeSheetsCIODaoTest.cs
@@ -63,7 +63,7 @@ public void TotalWorksDayByEmployeeID()
 
         public TimeSheet Search(TimeSheet timeSheet)
         {
-            DBConnection dbConnection = new DBConnection();
+            DbConnection dbConnection = new DbConnection();
             string sqlStr = $"Select * From TimeSheets Where ID = '{timeSheet.ID}'";
             return (TimeSheet)dbConnection.GetSingleObject(sqlStr, reader => new TimeSheet(reader));
         }