Calculate PPM and add support for getting data as JSON

Author: buffadin

Arctic.Puzzlers.Objects/CompetitionObjects/CompetitionRound.cs

@@ -17,7 +17,7 @@ public class CompetitionRound
         public List<Puzzle> Puzzles { get; set; } = new List<Puzzle>();
         public DateTime Time { get; set; } = new DateTime();
 
-        public TimeSpan MaxTime { get; set; } = new TimeSpan();
+        public TimeSpan MaxTime { get; set; } = TimeSpan.Zero;
         public int NumberOfPieces { get; set; } = 0;
         public string Location { get; set; } = string.Empty;
         public string Url { get; set; } = string.Empty;

Arctic.Puzzlers.Objects/CompetitionObjects/ParticipantResult.cs

@@ -11,7 +11,9 @@ public ParticipantResult()
         public bool? Qualified { get; set; }
 
         public int Rank { get; set; } = 0;
-
+        public TimeSpan TotalTime { get; set; } = TimeSpan.Zero;
+        public long FinishedPieces { get; set; } = 0;
+        
         public List<Participant> Participants { get; set; }       
         public List<Result> Results { get; set; }
 

Arctic.Puzzlers.Objects/CompetitionObjects/Result.cs

@@ -4,7 +4,7 @@ namespace Arctic.Puzzlers.Objects.CompetitionObjects
 {
     public class Result
     {
-        private TimeSpan m_time;
+        private TimeSpan m_time = TimeSpan.Zero;
         public TimeSpan Time
         {
             get

Arctic.Puzzlers.Objects/Misc/CompetitionCSV.cs renamed to Arctic.Puzzlers.Objects/Misc/CompetitionResult.cs

@@ -1,7 +1,7 @@
 namespace Arctic.Puzzlers.Objects.Misc
 {
     ////date, player(s) name event name, piece count, rank, time, and remaining pieces
-    public class CompetitionCSV
+    public class CompetitionResult
     {
         public DateTime Date {  get; set; }
         public string PlayersName { get; set; } = string.Empty;
@@ -10,5 +10,7 @@ public class CompetitionCSV
 
         public long Rank {  get; set; }
         public TimeSpan Time { get; set; }
+        public double PiecesPerMinute { get; set; }
+        public double SimplifiedJpar { get; set; }
     }
 }

Arctic.Puzzlers.Parsers/CompetitionParsers/AepuzzParser.cs

@@ -111,6 +111,7 @@ public async Task Parse(string url)
                         var competitionGroup = new CompetitionGroup { ContestType = competitionSingleRound.ContestType };
                         competitionGroup.Rounds.Add(competitionSingleRound);
                         competition.CompetitionGroups.Add(competitionGroup);
+                        competition.SetTotalResults();
                         var addedSingleCompetition = await m_store.Store(competition);
                         if (addedSingleCompetition)
                         {
@@ -137,6 +138,7 @@ public async Task Parse(string url)
                         competitionGroup.Rounds.Add(competitionSingleRound);
                         competition.CompetitionGroups.Add(competitionGroup);                       
                     }
+                    competition.SetTotalResults();
                     var added = await m_store.Store(competition);
                     if (added)
                     {

Arctic.Puzzlers.Parsers/CompetitionParsers/CompetitionExtensions.cs

@@ -0,0 +1,26 @@
+using Arctic.Puzzlers.Objects.CompetitionObjects;
+using System.Text;
+
+namespace Arctic.Puzzlers.Parsers.CompetitionParsers
+{
+    public static class CompetitionExtensions
+    {
+        public static void SetTotalResults(this Competition competition)
+        {
+            competition.CompetitionGroups.ForEach(t => t.Rounds.ForEach(k => k.Participants.ForEach(participant => SetResults(participant,k))));            
+        }
+        private static void SetResults(ParticipantResult participant, CompetitionRound round)
+        {
+            TimeSpan totalResults = TimeSpan.Zero;
+            long finishedPieces = 0;
+            foreach (var result in participant.Results)
+            {
+                totalResults = totalResults.Add(result.Time);
+                finishedPieces += result.FinishedPieces;
+            }
+            participant.FinishedPieces = finishedPieces == 0 ? round.NumberOfPieces : finishedPieces;
+
+            participant.TotalTime = totalResults;
+        }
+    }
+}

Arctic.Puzzlers.Parsers/CompetitionParsers/CompetitionRoundExtensions.cs

@@ -23,5 +23,6 @@ internal static void SetContestType(this CompetitionRound competitionObject)
                 competitionObject.ContestType = ContestType.Unknown;
             }
         }
+      
     }
 }

Arctic.Puzzlers.Parsers/CompetitionParsers/SpeedPuzzlingParser.cs

@@ -65,6 +65,7 @@ public async Task Parse(string url)
 
                         var competitionGroup = await ParsePdf(stream);
                         competition.CompetitionGroups.Add(competitionGroup);
+                        competition.SetTotalResults();
                         var stored = await m_store.Store(competition);
                         if (stored)
                         {

Arctic.Puzzlers.Parsers/CompetitionParsers/WorldJigsawPuzzleOrgParser.cs

@@ -3,10 +3,9 @@
 using Arctic.Puzzlers.Stores;
 using HtmlAgilityPack;
 using Microsoft.Extensions.Logging;
-using System.Diagnostics;
 using System.Globalization;
+using System.Text;
 using System.Text.RegularExpressions;
-using System.Xml.Linq;
 
 namespace Arctic.Puzzlers.Parsers.CompetitionParsers
 {
@@ -83,6 +82,7 @@ public async Task Parse(string baseurl)
                                 competition.CompetitionGroups.Add(teamGroup);
                             }
                         }
+                        competition.SetTotalResults();
                         await m_store.Store(competition);
                     }                     
                     catch (Exception ex)
@@ -140,12 +140,14 @@ internal async Task AddResult(CompetitionRound competitionRound, HtmlNodeCollect
             singlePuzzleResult.Puzzle = competitionRound.Puzzles.First();
             if (Regex.IsMatch(result, @"\d\d:\d\d:\d\d"))
             {
-                singlePuzzleResult.Time = TimeSpan.Parse(Regex.Match(result, @"\d\d:\d\d:\d\d").Value);
+                singlePuzzleResult.Time = TimeSpan.Parse(Regex.Match(result, @"\d\d:\d\d:\d\d").Value);                
             }
             else
             {
                 singlePuzzleResult.FinishedPieces = long.Parse(Regex.Match(result, @"\d+").Value);
             }
+
+
             if(int.TryParse(values[rankField].InnerText,out int rank))
             {
                 participantResult.Rank = rank;
@@ -298,6 +300,7 @@ private string CleanUpString(string value)
         {
             value = value.Replace(" ", string.Empty);
             value = value.Replace(" ", string.Empty);
+            value = value.Replace(".", string.Empty);
             return value;
         }
     }

Arctic.Puzzlers.Webapi/Controllers/CompetitionController.cs

@@ -28,7 +28,7 @@ public async Task<ActionResult<IEnumerable<Competition>>> Get()
         }
 
         [HttpGet]
-        [Route("CSV/ListOfCompetitions")]
+        [Route("ListOfCompetitions")]
         public async Task<ContentResult> GetAllCompetitions()
         {
             var html = "<p>List of competitions</p>";
@@ -39,8 +39,7 @@ public async Task<ContentResult> GetAllCompetitions()
                 foreach (var competitionGroups in result.CompetitionGroups)
                 {
                     foreach (var round in competitionGroups.Rounds) {
-                        html += "<br/> ";
-                        html += $"<a href=\"/api/Competition/CSV?competition={result.CompetitionId}&round={round.RoundId} \">{result.Name + " " + competitionGroups.ContestType + " " + round.RoundName} </a>";
+                        html += $"<p>{result.Name + " " + competitionGroups.ContestType + " " + round.RoundName} <a href=\"/api/Competition/Simplified?competition={result.CompetitionId}&round={round.RoundId}&format=csv \">CSV </a> <a href=\"/api/Competition/Simplified?competition={result.CompetitionId}&round={round.RoundId}&format=json \">JSON</a></p>";
                     }
                 }
 
@@ -54,9 +53,8 @@ public async Task<ContentResult> GetAllCompetitions()
 
 
         [HttpGet]
-        [Route("CSV")]
-        [Produces("text/csv")]
-        public async Task<ActionResult> GetCsv(Guid competition, Guid round)
+        [Route("Simplified")]
+        public async Task<ActionResult> GetCsv(Guid competition, Guid round, string format)
         {
 
             var data = await m_store.Get(competition);
@@ -74,7 +72,7 @@ public async Task<ActionResult> GetCsv(Guid competition, Guid round)
             {
                 return NotFound();
             }
-            var competitionCSVs = new List<CompetitionCSV>();
+            var competitionCSVs = new List<CompetitionResult>();
 
             foreach(var result in rounddata.Participants)
             {
@@ -84,26 +82,68 @@ public async Task<ActionResult> GetCsv(Guid competition, Guid round)
                 {
                     playersName = result.GroupName + "(" + playersName + ")";
                 }
-                var competitionCSV = new CompetitionCSV()
+                
+                var competitionCSV = new CompetitionResult()
                 {
                     Date = rounddata.Time,
                     EventName = data.Name + " " + groupData.ContestType + " " + rounddata.RoundName,
                     PlayersName = playersName,
-                    Rank = result.Rank
+                    Rank = result.Rank,
+                    PieceCount = result.FinishedPieces,
+                    Time = result.TotalTime                    
                 };
-
+                
                 competitionCSVs.Add(competitionCSV);
             }
-            using (var memoryStream = new MemoryStream())
-            {               
-                using (var streamWriter = new StreamWriter(memoryStream))
-                using (var csvWriter = new CsvWriter(streamWriter, CultureInfo.InvariantCulture))
+
+            if(rounddata.MaxTime != TimeSpan.Zero)
+            {
+                int playerCounter = 0;
+                double totalPiecesPerMinute = 0.0;
+                competitionCSVs.ForEach(compCSV =>
                 {
-                    csvWriter.WriteRecords(competitionCSVs);
-                }
+                    var timespent = compCSV.Time == TimeSpan.Zero ? rounddata.MaxTime : compCSV.Time;
+                    var piecesPerMinute = (compCSV.PieceCount / timespent.TotalSeconds) * 60;
+                    compCSV.PiecesPerMinute = Math.Round(piecesPerMinute, 2);
+                    if(piecesPerMinute >0)
+                    {
+                        totalPiecesPerMinute += piecesPerMinute;
+                        playerCounter++;
+                    }
+
+                });
+
+                var averagePiecesPerMinute = totalPiecesPerMinute / playerCounter;
+                if(averagePiecesPerMinute > 0)
+                {
+                    competitionCSVs.ForEach(compCSV =>
+                    {
+                        compCSV.SimplifiedJpar = Math.Round(averagePiecesPerMinute / compCSV.PiecesPerMinute, 8);
+                    });
+                }   
+                
+            }
 
-                return File(memoryStream.ToArray(), "text/csv", $"Export-{DateTime.Now.ToString("s")}.csv");
+            
+            switch (format)
+            {
+                case "json":
+                    return Ok(competitionCSVs);
+                case "csv":
+                    using (var memoryStream = new MemoryStream())
+                    {
+                        using (var streamWriter = new StreamWriter(memoryStream))
+                        using (var csvWriter = new CsvWriter(streamWriter, CultureInfo.InvariantCulture))
+                        {
+                            csvWriter.WriteRecords(competitionCSVs);
+                        }
+
+                        return File(memoryStream.ToArray(), "text/csv", $"Export-{DateTime.Now.ToString("s")}.csv");
+                    }
+                default:
+                    return Ok(competitionCSVs);
             }
+
         }
 
     }