Merge pull request #180 from bhenn/master

Estória 29. Criado método para cancelar o livro.
SharebookBR · Dec 30, 2018 · f4d4ce7 · f4d4ce7
2 parents 4776e9a + b847c8a
commit f4d4ce7
Show file tree

Hide file tree

Showing 12 changed files with 385 additions and 5 deletions.
diff --git a/ShareBook/ShareBook.Api/Controllers/BookController.cs b/ShareBook/ShareBook.Api/Controllers/BookController.cs
@@ -69,6 +69,15 @@ public PagedList<BooksVM> Paged(int page, int items)
         [AuthorizationFilter(Permissions.Permission.ApproveBook)]
         public Result<Book> Approve(string id, [FromBody] ApproveBookVM model) => _service.Approve(new Guid(id), model?.ChooseDate);
 
+        [Authorize("Bearer")]
+        [HttpPost("Cancel/{id}")]
+        public Result<Book> Cancel(string id) => _service.Cancel(new Guid(id), false);
+
+        [Authorize("Bearer")]
+        [HttpPost("CancelAdmin/{id}")]
+        [AuthorizationFilter(Permissions.Permission.DonateBook)]
+        public Result<Book> CancelAdmin(string id) => _service.Cancel(new Guid(id), true);
+
         [HttpGet("FreightOptions")]
         public IList<dynamic> FreightOptions()
         {

diff --git a/ShareBook/ShareBook.Domain/Book.cs b/ShareBook/ShareBook.Domain/Book.cs
@@ -37,6 +37,8 @@ public class Book : BaseEntity
 
         public bool Approved { get; set; } = false;
 
+        public bool Canceled { get; set; } = false;
+
         public virtual ICollection<BookUser> BookUsers { get; set; }
 
         public string ImageUrl { get; set; }
@@ -55,6 +57,9 @@ public BookStatus Status()
             if (Donated())
                 return BookStatus.Donated;
 
+            if(Canceled)
+                return BookStatus.Canceled;
+
             if (Approved)
                 return BookStatus.Available;
 

diff --git a/ShareBook/ShareBook.Domain/Enums/BookStatus.cs b/ShareBook/ShareBook.Domain/Enums/BookStatus.cs
@@ -15,6 +15,8 @@ public enum BookStatus
         [Description("Invisível")]
         Invisible,
         [Description("Doado")]
-        Donated
+        Donated,
+        [Description("Cancelado")]
+        Canceled
     }
 }
diff --git a/ShareBook/ShareBook.Repository/Migrations/20181221233828_NewField_Book_Canceled.Designer.cs b/ShareBook/ShareBook.Repository/Migrations/20181221233828_NewField_Book_Canceled.Designer.cs
diff --git a/ShareBook/ShareBook.Repository/Migrations/20181221233828_NewField_Book_Canceled.cs b/ShareBook/ShareBook.Repository/Migrations/20181221233828_NewField_Book_Canceled.cs
@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Collections.Generic;
+
+namespace ShareBook.Repository.Migrations
+{
+    public partial class NewField_Book_Canceled : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "Canceled",
+                table: "Books",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Canceled",
+                table: "Books");
+        }
+    }
+}
diff --git a/ShareBook/ShareBook.Repository/Migrations/ApplicationDbContextModelSnapshot.cs b/ShareBook/ShareBook.Repository/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -82,6 +82,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("varchar(200)")
                         .HasMaxLength(50);
 
+                    b.Property<bool>("Canceled");
+
                     b.Property<Guid>("CategoryId");
 
                     b.Property<DateTime?>("ChooseDate");