fix code related to merge

PoliNetworkOrg · Jul 6, 2024 · ec6ae7d · ec6ae7d
1 parent 5ba9c9d
commit ec6ae7d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/PoliNetwork.Graduatorie.Parser/Objects/Json/Indexes/IndexJsonBase.cs b/PoliNetwork.Graduatorie.Parser/Objects/Json/Indexes/IndexJsonBase.cs
@@ -27,8 +27,8 @@ public void WriteToFile(string outFolder, string pathFile)
     public static void WriteAllIndexes(RankingsSet rankingsSet, string outFolder, ArgsConfig argsConfig)
     {
         //now let's write each single different index
-        BySchoolYearJson.From(rankingsSet)?.WriteToFile(outFolder, BySchoolYearJson.CustomPath);
+        BySchoolYearJson.From(rankingsSet).WriteToFile(outFolder, BySchoolYearJson.CustomPath);
         ByYearSchoolJson.From(rankingsSet)?.WriteToFile(outFolder, ByYearSchoolJson.CustomPath);
-        BySchoolYearCourseJson.From(rankingsSet)?.WriteToFile(outFolder, BySchoolYearCourseJson.CustomPath);
+        BySchoolYearCourseJson.From(rankingsSet).WriteToFile(outFolder, BySchoolYearCourseJson.CustomPath);
     }
 }
diff --git a/PoliNetwork.Graduatorie.Parser/Objects/Json/SingleCourseJson.cs b/PoliNetwork.Graduatorie.Parser/Objects/Json/SingleCourseJson.cs
@@ -60,7 +60,7 @@ public int CompareTo(SingleCourseJson? singleCourseJson)
 
         return 0;
     }
-
+    
     public int GetHashWithoutLastUpdate()
     {
         var hashWithoutLastUpdate = Link?.GetHashCode() ?? "Link".GetHashCode();

diff --git a/PoliNetwork.Graduatorie.Parser/Objects/RankingNS/Ranking.cs b/PoliNetwork.Graduatorie.Parser/Objects/RankingNS/Ranking.cs
@@ -10,7 +10,6 @@
 using PoliNetwork.Graduatorie.Parser.Objects.Json.Stats;
 using PoliNetwork.Graduatorie.Parser.Objects.Tables.Course;
 using PoliNetwork.Graduatorie.Parser.Objects.Tables.Merit;
-using PoliNetwork.Graduatorie.Parser.Utils;
 using PoliNetwork.Graduatorie.Parser.Utils.Output;
 
 #endregion
@@ -189,7 +188,7 @@ public int GetHashWithoutLastUpdate()
         i ^= Url?.GetHashWithoutLastUpdate() ?? "Url".GetHashCode();
         i ^= Year?.GetHashCode() ?? "Year".GetHashCode();
         var iMerit = ByMerit?.GetHashWithoutLastUpdate();
-        i ^= Hashing.GetHashFromListHash(iMerit) ?? "ByMerit".GetHashCode();
+        i ^= iMerit ?? "ByMerit".GetHashCode();
 
 
         if (ByCourse == null)
@@ -198,7 +197,7 @@ public int GetHashWithoutLastUpdate()
             i = ByCourse.Aggregate(i, (current, variable) =>
             {
                 var hashWithoutLastUpdate = variable.GetHashWithoutLastUpdate();
-                var iList = Hashing.GetHashFromListHash(hashWithoutLastUpdate) ?? "empty".GetHashCode();
+                var iList = hashWithoutLastUpdate;
                 return current ^ iList;
             });
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,7 @@ public int CompareTo(SingleCourseJson? singleCourseJson) @@
             return 0;
         }
         public int GetHashWithoutLastUpdate()
         {
             var hashWithoutLastUpdate = Link?.GetHashCode() ?? "Link".GetHashCode();
@@ Expand Down @@