diff --git a/src/Database/Database.csproj b/src/Database/Database.csproj index dadf15e84377f2cace6fbef1aad252d645d2d5d0..0a1e2397756b416b851e51183a8e3a70142216a1 100644 --- a/src/Database/Database.csproj +++ b/src/Database/Database.csproj @@ -1,10 +1,10 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <OutputType>Library</OutputType> <RootNamespace>Coscine.Database</RootNamespace> <AssemblyName>Coscine.Database</AssemblyName> <TargetFrameworks>net5.0;net461</TargetFrameworks> - <Version>2.0.0</Version> + <Version>2.0.1</Version> </PropertyGroup> <PropertyGroup> <Authors>RWTH Aachen University</Authors> diff --git a/src/Scaffolding/DataModel/Model.cs b/src/Scaffolding/DataModel/Model.cs index bdec87e1a54da96e0ea6d974f6a39dee45e1fd5e..4745489d36ef647cdef333f627cfe95d8d776538 100644 --- a/src/Scaffolding/DataModel/Model.cs +++ b/src/Scaffolding/DataModel/Model.cs @@ -1,4 +1,4 @@ -using System; +using System; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; @@ -21,7 +21,6 @@ namespace Coscine.Database.DataModel public virtual DbSet<ActivatedFeature> ActivatedFeatures { get; set; } public virtual DbSet<ApiToken> ApiTokens { get; set; } - public virtual DbSet<ContactChange> ContactChanges { get; set; } public virtual DbSet<Discipline> Disciplines { get; set; } public virtual DbSet<ExternalAuthenticator> ExternalAuthenticators { get; set; } public virtual DbSet<ExternalId> ExternalIds { get; set; } @@ -58,8 +57,6 @@ namespace Coscine.Database.DataModel { if (!optionsBuilder.IsConfigured) { -#warning To protect potentially sensitive information in your connection string, you should move it out of source code. See http://go.microsoft.com/fwlink/?LinkId=723263 for guidance on storing connection strings. - optionsBuilder.UseSqlServer("Data Source=d-db-d02\\mssql14;Integrated Security=False;User ID=coscineDev;Password=Dev#123;Database=Coscine_hp-admin "); } } @@ -101,29 +98,6 @@ namespace Coscine.Database.DataModel .HasConstraintName("FK_ApiTokens_UserId_Users_Id"); }); - modelBuilder.Entity<ContactChange>(entity => - { - entity.HasKey(e => e.RelationId); - - entity.ToTable("ContactChange"); - - entity.Property(e => e.RelationId).HasDefaultValueSql("(newid())"); - - entity.Property(e => e.ConfirmationToken).HasDefaultValueSql("(newid())"); - - entity.Property(e => e.EditDate).HasColumnType("datetime"); - - entity.Property(e => e.NewEmail) - .IsRequired() - .HasMaxLength(200); - - entity.HasOne(d => d.User) - .WithMany(p => p.ContactChanges) - .HasForeignKey(d => d.UserId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FK_ContactChange_UserId_Users_Id"); - }); - modelBuilder.Entity<Discipline>(entity => { entity.Property(e => e.Id).HasDefaultValueSql("(newid())"); diff --git a/src/Scaffolding/DataModel/User.cs b/src/Scaffolding/DataModel/User.cs index e293e6d29548c737fecf2923f5f62bb5ed7e82e4..693b6adb7e504ace2f69e8cc474f81018fdf936a 100644 --- a/src/Scaffolding/DataModel/User.cs +++ b/src/Scaffolding/DataModel/User.cs @@ -12,7 +12,6 @@ namespace Coscine.Database.DataModel public User() { ApiTokens = new HashSet<ApiToken>(); - ContactChanges = new HashSet<ContactChange>(); ExternalIds = new HashSet<ExternalId>(); GroupMemberships = new HashSet<GroupMembership>(); ProjectRoles = new HashSet<ProjectRole>(); @@ -34,7 +33,6 @@ namespace Coscine.Database.DataModel public virtual Language Language { get; set; } public virtual Title Title { get; set; } public virtual ICollection<ApiToken> ApiTokens { get; set; } - public virtual ICollection<ContactChange> ContactChanges { get; set; } public virtual ICollection<ExternalId> ExternalIds { get; set; } public virtual ICollection<GroupMembership> GroupMemberships { get; set; } public virtual ICollection<ProjectRole> ProjectRoles { get; set; }