From ea67db0b2971271612a2fdf9631b1fe4d6ca7e07 Mon Sep 17 00:00:00 2001 From: 杨宇千 Date: Sat, 24 Aug 2019 22:24:04 +0800 Subject: Rename EMail to Email. --- Timeline.Tests/IntegratedTests/UserDetailTest.cs | 6 +++--- Timeline.Tests/UserDetailServiceTest.cs | 20 ++++++++++---------- Timeline/Entities/UserDetail.cs | 2 +- Timeline/Models/UserDetail.cs | 6 ++++-- Timeline/Services/UserDetailService.cs | 4 ++-- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Timeline.Tests/IntegratedTests/UserDetailTest.cs b/Timeline.Tests/IntegratedTests/UserDetailTest.cs index 4923cd06..ba15b7ca 100644 --- a/Timeline.Tests/IntegratedTests/UserDetailTest.cs +++ b/Timeline.Tests/IntegratedTests/UserDetailTest.cs @@ -67,7 +67,7 @@ namespace Timeline.Tests.IntegratedTests { Nickname = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", QQ = "aaaaaaa", - EMail = "aaaaaa", + Email = "aaaaaa", PhoneNumber = "aaaaaaaa" }); var body = res.Should().HaveStatusCode(HttpStatusCode.BadRequest) @@ -84,7 +84,7 @@ namespace Timeline.Tests.IntegratedTests { Nickname = "aaa", QQ = "1234567", - EMail = "aaaa@aaa.net", + Email = "aaaa@aaa.net", Description = "aaaaaaaaa" }; @@ -117,7 +117,7 @@ namespace Timeline.Tests.IntegratedTests { Nickname = detail.Nickname, QQ = null, - EMail = detail.EMail, + Email = detail.Email, PhoneNumber = detail2.PhoneNumber, Description = detail2.Description }); diff --git a/Timeline.Tests/UserDetailServiceTest.cs b/Timeline.Tests/UserDetailServiceTest.cs index f9170c42..7bbb2246 100644 --- a/Timeline.Tests/UserDetailServiceTest.cs +++ b/Timeline.Tests/UserDetailServiceTest.cs @@ -66,7 +66,7 @@ namespace Timeline.Tests var detail = context.UserDetails.Where(e => e.UserId == userId).Single(); detail.Nickname.Should().BeNullOrEmpty(); detail.QQ.Should().BeNullOrEmpty(); - detail.EMail.Should().BeNullOrEmpty(); + detail.Email.Should().BeNullOrEmpty(); detail.PhoneNumber.Should().BeNullOrEmpty(); detail.Description.Should().BeNullOrEmpty(); } @@ -128,7 +128,7 @@ namespace Timeline.Tests var detail = context.UserDetails.Where(e => e.UserId == userId).Single(); detail.Nickname.Should().BeNullOrEmpty(); detail.QQ.Should().BeNullOrEmpty(); - detail.EMail.Should().BeNullOrEmpty(); + detail.Email.Should().BeNullOrEmpty(); detail.PhoneNumber.Should().BeNullOrEmpty(); detail.Description.Should().BeNullOrEmpty(); } @@ -146,7 +146,7 @@ namespace Timeline.Tests var userId = await DatabaseExtensions.CheckAndGetUser(context.Users, MockUsers.UserUsername); var entity = new UserDetailEntity { - EMail = email, + Email = email, Description = description, UserId = userId }; @@ -158,7 +158,7 @@ namespace Timeline.Tests var detail = await _service.GetUserDetail(MockUsers.UserUsername); detail.Should().BeEquivalentTo(new UserDetail { - EMail = email, + Email = email, Description = description }); } @@ -194,7 +194,7 @@ namespace Timeline.Tests var entity = context.UserDetails.Where(e => e.UserId == userId).Single(); entity.Nickname.Should().BeNullOrEmpty(); entity.QQ.Should().BeNullOrEmpty(); - entity.EMail.Should().BeNullOrEmpty(); + entity.Email.Should().BeNullOrEmpty(); entity.PhoneNumber.Should().BeNullOrEmpty(); entity.Description.Should().BeNullOrEmpty(); } @@ -202,7 +202,7 @@ namespace Timeline.Tests [Theory] [InlineData(nameof(UserDetail.Nickname), nameof(UserDetailEntity.Nickname), "aaaa", "bbbb")] [InlineData(nameof(UserDetail.QQ), nameof(UserDetailEntity.QQ), "12345678910", "987654321")] - [InlineData(nameof(UserDetail.EMail), nameof(UserDetailEntity.EMail), "aaa@aaa.aaa", "bbb@bbb.bbb")] + [InlineData(nameof(UserDetail.Email), nameof(UserDetailEntity.Email), "aaa@aaa.aaa", "bbb@bbb.bbb")] [InlineData(nameof(UserDetail.PhoneNumber), nameof(UserDetailEntity.PhoneNumber), "12345678910", "987654321")] [InlineData(nameof(UserDetail.Description), nameof(UserDetailEntity.Description), "descriptionA", "descriptionB")] public async Task UpdateDetail_Single_Should_Work(string propertyName, string entityPropertyName, string mockData1, string mockData2) @@ -242,7 +242,7 @@ namespace Timeline.Tests var detail = new UserDetail { QQ = "12345678", - EMail = "aaa@aaa.aaa", + Email = "aaa@aaa.aaa", PhoneNumber = "11111111111", Description = "aaaaaaaaaa" }; @@ -253,21 +253,21 @@ namespace Timeline.Tests var userId = await DatabaseExtensions.CheckAndGetUser(context.Users, MockUsers.UserUsername); var entity = context.UserDetails.Where(e => e.UserId == userId).Single(); entity.QQ.Should().Equals(detail.QQ); - entity.EMail.Should().Equals(detail.EMail); + entity.Email.Should().Equals(detail.Email); entity.PhoneNumber.Should().Equals(detail.PhoneNumber); entity.Description.Should().Equals(detail.Description); var detail2 = new UserDetail { QQ = null, - EMail = "bbb@bbb.bbb", + Email = "bbb@bbb.bbb", PhoneNumber = "", Description = "bbbbbbbbb" }; await _service.UpdateUserDetail(MockUsers.UserUsername, detail2); entity.QQ.Should().Equals(detail.QQ); - entity.EMail.Should().Equals(detail2.EMail); + entity.Email.Should().Equals(detail2.Email); entity.PhoneNumber.Should().BeNullOrEmpty(); entity.Description.Should().Equals(detail2.Description); } diff --git a/Timeline/Entities/UserDetail.cs b/Timeline/Entities/UserDetail.cs index 6e582234..bc14dbe6 100644 --- a/Timeline/Entities/UserDetail.cs +++ b/Timeline/Entities/UserDetail.cs @@ -16,7 +16,7 @@ namespace Timeline.Entities public string QQ { get; set; } [Column("email"), MaxLength(50)] - public string EMail { get; set; } + public string Email { get; set; } [Column("phone_number"), MaxLength(15)] public string PhoneNumber { get; set; } diff --git a/Timeline/Models/UserDetail.cs b/Timeline/Models/UserDetail.cs index 86866d8b..1a6c0c6a 100644 --- a/Timeline/Models/UserDetail.cs +++ b/Timeline/Models/UserDetail.cs @@ -1,6 +1,7 @@ using System.ComponentModel.DataAnnotations; using Timeline.Entities; using Timeline.Models.Validation; +using Newtonsoft.Json; namespace Timeline.Models { @@ -10,10 +11,11 @@ namespace Timeline.Models public string Nickname { get; set; } [ValidateWith(typeof(UserDetailValidators.QQValidator))] + [JsonProperty(PropertyName = "qq")] public string QQ { get; set; } [ValidateWith(typeof(UserDetailValidators.EMailValidator))] - public string EMail { get; set; } + public string Email { get; set; } [ValidateWith(typeof(UserDetailValidators.PhoneNumberValidator))] public string PhoneNumber { get; set; } @@ -34,7 +36,7 @@ namespace Timeline.Models { Nickname = CoerceEmptyToNull(entity.Nickname), QQ = CoerceEmptyToNull(entity.QQ), - EMail = CoerceEmptyToNull(entity.EMail), + Email = CoerceEmptyToNull(entity.Email), PhoneNumber = CoerceEmptyToNull(entity.PhoneNumber), Description = CoerceEmptyToNull(entity.Description) }; diff --git a/Timeline/Services/UserDetailService.cs b/Timeline/Services/UserDetailService.cs index a8ed662b..5e049435 100644 --- a/Timeline/Services/UserDetailService.cs +++ b/Timeline/Services/UserDetailService.cs @@ -111,8 +111,8 @@ namespace Timeline.Services if (detail.QQ != null) detailEntity.QQ = detail.QQ; - if (detail.EMail != null) - detailEntity.EMail = detail.EMail; + if (detail.Email != null) + detailEntity.Email = detail.Email; if (detail.PhoneNumber != null) detailEntity.PhoneNumber = detail.PhoneNumber; -- cgit v1.2.3