refactor: remove param mutation + more

PoliNetwork.Graduatorie.Common/Data/Constants.cs

@@ -9,4 +9,5 @@ public static class Constants
     public const string HtmlFolder = "html";
     public const string OutputLinksFilename = "links.txt";
     public const string DataFolder = "data";
+    public const string LocationPlaceholder = "0";
 }

PoliNetwork.Graduatorie.Common/Objects/EnrollType.cs

@@ -11,7 +11,7 @@ namespace PoliNetwork.Graduatorie.Common.Objects;
 [JsonObject(MemberSerialization.Fields, NamingStrategyType = typeof(CamelCaseNamingStrategy))]
 public class EnrollType
 {
-    public bool? CanEnroll;
+    public bool CanEnroll;
     public string? Course;
     public string? Type;
 
@@ -20,8 +20,29 @@ public int GetHashWithoutLastUpdate()
         var i = "EnrollTypeNotNull".GetHashCode();
         i ^= Course?.GetHashCode() ?? "Course".GetHashCode();
         i ^= Type?.GetHashCode() ?? "Type".GetHashCode();
-        i ^= CanEnroll?.GetHashCode() ?? "CanEnroll".GetHashCode();
 
         return i;
     }
+
+    public static EnrollType From(string? rowCanEnrollInto, bool rowCanEnroll)
+    {
+        if (rowCanEnroll == false)
+            return new EnrollType { CanEnroll = false, Course = null, Type = null };
+
+        if (string.IsNullOrEmpty(rowCanEnrollInto))
+            return new EnrollType { CanEnroll = true, Course = null, Type = null };
+
+        string[] tester = { "assegnato", "prenotato" };
+        const string sep = " - ";
+        if (!rowCanEnrollInto.Contains(sep) || !tester.Any(t => rowCanEnrollInto.ToLower().Contains(t)))
+            return new EnrollType { CanEnroll = true, Course = rowCanEnrollInto, Type = null };
+
+        var s = rowCanEnrollInto.Split(sep).ToList();
+        var type = s.FirstOrDefault(x => tester.Any(t => t == x.ToLower()));
+
+        if (type != null) s.Remove(type);
+
+        var course = string.Join(sep, s);
+        return new EnrollType { CanEnroll = true, Course = course, Type = type };
+    }
 }

PoliNetwork.Graduatorie.Common/Utils/HashNS/HashMatricola.cs

@@ -24,7 +24,7 @@ public static partial class HashMatricola
         return string.IsNullOrEmpty(s) ? null : NotAlphaNumericRegex().Replace(s, "");
     }
 
-    public static string? HashMatricolaMethod(string? input)
+    public static string? Get(string? input)
     {
         input = CleanInput(input);
 
@@ -33,9 +33,9 @@ public static partial class HashMatricola
 
         var stringInputWithSalt = input + SaltGlobal;
         var hexHash = GetSha256(stringInputWithSalt);
-        var hashMatricolaMethod = hexHash[..MaxCharHash];
-        var matricolaMethod = hashMatricolaMethod.ToLower();
-        return matricolaMethod;
+        var shortHash = hexHash[..MaxCharHash];
+        var lowerShortHash = shortHash.ToLower();
+        return lowerShortHash;
     }
 
     private static string GetSha256(string stringInputWithSalt)

PoliNetwork.Graduatorie.Parser/Main/Program.cs

@@ -22,10 +22,10 @@ public static void Main(string[] args)
         var rankingsUrls = Scraper.Main.Program.RankingsUrls(mt, argsConfig);
 
         // esegui ciò che fa il parser (parse + write)
-        ParserDo(argsConfig, rankingsUrls);
+        RunParser(argsConfig, rankingsUrls);
     }
 
-    private static void ParserDo(ArgsConfig argsConfig, IEnumerable<RankingUrl> rankingsUrls)
+    private static void RunParser(ArgsConfig argsConfig, IEnumerable<RankingUrl> rankingsUrls)
     {
         // ricava un unico set partendo dai file html salvati, dagli url 
         // trovati e dal precedente set salvato nel .json
@@ -35,7 +35,6 @@ private static void ParserDo(ArgsConfig argsConfig, IEnumerable<RankingUrl> rank
         var dateFound = DateFoundUtil.GetDateFound(argsConfig, rankingsSet);
 
         // salvare il set
-        var writer = new OutputWriteUtil(argsConfig);
-        writer.SaveOutputs(rankingsSet, dateFound);
+        new OutputWriteUtil(argsConfig).SaveOutputs(rankingsSet, dateFound);
     }
 }

PoliNetwork.Graduatorie.Parser/Objects/Json/DateFound.cs

@@ -39,10 +39,10 @@ public void WriteToFile(string dataFolder)
         return date1 < date2 ? date1 : date2;
     }
 
-    public void UpdateDateFound(Ranking variable)
+    public void UpdateDateFound(Ranking ranking)
     {
-        var path = variable.GetPath().Trim();
-        var minDateTime = GetMinTime(variable, path);
+        var path = ranking.GetFullPath().Trim();
+        var minDateTime = GetMinTime(ranking, path);
         SetDate(path, minDateTime);
     }
 

PoliNetwork.Graduatorie.Parser/Objects/Json/Indexes/IndexJsonBase.cs

@@ -3,11 +3,8 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using PoliNetwork.Graduatorie.Common.Data;
-using PoliNetwork.Graduatorie.Common.Objects;
 using PoliNetwork.Graduatorie.Parser.Objects.Json.Indexes.Specific;
 using PoliNetwork.Graduatorie.Parser.Objects.RankingNS;
-using PoliNetwork.Graduatorie.Parser.Objects.Tables.Course;
-using PoliNetwork.Graduatorie.Parser.Objects.Tables.Merit;
 
 #endregion
 
@@ -19,122 +16,18 @@ public abstract class IndexJsonBase
 {
     public DateTime? LastUpdate;
 
-    public void WriteToFile(string outFolder, string pathFile)
+    public void Write(string outFolder, string pathFile)
     {
         var mainJsonPath = Path.Join(outFolder, pathFile);
         var mainJsonString = JsonConvert.SerializeObject(this, Culture.JsonSerializerSettings);
         File.WriteAllText(mainJsonPath, mainJsonString);
     }
 
-
-    public static void WriteSingleJsons(RankingsSet? set, string outFolder, ArgsConfig argsConfig)
-    {
-        if (set == null)
-            return;
-
-        // group rankings by year
-        var bySchool = set.Rankings.GroupBy(r => r.School);
-        foreach (var schoolGroup in bySchool)
-        {
-            if (schoolGroup.Key is null)
-                continue;
-            var school = schoolGroup.Key.Value;
-
-            var byYears = schoolGroup.GroupBy(r => r.Year);
-            foreach (var yearGroup in byYears)
-            {
-                if (yearGroup.Key is null)
-                    continue;
-                var year = yearGroup.Key.Value;
-                var folder = Path.Join(outFolder, school.ToString(), year.ToString());
-                Directory.CreateDirectory(folder);
-
-                foreach (var ranking in yearGroup) WriteSingleJsonRanking(folder, ranking, argsConfig);
-            }
-        }
-    }
-
-    private static void WriteSingleJsonRanking(string folder, Ranking ranking, ArgsConfig argsConfig)
-    {
-        var path = Path.Join(folder, ranking.GetFilename());
-
-        if (ExitIfAlreadyExistsAndNotUpdated(ranking, path) && !argsConfig.ForceReparsing) return;
-
-        var rankingJsonString = JsonConvert.SerializeObject(ranking, Culture.JsonSerializerSettings);
-        File.WriteAllText(path, rankingJsonString);
-    }
-
-    private static bool ExitIfAlreadyExistsAndNotUpdated(Ranking a, string path)
-    {
-        if (!File.Exists(path)) return false;
-        var b = GetRankingFromFile(path);
-        return b != null && SameHash(a, b);
-    }
-
-    private static bool SameHash(Ranking a, Ranking b)
-    {
-        var ai = a.GetHashWithoutLastUpdate();
-        var bi = b.GetHashWithoutLastUpdate();
-        return ai == bi;
-    }
-
-    private static bool SameHashCourse(IReadOnlyCollection<CourseTable>? aTableCourse,
-        IReadOnlyCollection<CourseTable>? bTableCourse)
+    public static void WriteAllIndexes(RankingsSet rankingsSet, string outFolder)
     {
-        if (aTableCourse == null && bTableCourse == null)
-            return true;
-        if (aTableCourse == null || bTableCourse == null)
-            return false;
-
-        if (aTableCourse.Count != bTableCourse.Count)
-            return false;
-
-        var aHash = aTableCourse.Select(variable =>
-        {
-            var hashWithoutLastUpdate = variable.GetHashWithoutLastUpdate();
-            return hashWithoutLastUpdate;
-        }).ToList();
-
-        var bHash = bTableCourse.Select(variable =>
-        {
-            var hashWithoutLastUpdate = variable.GetHashWithoutLastUpdate();
-            return hashWithoutLastUpdate;
-        }).ToList();
-
-        var ai = aHash;
-        var bi = bHash;
-
-        return ai == bi;
-    }
-
-    private static bool SameHashMerit(MeritTable? aTableMerit, MeritTable? bTableMerit)
-    {
-        if (aTableMerit == null && bTableMerit == null)
-            return true;
-        if (aTableMerit == null || bTableMerit == null)
-            return false;
-
-        var ai = aTableMerit.GetHashWithoutLastUpdate();
-        var bi = bTableMerit.GetHashWithoutLastUpdate();
-        return ai == bi;
-    }
-
-    private static Ranking? GetRankingFromFile(string path)
-    {
-        var x = File.ReadAllText(path);
-
-        var j = JsonConvert.DeserializeObject<Ranking>(x, Culture.JsonSerializerSettings);
-        return j;
-    }
-
-    public static void IndexesWrite(RankingsSet? rankingsSet, string outFolder, ArgsConfig argsConfig)
-    {
-        //let's write all single json files
-        WriteSingleJsons(rankingsSet, outFolder, argsConfig);
-
         //now let's write each single different index
-        BySchoolYearJson.From(rankingsSet)?.WriteToFile(outFolder, BySchoolYearJson.PathCustom);
-        ByYearSchoolJson.From(rankingsSet)?.WriteToFile(outFolder, ByYearSchoolJson.PathCustom);
-        BySchoolYearCourseJson.From(rankingsSet)?.WriteToFile(outFolder, BySchoolYearCourseJson.PathCustom);
+        BySchoolYearJson.From(rankingsSet).Write(outFolder, BySchoolYearJson.CustomPath);
+        ByYearSchoolJson.From(rankingsSet).Write(outFolder, ByYearSchoolJson.CustomPath);
+        BySchoolYearCourseJson.From(rankingsSet).Write(outFolder, BySchoolYearCourseJson.CustomPath);
     }
 }