From e8f9c4c0f5546b3171c7cd41ceccab218815baa7 Mon Sep 17 00:00:00 2001 From: Andre Beging Date: Mon, 4 Apr 2022 16:39:40 +0200 Subject: [PATCH] Database Update --- FSSiegen.Diagram1.view | 101 +++++----- FSSiegen.efml | 3 + .../Entity/Interaction.Generated.cs | 4 +- .../Entity/InteractionType.cs | 2 +- .../Entity/Prospect.Generated.cs | 2 +- .../Entity/User.Generated.cs | 2 +- .../Entity/UserType.cs | 2 +- .../Data/FsContext.Generated.cs | 3 +- .../20220404143914_interalert.Designer.cs | 173 ++++++++++++++++++ .../Migrations/20220404143914_interalert.cs | 26 +++ .../Migrations/FsContextModelSnapshot.cs | 4 + 11 files changed, 275 insertions(+), 47 deletions(-) create mode 100644 FoodsharingSiegen.Server/Migrations/20220404143914_interalert.Designer.cs create mode 100644 FoodsharingSiegen.Server/Migrations/20220404143914_interalert.cs diff --git a/FSSiegen.Diagram1.view b/FSSiegen.Diagram1.view index fb56f60..3a7cceb 100644 --- a/FSSiegen.Diagram1.view +++ b/FSSiegen.Diagram1.view @@ -720,7 +720,7 @@ 18 px - 7856bc01-520d-4caf-aefc-7bd4f1c78bd7 + 77b8afb4-e570-40e7-a023-74137c7d5407 EntityDeveloper.EntityFrameworkCore.EntityProperty @@ -738,6 +738,25 @@ 290 px 18 px + + 7856bc01-520d-4caf-aefc-7bd4f1c78bd7 + EntityDeveloper.EntityFrameworkCore.EntityProperty + + + + + 40 + 31 + + + + 0.5 px + 144.5 px + + + 290 px + 18 px + 735a509b-89a5-44b6-a80d-dc1bcd369ee2 EntityDeveloper.EntityFrameworkCore.EntityProperty @@ -746,23 +765,23 @@ 291 px - 145 px + 163 px 0 px - 145 px + 163 px - 40 + 41 30 - 41 - 40 + 42 + 41 @@ -776,8 +795,8 @@ - 42 - 40 + 43 + 41 @@ -796,7 +815,7 @@ 0 px - 144 px + 162 px 291 px @@ -815,15 +834,15 @@ 296 px - 248 px + 266 px 100 px - 248 px + 266 px 800 px - 248 px + 266 px @@ -834,11 +853,11 @@ - 43 + 44 1 30 - 44 - 45 + 45 + 46 0 @@ -850,7 +869,7 @@ Left Right Bottom - 44 + 45 FloatAnchor @@ -862,7 +881,7 @@ Left Right Top - 45 + 46 FloatAnchor @@ -875,20 +894,20 @@ - 46 + 47 0 - 47 - 46 + 48 + 47 - 48 - 47 + 49 + 48 @@ -906,8 +925,8 @@ - 49 - 47 + 50 + 48 @@ -925,8 +944,8 @@ - 50 - 47 + 51 + 48 @@ -944,8 +963,8 @@ - 51 - 47 + 52 + 48 @@ -963,8 +982,8 @@ - 52 - 47 + 53 + 48 @@ -982,8 +1001,8 @@ - 53 - 47 + 54 + 48 @@ -1001,8 +1020,8 @@ - 54 - 47 + 55 + 48 @@ -1054,11 +1073,11 @@ - 55 + 56 20 30 - 56 - 57 + 57 + 58 0 @@ -1070,19 +1089,19 @@ Top Bottom Right - 56 + 57 FloatAnchor 0 px - 100.989690721649 px + 108.319587628866 px Top Bottom Left - 57 + 58 FloatAnchor @@ -1094,7 +1113,7 @@ 34 px - 356.989690721649 px + 364.319587628866 px false diff --git a/FSSiegen.efml b/FSSiegen.efml index 1c3979c..add8cac 100644 --- a/FSSiegen.efml +++ b/FSSiegen.efml @@ -81,6 +81,9 @@ + + + diff --git a/FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs b/FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs index e917c06..ce569f6 100644 --- a/FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs +++ b/FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs @@ -2,7 +2,7 @@ // This is auto-generated code. //------------------------------------------------------------------------------ // This code was generated by Entity Developer tool using EF Core template. -// Code is generated on: 04.04.2022 13:38:25 +// Code is generated on: 04.04.2022 16:38:40 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -37,6 +37,8 @@ namespace FoodsharingSiegen.Contracts.Entity public virtual Guid ProspectId { get; set; } + public virtual bool Alert { get; set; } + public virtual bool NotNeeded { get; set; } public virtual DateTime Created { get; set; } diff --git a/FoodsharingSiegen.Contracts/Entity/InteractionType.cs b/FoodsharingSiegen.Contracts/Entity/InteractionType.cs index a23f176..1ae092f 100644 --- a/FoodsharingSiegen.Contracts/Entity/InteractionType.cs +++ b/FoodsharingSiegen.Contracts/Entity/InteractionType.cs @@ -2,7 +2,7 @@ // This is auto-generated code. //------------------------------------------------------------------------------ // This code was generated by Entity Developer tool using EF Core template. -// Code is generated on: 04.04.2022 13:38:25 +// Code is generated on: 04.04.2022 16:38:40 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs b/FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs index 1bd71ee..3649bd6 100644 --- a/FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs +++ b/FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs @@ -2,7 +2,7 @@ // This is auto-generated code. //------------------------------------------------------------------------------ // This code was generated by Entity Developer tool using EF Core template. -// Code is generated on: 04.04.2022 13:38:25 +// Code is generated on: 04.04.2022 16:38:40 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/FoodsharingSiegen.Contracts/Entity/User.Generated.cs b/FoodsharingSiegen.Contracts/Entity/User.Generated.cs index e355f1b..a54f0be 100644 --- a/FoodsharingSiegen.Contracts/Entity/User.Generated.cs +++ b/FoodsharingSiegen.Contracts/Entity/User.Generated.cs @@ -2,7 +2,7 @@ // This is auto-generated code. //------------------------------------------------------------------------------ // This code was generated by Entity Developer tool using EF Core template. -// Code is generated on: 04.04.2022 13:38:25 +// Code is generated on: 04.04.2022 16:38:40 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/FoodsharingSiegen.Contracts/Entity/UserType.cs b/FoodsharingSiegen.Contracts/Entity/UserType.cs index be16cb1..fc78de8 100644 --- a/FoodsharingSiegen.Contracts/Entity/UserType.cs +++ b/FoodsharingSiegen.Contracts/Entity/UserType.cs @@ -2,7 +2,7 @@ // This is auto-generated code. //------------------------------------------------------------------------------ // This code was generated by Entity Developer tool using EF Core template. -// Code is generated on: 04.04.2022 13:38:25 +// Code is generated on: 04.04.2022 16:38:40 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/FoodsharingSiegen.Server/Data/FsContext.Generated.cs b/FoodsharingSiegen.Server/Data/FsContext.Generated.cs index ca8f186..6324fae 100644 --- a/FoodsharingSiegen.Server/Data/FsContext.Generated.cs +++ b/FoodsharingSiegen.Server/Data/FsContext.Generated.cs @@ -2,7 +2,7 @@ // This is auto-generated code. //------------------------------------------------------------------------------ // This code was generated by Entity Developer tool using EF Core template. -// Code is generated on: 04.04.2022 13:38:25 +// Code is generated on: 04.04.2022 16:38:40 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -137,6 +137,7 @@ namespace FoodsharingSiegen.Server.Data modelBuilder.Entity().Property(x => x.Info).HasColumnName(@"Info").ValueGeneratedNever(); modelBuilder.Entity().Property(x => x.Type).HasColumnName(@"Type").IsRequired().ValueGeneratedNever(); modelBuilder.Entity().Property(x => x.ProspectId).HasColumnName(@"ProspectId").ValueGeneratedNever(); + modelBuilder.Entity().Property(x => x.Alert).HasColumnName(@"Alert").IsRequired().ValueGeneratedNever(); modelBuilder.Entity().Property(x => x.NotNeeded).HasColumnName(@"NotNeeded").IsRequired().ValueGeneratedNever(); modelBuilder.Entity().Property(x => x.Created).HasColumnName(@"Created").IsRequired().ValueGeneratedNever(); modelBuilder.Entity().HasKey(@"Id"); diff --git a/FoodsharingSiegen.Server/Migrations/20220404143914_interalert.Designer.cs b/FoodsharingSiegen.Server/Migrations/20220404143914_interalert.Designer.cs new file mode 100644 index 0000000..348d405 --- /dev/null +++ b/FoodsharingSiegen.Server/Migrations/20220404143914_interalert.Designer.cs @@ -0,0 +1,173 @@ +// +using System; +using FoodsharingSiegen.Server.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace FoodsharingSiegen.Server.Migrations +{ + [DbContext(typeof(FsContext))] + [Migration("20220404143914_interalert")] + partial class interalert + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "6.0.1"); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Interaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("Id"); + + b.Property("Alert") + .HasColumnType("INTEGER") + .HasColumnName("Alert"); + + b.Property("Created") + .HasColumnType("TEXT") + .HasColumnName("Created"); + + b.Property("Date") + .HasColumnType("TEXT") + .HasColumnName("Date"); + + b.Property("Info") + .HasColumnType("TEXT") + .HasColumnName("Info"); + + b.Property("NotNeeded") + .HasColumnType("INTEGER") + .HasColumnName("NotNeeded"); + + b.Property("ProspectId") + .HasColumnType("TEXT") + .HasColumnName("ProspectId"); + + b.Property("Type") + .HasColumnType("INTEGER") + .HasColumnName("Type"); + + b.Property("UserId") + .HasColumnType("TEXT") + .HasColumnName("UserId"); + + b.HasKey("Id"); + + b.HasIndex("ProspectId"); + + b.HasIndex("UserId"); + + b.ToTable("Interactions", (string)null); + }); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Prospect", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("Id"); + + b.Property("Created") + .HasColumnType("TEXT") + .HasColumnName("Created"); + + b.Property("FsId") + .HasColumnType("INTEGER") + .HasColumnName("FsId"); + + b.Property("Memo") + .HasColumnType("TEXT") + .HasColumnName("Memo"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("Name"); + + b.Property("ProgressId") + .HasColumnType("TEXT") + .HasColumnName("ProgressId"); + + b.HasKey("Id"); + + b.ToTable("Prospects", (string)null); + }); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("Id"); + + b.Property("Created") + .HasColumnType("TEXT") + .HasColumnName("Created"); + + b.Property("EncryptedPassword") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("EncryptedPassword"); + + b.Property("Mail") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("Mail"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("Name"); + + b.Property("Type") + .HasColumnType("INTEGER") + .HasColumnName("Type"); + + b.Property("Verified") + .HasColumnType("INTEGER") + .HasColumnName("Verified"); + + b.HasKey("Id"); + + b.ToTable("Users", (string)null); + }); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Interaction", b => + { + b.HasOne("FoodsharingSiegen.Contracts.Entity.Prospect", "Prospect") + .WithMany("Interactions") + .HasForeignKey("ProspectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("FoodsharingSiegen.Contracts.Entity.User", "User") + .WithMany("Interactions") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Prospect"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Prospect", b => + { + b.Navigation("Interactions"); + }); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.User", b => + { + b.Navigation("Interactions"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/FoodsharingSiegen.Server/Migrations/20220404143914_interalert.cs b/FoodsharingSiegen.Server/Migrations/20220404143914_interalert.cs new file mode 100644 index 0000000..d8b1860 --- /dev/null +++ b/FoodsharingSiegen.Server/Migrations/20220404143914_interalert.cs @@ -0,0 +1,26 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace FoodsharingSiegen.Server.Migrations +{ + public partial class interalert : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Alert", + table: "Interactions", + type: "INTEGER", + nullable: false, + defaultValue: false); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Alert", + table: "Interactions"); + } + } +} diff --git a/FoodsharingSiegen.Server/Migrations/FsContextModelSnapshot.cs b/FoodsharingSiegen.Server/Migrations/FsContextModelSnapshot.cs index 6f39810..7fcac87 100644 --- a/FoodsharingSiegen.Server/Migrations/FsContextModelSnapshot.cs +++ b/FoodsharingSiegen.Server/Migrations/FsContextModelSnapshot.cs @@ -24,6 +24,10 @@ namespace FoodsharingSiegen.Server.Migrations .HasColumnType("TEXT") .HasColumnName("Id"); + b.Property("Alert") + .HasColumnType("INTEGER") + .HasColumnName("Alert"); + b.Property("Created") .HasColumnType("TEXT") .HasColumnName("Created");