From 6944da4a8200b6f6b26a7601f9569d2a28eba677 Mon Sep 17 00:00:00 2001 From: maliming Date: Sun, 10 Nov 2019 14:38:52 +0800 Subject: [PATCH] Remove the id property from the view. --- .../EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs | 2 +- .../Abp/TestApp/EntityFrameworkCore/PersonRepository.cs | 4 ++-- .../Volo/Abp/TestApp/Domain/IPersonRepository.cs | 2 +- .../Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs | 2 -- .../Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs | 6 +++--- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs index 8925c2bff3..71522d0216 100644 --- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs @@ -62,7 +62,7 @@ namespace Volo.Abp.EntityFrameworkCore context.GetService().CreateTables(); context.Database.ExecuteSqlRaw( @"CREATE VIEW View_PersonView AS - SELECT Id, Name, CreationTime, Birthday, LastActive FROM People"); + SELECT Name, CreationTime, Birthday, LastActive FROM People"); } return connection; diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs index e42d88c2b8..ab8c1920a7 100644 --- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs @@ -16,9 +16,9 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore { } - public async Task GetViewAsync(Guid id) + public async Task GetViewAsync(string name) { - return await DbContext.PersonView.Where(x => x.Id == id).FirstOrDefaultAsync(); + return await DbContext.PersonView.Where(x => x.Name == name).FirstOrDefaultAsync(); } } } \ No newline at end of file diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs index ac094de826..9058522346 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs @@ -8,6 +8,6 @@ namespace Volo.Abp.TestApp.Domain { public interface IPersonRepository : IBasicRepository { - Task GetViewAsync(Guid id); + Task GetViewAsync(string name); } } diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs index 72249fa541..e77827c263 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs @@ -5,8 +5,6 @@ namespace Volo.Abp.TestApp.Domain { public class PersonView { - public Guid Id { get; set; } - public string Name { get; set; } public DateTime CreationTime { get; set; } diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs index bf95982daa..e36225e53c 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs @@ -48,14 +48,14 @@ namespace Volo.Abp.TestApp.Testing [Fact] public async Task DateTime_Kind_Should_Be_Normalized_To_UTC_View_Test() { - var personId = Guid.Parse("7a942bca-c911-4473-93aa-2daf88e18fb9"); - await _personRepository.InsertAsync(new Person(personId, "bob lee", 18) + var personName = "bob lee"; + await _personRepository.InsertAsync(new Person(Guid.NewGuid(), personName, 18) { Birthday = DateTime.Parse("2020-01-01 00:00:00"), LastActive = DateTime.Parse("2020-01-01 00:00:00"), }, true); - var person = await _personRepository.GetViewAsync(personId); + var person = await _personRepository.GetViewAsync(personName); person.ShouldNotBeNull(); person.CreationTime.Kind.ShouldBe(DateTimeKind.Utc);