Add Flag Weight, Remove PublicationClass Weight (#1891)

* Remove Weight column on publication class, and add it to flags, refactor points calculation to use flag weight * cleanup migration formatting
TASVideos · Jun 27, 2024 · 01f8d5b · 01f8d5b
1 parent 653251d
commit 01f8d5b
Show file tree

Hide file tree

Showing 17 changed files with 3,614 additions and 43 deletions.
diff --git a/TASVideos.Core/Services/ClassService.cs b/TASVideos.Core/Services/ClassService.cs
@@ -46,7 +46,6 @@ public async Task<(int? Id, ClassEditResult Result)> Add(PublicationClass public
 			Name = publicationClass.Name,
 			IconPath = publicationClass.IconPath,
 			Link = publicationClass.Link,
-			Weight = publicationClass.Weight
 		});
 
 		try
@@ -81,7 +80,6 @@ public async Task<ClassEditResult> Edit(int id, PublicationClass publicationClas
 		existingClass.Name = publicationClass.Name;
 		existingClass.Link = publicationClass.Link;
 		existingClass.IconPath = publicationClass.IconPath;
-		existingClass.Weight = publicationClass.Weight;
 
 		try
 		{

diff --git a/TASVideos.Core/Services/FlagsService.cs b/TASVideos.Core/Services/FlagsService.cs
@@ -62,7 +62,8 @@ public async Task<FlagEditResult> Add(Flag flag)
 			IconPath = flag.IconPath,
 			LinkPath = flag.LinkPath,
 			Token = flag.Token,
-			PermissionRestriction = flag.PermissionRestriction
+			PermissionRestriction = flag.PermissionRestriction,
+			Weight = flag.Weight
 		});
 
 		try
@@ -99,6 +100,7 @@ public async Task<FlagEditResult> Edit(int id, Flag flag)
 		existingFlag.LinkPath = flag.LinkPath;
 		existingFlag.Token = flag.Token;
 		existingFlag.PermissionRestriction = flag.PermissionRestriction;
+		existingFlag.Weight = flag.Weight;
 
 		try
 		{

diff --git a/TASVideos.Core/Services/PointsService/PointsService.cs b/TASVideos.Core/Services/PointsService/PointsService.cs
@@ -95,7 +95,7 @@ public static IQueryable<PointsCalculator.Publication> ToCalcPublication(this IQ
 			p.ObsoletedById.HasValue,
 			p.PublicationRatings.Count,
 			p.Authors.Count,
-			p.PublicationClass!.Weight,
+			p.PublicationFlags.Any() ? p.PublicationFlags.Max(pf => pf.Flag!.Weight) : 1,
 			p.PublicationRatings.Count > 0 ? p.PublicationRatings
 				.Where(pr => !pr.Publication!.Authors.Select(a => a.UserId).Contains(pr.UserId))
 				.Where(pr => pr.User!.UseRatings)

diff --git a/TASVideos.Data/Entity/Flag.cs b/TASVideos.Data/Entity/Flag.cs
@@ -17,4 +17,6 @@ public class Flag
 	public string Token { get; set; } = "";
 
 	public PermissionTo? PermissionRestriction { get; set; }
+
+	public double Weight { get; set; }
 }
diff --git a/TASVideos.Data/Entity/PublicationClass.cs b/TASVideos.Data/Entity/PublicationClass.cs
@@ -7,7 +7,6 @@ public class PublicationClass
 
 	[StringLength(20)]
 	public string Name { get; set; } = "";
-	public double Weight { get; set; }
 
 	[StringLength(100)]
 	public string? IconPath { get; set; }