Added editablity

This commit is contained in:
JakubWalkowiak 2021-01-03 23:31:11 +01:00
parent 854652d7ab
commit 90e980be98
17 changed files with 1232 additions and 4 deletions

Binary file not shown.

View File

@ -118,7 +118,7 @@ namespace StudyLib.API.Controllers
[HttpGet("leave/{id}/{userId}")] [HttpGet("leave/{id}/{userId}")]
public async Task<IActionResult> LeaveGroup(long id, string userId) public async Task<IActionResult> LeaveGroup(long id, string userId)
{ {
var user = await _context.Users.FindAsync(userId); var user = await _context.Users.Where(u => u.Id == userId).Include(u => u.Groups).SingleOrDefaultAsync();
var groups = user.Groups.Where(g => g.ID != id).ToList(); var groups = user.Groups.Where(g => g.ID != id).ToList();

View File

@ -30,8 +30,8 @@ namespace StudyLib.API.Controllers
return await _context.Subjects.Where(s => s.Group.ID == groupId).Include(s => s.Comments).Include(s => s.Assignments).Include(s => s.Tests).ToListAsync(); return await _context.Subjects.Where(s => s.Group.ID == groupId).Include(s => s.Comments).Include(s => s.Assignments).Include(s => s.Tests).ToListAsync();
} }
[HttpGet("get-by-id/{id}")] [HttpGet("get-by-id/{id}/{userId}")]
public async Task<ActionResult<Subject>> GetSubject(long id) public async Task<ActionResult<Subject>> GetSubject(long id, string userId)
{ {
var subject = await _context.Subjects.Where(s => s.ID == id).Include(s => s.Comments).Include(s => s.Assignments).Include(s => s.Tests).SingleOrDefaultAsync(); var subject = await _context.Subjects.Where(s => s.ID == id).Include(s => s.Comments).Include(s => s.Assignments).Include(s => s.Tests).SingleOrDefaultAsync();
@ -40,6 +40,10 @@ namespace StudyLib.API.Controllers
return NotFound(); return NotFound();
} }
subject.EditedBy = userId;
_context.Entry(subject).State = EntityState.Modified;
await _context.SaveChangesAsync();
return subject; return subject;
} }
@ -133,6 +137,23 @@ namespace StudyLib.API.Controllers
return subject; return subject;
} }
[HttpGet("unlock/{id}")]
public async Task<ActionResult<Subject>> UnlockSubject(long id)
{
var subject = await _context.Subjects.FindAsync(id);
if (subject == null)
{
return NotFound();
}
subject.EditedBy = null;
_context.Entry(subject).State = EntityState.Modified;
await _context.SaveChangesAsync();
return NoContent();
}
private bool SubjectExists(long id) private bool SubjectExists(long id)
{ {
return _context.Subjects.Any(e => e.ID == id); return _context.Subjects.Any(e => e.ID == id);

View File

@ -17,6 +17,8 @@ namespace StudyLib.Models
public string LabTeacher { get; set; } public string LabTeacher { get; set; }
public bool MainExam { get; set; } public bool MainExam { get; set; }
public string EditedBy { get; set; }
public long GroupId { get; set; } public long GroupId { get; set; }

View File

@ -0,0 +1,578 @@
// <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 StudyLib.API.Data;
namespace StudyLib.Migrations
{
[DbContext(typeof(StudyLibContext))]
[Migration("20210103192936_EditedBy")]
partial class EditedBy
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.UseIdentityColumns()
.HasAnnotation("Relational:MaxIdentifierLength", 128)
.HasAnnotation("ProductVersion", "5.0.0");
modelBuilder.Entity("GroupUser", b =>
{
b.Property<long>("GroupsID")
.HasColumnType("bigint");
b.Property<string>("UsersId")
.HasColumnType("nvarchar(450)");
b.HasKey("GroupsID", "UsersId");
b.HasIndex("UsersId");
b.ToTable("GroupUser");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
{
b.Property<string>("Id")
.HasColumnType("nvarchar(450)");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("nvarchar(max)");
b.Property<string>("Name")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<string>("NormalizedName")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasDatabaseName("RoleNameIndex")
.HasFilter("[NormalizedName] IS NOT NULL");
b.ToTable("AspNetRoles");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.UseIdentityColumn();
b.Property<string>("ClaimType")
.HasColumnType("nvarchar(max)");
b.Property<string>("ClaimValue")
.HasColumnType("nvarchar(max)");
b.Property<string>("RoleId")
.IsRequired()
.HasColumnType("nvarchar(450)");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AspNetRoleClaims");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.UseIdentityColumn();
b.Property<string>("ClaimType")
.HasColumnType("nvarchar(max)");
b.Property<string>("ClaimValue")
.HasColumnType("nvarchar(max)");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("nvarchar(450)");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AspNetUserClaims");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<string>("ProviderKey")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<string>("ProviderDisplayName")
.HasColumnType("nvarchar(max)");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("nvarchar(450)");
b.HasKey("LoginProvider", "ProviderKey");
b.HasIndex("UserId");
b.ToTable("AspNetUserLogins");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("nvarchar(450)");
b.Property<string>("RoleId")
.HasColumnType("nvarchar(450)");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId");
b.ToTable("AspNetUserRoles");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("nvarchar(450)");
b.Property<string>("LoginProvider")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<string>("Name")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<string>("Value")
.HasColumnType("nvarchar(max)");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AspNetUserTokens");
});
modelBuilder.Entity("StudyLib.API.Models.Comment", b =>
{
b.Property<long>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
b.Property<long>("SubjectId")
.HasColumnType("bigint");
b.Property<string>("Text")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.HasKey("ID");
b.HasIndex("SubjectId");
b.ToTable("Comments");
});
modelBuilder.Entity("StudyLib.API.Models.Group", b =>
{
b.Property<long>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
b.Property<string>("AdminId")
.HasColumnType("nvarchar(max)");
b.Property<string>("Name")
.HasColumnType("nvarchar(max)");
b.Property<int>("Year")
.HasColumnType("int");
b.HasKey("ID");
b.ToTable("Groups");
});
modelBuilder.Entity("StudyLib.API.Models.GroupCandidate", b =>
{
b.Property<long>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
b.Property<long>("GroupId")
.HasColumnType("bigint");
b.Property<string>("UserId")
.HasColumnType("nvarchar(450)");
b.HasKey("ID");
b.HasIndex("GroupId");
b.HasIndex("UserId");
b.ToTable("GroupCandidates");
});
modelBuilder.Entity("StudyLib.API.Models.SubjectDeleteRequest", b =>
{
b.Property<long>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
b.Property<long>("SubjectId")
.HasColumnType("bigint");
b.HasKey("ID");
b.HasIndex("SubjectId");
b.ToTable("SubjectDeleteRequests");
});
modelBuilder.Entity("StudyLib.API.Models.User", b =>
{
b.Property<string>("Id")
.HasColumnType("nvarchar(450)");
b.Property<int>("AccessFailedCount")
.HasColumnType("int");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("nvarchar(max)");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<bool>("EmailConfirmed")
.HasColumnType("bit");
b.Property<string>("FullName")
.HasColumnType("nvarchar(max)");
b.Property<bool>("LockoutEnabled")
.HasColumnType("bit");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("datetimeoffset");
b.Property<string>("NormalizedEmail")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<string>("NormalizedUserName")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<string>("PasswordHash")
.HasColumnType("nvarchar(max)");
b.Property<string>("PhoneNumber")
.HasColumnType("nvarchar(max)");
b.Property<bool>("PhoneNumberConfirmed")
.HasColumnType("bit");
b.Property<string>("SecurityStamp")
.HasColumnType("nvarchar(max)");
b.Property<bool>("TwoFactorEnabled")
.HasColumnType("bit");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasDatabaseName("UserNameIndex")
.HasFilter("[NormalizedUserName] IS NOT NULL");
b.ToTable("AspNetUsers");
});
modelBuilder.Entity("StudyLib.Models.Assignment", b =>
{
b.Property<long>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
b.Property<DateTime>("Deadline")
.HasColumnType("datetime2");
b.Property<string>("Description")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<double>("FinalMarkPercent")
.HasColumnType("float");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<long>("SubjectId")
.HasColumnType("bigint");
b.HasKey("ID");
b.HasIndex("SubjectId");
b.ToTable("Assignments");
});
modelBuilder.Entity("StudyLib.Models.Subject", b =>
{
b.Property<long>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
b.Property<DateTime>("ExamDate")
.HasColumnType("datetime2");
b.Property<long>("GroupId")
.HasColumnType("bigint");
b.Property<string>("LabTeacher")
.HasColumnType("nvarchar(max)");
b.Property<string>("LectureTeacher")
.HasColumnType("nvarchar(max)");
b.Property<bool>("MainExam")
.HasColumnType("bit");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<string>("editedBy")
.HasColumnType("nvarchar(max)");
b.HasKey("ID");
b.HasIndex("GroupId");
b.ToTable("Subjects");
});
modelBuilder.Entity("StudyLib.Models.Test", b =>
{
b.Property<long>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
b.Property<DateTime>("Date")
.HasColumnType("datetime2");
b.Property<double>("FinalMarkPercent")
.HasColumnType("float");
b.Property<string>("Scope")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<long>("SubjectId")
.HasColumnType("bigint");
b.HasKey("ID");
b.HasIndex("SubjectId");
b.ToTable("Tests");
});
modelBuilder.Entity("GroupUser", b =>
{
b.HasOne("StudyLib.API.Models.Group", null)
.WithMany()
.HasForeignKey("GroupsID")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("StudyLib.API.Models.User", null)
.WithMany()
.HasForeignKey("UsersId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.HasOne("StudyLib.API.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.HasOne("StudyLib.API.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("StudyLib.API.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.HasOne("StudyLib.API.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("StudyLib.API.Models.Comment", b =>
{
b.HasOne("StudyLib.Models.Subject", "Subject")
.WithMany("Comments")
.HasForeignKey("SubjectId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Subject");
});
modelBuilder.Entity("StudyLib.API.Models.GroupCandidate", b =>
{
b.HasOne("StudyLib.API.Models.Group", "Group")
.WithMany("GroupCandidates")
.HasForeignKey("GroupId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("StudyLib.API.Models.User", "User")
.WithMany("GroupCandidates")
.HasForeignKey("UserId");
b.Navigation("Group");
b.Navigation("User");
});
modelBuilder.Entity("StudyLib.API.Models.SubjectDeleteRequest", b =>
{
b.HasOne("StudyLib.Models.Subject", "Subject")
.WithMany()
.HasForeignKey("SubjectId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Subject");
});
modelBuilder.Entity("StudyLib.Models.Assignment", b =>
{
b.HasOne("StudyLib.Models.Subject", "Subject")
.WithMany("Assignments")
.HasForeignKey("SubjectId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Subject");
});
modelBuilder.Entity("StudyLib.Models.Subject", b =>
{
b.HasOne("StudyLib.API.Models.Group", "Group")
.WithMany("Subjects")
.HasForeignKey("GroupId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Group");
});
modelBuilder.Entity("StudyLib.Models.Test", b =>
{
b.HasOne("StudyLib.Models.Subject", "Subject")
.WithMany("Tests")
.HasForeignKey("SubjectId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Subject");
});
modelBuilder.Entity("StudyLib.API.Models.Group", b =>
{
b.Navigation("GroupCandidates");
b.Navigation("Subjects");
});
modelBuilder.Entity("StudyLib.API.Models.User", b =>
{
b.Navigation("GroupCandidates");
});
modelBuilder.Entity("StudyLib.Models.Subject", b =>
{
b.Navigation("Assignments");
b.Navigation("Comments");
b.Navigation("Tests");
});
#pragma warning restore 612, 618
}
}
}

View File

@ -0,0 +1,23 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace StudyLib.Migrations
{
public partial class EditedBy : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "editedBy",
table: "Subjects",
type: "nvarchar(max)",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "editedBy",
table: "Subjects");
}
}
}

View File

@ -0,0 +1,578 @@
// <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 StudyLib.API.Data;
namespace StudyLib.Migrations
{
[DbContext(typeof(StudyLibContext))]
[Migration("20210103193005_EditedBy2")]
partial class EditedBy2
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.UseIdentityColumns()
.HasAnnotation("Relational:MaxIdentifierLength", 128)
.HasAnnotation("ProductVersion", "5.0.0");
modelBuilder.Entity("GroupUser", b =>
{
b.Property<long>("GroupsID")
.HasColumnType("bigint");
b.Property<string>("UsersId")
.HasColumnType("nvarchar(450)");
b.HasKey("GroupsID", "UsersId");
b.HasIndex("UsersId");
b.ToTable("GroupUser");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
{
b.Property<string>("Id")
.HasColumnType("nvarchar(450)");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("nvarchar(max)");
b.Property<string>("Name")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<string>("NormalizedName")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasDatabaseName("RoleNameIndex")
.HasFilter("[NormalizedName] IS NOT NULL");
b.ToTable("AspNetRoles");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.UseIdentityColumn();
b.Property<string>("ClaimType")
.HasColumnType("nvarchar(max)");
b.Property<string>("ClaimValue")
.HasColumnType("nvarchar(max)");
b.Property<string>("RoleId")
.IsRequired()
.HasColumnType("nvarchar(450)");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AspNetRoleClaims");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.UseIdentityColumn();
b.Property<string>("ClaimType")
.HasColumnType("nvarchar(max)");
b.Property<string>("ClaimValue")
.HasColumnType("nvarchar(max)");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("nvarchar(450)");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AspNetUserClaims");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<string>("ProviderKey")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<string>("ProviderDisplayName")
.HasColumnType("nvarchar(max)");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("nvarchar(450)");
b.HasKey("LoginProvider", "ProviderKey");
b.HasIndex("UserId");
b.ToTable("AspNetUserLogins");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("nvarchar(450)");
b.Property<string>("RoleId")
.HasColumnType("nvarchar(450)");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId");
b.ToTable("AspNetUserRoles");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("nvarchar(450)");
b.Property<string>("LoginProvider")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<string>("Name")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<string>("Value")
.HasColumnType("nvarchar(max)");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AspNetUserTokens");
});
modelBuilder.Entity("StudyLib.API.Models.Comment", b =>
{
b.Property<long>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
b.Property<long>("SubjectId")
.HasColumnType("bigint");
b.Property<string>("Text")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.HasKey("ID");
b.HasIndex("SubjectId");
b.ToTable("Comments");
});
modelBuilder.Entity("StudyLib.API.Models.Group", b =>
{
b.Property<long>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
b.Property<string>("AdminId")
.HasColumnType("nvarchar(max)");
b.Property<string>("Name")
.HasColumnType("nvarchar(max)");
b.Property<int>("Year")
.HasColumnType("int");
b.HasKey("ID");
b.ToTable("Groups");
});
modelBuilder.Entity("StudyLib.API.Models.GroupCandidate", b =>
{
b.Property<long>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
b.Property<long>("GroupId")
.HasColumnType("bigint");
b.Property<string>("UserId")
.HasColumnType("nvarchar(450)");
b.HasKey("ID");
b.HasIndex("GroupId");
b.HasIndex("UserId");
b.ToTable("GroupCandidates");
});
modelBuilder.Entity("StudyLib.API.Models.SubjectDeleteRequest", b =>
{
b.Property<long>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
b.Property<long>("SubjectId")
.HasColumnType("bigint");
b.HasKey("ID");
b.HasIndex("SubjectId");
b.ToTable("SubjectDeleteRequests");
});
modelBuilder.Entity("StudyLib.API.Models.User", b =>
{
b.Property<string>("Id")
.HasColumnType("nvarchar(450)");
b.Property<int>("AccessFailedCount")
.HasColumnType("int");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("nvarchar(max)");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<bool>("EmailConfirmed")
.HasColumnType("bit");
b.Property<string>("FullName")
.HasColumnType("nvarchar(max)");
b.Property<bool>("LockoutEnabled")
.HasColumnType("bit");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("datetimeoffset");
b.Property<string>("NormalizedEmail")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<string>("NormalizedUserName")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<string>("PasswordHash")
.HasColumnType("nvarchar(max)");
b.Property<string>("PhoneNumber")
.HasColumnType("nvarchar(max)");
b.Property<bool>("PhoneNumberConfirmed")
.HasColumnType("bit");
b.Property<string>("SecurityStamp")
.HasColumnType("nvarchar(max)");
b.Property<bool>("TwoFactorEnabled")
.HasColumnType("bit");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasDatabaseName("UserNameIndex")
.HasFilter("[NormalizedUserName] IS NOT NULL");
b.ToTable("AspNetUsers");
});
modelBuilder.Entity("StudyLib.Models.Assignment", b =>
{
b.Property<long>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
b.Property<DateTime>("Deadline")
.HasColumnType("datetime2");
b.Property<string>("Description")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<double>("FinalMarkPercent")
.HasColumnType("float");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<long>("SubjectId")
.HasColumnType("bigint");
b.HasKey("ID");
b.HasIndex("SubjectId");
b.ToTable("Assignments");
});
modelBuilder.Entity("StudyLib.Models.Subject", b =>
{
b.Property<long>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
b.Property<string>("EditedBy")
.HasColumnType("nvarchar(max)");
b.Property<DateTime>("ExamDate")
.HasColumnType("datetime2");
b.Property<long>("GroupId")
.HasColumnType("bigint");
b.Property<string>("LabTeacher")
.HasColumnType("nvarchar(max)");
b.Property<string>("LectureTeacher")
.HasColumnType("nvarchar(max)");
b.Property<bool>("MainExam")
.HasColumnType("bit");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.HasKey("ID");
b.HasIndex("GroupId");
b.ToTable("Subjects");
});
modelBuilder.Entity("StudyLib.Models.Test", b =>
{
b.Property<long>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.UseIdentityColumn();
b.Property<DateTime>("Date")
.HasColumnType("datetime2");
b.Property<double>("FinalMarkPercent")
.HasColumnType("float");
b.Property<string>("Scope")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<long>("SubjectId")
.HasColumnType("bigint");
b.HasKey("ID");
b.HasIndex("SubjectId");
b.ToTable("Tests");
});
modelBuilder.Entity("GroupUser", b =>
{
b.HasOne("StudyLib.API.Models.Group", null)
.WithMany()
.HasForeignKey("GroupsID")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("StudyLib.API.Models.User", null)
.WithMany()
.HasForeignKey("UsersId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.HasOne("StudyLib.API.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.HasOne("StudyLib.API.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("StudyLib.API.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.HasOne("StudyLib.API.Models.User", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("StudyLib.API.Models.Comment", b =>
{
b.HasOne("StudyLib.Models.Subject", "Subject")
.WithMany("Comments")
.HasForeignKey("SubjectId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Subject");
});
modelBuilder.Entity("StudyLib.API.Models.GroupCandidate", b =>
{
b.HasOne("StudyLib.API.Models.Group", "Group")
.WithMany("GroupCandidates")
.HasForeignKey("GroupId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("StudyLib.API.Models.User", "User")
.WithMany("GroupCandidates")
.HasForeignKey("UserId");
b.Navigation("Group");
b.Navigation("User");
});
modelBuilder.Entity("StudyLib.API.Models.SubjectDeleteRequest", b =>
{
b.HasOne("StudyLib.Models.Subject", "Subject")
.WithMany()
.HasForeignKey("SubjectId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Subject");
});
modelBuilder.Entity("StudyLib.Models.Assignment", b =>
{
b.HasOne("StudyLib.Models.Subject", "Subject")
.WithMany("Assignments")
.HasForeignKey("SubjectId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Subject");
});
modelBuilder.Entity("StudyLib.Models.Subject", b =>
{
b.HasOne("StudyLib.API.Models.Group", "Group")
.WithMany("Subjects")
.HasForeignKey("GroupId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Group");
});
modelBuilder.Entity("StudyLib.Models.Test", b =>
{
b.HasOne("StudyLib.Models.Subject", "Subject")
.WithMany("Tests")
.HasForeignKey("SubjectId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Subject");
});
modelBuilder.Entity("StudyLib.API.Models.Group", b =>
{
b.Navigation("GroupCandidates");
b.Navigation("Subjects");
});
modelBuilder.Entity("StudyLib.API.Models.User", b =>
{
b.Navigation("GroupCandidates");
});
modelBuilder.Entity("StudyLib.Models.Subject", b =>
{
b.Navigation("Assignments");
b.Navigation("Comments");
b.Navigation("Tests");
});
#pragma warning restore 612, 618
}
}
}

View File

@ -0,0 +1,23 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace StudyLib.Migrations
{
public partial class EditedBy2 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "editedBy",
table: "Subjects",
newName: "EditedBy");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "EditedBy",
table: "Subjects",
newName: "editedBy");
}
}
}

View File

@ -356,6 +356,9 @@ namespace StudyLib.Migrations
.HasColumnType("bigint") .HasColumnType("bigint")
.UseIdentityColumn(); .UseIdentityColumn();
b.Property<string>("EditedBy")
.HasColumnType("nvarchar(max)");
b.Property<DateTime>("ExamDate") b.Property<DateTime>("ExamDate")
.HasColumnType("datetime2"); .HasColumnType("datetime2");

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1 +1 @@
119b850527e9f659a5a20a28f72de7822bb65ba5 1bfc0accae85c0aef096b7a83846583c2f400f56

Binary file not shown.

Binary file not shown.

Binary file not shown.