From 4be2cd2d465d97bc891329abf7a60b4980bd059f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 11 Sep 2017 17:29:25 +0300 Subject: [PATCH] Rename PersonAppService to PeopleAppService --- .../AspNetCore/Mvc/PersonAppService_Tests.cs | 30 +++++++++---------- .../Application/PersonAppService_Tests.cs | 6 ++-- ...rsonAppService.cs => IPeopleAppService.cs} | 4 +-- ...ersonAppService.cs => PeopleAppService.cs} | 6 ++-- 4 files changed, 23 insertions(+), 23 deletions(-) rename test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/{IPersonAppService.cs => IPeopleAppService.cs} (74%) rename test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/{PersonAppService.cs => PeopleAppService.cs} (85%) diff --git a/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/PersonAppService_Tests.cs b/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/PersonAppService_Tests.cs index 6cab463dab..b8b1739ec4 100644 --- a/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/PersonAppService_Tests.cs +++ b/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/PersonAppService_Tests.cs @@ -34,8 +34,8 @@ namespace Volo.Abp.AspNetCore.Mvc [Fact] public async Task GetAll_Test() { - //Ideally should be [GET] /api/app/person OK! - var result = await GetResponseAsObjectAsync>("/api/app/person"); + //Ideally should be [GET] /api/app/people OK! + var result = await GetResponseAsObjectAsync>("/api/app/people"); result.Items.Count.ShouldBeGreaterThan(0); } @@ -44,8 +44,8 @@ namespace Volo.Abp.AspNetCore.Mvc { var firstPerson = _personRepository.GetList().First(); - //Ideally should be [GET] /api/app/person/{id} OK! - var result = await GetResponseAsObjectAsync($"/api/app/person/{firstPerson.Id}"); + //Ideally should be [GET] /api/app/people/{id} OK! + var result = await GetResponseAsObjectAsync($"/api/app/people/{firstPerson.Id}"); result.Name.ShouldBe(firstPerson.Name); } @@ -54,8 +54,8 @@ namespace Volo.Abp.AspNetCore.Mvc { var firstPerson = _personRepository.GetList().First(); - //Ideally should be [DELETE] /api/app/person/{id} OK! - await Client.DeleteAsync($"/api/app/person/{firstPerson.Id}"); + //Ideally should be [DELETE] /api/app/people/{id} OK! + await Client.DeleteAsync($"/api/app/people/{firstPerson.Id}"); (await _personRepository.FindAsync(firstPerson.Id)).ShouldBeNull(); } @@ -67,9 +67,9 @@ namespace Volo.Abp.AspNetCore.Mvc var postData = _jsonSerializer.Serialize(new PersonDto {Name = "John", Age = 33}); - //Ideally should be [POST] /api/app/person OK! + //Ideally should be [POST] /api/app/people OK! var response = await Client.PostAsync( - "/api/app/person", + "/api/app/people", new StringContent(postData, Encoding.UTF8, "application/json") ); @@ -100,9 +100,9 @@ namespace Volo.Abp.AspNetCore.Mvc //Act - //Ideally should be [PUT] /api/app/person/{id} OK! + //Ideally should be [PUT] /api/app/people/{id} OK! var response = await Client.PutAsync( - $"/api/app/person/{updateDto.Id}", + $"/api/app/people/{updateDto.Id}", new StringContent(putData, Encoding.UTF8, "application/json") ); @@ -136,7 +136,7 @@ namespace Volo.Abp.AspNetCore.Mvc //Ideally should be [POST] /api/people/{id}/phones var response = await Client.PostAsync( - $"/api/app/person/{personToAddNewPhone.Id}/Phone", + $"/api/app/people/{personToAddNewPhone.Id}/Phone", new StringContent(postData, Encoding.UTF8, "application/json") ); @@ -159,8 +159,8 @@ namespace Volo.Abp.AspNetCore.Mvc { var douglas = _personRepository.GetList().First(p => p.Name == "Douglas"); - //Ideally should be [GET] /api/person/{id}/phones?type=office - var result = await GetResponseAsObjectAsync>($"/api/app/person/{douglas.Id}/Phones"); + //Ideally should be [GET] /api/people/{id}/phones?type=office + var result = await GetResponseAsObjectAsync>($"/api/app/people/{douglas.Id}/Phones"); result.Items.Count.ShouldBe(douglas.Phones.Count); } @@ -170,8 +170,8 @@ namespace Volo.Abp.AspNetCore.Mvc var douglas = _personRepository.GetList().First(p => p.Name == "Douglas"); var firstPhone = douglas.Phones.First(); - //Ideally should be [DELETE] /api/app/person/{id}/phones/{phoneId} - await Client.DeleteAsync($"/api/app/person/{douglas.Id}/Phone?phoneId=" + firstPhone.Id); + //Ideally should be [DELETE] /api/app/people/{id}/phones/{phoneId} + await Client.DeleteAsync($"/api/app/people/{douglas.Id}/Phone?phoneId=" + firstPhone.Id); douglas = _personRepository.GetList().First(p => p.Name == "Douglas"); douglas.Phones.Any(p => p.Id == firstPhone.Id).ShouldBeFalse(); diff --git a/test/Volo.Abp.TestApp.Tests/Volo/Abp/TestApp/Application/PersonAppService_Tests.cs b/test/Volo.Abp.TestApp.Tests/Volo/Abp/TestApp/Application/PersonAppService_Tests.cs index ef268dbc18..966821f83e 100644 --- a/test/Volo.Abp.TestApp.Tests/Volo/Abp/TestApp/Application/PersonAppService_Tests.cs +++ b/test/Volo.Abp.TestApp.Tests/Volo/Abp/TestApp/Application/PersonAppService_Tests.cs @@ -8,17 +8,17 @@ namespace Volo.Abp.TestApp.Application { public class PersonAppService_Tests : TestAppTestBase { - private readonly IPersonAppService _personAppService; + private readonly IPeopleAppService _peopleAppService; public PersonAppService_Tests() { - _personAppService = ServiceProvider.GetRequiredService(); + _peopleAppService = ServiceProvider.GetRequiredService(); } [Fact] public async Task GetAll() { - var people = await _personAppService.GetList(new PagedAndSortedResultRequestDto()); + var people = await _peopleAppService.GetList(new PagedAndSortedResultRequestDto()); people.Items.Count.ShouldBeGreaterThan(0); } } diff --git a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/IPersonAppService.cs b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/IPeopleAppService.cs similarity index 74% rename from test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/IPersonAppService.cs rename to test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/IPeopleAppService.cs index 7f241f70f5..cd1a3932a6 100644 --- a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/IPersonAppService.cs +++ b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/IPeopleAppService.cs @@ -5,12 +5,12 @@ using Volo.Abp.Application.Services; namespace Volo.Abp.TestApp.Application { - public interface IPersonAppService : IAsyncCrudAppService + public interface IPeopleAppService : IAsyncCrudAppService { Task> GetPhones(Guid id, GetPersonPhonesFilter filter); Task AddPhone(Guid id, PhoneDto phoneDto); - Task DeletePhone(Guid id, long phoneId); + Task RemovePhone(Guid id, long phoneId); } } \ No newline at end of file diff --git a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PersonAppService.cs b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs similarity index 85% rename from test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PersonAppService.cs rename to test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs index 2936e100e6..2b41185905 100644 --- a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PersonAppService.cs +++ b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/PeopleAppService.cs @@ -9,9 +9,9 @@ using Volo.Abp.Application.Services; namespace Volo.Abp.TestApp.Application { - public class PersonAppService : AsyncCrudAppService, IPersonAppService + public class PeopleAppService : AsyncCrudAppService, IPeopleAppService { - public PersonAppService(IQueryableRepository repository) + public PeopleAppService(IQueryableRepository repository) : base(repository) { @@ -38,7 +38,7 @@ namespace Volo.Abp.TestApp.Application return ObjectMapper.Map(phone); } - public async Task DeletePhone(Guid id, long phoneId) + public async Task RemovePhone(Guid id, long phoneId) { var person = await GetEntityByIdAsync(id); person.Phones.RemoveAll(p => p.Id == phoneId);