updates to remove warnings in LP4 code

ChrisHowd · ChrisHowd · commit e4cc15769603 · 2025-02-27T09:48:39.000-08:00
diff --git a/DownloadableCodeProjects/LP4_manage-app-data/Data_M2/Solution/Models/Bank.cs b/DownloadableCodeProjects/LP4_manage-app-data/Data_M2/Solution/Models/Bank.cs
@@ -41,7 +41,7 @@ internal IEnumerable<BankCustomer> GetCustomersByName(string firstName, string l
     }
 
     // get customer based on Customer ID
-    internal BankCustomer GetCustomerById(string customerId)
+    internal BankCustomer? GetCustomerById(string customerId)
     {
         foreach (var customer in _customers)
         {
diff --git a/DownloadableCodeProjects/LP4_manage-app-data/Data_M2/Solution/Services/SimulateDepositsWithdrawalsTransfers.cs b/DownloadableCodeProjects/LP4_manage-app-data/Data_M2/Solution/Services/SimulateDepositsWithdrawalsTransfers.cs
@@ -315,11 +315,12 @@ public class TransactionInfo : IComparable<TransactionInfo>
     public DateOnly Date { get; set; }
     public TimeOnly Time { get; set; }
     public double Amount { get; set; }
-    public string Description { get; set; }
-    public string TransactionType { get; set; }
+    public string Description { get; set; } = string.Empty;
+    public string TransactionType { get; set; } = string.Empty;
 
-    public int CompareTo(TransactionInfo other)
+    public int CompareTo(TransactionInfo? other)
     {
+        if (other == null) return 1;
         int dateComparison = Date.CompareTo(other.Date);
         if (dateComparison == 0)
         {
diff --git a/DownloadableCodeProjects/LP4_manage-app-data/Data_M3/Solution/Models/Bank.cs b/DownloadableCodeProjects/LP4_manage-app-data/Data_M3/Solution/Models/Bank.cs
@@ -41,7 +41,7 @@ internal IEnumerable<BankCustomer> GetCustomersByName(string firstName, string l
     }
 
     // get customer based on Customer ID
-    internal BankCustomer GetCustomerById(string customerId)
+    internal BankCustomer? GetCustomerById(string customerId)
     {
         foreach (var customer in _customers)
         {
diff --git a/DownloadableCodeProjects/LP4_manage-app-data/Data_M3/Solution/Services/SimulateDepositsWithdrawalsTransfers.cs b/DownloadableCodeProjects/LP4_manage-app-data/Data_M3/Solution/Services/SimulateDepositsWithdrawalsTransfers.cs
@@ -315,11 +315,12 @@ public class TransactionInfo : IComparable<TransactionInfo>
     public DateOnly Date { get; set; }
     public TimeOnly Time { get; set; }
     public double Amount { get; set; }
-    public string Description { get; set; }
-    public string TransactionType { get; set; }
+    public string Description { get; set; } = string.Empty;
+    public string TransactionType { get; set; } = string.Empty;
 
-    public int CompareTo(TransactionInfo other)
+    public int CompareTo(TransactionInfo? other)
     {
+        if (other == null) return 1;
         int dateComparison = Date.CompareTo(other.Date);
         if (dateComparison == 0)
         {
@@ -328,306 +329,3 @@ public int CompareTo(TransactionInfo other)
         return dateComparison;
     }
 }
-
-
-
-
-
-// public class SimulateDepositsWithdrawalsTransfers
-// {
-//     public static BankCustomer SimulateActivityDateRange(DateOnly startDate, DateOnly endDate, BankCustomer bankCustomer)
-//     {
-//         // Determine the starting day, month, and year
-//         int startDay = startDate.Day;
-//         int startMonth = startDate.Month;
-//         int startYear = startDate.Year;
-
-//         // Determine the ending day, month, and year
-//         int endDay = endDate.Day;
-//         int endMonth = endDate.Month;
-//         int endYear = endDate.Year;
-
-//         DateOnly currentDate = startDate;
-
-//         // Call SimulateActivityForPeriod if the startDate is not the first day of the month
-//         if (startDay != 1)
-//         {
-//             DateOnly lastDayOfMonth = new DateOnly(startYear, startMonth, DateTime.DaysInMonth(startYear, startMonth));
-//             bankCustomer = SimulateActivityForPeriod(startDate, lastDayOfMonth, bankCustomer);
-
-//             // Update the currentDate to the first day of the next month
-//             currentDate = lastDayOfMonth.AddDays(1);
-//         }
-
-//         // Need to compare the month and year of the start and end dates
-//         DateOnly firstDayFirstFullMonth = new DateOnly(currentDate.Year, currentDate.Month, 1);
-//         DateOnly lastDayOfFirstFullMonth = new DateOnly(currentDate.Year, currentDate.Month, DateTime.DaysInMonth(currentDate.Year, currentDate.Month));
-//         DateOnly firstDayLastMonth = new DateOnly(endYear, endMonth, 1);
-//         DateOnly lastDayOfLastMonth = new DateOnly(endYear, endMonth, DateTime.DaysInMonth(endYear, endMonth));
-
-
-//         // If the first day of the current month and the first day of the last month are the same, then the remaining date range is exactly one month
-//         if (firstDayFirstFullMonth == firstDayLastMonth && lastDayOfFirstFullMonth == lastDayOfLastMonth)
-//         {
-//             // Call SimulateActivityForPeriod once
-//             bankCustomer = SimulateActivityForPeriod(currentDate, endDate, bankCustomer);
-//         }
-//         else
-//         {
-//             // Call SimulateActivityForPeriod for each full month in the date range
-//             DateOnly currentMonth = firstDayFirstFullMonth;
-//             while (currentMonth < firstDayLastMonth)
-//             {
-//                 DateOnly lastDayOfMonth = new DateOnly(currentMonth.Year, currentMonth.Month, DateTime.DaysInMonth(currentMonth.Year, currentMonth.Month));
-//                 bankCustomer = SimulateActivityForPeriod(currentMonth, lastDayOfMonth, bankCustomer);
-//                 currentMonth = currentMonth.AddMonths(1);
-//             }
-
-//             // Call SimulateActivityForPeriod for the remaining days in the last month
-//             bankCustomer = SimulateActivityForPeriod(firstDayLastMonth, endDate, bankCustomer);
-//         }
-
-//         // Return the updated bankCustomer
-//         return bankCustomer;
-//     }
-
-//     private static BankCustomer SimulateActivityForPeriod(DateOnly startDate, DateOnly endDate, BankCustomer bankCustomer)
-//     {
-//         foreach (BankAccount account in bankCustomer.Accounts)
-//         {
-//             if (account.AccountType == "Savings")
-//             {
-//                 SavingsAccount savingsAccount = (SavingsAccount)account;
-//                 savingsAccount.ResetWithdrawalLimit();
-//             }
-//         }
-
-//         double[] monthlyExpenses = ReturnMonthlyExpenses();
-
-//         double semiMonthlyPaycheck = monthlyExpenses[0];
-//         double transferToSavings = monthlyExpenses[1];
-//         double rent = monthlyExpenses[2];
-//         double entertainment1 = monthlyExpenses[3];
-//         double entertainment2 = monthlyExpenses[4];
-//         double entertainment3 = monthlyExpenses[5];
-//         double entertainment4 = monthlyExpenses[6];
-//         double monthlyGasElectric = monthlyExpenses[7];
-//         double monthlyWaterSewer = monthlyExpenses[8];
-//         double monthlyWasteManagement = monthlyExpenses[9];
-//         double monthlyHealthClub = monthlyExpenses[10];
-//         double creditCardBill = monthlyExpenses[11];
-
-//         double minCheckingBalance = 1000.00;
-//         double maxCheckingBalance = 5000.00;
-//         double transferToChecking = 2000.00;
-
-//         DateOnly dateMiddleWeekday = new DateOnly(startDate.Year, startDate.Month, 14);
-//         if (dateMiddleWeekday.DayOfWeek == DayOfWeek.Saturday)
-//         {
-//             dateMiddleWeekday = dateMiddleWeekday.AddDays(2);
-//         }
-//         else if (dateMiddleWeekday.DayOfWeek == DayOfWeek.Sunday)
-//         {
-//             dateMiddleWeekday = dateMiddleWeekday.AddDays(1);
-//         }
-
-//         DateOnly dateFinalWeekday = new DateOnly(endDate.Year, endDate.Month, DateTime.DaysInMonth(endDate.Year, endDate.Month));
-//         if (dateFinalWeekday.DayOfWeek == DayOfWeek.Saturday)
-//         {
-//             dateFinalWeekday = dateFinalWeekday.AddDays(-1);
-//         }
-//         else if (dateFinalWeekday.DayOfWeek == DayOfWeek.Sunday)
-//         {
-//             dateFinalWeekday = dateFinalWeekday.AddDays(-2);
-//         }
-
-//         // deposit semi-monthly paychecks at the middle and end of the month
-//         if (dateMiddleWeekday >= startDate && dateMiddleWeekday <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Deposit(semiMonthlyPaycheck, dateMiddleWeekday, new TimeOnly(12, 00), "Bi-monthly salary deposit");
-//         }
-//         if (dateFinalWeekday >= startDate && dateFinalWeekday <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Deposit(semiMonthlyPaycheck, dateFinalWeekday, new TimeOnly(12, 00), "Bi-monthly salary deposit");
-//         }
-
-//         // withdraw rent payment on the first day of the month
-//         DateOnly rentDueDate = new DateOnly(startDate.Year, startDate.Month, 1);
-//         if (startDate <= rentDueDate && rentDueDate <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Withdraw(rent, rentDueDate, new TimeOnly(12, 00), "Rent payment");
-//         }
-
-//         DateOnly saturday1 = new DateOnly(startDate.Year, startDate.Month, 1);
-//         while (saturday1.DayOfWeek != DayOfWeek.Saturday)
-//         {
-//             saturday1 = saturday1.AddDays(1);
-//         }
-//         DateOnly saturday2 = saturday1.AddDays(7);
-//         DateOnly saturday3 = saturday2.AddDays(7);
-//         DateOnly saturday4 = saturday3.AddDays(7);
-
-//         // withdraw entertainment expenses on the first four Saturdays of the month
-//         if (saturday1 >= startDate && saturday1 <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Withdraw(entertainment1, saturday1, new TimeOnly(21, 00), "Debit card purchase");
-//             //public virtual bool Withdraw(double amount, DateOnly transactionDate, TimeOnly transactionTime, string description)
-//         }
-//         if (saturday2 >= startDate && saturday2 <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Withdraw(entertainment2, saturday2, new TimeOnly(21, 00), "Debit card purchase");
-//         }
-//         if (saturday3 >= startDate && saturday3 <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Withdraw(entertainment3, saturday3, new TimeOnly(21, 00), "Debit card purchase");
-//         }
-//         if (saturday4 >= startDate && saturday4 <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Withdraw(entertainment4, saturday4, new TimeOnly(21, 00), "Debit card purchase");
-//         }
-
-//         // withdraw monthly bill payments on the 20th of the month
-//         DateOnly billPayDate = new DateOnly(startDate.Year, startDate.Month, 20);
-//         if (billPayDate >= startDate && billPayDate <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Withdraw(monthlyGasElectric, billPayDate, new TimeOnly(12, 00), "Auto-pay gas and electric bill");
-//             bankCustomer.Accounts[0].Withdraw(monthlyWaterSewer, billPayDate, new TimeOnly(12, 00), "Auto-pay water and sewer bill");
-//             bankCustomer.Accounts[0].Withdraw(monthlyWasteManagement, billPayDate, new TimeOnly(12, 00), "Auto-pay waste management bill");
-//             bankCustomer.Accounts[0].Withdraw(monthlyHealthClub, billPayDate, new TimeOnly(12, 00), "Auto-pay health club membership");
-//         }
-
-//         DateOnly monday1 = new DateOnly(startDate.Year, startDate.Month, 1);
-//         while (monday1.DayOfWeek != DayOfWeek.Monday)
-//         {
-//             monday1 = monday1.AddDays(1);
-//         }
-//         DateOnly monday2 = monday1.AddDays(7);
-//         DateOnly monday3 = monday2.AddDays(7);
-//         DateOnly monday4 = monday3.AddDays(7);
-
-//         double weeklyCash = 400.00;
-//         // withdraw weekly expenses on the first four Mondays of the month
-//         if (monday1 >= startDate && monday1 <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Withdraw(weeklyCash, monday1, new TimeOnly(8, 00), "Withdraw for expenses");
-//         }
-//         if (monday2 >= startDate && monday2 <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Withdraw(weeklyCash, monday2, new TimeOnly(8, 00), "Withdraw for expenses");
-//         }
-//         if (monday3 >= startDate && monday3 <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Withdraw(weeklyCash, monday3, new TimeOnly(8, 00), "Withdraw for expenses");
-//         }
-//         if (monday4 >= startDate && monday4 <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Withdraw(weeklyCash, monday4, new TimeOnly(8, 00), "Withdraw for expenses");
-//         }
-
-//         // withdraw credit card bill payment on the last workday of the month
-//         if (dateFinalWeekday >= startDate && dateFinalWeekday <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Withdraw(creditCardBill, dateFinalWeekday, new TimeOnly(12, 00), "Auto-pay credit card bill");
-//         }
-
-//         // deposit refund for overcharge on the 5th of the month
-//         DateOnly refundDate = new DateOnly(startDate.Year, startDate.Month, 5);
-//         if (refundDate >= startDate && refundDate <= endDate)
-//         {
-//             bankCustomer.Accounts[1].Deposit(100.00, refundDate, new TimeOnly(12, 00), "Refund for overcharge -(BANK REFUND)");
-//         }
-
-//         DateOnly feeDate1 = new DateOnly(startDate.Year, startDate.Month, 3);
-//         DateOnly feeDate2 = new DateOnly(startDate.Year, startDate.Month, 10);
-
-//         // withdraw monthly fee on the 3rd and 10th of the month
-//         if (feeDate1 >= startDate && feeDate1 <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Withdraw(50.00, feeDate1, new TimeOnly(12, 00), "-(BANK FEE)");
-//         }
-//         if (feeDate2 >= startDate && feeDate2 <= endDate)
-//         {
-//             bankCustomer.Accounts[0].Withdraw(50.00, feeDate2, new TimeOnly(12, 00), "-(BANK FEE)");
-//         }
-
-//         // evaluate checking account balance at the end of the month and transfer funds as needed
-//         DateOnly dateFinalDayOfMonth = new DateOnly(endDate.Year, endDate.Month, DateTime.DaysInMonth(endDate.Year, endDate.Month));
-//         if (startDate <= dateFinalDayOfMonth && dateFinalDayOfMonth <= endDate)
-//         {
-//             if (bankCustomer.Accounts[0].Balance <= minCheckingBalance)
-//             {
-//                 bool transferSavingsToChecking = bankCustomer.Accounts[1].Transfer(bankCustomer.Accounts[0], transferToChecking, dateFinalDayOfMonth, new TimeOnly(12, 00), "Transfer from savings to checking account");
-//                 if (transferSavingsToChecking != true)
-//                 {
-//                     // Running out of money in Savings account?
-//                 }
-//             }
-//             else if (bankCustomer.Accounts[0].Balance >= maxCheckingBalance)
-//             {
-//                 bool transferSavingsToChecking = bankCustomer.Accounts[0].Transfer(bankCustomer.Accounts[1], transferToSavings, dateFinalDayOfMonth, new TimeOnly(12, 00), "Transfer from checking to savings account");
-//                 if (transferSavingsToChecking != true)
-//                 {
-//                     // Need to contact the bank?
-//                 }
-//             }
-//         }
-
-//         return bankCustomer;
-//     }
-
-//     static double[] ReturnMonthlyExpenses()
-//     {
-//         Random random = new Random();
-
-//         // Generate a salary paycheck amount. Calculate a random salary amount between 2000 and 5000.
-//         double semiMonthlyPaycheck = random.Next(3000, 4000);
-
-//         // Generate a default transfer that's 25% of the salary paycheck amount rounded down to nearest 100.
-//         double transferToSavings = Math.Floor(semiMonthlyPaycheck * 0.25 / 100) * 100;
-
-//         // Generate a rent amount using random value between 800 and 1000 plus 30% of a paycheck.
-//         double rent = random.Next(1800, 2000) + semiMonthlyPaycheck * 0.3;
-
-//         // Generate four random entertainment expense amounts between 150 and 220.
-//         double entertainment1 = random.Next(150, 220);
-//         double entertainment2 = random.Next(150, 220);
-//         double entertainment3 = random.Next(150, 220);
-//         double entertainment4 = random.Next(150, 220);
-
-//         // Generate a monthly gas and electric bill using a random number between 100 and 150.
-//         double monthlyGasElectric = random.Next(100, 150);
-
-//         // Generate a monthly water and sewer bill using a random number between 80 and 90.
-//         double monthlyWaterSewer = random.Next(80, 90);
-
-//         // Generate a monthly waste management bill using a random number between 60 and 70.
-//         double monthlyWasteManagement = random.Next(60, 70);
-
-//         // Generate a monthly health club membership bill using a random number between 120 and 160.
-//         double monthlyHealthClub = random.Next(120, 160);
-
-//         // Generate a random credit card bill between 1000 and 1500 plus 30% of a paycheck.
-//         double creditCardBill = random.Next(500, 800) + semiMonthlyPaycheck * 0.25;
-
-//         // Create an array with the monthly expenses
-//         double[] monthlyExpenses = new double[]
-//         {
-//             semiMonthlyPaycheck,
-//             transferToSavings,
-//             rent,
-//             entertainment1,
-//             entertainment2,
-//             entertainment3,
-//             entertainment4,
-//             monthlyGasElectric,
-//             monthlyWaterSewer,
-//             monthlyWasteManagement,
-//             monthlyHealthClub,
-//             creditCardBill
-//         };
-
-//         return monthlyExpenses;
-//     }
-// }
-
-
diff --git a/DownloadableCodeProjects/LP4_manage-app-data/Data_M3/Starter/Models/Bank.cs b/DownloadableCodeProjects/LP4_manage-app-data/Data_M3/Starter/Models/Bank.cs
@@ -41,7 +41,7 @@ internal IEnumerable<BankCustomer> GetCustomersByName(string firstName, string l
     }
 
     // get customer based on Customer ID
-    internal BankCustomer GetCustomerById(string customerId)
+    internal BankCustomer? GetCustomerById(string customerId)
     {
         foreach (var customer in _customers)
         {
diff --git a/DownloadableCodeProjects/LP4_manage-app-data/Data_M3/Starter/Services/SimulateDepositsWithdrawalsTransfers.cs b/DownloadableCodeProjects/LP4_manage-app-data/Data_M3/Starter/Services/SimulateDepositsWithdrawalsTransfers.cs

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ internal IEnumerable<BankCustomer> GetCustomersByName(string firstName, string l`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`// get customer based on Customer ID`
`44`		`- internal BankCustomer GetCustomerById(string customerId)`
	`44`	`+ internal BankCustomer? GetCustomerById(string customerId)`
`45`	`45`	`{`
`46`	`46`	`foreach (var customer in _customers)`
`47`	`47`	`{`