Replace UserLogin string to userId in FilePublishInfo and some renames. In Model, no migrations needed.

This commit is contained in:
Фролов 2021-11-09 17:24:30 +05:00
parent 0f04fbe7b7
commit b643934411
5 changed files with 19 additions and 10 deletions

View File

@ -5,10 +5,19 @@ namespace AsbCloudApp.Data
public class FileMarkDto
{
public int Id { get; set; }
public int IdMark { get; set; }
public DateTime DateCreated { get; set; }
public int IdFile { get; set; }
public string UserLogin { get; set; }
public int IdMarkType { get; set; }
/// <summary>
/// дата/время добавления.
/// Необязательно указывать в запросе на создание.
/// </summary>
public DateTime DateCreated { get; set; }
public string Comment { get; set; }
public bool IsDeleted { get; set; }
/// <summary>
/// Пользователь создающий отметку.
/// Необязательно указывать в запросе на создание.
/// </summary>
public UserDto User { get; set; }
}
}

View File

@ -228,7 +228,7 @@ namespace AsbCloudDb.Model
modelBuilder.Entity<FileMark>(entity =>
{
entity.HasOne(d => d.Author)
entity.HasOne(d => d.User)
.WithMany(p => p.FileMarks)
.HasForeignKey(d => d.IdUser)
.OnDelete(DeleteBehavior.Cascade)

View File

@ -13,15 +13,15 @@ namespace AsbCloudDb.Model
[Column("id")]
public int Id { get; set; }
[Column("id_file"), Comment("id файла")]
public int IdFile { get; set; }
[Column("id_mark_type"), Comment("0 - Согласован")]
public int IdMarkType { get; set; }
[Column("date_created"), Comment("Дата совершенного действия")]
public DateTime DateCreated { get; set; }
[Column("id_file"), Comment("id файла")]
public int IdFile { get; set; }
[Column("id_user"), Comment("id пользователя")]
public int IdUser { get; set; }
@ -34,7 +34,7 @@ namespace AsbCloudDb.Model
[JsonIgnore]
[ForeignKey(nameof(IdUser))]
public virtual User Author { get; set; }
public virtual User User { get; set; }
[JsonIgnore]
[ForeignKey(nameof(IdFile))]

View File

@ -4,7 +4,7 @@ namespace AsbCloudDb.Model
{
public class FilePublishInfo
{
public string PublisherLogin { get; set; }
public int IdPublisher { get; set; }
public DateTime Date { get; set; }
public string WebStorageFileUrl { get; set; }
}

View File

@ -71,7 +71,7 @@ namespace AsbCloudDb.Model
[InverseProperty(nameof(FileInfo.Author))]
public virtual ICollection<FileInfo> Files { get; set; }
[InverseProperty(nameof(FileMark.Author))]
[InverseProperty(nameof(FileMark.User))]
public virtual ICollection<FileMark> FileMarks { get; set; }
public string MakeDisplayName()