diff options
Diffstat (limited to 'Timeline/Entities')
| -rw-r--r-- | Timeline/Entities/DatabaseContext.cs | 10 | ||||
| -rw-r--r-- | Timeline/Entities/TimelineEntity.cs | 4 | ||||
| -rw-r--r-- | Timeline/Entities/TimelineMemberEntity.cs | 2 | ||||
| -rw-r--r-- | Timeline/Entities/TimelinePostEntity.cs | 2 | ||||
| -rw-r--r-- | Timeline/Entities/UserAvatarEntity.cs (renamed from Timeline/Entities/UserAvatar.cs) | 6 | ||||
| -rw-r--r-- | Timeline/Entities/UserDetail.cs | 21 | ||||
| -rw-r--r-- | Timeline/Entities/UserEntity.cs (renamed from Timeline/Entities/User.cs) | 15 |
7 files changed, 21 insertions, 39 deletions
diff --git a/Timeline/Entities/DatabaseContext.cs b/Timeline/Entities/DatabaseContext.cs index ffb6158a..cac33379 100644 --- a/Timeline/Entities/DatabaseContext.cs +++ b/Timeline/Entities/DatabaseContext.cs @@ -10,16 +10,14 @@ namespace Timeline.Entities }
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1062:Validate arguments of public methods")]
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
- modelBuilder.Entity<User>().Property(e => e.Version).HasDefaultValue(0);
- modelBuilder.Entity<User>().HasIndex(e => e.Name).IsUnique();
+ modelBuilder.Entity<UserEntity>().Property(e => e.Version).HasDefaultValue(0);
+ modelBuilder.Entity<UserEntity>().HasIndex(e => e.Username).IsUnique();
}
- public DbSet<User> Users { get; set; } = default!;
- public DbSet<UserAvatar> UserAvatars { get; set; } = default!;
- public DbSet<UserDetail> UserDetails { get; set; } = default!;
+ public DbSet<UserEntity> Users { get; set; } = default!;
+ public DbSet<UserAvatarEntity> UserAvatars { get; set; } = default!;
public DbSet<TimelineEntity> Timelines { get; set; } = default!;
public DbSet<TimelinePostEntity> TimelinePosts { get; set; } = default!;
public DbSet<TimelineMemberEntity> TimelineMembers { get; set; } = default!;
diff --git a/Timeline/Entities/TimelineEntity.cs b/Timeline/Entities/TimelineEntity.cs index 9cacfcae..c50fe6dd 100644 --- a/Timeline/Entities/TimelineEntity.cs +++ b/Timeline/Entities/TimelineEntity.cs @@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using Timeline.Models;
+using Timeline.Models.Http;
namespace Timeline.Entities
{
@@ -26,7 +26,7 @@ namespace Timeline.Entities public long OwnerId { get; set; }
[ForeignKey(nameof(OwnerId))]
- public User Owner { get; set; } = default!;
+ public UserEntity Owner { get; set; } = default!;
[Column("visibility")]
public TimelineVisibility Visibility { get; set; }
diff --git a/Timeline/Entities/TimelineMemberEntity.cs b/Timeline/Entities/TimelineMemberEntity.cs index dbe861bd..e76f2099 100644 --- a/Timeline/Entities/TimelineMemberEntity.cs +++ b/Timeline/Entities/TimelineMemberEntity.cs @@ -13,7 +13,7 @@ namespace Timeline.Entities public long UserId { get; set; }
[ForeignKey(nameof(UserId))]
- public User User { get; set; } = default!;
+ public UserEntity User { get; set; } = default!;
[Column("timeline")]
public long TimelineId { get; set; }
diff --git a/Timeline/Entities/TimelinePostEntity.cs b/Timeline/Entities/TimelinePostEntity.cs index efef3ab5..a615c61f 100644 --- a/Timeline/Entities/TimelinePostEntity.cs +++ b/Timeline/Entities/TimelinePostEntity.cs @@ -20,7 +20,7 @@ namespace Timeline.Entities public long AuthorId { get; set; }
[ForeignKey(nameof(AuthorId))]
- public User Author { get; set; } = default!;
+ public UserEntity Author { get; set; } = default!;
[Column("content")]
public string? Content { get; set; }
diff --git a/Timeline/Entities/UserAvatar.cs b/Timeline/Entities/UserAvatarEntity.cs index 114246f3..6cecce1a 100644 --- a/Timeline/Entities/UserAvatar.cs +++ b/Timeline/Entities/UserAvatarEntity.cs @@ -6,7 +6,7 @@ namespace Timeline.Entities {
[System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1819:Properties should not return arrays", Justification = "This is data base entity.")]
[Table("user_avatars")]
- public class UserAvatar
+ public class UserAvatarEntity
{
[Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public long Id { get; set; }
@@ -23,6 +23,10 @@ namespace Timeline.Entities [Column("last_modified"), Required]
public DateTime LastModified { get; set; }
+ [Column("user"), Required]
public long UserId { get; set; }
+
+ [ForeignKey(nameof(UserId))]
+ public UserEntity User { get; set; } = default!;
}
}
diff --git a/Timeline/Entities/UserDetail.cs b/Timeline/Entities/UserDetail.cs deleted file mode 100644 index 45f87e2b..00000000 --- a/Timeline/Entities/UserDetail.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Timeline.Entities
-{
- [Table("user_details")]
- public class UserDetail
- {
- [Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
- public long Id { get; set; }
-
- [Column("nickname"), MaxLength(26)]
- public string? Nickname { get; set; }
-
- public long UserId { get; set; }
- }
-}
diff --git a/Timeline/Entities/User.cs b/Timeline/Entities/UserEntity.cs index e725a69a..946c3fa2 100644 --- a/Timeline/Entities/User.cs +++ b/Timeline/Entities/UserEntity.cs @@ -12,26 +12,27 @@ namespace Timeline.Entities [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification = "This is an entity class.")]
[Table("users")]
- public class User
+ public class UserEntity
{
[Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public long Id { get; set; }
- [Column("name"), MaxLength(26), Required]
- public string Name { get; set; } = default!;
+ [Column("username"), MaxLength(26), Required]
+ public string Username { get; set; } = default!;
[Column("password"), Required]
- public string EncryptedPassword { get; set; } = default!;
+ public string Password { get; set; } = default!;
[Column("roles"), Required]
- public string RoleString { get; set; } = default!;
+ public string Roles { get; set; } = default!;
[Column("version"), Required]
public long Version { get; set; }
- public UserAvatar? Avatar { get; set; }
+ [Column("nickname"), MaxLength(100)]
+ public string? Nickname { get; set; }
- public UserDetail? Detail { get; set; }
+ public UserAvatarEntity? Avatar { get; set; }
public List<TimelineEntity> Timelines { get; set; } = default!;
|