From b6a7dad1fad018bf04e42f08bd2b4c11b2fafc5a Mon Sep 17 00:00:00 2001
From: Lambert Wang <law@microsoft.com>
Date: Wed, 27 Mar 2019 19:41:57 -0700
Subject: [PATCH 1/2] Show feedback user email to author

---
 Data/DataModel/Feedback.cs                    |   39 +
 ...190328022943_AnonymousFeedback.Designer.cs | 1001 +++++++++++++++++
 .../20190328022943_AnonymousFeedback.cs       |   23 +
 .../PuzzleServerContextModelSnapshot.cs       |    4 +-
 ServerCore/Pages/Puzzles/Feedback.cshtml      |   14 +
 .../Pages/Puzzles/SubmitFeedback.cshtml       |   19 +-
 .../Pages/Puzzles/SubmitFeedback.cshtml.cs    |   38 +-
 7 files changed, 1120 insertions(+), 18 deletions(-)
 create mode 100644 Data/Migrations/20190328022943_AnonymousFeedback.Designer.cs
 create mode 100644 Data/Migrations/20190328022943_AnonymousFeedback.cs

diff --git a/Data/DataModel/Feedback.cs b/Data/DataModel/Feedback.cs
index 09fbc95c..3cad0035 100644
--- a/Data/DataModel/Feedback.cs
+++ b/Data/DataModel/Feedback.cs
@@ -9,15 +9,54 @@ namespace ServerCore.DataModel
 {
     public class Feedback
     {
+        public Feedback()
+        {
+            Fun = AvgRating;
+            Difficulty = AvgRating;
+        }
+
+        public const int MinRating = 1;
+        public const int AvgRating = 1;
+        public const int MaxRating = 10;
+
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int ID { get; set; }
+
         [Required]
         public virtual Puzzle Puzzle { get; set; }
+
+        /// <summary>
+        /// The user who submitted the feedback>
+        /// </summary>
         [Required]
         public virtual PuzzleUser Submitter {get; set;}
+
+        /// <summary>
+        /// The time the feedback was submitted.
+        /// </summary>
         public DateTime SubmissionTime { get; set; }
+
+        /// <summary>
+        /// True if the puzzle author should not be able to see details about
+        /// the user.
+        /// </summary>
+        public bool IsAnonymous { get; set; }
+
+        /// <summary>
+        /// The feedback text submitted by the user.
+        /// </summary>
         public string WrittenFeedback { get; set; }
+
+        /// <summary>
+        /// The user submitted difficulty score for the puzzle.
+        /// </summary>
+        [Range(MinRating, MaxRating)]
         public int Difficulty { get; set; }
+
+        /// <summary>
+        /// The user submitted fun score for the puzzle.
+        /// </summary>
+        [Range(MinRating, MaxRating)]
         public int Fun { get; set; }
     }
 }
diff --git a/Data/Migrations/20190328022943_AnonymousFeedback.Designer.cs b/Data/Migrations/20190328022943_AnonymousFeedback.Designer.cs
new file mode 100644
index 00000000..384774ac
--- /dev/null
+++ b/Data/Migrations/20190328022943_AnonymousFeedback.Designer.cs
@@ -0,0 +1,1001 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using ServerCore.DataModel;
+
+namespace Data.Migrations
+{
+    [DbContext(typeof(PuzzleServerContext))]
+    [Migration("20190328022943_AnonymousFeedback")]
+    partial class AnonymousFeedback
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.1.1-rtm-30846")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasName("RoleNameIndex")
+                        .HasFilter("[NormalizedName] IS NOT NULL");
+
+                    b.ToTable("AspNetRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("AccessFailedCount");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed");
+
+                    b.Property<bool>("LockoutEnabled");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PasswordHash");
+
+                    b.Property<string>("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed");
+
+                    b.Property<string>("SecurityStamp");
+
+                    b.Property<bool>("TwoFactorEnabled");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasName("UserNameIndex")
+                        .HasFilter("[NormalizedUserName] IS NOT NULL");
+
+                    b.ToTable("AspNetUsers");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderDisplayName");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("RoleId");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Annotation", b =>
+                {
+                    b.Property<int>("PuzzleID");
+
+                    b.Property<int>("TeamID");
+
+                    b.Property<int>("Key");
+
+                    b.Property<string>("Contents")
+                        .IsRequired()
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("Timestamp");
+
+                    b.Property<int>("Version");
+
+                    b.HasKey("PuzzleID", "TeamID", "Key");
+
+                    b.HasIndex("TeamID");
+
+                    b.ToTable("Annotations");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.ContentFile", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("EventID");
+
+                    b.Property<int>("FileType");
+
+                    b.Property<int?>("PuzzleID")
+                        .IsRequired();
+
+                    b.Property<string>("ShortName")
+                        .IsRequired();
+
+                    b.Property<string>("UrlString")
+                        .IsRequired();
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("PuzzleID");
+
+                    b.HasIndex("EventID", "ShortName")
+                        .IsUnique();
+
+                    b.ToTable("ContentFiles");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Event", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<bool>("AllowFeedback");
+
+                    b.Property<DateTime>("AnswerSubmissionEnd");
+
+                    b.Property<DateTime>("AnswersAvailableBegin");
+
+                    b.Property<string>("ContactEmail");
+
+                    b.Property<DateTime>("EventBegin");
+
+                    b.Property<string>("HomePartial");
+
+                    b.Property<bool>("IsInternEvent");
+
+                    b.Property<double>("LockoutDurationMultiplier");
+
+                    b.Property<int>("LockoutIncorrectGuessLimit");
+
+                    b.Property<double>("LockoutIncorrectGuessPeriod");
+
+                    b.Property<int>("MaxExternalsPerTeam");
+
+                    b.Property<int>("MaxNumberOfTeams");
+
+                    b.Property<long>("MaxSubmissionCount");
+
+                    b.Property<int>("MaxTeamSize");
+
+                    b.Property<string>("Name")
+                        .IsRequired();
+
+                    b.Property<bool>("ShowFastestSolves");
+
+                    b.Property<DateTime>("StandingsAvailableBegin");
+
+                    b.Property<bool>("StandingsOverride");
+
+                    b.Property<DateTime>("TeamDeleteEnd");
+
+                    b.Property<DateTime>("TeamMembershipChangeEnd");
+
+                    b.Property<DateTime>("TeamMiscDataChangeEnd");
+
+                    b.Property<DateTime>("TeamNameChangeEnd");
+
+                    b.Property<DateTime>("TeamRegistrationBegin");
+
+                    b.Property<DateTime>("TeamRegistrationEnd");
+
+                    b.Property<string>("UrlString");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("UrlString")
+                        .IsUnique()
+                        .HasFilter("[UrlString] IS NOT NULL");
+
+                    b.ToTable("Events");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.EventAdmins", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("AdminID");
+
+                    b.Property<int>("EventID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("AdminID");
+
+                    b.HasIndex("EventID");
+
+                    b.ToTable("EventAdmins");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.EventAuthors", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("AuthorID");
+
+                    b.Property<int>("EventID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("AuthorID");
+
+                    b.HasIndex("EventID");
+
+                    b.ToTable("EventAuthors");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Feedback", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("Difficulty");
+
+                    b.Property<int>("Fun");
+
+                    b.Property<bool>("IsAnonymous");
+
+                    b.Property<int>("PuzzleID");
+
+                    b.Property<DateTime>("SubmissionTime");
+
+                    b.Property<int>("SubmitterID");
+
+                    b.Property<string>("WrittenFeedback");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("PuzzleID");
+
+                    b.HasIndex("SubmitterID");
+
+                    b.ToTable("Feedback");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Hint", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Content")
+                        .IsRequired();
+
+                    b.Property<int>("Cost");
+
+                    b.Property<string>("Description")
+                        .IsRequired();
+
+                    b.Property<int>("DisplayOrder");
+
+                    b.Property<int>("PuzzleID");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PuzzleID");
+
+                    b.ToTable("Hints");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.HintStatePerTeam", b =>
+                {
+                    b.Property<int>("TeamID");
+
+                    b.Property<int>("HintID");
+
+                    b.Property<DateTime?>("UnlockTime");
+
+                    b.HasKey("TeamID", "HintID");
+
+                    b.HasIndex("HintID");
+
+                    b.ToTable("HintStatePerTeam");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Invitation", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("EmailAddress");
+
+                    b.Property<DateTime>("Expiration");
+
+                    b.Property<Guid>("InvitationCode");
+
+                    b.Property<string>("InvitationType");
+
+                    b.Property<int?>("TeamID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("TeamID");
+
+                    b.ToTable("Invitations");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Piece", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Contents")
+                        .IsRequired();
+
+                    b.Property<int>("ProgressLevel");
+
+                    b.Property<int>("PuzzleID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("PuzzleID");
+
+                    b.ToTable("Pieces");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Prerequisites", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("PrerequisiteID");
+
+                    b.Property<int>("PuzzleID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("PrerequisiteID");
+
+                    b.HasIndex("PuzzleID");
+
+                    b.ToTable("Prerequisites");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Puzzle", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("CustomURL");
+
+                    b.Property<string>("Description");
+
+                    b.Property<int>("EventID");
+
+                    b.Property<string>("Group");
+
+                    b.Property<int>("HintCoinsForSolve");
+
+                    b.Property<bool>("HintsAreCumulative");
+
+                    b.Property<bool>("IsCheatCode");
+
+                    b.Property<bool>("IsFinalPuzzle");
+
+                    b.Property<bool>("IsGloballyVisiblePrerequisite");
+
+                    b.Property<bool>("IsMetaPuzzle");
+
+                    b.Property<bool>("IsPuzzle");
+
+                    b.Property<int>("MaxAnnotationKey");
+
+                    b.Property<int>("MinPrerequisiteCount");
+
+                    b.Property<int>("MinutesOfEventLockout");
+
+                    b.Property<int?>("MinutesToAutomaticallySolve");
+
+                    b.Property<string>("Name")
+                        .IsRequired();
+
+                    b.Property<int>("OrderInGroup");
+
+                    b.Property<int>("SolveValue");
+
+                    b.Property<string>("SupportEmailAlias");
+
+                    b.Property<string>("Token");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("EventID");
+
+                    b.ToTable("Puzzles");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.PuzzleAuthors", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("AuthorID");
+
+                    b.Property<int>("PuzzleID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("AuthorID");
+
+                    b.HasIndex("PuzzleID");
+
+                    b.ToTable("PuzzleAuthors");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.PuzzleStatePerTeam", b =>
+                {
+                    b.Property<int>("PuzzleID");
+
+                    b.Property<int>("TeamID");
+
+                    b.Property<bool>("IsEmailOnlyMode");
+
+                    b.Property<DateTime?>("LockoutExpiryTime");
+
+                    b.Property<string>("Notes");
+
+                    b.Property<bool>("Printed");
+
+                    b.Property<DateTime?>("SolvedTime");
+
+                    b.Property<DateTime?>("UnlockedTime");
+
+                    b.Property<long>("WrongSubmissionCountBuffer");
+
+                    b.HasKey("PuzzleID", "TeamID");
+
+                    b.HasIndex("TeamID");
+
+                    b.ToTable("PuzzleStatePerTeam");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.PuzzleUser", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Email");
+
+                    b.Property<string>("EmployeeAlias");
+
+                    b.Property<string>("IdentityUserId")
+                        .IsRequired();
+
+                    b.Property<bool>("IsGlobalAdmin");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("PhoneNumber");
+
+                    b.Property<string>("TShirtSize");
+
+                    b.Property<bool>("VisibleToOthers");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("PuzzleUsers");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Response", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<bool>("IsSolution");
+
+                    b.Property<string>("Note");
+
+                    b.Property<int>("PuzzleID");
+
+                    b.Property<string>("ResponseText")
+                        .IsRequired();
+
+                    b.Property<string>("SubmittedText")
+                        .IsRequired();
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("PuzzleID");
+
+                    b.ToTable("Responses");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Submission", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("PuzzleID");
+
+                    b.Property<int?>("ResponseID");
+
+                    b.Property<string>("SubmissionText")
+                        .IsRequired();
+
+                    b.Property<int>("SubmitterID");
+
+                    b.Property<int>("TeamID");
+
+                    b.Property<int?>("TeamID1");
+
+                    b.Property<DateTime>("TimeSubmitted");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("PuzzleID");
+
+                    b.HasIndex("ResponseID");
+
+                    b.HasIndex("SubmitterID");
+
+                    b.HasIndex("TeamID");
+
+                    b.HasIndex("TeamID1");
+
+                    b.ToTable("Submissions");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Team", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("CustomRoom");
+
+                    b.Property<int>("EventID");
+
+                    b.Property<int>("HintCoinCount");
+
+                    b.Property<int>("HintCoinsUsed");
+
+                    b.Property<bool>("IsLookingForTeammates");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("PrimaryContactEmail");
+
+                    b.Property<string>("PrimaryPhoneNumber");
+
+                    b.Property<int?>("RoomID");
+
+                    b.Property<string>("SecondaryPhoneNumber");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("EventID");
+
+                    b.ToTable("Teams");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.TeamApplication", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("PlayerID");
+
+                    b.Property<int>("TeamID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("PlayerID");
+
+                    b.HasIndex("TeamID");
+
+                    b.ToTable("TeamApplications");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.TeamMembers", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int?>("Team.ID")
+                        .IsRequired();
+
+                    b.Property<int?>("User.ID")
+                        .IsRequired();
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Team.ID");
+
+                    b.HasIndex("User.ID");
+
+                    b.ToTable("TeamMembers");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Annotation", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany()
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.Team", "Team")
+                        .WithMany()
+                        .HasForeignKey("TeamID")
+                        .OnDelete(DeleteBehavior.Restrict);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.ContentFile", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Event", "Event")
+                        .WithMany()
+                        .HasForeignKey("EventID")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany("Contents")
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.EventAdmins", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Admin")
+                        .WithMany()
+                        .HasForeignKey("AdminID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.Event", "Event")
+                        .WithMany()
+                        .HasForeignKey("EventID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.EventAuthors", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Author")
+                        .WithMany()
+                        .HasForeignKey("AuthorID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.Event", "Event")
+                        .WithMany()
+                        .HasForeignKey("EventID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Feedback", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany()
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Submitter")
+                        .WithMany()
+                        .HasForeignKey("SubmitterID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Hint", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany()
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.HintStatePerTeam", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Hint", "Hint")
+                        .WithMany()
+                        .HasForeignKey("HintID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.Team", "Team")
+                        .WithMany()
+                        .HasForeignKey("TeamID")
+                        .OnDelete(DeleteBehavior.Restrict);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Invitation", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Team")
+                        .WithMany("Invitations")
+                        .HasForeignKey("TeamID");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Piece", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany()
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Prerequisites", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Prerequisite")
+                        .WithMany()
+                        .HasForeignKey("PrerequisiteID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany()
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Puzzle", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Event", "Event")
+                        .WithMany()
+                        .HasForeignKey("EventID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.PuzzleAuthors", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Author")
+                        .WithMany()
+                        .HasForeignKey("AuthorID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany()
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.PuzzleStatePerTeam", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany()
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.Team", "Team")
+                        .WithMany()
+                        .HasForeignKey("TeamID")
+                        .OnDelete(DeleteBehavior.Restrict);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Response", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany()
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Submission", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
+                        .WithMany("Submissions")
+                        .HasForeignKey("PuzzleID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.Response", "Response")
+                        .WithMany()
+                        .HasForeignKey("ResponseID");
+
+                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Submitter")
+                        .WithMany()
+                        .HasForeignKey("SubmitterID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.Team", "Team")
+                        .WithMany()
+                        .HasForeignKey("TeamID")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.HasOne("ServerCore.DataModel.Team")
+                        .WithMany("Submissions")
+                        .HasForeignKey("TeamID1");
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.Team", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Event", "Event")
+                        .WithMany()
+                        .HasForeignKey("EventID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.TeamApplication", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Player")
+                        .WithMany()
+                        .HasForeignKey("PlayerID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.Team", "Team")
+                        .WithMany()
+                        .HasForeignKey("TeamID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ServerCore.DataModel.TeamMembers", b =>
+                {
+                    b.HasOne("ServerCore.DataModel.Team", "Team")
+                        .WithMany()
+                        .HasForeignKey("Team.ID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Member")
+                        .WithMany()
+                        .HasForeignKey("User.ID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Data/Migrations/20190328022943_AnonymousFeedback.cs b/Data/Migrations/20190328022943_AnonymousFeedback.cs
new file mode 100644
index 00000000..4201babb
--- /dev/null
+++ b/Data/Migrations/20190328022943_AnonymousFeedback.cs
@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations
+{
+    public partial class AnonymousFeedback : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsAnonymous",
+                table: "Feedback",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsAnonymous",
+                table: "Feedback");
+        }
+    }
+}
diff --git a/Data/Migrations/PuzzleServerContextModelSnapshot.cs b/Data/Migrations/PuzzleServerContextModelSnapshot.cs
index fa9eae59..29c87381 100644
--- a/Data/Migrations/PuzzleServerContextModelSnapshot.cs
+++ b/Data/Migrations/PuzzleServerContextModelSnapshot.cs
@@ -15,7 +15,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.8-servicing-32085")
+                .HasAnnotation("ProductVersion", "2.1.1-rtm-30846")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128)
                 .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
@@ -350,6 +350,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.Property<int>("Fun");
 
+                    b.Property<bool>("IsAnonymous");
+
                     b.Property<int>("PuzzleID");
 
                     b.Property<DateTime>("SubmissionTime");
diff --git a/ServerCore/Pages/Puzzles/Feedback.cshtml b/ServerCore/Pages/Puzzles/Feedback.cshtml
index b9417904..09353269 100644
--- a/ServerCore/Pages/Puzzles/Feedback.cshtml
+++ b/ServerCore/Pages/Puzzles/Feedback.cshtml
@@ -26,6 +26,9 @@
             <th>
                 @Html.DisplayNameFor(model => model.Feedbacks[0].Submitter)
             </th>
+            <th>
+                @Html.DisplayNameFor(model => model.Feedbacks[0].Submitter.Email)
+            </th>
             <th>
                 @Html.DisplayNameFor(model => model.Feedbacks[0].SubmissionTime)
             </th>
@@ -43,9 +46,20 @@
     <tbody>
 @foreach (var item in Model.Feedbacks) {
         <tr>
+            @if (item.IsAnonymous)
+            {
+            <td>Hidden</td>
+            <td>Hidden</td>
+            }
+            else
+            {
             <td>
                 @Html.DisplayFor(modelItem => item.Submitter.Name)
             </td>
+            <td>
+                @Html.DisplayFor(modelItem => item.Submitter.Email)
+            </td>
+            }
             <td>
                 @Html.DisplayFor(modelItem => item.SubmissionTime)
             </td>
diff --git a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
index bbd4e967..6b5a005d 100644
--- a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
+++ b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
@@ -26,7 +26,7 @@
             </div>
             <div class="form-group">
                 <label asp-for="Feedback.Difficulty" class="control-label"></label>
-                <input asp-for="Feedback.Difficulty" type="range" min="@Model.MinRating" max="@Model.MaxRating" step="1" class="slider" id="difficultySlider">
+                <input asp-for="Feedback.Difficulty" type="range" min="@DataModel.Feedback.MinRating" max="@DataModel.Feedback.MaxRating" step="1" class="slider" id="difficultySlider">
                 <label id="difficultyLabel">NULL</label>
                 <script>
                     var diffslider = document.getElementById("difficultySlider");
@@ -41,7 +41,7 @@
             </div>
             <div class="form-group">
                 <label asp-for="Feedback.Fun" class="control-label"></label>
-                <input asp-for="Feedback.Fun" type="range" min="@Model.MinRating" max="@Model.MaxRating" step="1" class="slider" id="funSlider">
+                <input asp-for="Feedback.Fun" type="range" min="@DataModel.Feedback.MinRating" max="@DataModel.Feedback.MaxRating" step="1" class="slider" id="funSlider">
                 <label id="funLabel">NULL</label>
                 <script>
                     var funslider = document.getElementById("funSlider");
@@ -54,6 +54,21 @@
                     }
                 </script>
             </div>
+            <!--
+            The code below displays an option to the user to anonymize their feedback.    
+            <div class="form-group">
+                <label asp-for="Feedback.IsAnonymous" class="control-label">Keep feedback anonymous</label>
+                <table>
+                    <tr>
+                        <input asp-for="Feedback.IsAnonymous" class="form-control" />
+                        <td>
+                            <p>Checking this box will hide your email from the puzzle author when they go to view this feedback. You may want to check this if you do not wish to be contacted by a puzzle author to follow up on your feedback.</p>
+                            <span asp-validation-for="Feedback.IsAnonymous" class="text-danger"></span>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            -->
             <div class="form-group">
                 <input type="submit" value="Create" class="btn btn-default" />
             </div>
diff --git a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
index d450858c..8cb63f79 100644
--- a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
+++ b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
@@ -20,8 +20,6 @@ public SubmitFeedbackModel(PuzzleServerContext serverContext, UserManager<Identi
         [BindProperty]
         public Feedback Feedback { get; set; }  
         public Puzzle Puzzle { get; set; }
-        public int MinRating = 1;
-        public int MaxRating = 10;
 
         /// <summary>
         /// Gets the submit feedback page for a puzzle
@@ -36,12 +34,14 @@ public async Task<IActionResult> OnGetAsync(int puzzleId)
             }
 
             // Seed existing feedback page
-            Feedback = await _context.Feedback.Where((f) => f.Puzzle.ID == puzzleId && f.Submitter == LoggedInUser).FirstOrDefaultAsync();
+            Feedback = await _context.Feedback
+                .Where((f) => (f.Puzzle.ID == puzzleId &&
+                               f.Submitter == LoggedInUser))
+                .FirstOrDefaultAsync();
+
             if (Feedback == null)
             {
                 Feedback = new Feedback();
-                Feedback.Fun = 5;
-                Feedback.Difficulty = 5;
             }
 
             return Page();
@@ -59,16 +59,19 @@ public async Task<IActionResult> OnPostAsync(int puzzleId)
                 return Page();
             }
 
-            if (Feedback.Fun < MinRating)
-                Feedback.Fun = MinRating;
-            if (Feedback.Fun > MaxRating)
-                Feedback.Fun = MaxRating;
-            if (Feedback.Difficulty < MinRating)
-                Feedback.Difficulty = MinRating;
-            if (Feedback.Difficulty > MaxRating)
-                Feedback.Difficulty = MaxRating;
+            Feedback.Fun = Math.Clamp(Feedback.Fun,
+                                      Feedback.MinRating,
+                                      Feedback.MaxRating);
+
+            Feedback.Difficulty = Math.Clamp(Feedback.Difficulty,
+                                             Feedback.MinRating,
+                                             Feedback.MaxRating);
+
+            Feedback editableFeedback = await _context.Feedback
+                .Where((f) => (f.Puzzle.ID == puzzleId && 
+                               f.Submitter == LoggedInUser))
+                .FirstOrDefaultAsync();
 
-            Feedback editableFeedback = await _context.Feedback.Where((f) => f.Puzzle.ID == puzzleId && f.Submitter == LoggedInUser).FirstOrDefaultAsync();
             if (editableFeedback == null)
             {
                 Feedback.SubmissionTime = DateTime.UtcNow;
@@ -84,14 +87,19 @@ public async Task<IActionResult> OnPostAsync(int puzzleId)
             {
                 editableFeedback.SubmissionTime = DateTime.UtcNow;
                 editableFeedback.Submitter = LoggedInUser;
+                editableFeedback.IsAnonymous = Feedback.IsAnonymous;
                 editableFeedback.Difficulty = Feedback.Difficulty;
                 editableFeedback.Fun = Feedback.Fun;
                 editableFeedback.WrittenFeedback = Feedback.WrittenFeedback;
-                editableFeedback.Puzzle = await _context.Puzzles.Where(m => m.ID == puzzleId).FirstOrDefaultAsync();
+                editableFeedback.Puzzle = await _context.Puzzles
+                    .Where(m => m.ID == puzzleId)
+                    .FirstOrDefaultAsync();
+
                 if (editableFeedback.Puzzle == null)
                 {
                     return NotFound();
                 }
+
                 _context.Attach(editableFeedback).State = EntityState.Modified;
             }
 

From b7f404c75ef13de141f17cd9680957b924c22c3f Mon Sep 17 00:00:00 2001
From: Lambert Wang <law@microsoft.com>
Date: Wed, 27 Mar 2019 19:50:18 -0700
Subject: [PATCH 2/2] Back out anonymization

---
 Data/DataModel/Feedback.cs                    |    8 +-
 ...190328022943_AnonymousFeedback.Designer.cs | 1001 -----------------
 .../20190328022943_AnonymousFeedback.cs       |   23 -
 .../PuzzleServerContextModelSnapshot.cs       |    4 +-
 ServerCore/Pages/Puzzles/Feedback.cshtml      |    8 -
 .../Pages/Puzzles/SubmitFeedback.cshtml       |   15 -
 .../Pages/Puzzles/SubmitFeedback.cshtml.cs    |    1 -
 7 files changed, 2 insertions(+), 1058 deletions(-)
 delete mode 100644 Data/Migrations/20190328022943_AnonymousFeedback.Designer.cs
 delete mode 100644 Data/Migrations/20190328022943_AnonymousFeedback.cs

diff --git a/Data/DataModel/Feedback.cs b/Data/DataModel/Feedback.cs
index 3cad0035..7500296a 100644
--- a/Data/DataModel/Feedback.cs
+++ b/Data/DataModel/Feedback.cs
@@ -16,7 +16,7 @@ public Feedback()
         }
 
         public const int MinRating = 1;
-        public const int AvgRating = 1;
+        public const int AvgRating = 5;
         public const int MaxRating = 10;
 
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -36,12 +36,6 @@ public Feedback()
         /// </summary>
         public DateTime SubmissionTime { get; set; }
 
-        /// <summary>
-        /// True if the puzzle author should not be able to see details about
-        /// the user.
-        /// </summary>
-        public bool IsAnonymous { get; set; }
-
         /// <summary>
         /// The feedback text submitted by the user.
         /// </summary>
diff --git a/Data/Migrations/20190328022943_AnonymousFeedback.Designer.cs b/Data/Migrations/20190328022943_AnonymousFeedback.Designer.cs
deleted file mode 100644
index 384774ac..00000000
--- a/Data/Migrations/20190328022943_AnonymousFeedback.Designer.cs
+++ /dev/null
@@ -1,1001 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ServerCore.DataModel;
-
-namespace Data.Migrations
-{
-    [DbContext(typeof(PuzzleServerContext))]
-    [Migration("20190328022943_AnonymousFeedback")]
-    partial class AnonymousFeedback
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.1-rtm-30846")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
-                {
-                    b.Property<string>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken();
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("NormalizedName")
-                        .HasMaxLength(256);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedName")
-                        .IsUnique()
-                        .HasName("RoleNameIndex")
-                        .HasFilter("[NormalizedName] IS NOT NULL");
-
-                    b.ToTable("AspNetRoles");
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("ClaimType");
-
-                    b.Property<string>("ClaimValue");
-
-                    b.Property<string>("RoleId")
-                        .IsRequired();
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AspNetRoleClaims");
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
-                {
-                    b.Property<string>("Id")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AccessFailedCount");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken();
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(256);
-
-                    b.Property<bool>("EmailConfirmed");
-
-                    b.Property<bool>("LockoutEnabled");
-
-                    b.Property<DateTimeOffset?>("LockoutEnd");
-
-                    b.Property<string>("NormalizedEmail")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("NormalizedUserName")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("PasswordHash");
-
-                    b.Property<string>("PhoneNumber");
-
-                    b.Property<bool>("PhoneNumberConfirmed");
-
-                    b.Property<string>("SecurityStamp");
-
-                    b.Property<bool>("TwoFactorEnabled");
-
-                    b.Property<string>("UserName")
-                        .HasMaxLength(256);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedEmail")
-                        .HasName("EmailIndex");
-
-                    b.HasIndex("NormalizedUserName")
-                        .IsUnique()
-                        .HasName("UserNameIndex")
-                        .HasFilter("[NormalizedUserName] IS NOT NULL");
-
-                    b.ToTable("AspNetUsers");
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("ClaimType");
-
-                    b.Property<string>("ClaimValue");
-
-                    b.Property<string>("UserId")
-                        .IsRequired();
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AspNetUserClaims");
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
-                {
-                    b.Property<string>("LoginProvider")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ProviderKey")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ProviderDisplayName");
-
-                    b.Property<string>("UserId")
-                        .IsRequired();
-
-                    b.HasKey("LoginProvider", "ProviderKey");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AspNetUserLogins");
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
-                {
-                    b.Property<string>("UserId");
-
-                    b.Property<string>("RoleId");
-
-                    b.HasKey("UserId", "RoleId");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AspNetUserRoles");
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
-                {
-                    b.Property<string>("UserId");
-
-                    b.Property<string>("LoginProvider")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("Value");
-
-                    b.HasKey("UserId", "LoginProvider", "Name");
-
-                    b.ToTable("AspNetUserTokens");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Annotation", b =>
-                {
-                    b.Property<int>("PuzzleID");
-
-                    b.Property<int>("TeamID");
-
-                    b.Property<int>("Key");
-
-                    b.Property<string>("Contents")
-                        .IsRequired()
-                        .HasMaxLength(255);
-
-                    b.Property<DateTime>("Timestamp");
-
-                    b.Property<int>("Version");
-
-                    b.HasKey("PuzzleID", "TeamID", "Key");
-
-                    b.HasIndex("TeamID");
-
-                    b.ToTable("Annotations");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.ContentFile", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("EventID");
-
-                    b.Property<int>("FileType");
-
-                    b.Property<int?>("PuzzleID")
-                        .IsRequired();
-
-                    b.Property<string>("ShortName")
-                        .IsRequired();
-
-                    b.Property<string>("UrlString")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("PuzzleID");
-
-                    b.HasIndex("EventID", "ShortName")
-                        .IsUnique();
-
-                    b.ToTable("ContentFiles");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Event", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<bool>("AllowFeedback");
-
-                    b.Property<DateTime>("AnswerSubmissionEnd");
-
-                    b.Property<DateTime>("AnswersAvailableBegin");
-
-                    b.Property<string>("ContactEmail");
-
-                    b.Property<DateTime>("EventBegin");
-
-                    b.Property<string>("HomePartial");
-
-                    b.Property<bool>("IsInternEvent");
-
-                    b.Property<double>("LockoutDurationMultiplier");
-
-                    b.Property<int>("LockoutIncorrectGuessLimit");
-
-                    b.Property<double>("LockoutIncorrectGuessPeriod");
-
-                    b.Property<int>("MaxExternalsPerTeam");
-
-                    b.Property<int>("MaxNumberOfTeams");
-
-                    b.Property<long>("MaxSubmissionCount");
-
-                    b.Property<int>("MaxTeamSize");
-
-                    b.Property<string>("Name")
-                        .IsRequired();
-
-                    b.Property<bool>("ShowFastestSolves");
-
-                    b.Property<DateTime>("StandingsAvailableBegin");
-
-                    b.Property<bool>("StandingsOverride");
-
-                    b.Property<DateTime>("TeamDeleteEnd");
-
-                    b.Property<DateTime>("TeamMembershipChangeEnd");
-
-                    b.Property<DateTime>("TeamMiscDataChangeEnd");
-
-                    b.Property<DateTime>("TeamNameChangeEnd");
-
-                    b.Property<DateTime>("TeamRegistrationBegin");
-
-                    b.Property<DateTime>("TeamRegistrationEnd");
-
-                    b.Property<string>("UrlString");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("UrlString")
-                        .IsUnique()
-                        .HasFilter("[UrlString] IS NOT NULL");
-
-                    b.ToTable("Events");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.EventAdmins", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("AdminID");
-
-                    b.Property<int>("EventID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("AdminID");
-
-                    b.HasIndex("EventID");
-
-                    b.ToTable("EventAdmins");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.EventAuthors", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("AuthorID");
-
-                    b.Property<int>("EventID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("AuthorID");
-
-                    b.HasIndex("EventID");
-
-                    b.ToTable("EventAuthors");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Feedback", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("Difficulty");
-
-                    b.Property<int>("Fun");
-
-                    b.Property<bool>("IsAnonymous");
-
-                    b.Property<int>("PuzzleID");
-
-                    b.Property<DateTime>("SubmissionTime");
-
-                    b.Property<int>("SubmitterID");
-
-                    b.Property<string>("WrittenFeedback");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("PuzzleID");
-
-                    b.HasIndex("SubmitterID");
-
-                    b.ToTable("Feedback");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Hint", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Content")
-                        .IsRequired();
-
-                    b.Property<int>("Cost");
-
-                    b.Property<string>("Description")
-                        .IsRequired();
-
-                    b.Property<int>("DisplayOrder");
-
-                    b.Property<int>("PuzzleID");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("PuzzleID");
-
-                    b.ToTable("Hints");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.HintStatePerTeam", b =>
-                {
-                    b.Property<int>("TeamID");
-
-                    b.Property<int>("HintID");
-
-                    b.Property<DateTime?>("UnlockTime");
-
-                    b.HasKey("TeamID", "HintID");
-
-                    b.HasIndex("HintID");
-
-                    b.ToTable("HintStatePerTeam");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Invitation", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("EmailAddress");
-
-                    b.Property<DateTime>("Expiration");
-
-                    b.Property<Guid>("InvitationCode");
-
-                    b.Property<string>("InvitationType");
-
-                    b.Property<int?>("TeamID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("TeamID");
-
-                    b.ToTable("Invitations");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Piece", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Contents")
-                        .IsRequired();
-
-                    b.Property<int>("ProgressLevel");
-
-                    b.Property<int>("PuzzleID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("PuzzleID");
-
-                    b.ToTable("Pieces");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Prerequisites", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("PrerequisiteID");
-
-                    b.Property<int>("PuzzleID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("PrerequisiteID");
-
-                    b.HasIndex("PuzzleID");
-
-                    b.ToTable("Prerequisites");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Puzzle", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("CustomURL");
-
-                    b.Property<string>("Description");
-
-                    b.Property<int>("EventID");
-
-                    b.Property<string>("Group");
-
-                    b.Property<int>("HintCoinsForSolve");
-
-                    b.Property<bool>("HintsAreCumulative");
-
-                    b.Property<bool>("IsCheatCode");
-
-                    b.Property<bool>("IsFinalPuzzle");
-
-                    b.Property<bool>("IsGloballyVisiblePrerequisite");
-
-                    b.Property<bool>("IsMetaPuzzle");
-
-                    b.Property<bool>("IsPuzzle");
-
-                    b.Property<int>("MaxAnnotationKey");
-
-                    b.Property<int>("MinPrerequisiteCount");
-
-                    b.Property<int>("MinutesOfEventLockout");
-
-                    b.Property<int?>("MinutesToAutomaticallySolve");
-
-                    b.Property<string>("Name")
-                        .IsRequired();
-
-                    b.Property<int>("OrderInGroup");
-
-                    b.Property<int>("SolveValue");
-
-                    b.Property<string>("SupportEmailAlias");
-
-                    b.Property<string>("Token");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("EventID");
-
-                    b.ToTable("Puzzles");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.PuzzleAuthors", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("AuthorID");
-
-                    b.Property<int>("PuzzleID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("AuthorID");
-
-                    b.HasIndex("PuzzleID");
-
-                    b.ToTable("PuzzleAuthors");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.PuzzleStatePerTeam", b =>
-                {
-                    b.Property<int>("PuzzleID");
-
-                    b.Property<int>("TeamID");
-
-                    b.Property<bool>("IsEmailOnlyMode");
-
-                    b.Property<DateTime?>("LockoutExpiryTime");
-
-                    b.Property<string>("Notes");
-
-                    b.Property<bool>("Printed");
-
-                    b.Property<DateTime?>("SolvedTime");
-
-                    b.Property<DateTime?>("UnlockedTime");
-
-                    b.Property<long>("WrongSubmissionCountBuffer");
-
-                    b.HasKey("PuzzleID", "TeamID");
-
-                    b.HasIndex("TeamID");
-
-                    b.ToTable("PuzzleStatePerTeam");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.PuzzleUser", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Email");
-
-                    b.Property<string>("EmployeeAlias");
-
-                    b.Property<string>("IdentityUserId")
-                        .IsRequired();
-
-                    b.Property<bool>("IsGlobalAdmin");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("PhoneNumber");
-
-                    b.Property<string>("TShirtSize");
-
-                    b.Property<bool>("VisibleToOthers");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("PuzzleUsers");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Response", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<bool>("IsSolution");
-
-                    b.Property<string>("Note");
-
-                    b.Property<int>("PuzzleID");
-
-                    b.Property<string>("ResponseText")
-                        .IsRequired();
-
-                    b.Property<string>("SubmittedText")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("PuzzleID");
-
-                    b.ToTable("Responses");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Submission", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("PuzzleID");
-
-                    b.Property<int?>("ResponseID");
-
-                    b.Property<string>("SubmissionText")
-                        .IsRequired();
-
-                    b.Property<int>("SubmitterID");
-
-                    b.Property<int>("TeamID");
-
-                    b.Property<int?>("TeamID1");
-
-                    b.Property<DateTime>("TimeSubmitted");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("PuzzleID");
-
-                    b.HasIndex("ResponseID");
-
-                    b.HasIndex("SubmitterID");
-
-                    b.HasIndex("TeamID");
-
-                    b.HasIndex("TeamID1");
-
-                    b.ToTable("Submissions");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Team", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("CustomRoom");
-
-                    b.Property<int>("EventID");
-
-                    b.Property<int>("HintCoinCount");
-
-                    b.Property<int>("HintCoinsUsed");
-
-                    b.Property<bool>("IsLookingForTeammates");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("PrimaryContactEmail");
-
-                    b.Property<string>("PrimaryPhoneNumber");
-
-                    b.Property<int?>("RoomID");
-
-                    b.Property<string>("SecondaryPhoneNumber");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("EventID");
-
-                    b.ToTable("Teams");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.TeamApplication", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("PlayerID");
-
-                    b.Property<int>("TeamID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("PlayerID");
-
-                    b.HasIndex("TeamID");
-
-                    b.ToTable("TeamApplications");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.TeamMembers", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int?>("Team.ID")
-                        .IsRequired();
-
-                    b.Property<int?>("User.ID")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Team.ID");
-
-                    b.HasIndex("User.ID");
-
-                    b.ToTable("TeamMembers");
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
-                {
-                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Annotation", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
-                        .WithMany()
-                        .HasForeignKey("PuzzleID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ServerCore.DataModel.Team", "Team")
-                        .WithMany()
-                        .HasForeignKey("TeamID")
-                        .OnDelete(DeleteBehavior.Restrict);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.ContentFile", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Event", "Event")
-                        .WithMany()
-                        .HasForeignKey("EventID")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
-                        .WithMany("Contents")
-                        .HasForeignKey("PuzzleID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.EventAdmins", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Admin")
-                        .WithMany()
-                        .HasForeignKey("AdminID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ServerCore.DataModel.Event", "Event")
-                        .WithMany()
-                        .HasForeignKey("EventID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.EventAuthors", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Author")
-                        .WithMany()
-                        .HasForeignKey("AuthorID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ServerCore.DataModel.Event", "Event")
-                        .WithMany()
-                        .HasForeignKey("EventID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Feedback", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
-                        .WithMany()
-                        .HasForeignKey("PuzzleID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Submitter")
-                        .WithMany()
-                        .HasForeignKey("SubmitterID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Hint", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
-                        .WithMany()
-                        .HasForeignKey("PuzzleID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.HintStatePerTeam", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Hint", "Hint")
-                        .WithMany()
-                        .HasForeignKey("HintID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ServerCore.DataModel.Team", "Team")
-                        .WithMany()
-                        .HasForeignKey("TeamID")
-                        .OnDelete(DeleteBehavior.Restrict);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Invitation", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Team")
-                        .WithMany("Invitations")
-                        .HasForeignKey("TeamID");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Piece", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
-                        .WithMany()
-                        .HasForeignKey("PuzzleID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Prerequisites", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Puzzle", "Prerequisite")
-                        .WithMany()
-                        .HasForeignKey("PrerequisiteID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
-                        .WithMany()
-                        .HasForeignKey("PuzzleID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Puzzle", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Event", "Event")
-                        .WithMany()
-                        .HasForeignKey("EventID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.PuzzleAuthors", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Author")
-                        .WithMany()
-                        .HasForeignKey("AuthorID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
-                        .WithMany()
-                        .HasForeignKey("PuzzleID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.PuzzleStatePerTeam", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
-                        .WithMany()
-                        .HasForeignKey("PuzzleID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ServerCore.DataModel.Team", "Team")
-                        .WithMany()
-                        .HasForeignKey("TeamID")
-                        .OnDelete(DeleteBehavior.Restrict);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Response", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
-                        .WithMany()
-                        .HasForeignKey("PuzzleID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Submission", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Puzzle", "Puzzle")
-                        .WithMany("Submissions")
-                        .HasForeignKey("PuzzleID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ServerCore.DataModel.Response", "Response")
-                        .WithMany()
-                        .HasForeignKey("ResponseID");
-
-                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Submitter")
-                        .WithMany()
-                        .HasForeignKey("SubmitterID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ServerCore.DataModel.Team", "Team")
-                        .WithMany()
-                        .HasForeignKey("TeamID")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ServerCore.DataModel.Team")
-                        .WithMany("Submissions")
-                        .HasForeignKey("TeamID1");
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.Team", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Event", "Event")
-                        .WithMany()
-                        .HasForeignKey("EventID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.TeamApplication", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Player")
-                        .WithMany()
-                        .HasForeignKey("PlayerID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ServerCore.DataModel.Team", "Team")
-                        .WithMany()
-                        .HasForeignKey("TeamID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ServerCore.DataModel.TeamMembers", b =>
-                {
-                    b.HasOne("ServerCore.DataModel.Team", "Team")
-                        .WithMany()
-                        .HasForeignKey("Team.ID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ServerCore.DataModel.PuzzleUser", "Member")
-                        .WithMany()
-                        .HasForeignKey("User.ID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/Data/Migrations/20190328022943_AnonymousFeedback.cs b/Data/Migrations/20190328022943_AnonymousFeedback.cs
deleted file mode 100644
index 4201babb..00000000
--- a/Data/Migrations/20190328022943_AnonymousFeedback.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace Data.Migrations
-{
-    public partial class AnonymousFeedback : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsAnonymous",
-                table: "Feedback",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "IsAnonymous",
-                table: "Feedback");
-        }
-    }
-}
diff --git a/Data/Migrations/PuzzleServerContextModelSnapshot.cs b/Data/Migrations/PuzzleServerContextModelSnapshot.cs
index 29c87381..fa9eae59 100644
--- a/Data/Migrations/PuzzleServerContextModelSnapshot.cs
+++ b/Data/Migrations/PuzzleServerContextModelSnapshot.cs
@@ -15,7 +15,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.1-rtm-30846")
+                .HasAnnotation("ProductVersion", "2.1.8-servicing-32085")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128)
                 .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
@@ -350,8 +350,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.Property<int>("Fun");
 
-                    b.Property<bool>("IsAnonymous");
-
                     b.Property<int>("PuzzleID");
 
                     b.Property<DateTime>("SubmissionTime");
diff --git a/ServerCore/Pages/Puzzles/Feedback.cshtml b/ServerCore/Pages/Puzzles/Feedback.cshtml
index 09353269..c0dba311 100644
--- a/ServerCore/Pages/Puzzles/Feedback.cshtml
+++ b/ServerCore/Pages/Puzzles/Feedback.cshtml
@@ -46,20 +46,12 @@
     <tbody>
 @foreach (var item in Model.Feedbacks) {
         <tr>
-            @if (item.IsAnonymous)
-            {
-            <td>Hidden</td>
-            <td>Hidden</td>
-            }
-            else
-            {
             <td>
                 @Html.DisplayFor(modelItem => item.Submitter.Name)
             </td>
             <td>
                 @Html.DisplayFor(modelItem => item.Submitter.Email)
             </td>
-            }
             <td>
                 @Html.DisplayFor(modelItem => item.SubmissionTime)
             </td>
diff --git a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
index 6b5a005d..fedde5c2 100644
--- a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
+++ b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
@@ -54,21 +54,6 @@
                     }
                 </script>
             </div>
-            <!--
-            The code below displays an option to the user to anonymize their feedback.    
-            <div class="form-group">
-                <label asp-for="Feedback.IsAnonymous" class="control-label">Keep feedback anonymous</label>
-                <table>
-                    <tr>
-                        <input asp-for="Feedback.IsAnonymous" class="form-control" />
-                        <td>
-                            <p>Checking this box will hide your email from the puzzle author when they go to view this feedback. You may want to check this if you do not wish to be contacted by a puzzle author to follow up on your feedback.</p>
-                            <span asp-validation-for="Feedback.IsAnonymous" class="text-danger"></span>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-            -->
             <div class="form-group">
                 <input type="submit" value="Create" class="btn btn-default" />
             </div>
diff --git a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
index 8cb63f79..3174375f 100644
--- a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
+++ b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
@@ -87,7 +87,6 @@ public async Task<IActionResult> OnPostAsync(int puzzleId)
             {
                 editableFeedback.SubmissionTime = DateTime.UtcNow;
                 editableFeedback.Submitter = LoggedInUser;
-                editableFeedback.IsAnonymous = Feedback.IsAnonymous;
                 editableFeedback.Difficulty = Feedback.Difficulty;
                 editableFeedback.Fun = Feedback.Fun;
                 editableFeedback.WrittenFeedback = Feedback.WrittenFeedback;