Merge pull request #11 from IowaComputerGurus/feature/updates

Production Fixes
IowaComputerGurus · Oct 5, 2022 · aaf47ae · aaf47ae
2 parents 0a70362 + 1dd651d
commit aaf47ae
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/Source/GitHubCostVisualizer.Web/Models/GithubUsageEntry.cs b/Source/GitHubCostVisualizer.Web/Models/GithubUsageEntry.cs
@@ -14,13 +14,13 @@ public class GithubUsageEntry
         [Name("SKU")]
         public string Sku { get; set; }
         [Name("Quantity")]
-        public decimal Quantity { get; set; }
+        public decimal? Quantity { get; set; }
         [Name("Unit Type")]
         public string UnitType { get; set; }
         [Name("Price Per Unit ($)")]
-        public decimal PricePer { get; set; }
+        public decimal? PricePer { get; set; }
         [Name("Multiplier")]
-        public decimal Multiplier { get; set; }
+        public decimal? Multiplier { get; set; }
         [Name("Actions Workflow")]
         public string ActionWorkflow { get; set; }
         [Name("Username")]

diff --git a/Source/GitHubCostVisualizer.Web/Processor/GithubUsageProcessor.cs b/Source/GitHubCostVisualizer.Web/Processor/GithubUsageProcessor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Transactions;
 using GitHubCostVisualizer.Web.Models;
 
 namespace GitHubCostVisualizer.Web.Processor
@@ -26,7 +24,7 @@ public UsageReportViewModel ProcessUsageReport(List<GithubUsageEntry> entries)
                 .Sum(i => (int)(i.Quantity * i.Multiplier));
             model.TotalActionMinutesCost = entries
                 .Where(i => i.Product.Equals(Constants.GitHubProducts.Actions, StringComparison.InvariantCultureIgnoreCase))
-                .Sum(i => i.Quantity * i.Multiplier * i.PricePer);
+                .Sum(i => i.Quantity.GetValueOrDefault() * i.Multiplier.GetValueOrDefault() * i.PricePer.GetValueOrDefault());
             model.ActionsSummary = (from x in entries.Where(i => i.Product.Equals(Constants.GitHubProducts.Actions, StringComparison.InvariantCultureIgnoreCase))
                                     group x by x.Sku
                     into grp
@@ -40,7 +38,7 @@ into grp
             model.DailyStorageSummary = (from x in entries.Where(i => i.Product.Equals(Constants.GitHubProducts.SharedStorage, StringComparison.InvariantCultureIgnoreCase))
                                          group x by x.Date
                     into grp
-                                         select new KeyValuePair<DateTime, decimal>(grp.Key, grp.Sum(i => i.Quantity)))
+                                         select new KeyValuePair<DateTime, decimal>(grp.Key, grp.Sum(i => i.Quantity.GetValueOrDefault())))
                 .ToList();
 
             model.DailyStorageByRepo = GenerateStorageByDays(entries);
@@ -54,7 +52,7 @@ into grp
                 model.AverageDailyStorageByRepo = (from x in entries.Where(i => i.Product.Equals(Constants.GitHubProducts.SharedStorage, StringComparison.InvariantCultureIgnoreCase))
                                                    group x by x.Repository
                     into grp
-                                                   select new KeyValuePair<string, decimal>(grp.Key, grp.Sum(i => i.Quantity) / grp.Count())).ToList();
+                                                   select new KeyValuePair<string, decimal>(grp.Key, grp.Sum(i => i.Quantity.GetValueOrDefault()) / grp.Count())).ToList();
             }
 
             return model;

diff --git a/Source/GitHubCostVisualizer.Web/Views/Home/_SummaryItems.cshtml b/Source/GitHubCostVisualizer.Web/Views/Home/_SummaryItems.cshtml
@@ -21,7 +21,7 @@
             <div class="card-header d-block">
                 <div class="row align-items-center justify-content-between flex-nowrap">
                     <div class="col-auto">
-                        <span class="display-5">@Model.TotalBillableActionMinutes.ToString("N0") (@Model.TotalActionMinutesCost.ToString("C"))</span>
+                        <span class="display-5">@Model.TotalBillableActionMinutes.ToString("N0")</span>
                         <h5>Total Billable Action Minutes *</h5>
                     </div>
                     <div class="col-auto">
@@ -31,6 +31,21 @@
             </div>
         </div>
     </div>
+    <div class="col-md-3">
+        <div class="stat-box card card-primary card-darker card-full">
+            <div class="card-header d-block">
+                <div class="row align-items-center justify-content-between flex-nowrap">
+                    <div class="col-auto">
+                        <span class="display-5">@Model.TotalActionMinutesCost.ToString("C")</span>
+                        <h5>Estimated Cost of Action Minutes **</h5>
+                    </div>
+                    <div class="col-auto">
+                        <i class="fas fa-stopwatch"></i>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="col-md-3">
         <div class="stat-box card card-primary card-darker card-full">
             <div class="card-header d-block">