update database to current model, update dependencies and fix warnings

Author: Cinnazeyy

PlotSystem-API/Controllers/CityProjectController.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
 using PlotSystem_API.Extensions;
-using PlotSystem_API.Models;
 using PlotSystem_API.Models.DTO;
 using PlotSystem_API.Services;
 

PlotSystem-API/Models/BuildTeam.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
 namespace PlotSystem_API.Models;
 
@@ -9,15 +8,16 @@ public partial class BuildTeam
 
     public string Name { get; set; } = null!;
 
+    [MaxLength(255)]
     public string? ApiKey { get; set; }
 
     public DateTime? ApiCreateDate { get; set; }
 
-    public virtual ICollection<Server> Servers { get; set; } = new List<Server>();
-
     public virtual ICollection<CityProject> CityProjects { get; set; } = new List<CityProject>();
 
-    public virtual ICollection<Country> CountryCodes { get; set; } = new List<Country>();
+    public virtual ICollection<Server> Servers { get; set; } = new List<Server>();
+
+    public virtual ICollection<ReviewToggleCriterion> CriteriaNames { get; set; } = new List<ReviewToggleCriterion>();
 
     public virtual ICollection<Builder> Uus { get; set; } = new List<Builder>();
 }

PlotSystem-API/Models/Builder.cs

@@ -1,12 +1,12 @@
-using System;
-using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
 namespace PlotSystem_API.Models;
 
 public partial class Builder
 {
     public string Uuid { get; set; } = null!;
 
+    [MaxLength(255)]
     public string Name { get; set; } = null!;
 
     public int Score { get; set; }
@@ -19,9 +19,11 @@ public partial class Builder
 
     public int PlotType { get; set; }
 
-    public virtual ICollection<BuilderHasPlot> BuilderHasPlots { get; set; } = new List<BuilderHasPlot>();
+    public virtual ICollection<Plot> PlotsNavigation { get; set; } = new List<Plot>();
 
     public virtual ICollection<BuildTeam> BuildTeams { get; set; } = new List<BuildTeam>();
 
+    public virtual ICollection<Plot> Plots { get; set; } = new List<Plot>();
+
     public virtual ICollection<PlotReview> Reviews { get; set; } = new List<PlotReview>();
 }

PlotSystem-API/Models/BuilderHasPlot.cs

@@ -1,23 +1,26 @@
-using System;
-using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
 namespace PlotSystem_API.Models;
 
 public partial class CityProject
 {
+    [MaxLength(255)]
     public string CityProjectId { get; set; } = null!;
 
+    public int BuildTeamId { get; set; }
+
     public string CountryCode { get; set; } = null!;
 
+    [MaxLength(255)]
     public string ServerName { get; set; } = null!;
 
     public bool IsVisible { get; set; }
 
+    public virtual BuildTeam BuildTeam { get; set; } = null!;
+
     public virtual Country CountryCodeNavigation { get; set; } = null!;
 
     public virtual ICollection<Plot> Plots { get; set; } = new List<Plot>();
 
     public virtual Server ServerNameNavigation { get; set; } = null!;
-
-    public virtual ICollection<BuildTeam> BuildTeams { get; set; } = new List<BuildTeam>();
 }

PlotSystem-API/Models/CityProject.cs

@@ -1,19 +1,17 @@
-using System;
-using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
 namespace PlotSystem_API.Models;
 
 public partial class Country
 {
     public string CountryCode { get; set; } = null!;
 
+    [MaxLength(2)]
     public string Continent { get; set; } = null!;
 
     public string Material { get; set; } = null!;
 
     public string? CustomModelData { get; set; }
 
     public virtual ICollection<CityProject> CityProjects { get; set; } = new List<CityProject>();
-
-    public virtual ICollection<BuildTeam> BuildTeams { get; set; } = new List<BuildTeam>();
 }

PlotSystem-API/Models/Country.cs

@@ -1,12 +1,13 @@
-namespace PlotSystem_API.Models.DTO
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+namespace PlotSystem_API.Models.DTO
 {
     public class CityProjectDto
     {
-        public string Id { get; set; }
-        public string CountryCode { get; set; }
-        public bool IsVisible { get; set; }
-        public string Material { get; set; }
+        public required string Id { get; set; }
+        public required string CountryCode { get; set; }
+        public required bool IsVisible { get; set; }
+        public required string Material { get; set; }
         public string? CustomModelData { get; set; }
-        public string ServerName { get; set; }
+        public required string ServerName { get; set; }
     }
 }

PlotSystem-API/Models/DTO/CityProjectDto.cs

@@ -1,11 +1,12 @@
-namespace PlotSystem_API.Models.DTO;
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+namespace PlotSystem_API.Models.DTO;
 
 public class PlotDto
 {
-    public int Id { get; set; }
-    public string Status { get; set; }
-    public string CityProjectId { get; set; }
-    public double PlotVersion { get; set; }
+    public required int Id { get; set; }
+    public required string Status { get; set; }
+    public required string CityProjectId { get; set; }
+    public required double PlotVersion { get; set; }
     public string? McVersion { get; set; }
     public byte[]? CompletedSchematic { get; set; }
 }

PlotSystem-API/Models/DTO/PlotDto.cs

@@ -1,20 +1,24 @@
-using System;
-using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
 namespace PlotSystem_API.Models;
 
 public partial class Plot
 {
     public int PlotId { get; set; }
 
+    [MaxLength(255)]
     public string CityProjectId { get; set; } = null!;
 
+    [MaxLength(255)]
     public string DifficultyId { get; set; } = null!;
 
+    public string? OwnerUuid { get; set; }
+
+    [MaxLength(255)]
     public string Status { get; set; } = null!;
 
     public int? Score { get; set; }
-
+    
     public string OutlineBounds { get; set; } = null!;
 
     public byte[] InitialSchematic { get; set; } = null!;
@@ -29,15 +33,19 @@ public partial class Plot
 
     public double PlotVersion { get; set; }
 
+    public int PlotType { get; set; }
+
     public string CreatedBy { get; set; } = null!;
 
     public DateTime CreateDate { get; set; }
 
-    public virtual ICollection<BuilderHasPlot> BuilderHasPlots { get; set; } = new List<BuilderHasPlot>();
-
     public virtual CityProject CityProject { get; set; } = null!;
 
     public virtual PlotDifficulty Difficulty { get; set; } = null!;
 
+    public virtual Builder? OwnerUu { get; set; }
+
     public virtual ICollection<PlotReview> PlotReviews { get; set; } = new List<PlotReview>();
+
+    public virtual ICollection<Builder> Uus { get; set; } = new List<Builder>();
 }

PlotSystem-API/Models/Plot.cs

@@ -1,10 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
 namespace PlotSystem_API.Models;
 
 public partial class PlotDifficulty
 {
+    [MaxLength(255)]
     public string DifficultyId { get; set; } = null!;
 
     public decimal? Multiplier { get; set; }