Merge pull request #185 from raffacabofrio/master

Adicionar facilitador no endpoint "book paged list".
SharebookBR · Dec 29, 2018 · 99b3a4f · 99b3a4f
2 parents 5f492ad + a764198
commit 99b3a4f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/ShareBook/ShareBook.Api/AutoMapper/DomainToViewModelMappingProfile.cs b/ShareBook/ShareBook.Api/AutoMapper/DomainToViewModelMappingProfile.cs
@@ -14,6 +14,7 @@ protected DomainToViewModelMappingProfile(string profileName) : base(profileName
             #region [ Book ]
             CreateMap<Book, BooksVM>()
                  .ForMember(dest => dest.Donor, opt => opt.MapFrom(src => src.User.Name))
+                 .ForMember(dest => dest.Facilitator, opt => opt.MapFrom(src => src.UserFacilitator.Name))
                  .ForMember(dest => dest.Donated, opt => opt.MapFrom(src => src.Donated()))
                  .ForMember(dest => dest.PhoneDonor, opt => opt.MapFrom(src => src.User.Phone))
                  .ForMember(dest => dest.DaysInShowcase, opt => opt.MapFrom(src => src.DaysInShowcase()))

diff --git a/ShareBook/ShareBook.Api/Controllers/BookController.cs b/ShareBook/ShareBook.Api/Controllers/BookController.cs
@@ -50,7 +50,7 @@ protected void SetDefault(Expression<Func<Book, object>> defaultOrder)
         [AuthorizationFilter(Permissions.Permission.DonateBook)]
         public PagedList<BooksVM> Paged(int page, int items)
         {
-            var books = _service.Get(x => x.Title, page, items, new IncludeList<Book>(x => x.User, x => x.BookUsers));
+            var books = _service.Get(x => x.Title, page, items, new IncludeList<Book>(x => x.User, x => x.BookUsers, x => x.UserFacilitator));
             var responseVM = Mapper.Map<List<BooksVM>>(books.Items);
             return new PagedList<BooksVM>()
             {

diff --git a/ShareBook/ShareBook.Api/ViewModels/BooksVM.cs b/ShareBook/ShareBook.Api/ViewModels/BooksVM.cs
@@ -8,6 +8,7 @@ public class BooksVM
         public string Author { get; set; }
         public bool Donated { get; set; }
         public string Donor { get; set; }
+        public string Facilitator { get; set; }
         public bool Approved { get; set; }
         public string PhoneDonor { get; set; }
         public int DaysInShowcase { get; set; }

diff --git a/ShareBook/ShareBook.Repository/ShareBook.Infra.Data.csproj b/ShareBook/ShareBook.Repository/ShareBook.Infra.Data.csproj
@@ -3,16 +3,16 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JsonDiffPatch.Net" Version="2.1.0"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.3"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.3"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.3"/>
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2"/>
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.2.4"/>
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.2.4"/>
+    <PackageReference Include="JsonDiffPatch.Net" Version="2.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.2.4" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.2.4" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ShareBook.Domain\ShareBook.Domain.csproj"/>
+    <ProjectReference Include="..\ShareBook.Domain\ShareBook.Domain.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.IdentityModel.Tokens">