diff --git a/pointMaster/Migrations/20241121135108_DateTime.Designer.cs b/pointMaster/Migrations/20250212090035_Adding blockings.Designer.cs similarity index 85% rename from pointMaster/Migrations/20241121135108_DateTime.Designer.cs rename to pointMaster/Migrations/20250212090035_Adding blockings.Designer.cs index 6cdfa42..a5486fa 100644 --- a/pointMaster/Migrations/20241121135108_DateTime.Designer.cs +++ b/pointMaster/Migrations/20250212090035_Adding blockings.Designer.cs @@ -12,8 +12,8 @@ using pointMaster.Data; namespace pointMaster.Migrations { [DbContext(typeof(DataContext))] - [Migration("20241121135108_DateTime")] - partial class DateTime + [Migration("20250212090035_Adding blockings")] + partial class Addingblockings { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -37,7 +37,6 @@ namespace pointMaster.Migrations .HasColumnType("timestamp with time zone"); b.Property("Name") - .IsRequired() .HasColumnType("text"); b.HasKey("Id"); @@ -60,10 +59,9 @@ namespace pointMaster.Migrations .HasColumnType("timestamp with time zone"); b.Property("Name") - .IsRequired() .HasColumnType("text"); - b.Property("PatruljeId") + b.Property("PatruljeId") .HasColumnType("integer"); b.HasKey("Id"); @@ -84,13 +82,13 @@ namespace pointMaster.Migrations b.Property("DateCreated") .HasColumnType("timestamp with time zone"); - b.Property("PatruljeId") + b.Property("PatruljeId") .HasColumnType("integer"); b.Property("Points") .HasColumnType("integer"); - b.Property("PosterId") + b.Property("PosterId") .HasColumnType("integer"); b.Property("Turnout") @@ -113,19 +111,22 @@ namespace pointMaster.Migrations NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("BlockPoint") + .HasColumnType("boolean"); + + b.Property("BlockTurnout") + .HasColumnType("boolean"); + b.Property("DateCreated") .HasColumnType("timestamp with time zone"); b.Property("Description") - .IsRequired() .HasColumnType("text"); b.Property("Location") - .IsRequired() .HasColumnType("text"); b.Property("Name") - .IsRequired() .HasColumnType("text"); b.HasKey("Id"); @@ -137,9 +138,7 @@ namespace pointMaster.Migrations { b.HasOne("pointMaster.Models.Patrulje", "Patrulje") .WithMany("PatruljeMedlems") - .HasForeignKey("PatruljeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); + .HasForeignKey("PatruljeId"); b.Navigation("Patrulje"); }); @@ -148,15 +147,11 @@ namespace pointMaster.Migrations { b.HasOne("pointMaster.Models.Patrulje", "Patrulje") .WithMany("Points") - .HasForeignKey("PatruljeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); + .HasForeignKey("PatruljeId"); b.HasOne("pointMaster.Models.Post", "Poster") .WithMany() - .HasForeignKey("PosterId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); + .HasForeignKey("PosterId"); b.Navigation("Patrulje"); diff --git a/pointMaster/Migrations/20241121135108_DateTime.cs b/pointMaster/Migrations/20250212090035_Adding blockings.cs similarity index 89% rename from pointMaster/Migrations/20241121135108_DateTime.cs rename to pointMaster/Migrations/20250212090035_Adding blockings.cs index 4721701..0aff272 100644 --- a/pointMaster/Migrations/20241121135108_DateTime.cs +++ b/pointMaster/Migrations/20250212090035_Adding blockings.cs @@ -1,4 +1,5 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using System; +using Microsoft.EntityFrameworkCore.Migrations; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; #nullable disable @@ -6,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace pointMaster.Migrations { /// - public partial class DateTime : Migration + public partial class Addingblockings : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) @@ -17,7 +18,7 @@ namespace pointMaster.Migrations { Id = table.Column(type: "integer", nullable: false) .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - Name = table.Column(type: "text", nullable: false), + Name = table.Column(type: "text", nullable: true), DateCreated = table.Column(type: "timestamp with time zone", nullable: true) }, constraints: table => @@ -31,9 +32,11 @@ namespace pointMaster.Migrations { Id = table.Column(type: "integer", nullable: false) .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - Name = table.Column(type: "text", nullable: false), - Location = table.Column(type: "text", nullable: false), - Description = table.Column(type: "text", nullable: false), + Name = table.Column(type: "text", nullable: true), + Location = table.Column(type: "text", nullable: true), + Description = table.Column(type: "text", nullable: true), + BlockPoint = table.Column(type: "boolean", nullable: false), + BlockTurnout = table.Column(type: "boolean", nullable: false), DateCreated = table.Column(type: "timestamp with time zone", nullable: true) }, constraints: table => @@ -47,9 +50,9 @@ namespace pointMaster.Migrations { Id = table.Column(type: "integer", nullable: false) .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - Name = table.Column(type: "text", nullable: false), + Name = table.Column(type: "text", nullable: true), Age = table.Column(type: "integer", nullable: false), - PatruljeId = table.Column(type: "integer", nullable: false), + PatruljeId = table.Column(type: "integer", nullable: true), DateCreated = table.Column(type: "timestamp with time zone", nullable: true) }, constraints: table => @@ -59,8 +62,7 @@ namespace pointMaster.Migrations name: "FK_PatruljeMedlemmer_Patruljer_PatruljeId", column: x => x.PatruljeId, principalTable: "Patruljer", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); + principalColumn: "Id"); }); migrationBuilder.CreateTable( @@ -71,8 +73,8 @@ namespace pointMaster.Migrations .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), Points = table.Column(type: "integer", nullable: false), Turnout = table.Column(type: "integer", nullable: false), - PatruljeId = table.Column(type: "integer", nullable: false), - PosterId = table.Column(type: "integer", nullable: false), + PatruljeId = table.Column(type: "integer", nullable: true), + PosterId = table.Column(type: "integer", nullable: true), DateCreated = table.Column(type: "timestamp with time zone", nullable: true) }, constraints: table => @@ -82,14 +84,12 @@ namespace pointMaster.Migrations name: "FK_Points_Patruljer_PatruljeId", column: x => x.PatruljeId, principalTable: "Patruljer", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); + principalColumn: "Id"); table.ForeignKey( name: "FK_Points_Poster_PosterId", column: x => x.PosterId, principalTable: "Poster", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); + principalColumn: "Id"); }); migrationBuilder.CreateIndex( diff --git a/pointMaster/Migrations/DataContextModelSnapshot.cs b/pointMaster/Migrations/DataContextModelSnapshot.cs index d400d6a..ba63e5d 100644 --- a/pointMaster/Migrations/DataContextModelSnapshot.cs +++ b/pointMaster/Migrations/DataContextModelSnapshot.cs @@ -34,7 +34,6 @@ namespace pointMaster.Migrations .HasColumnType("timestamp with time zone"); b.Property("Name") - .IsRequired() .HasColumnType("text"); b.HasKey("Id"); @@ -57,10 +56,9 @@ namespace pointMaster.Migrations .HasColumnType("timestamp with time zone"); b.Property("Name") - .IsRequired() .HasColumnType("text"); - b.Property("PatruljeId") + b.Property("PatruljeId") .HasColumnType("integer"); b.HasKey("Id"); @@ -81,13 +79,13 @@ namespace pointMaster.Migrations b.Property("DateCreated") .HasColumnType("timestamp with time zone"); - b.Property("PatruljeId") + b.Property("PatruljeId") .HasColumnType("integer"); b.Property("Points") .HasColumnType("integer"); - b.Property("PosterId") + b.Property("PosterId") .HasColumnType("integer"); b.Property("Turnout") @@ -110,19 +108,22 @@ namespace pointMaster.Migrations NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("BlockPoint") + .HasColumnType("boolean"); + + b.Property("BlockTurnout") + .HasColumnType("boolean"); + b.Property("DateCreated") .HasColumnType("timestamp with time zone"); b.Property("Description") - .IsRequired() .HasColumnType("text"); b.Property("Location") - .IsRequired() .HasColumnType("text"); b.Property("Name") - .IsRequired() .HasColumnType("text"); b.HasKey("Id"); @@ -134,9 +135,7 @@ namespace pointMaster.Migrations { b.HasOne("pointMaster.Models.Patrulje", "Patrulje") .WithMany("PatruljeMedlems") - .HasForeignKey("PatruljeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); + .HasForeignKey("PatruljeId"); b.Navigation("Patrulje"); }); @@ -145,15 +144,11 @@ namespace pointMaster.Migrations { b.HasOne("pointMaster.Models.Patrulje", "Patrulje") .WithMany("Points") - .HasForeignKey("PatruljeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); + .HasForeignKey("PatruljeId"); b.HasOne("pointMaster.Models.Post", "Poster") .WithMany() - .HasForeignKey("PosterId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); + .HasForeignKey("PosterId"); b.Navigation("Patrulje"); diff --git a/pointMaster/Models/Poster.cs b/pointMaster/Models/Poster.cs index eba0aaf..cf4e9a3 100644 --- a/pointMaster/Models/Poster.cs +++ b/pointMaster/Models/Poster.cs @@ -6,6 +6,8 @@ public string Name { get; set; } public string Location { get; set; } public string Description { get; set; } + public bool BlockPoint { get; set; } + public bool BlockTurnout { get; set; } public DateTime? DateCreated { get; set; } } }