From 7368d0388e78228499f28b33f79891c60639fb57 Mon Sep 17 00:00:00 2001 From: crupest Date: Sun, 17 Apr 2022 22:43:19 +0800 Subject: ... --- BackEnd/Timeline/Entities/DatabaseContext.cs | 5 ++++- BackEnd/Timeline/Entities/RegisterCode.cs | 4 ++-- BackEnd/Timeline/Entities/UserEntity.cs | 3 --- BackEnd/Timeline/Entities/UserRegisterInfo.cs | 31 +++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 BackEnd/Timeline/Entities/UserRegisterInfo.cs (limited to 'BackEnd/Timeline/Entities') diff --git a/BackEnd/Timeline/Entities/DatabaseContext.cs b/BackEnd/Timeline/Entities/DatabaseContext.cs index cb776e72..7984f0a3 100644 --- a/BackEnd/Timeline/Entities/DatabaseContext.cs +++ b/BackEnd/Timeline/Entities/DatabaseContext.cs @@ -1,4 +1,4 @@ -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; namespace Timeline.Entities { @@ -36,6 +36,9 @@ namespace Timeline.Entities public DbSet UserConfigurations { get; set; } = default!; + public DbSet RegisterCodes { get; set; } = default!; + public DbSet UserRegisterInfos { get; set; } = default!; + public DbSet JwtToken { get; set; } = default!; public DbSet UserTokens { get; set; } = default!; public DbSet Data { get; set; } = default!; diff --git a/BackEnd/Timeline/Entities/RegisterCode.cs b/BackEnd/Timeline/Entities/RegisterCode.cs index 945d61e9..034dde98 100644 --- a/BackEnd/Timeline/Entities/RegisterCode.cs +++ b/BackEnd/Timeline/Entities/RegisterCode.cs @@ -10,10 +10,10 @@ namespace Timeline.Entities public long Id { get; set; } [Column("owner_id")] - public long OwnerId { get; set; } + public long? OwnerId { get; set; } [ForeignKey(nameof(OwnerId))] - public UserEntity Owner { get; set; } = default!; + public UserEntity? Owner { get; set; } = default!; [Column("code")] public string Code { get; set; } = default!; diff --git a/BackEnd/Timeline/Entities/UserEntity.cs b/BackEnd/Timeline/Entities/UserEntity.cs index 267d0ef2..d8015ccf 100644 --- a/BackEnd/Timeline/Entities/UserEntity.cs +++ b/BackEnd/Timeline/Entities/UserEntity.cs @@ -37,9 +37,6 @@ namespace Timeline.Entities [Column("last_modified")] public DateTime LastModified { get; set; } - [Column("register_code")] - public string? RegisterCode { get; set; } - public UserAvatarEntity? Avatar { get; set; } #pragma warning disable CA2227 // Collection properties should be read only diff --git a/BackEnd/Timeline/Entities/UserRegisterInfo.cs b/BackEnd/Timeline/Entities/UserRegisterInfo.cs new file mode 100644 index 00000000..1d62aadb --- /dev/null +++ b/BackEnd/Timeline/Entities/UserRegisterInfo.cs @@ -0,0 +1,31 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Timeline.Entities +{ + [Table("user_register_info")] + public class UserRegisterInfo + { + [Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public long Id { get; set; } + + [Column("user_id")] + public long UserId { get; set; } + + [ForeignKey(nameof(UserId))] + public UserEntity User { get; set; } = default!; + + [Column("register_code")] + public string RegisterCode { get; set; } = default!; + + [Column("introducer_id")] + public long? IntroducerId { get; set; } + + [ForeignKey(nameof(IntroducerId))] + public UserEntity? Introducer { get; set; } + + [Column("register_time")] + public DateTime RegisterTime { get; set; } + } +} -- cgit v1.2.3