Merge remote-tracking branch 'origin/Amedeo' into Felix

Controllers/InventarController.cs

@@ -27,16 +27,16 @@ namespace BuecherwurmAPI.Controllers
 
         // POST Inventar
         [HttpPost]
-        public ActionResult<IEnumerable<Item>> NewItem(Item item)
+        public ActionResult<IEnumerable<Item>> NewItem(int bookId)
         {
+            var itemid = insertItemReturningId(bookId);
             return Ok(new Item
             {
-                Id = item.Id,
+                Id = itemId,
-                BookId = item.BookId,
+                BookId = bookId,
             });
         }
-
+        
-
         // GET Inventar/{id}
         [HttpGet("{id}", Name = "GetItemByID")]
         public ActionResult<IEnumerable<Item>> GetItemByID(int id)

Controllers/LendController.cs

@@ -8,7 +8,7 @@ using BuecherwurmAPI.DTOs;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.Extensions.Logging;
-
+using Microsoft.Data.Sqlite;
 
 namespace BuecherwurmAPI.Controllers
 {
@@ -16,12 +16,12 @@ namespace BuecherwurmAPI.Controllers
     [ApiController]
     public class LendController : ControllerBase
     {
-        private readonly IRepository _repository;
+        private readonly LendModel _repository;
         private readonly IMapper _mapper;
 
-        public LendController(IRepository repository, IMapper mapper)
+        public LendController(SqliteConnection connection, IMapper mapper)
         {
-            _repository = repository;
+            _repository = new LendModel(connection);
             _mapper = mapper;
         }
 
@@ -34,7 +34,7 @@ namespace BuecherwurmAPI.Controllers
 
         //POST api/leihvorgang
         [HttpPost]
-        public ActionResult<LendReadDTO> LendsPost(Lend lend)
+        public ActionResult<LendReadDTO> LendsPost(LendSeed lend)
         {
             /*
                 Internally a lend is stored with an id
@@ -49,15 +49,23 @@ namespace BuecherwurmAPI.Controllers
                 
                 DTO stands for Data Transfer Object
             */
-            var item = new Lend
+            var newId = _repository.insertLendReturningId(lend);
+            if (newId > 0)
             {
-                Id = 256,
+                var item = new Lend
-                Customer = lend.Customer,
+                {
-                Returned = lend.Returned,
+                    Id = newId,
-                ItemId = lend.ItemId,
+                    Customer = lend.Customer,
-                ReturnDate = lend.ReturnDate
+                    Returned = false,
-            };
+                    ItemId = lend.ItemId,
-            return Ok(item);
+                    ReturnDate = lend.ReturnDate
+                };
+                return Ok(item);
+            }
+            else
+            {
+                return BadRequest();
+            }
             //return Ok(_mapper.Map<LendReadDTO>(item));
         }
 

Models/ILendRepo.cs

@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-using BuecherwurmAPI.Models;
-
-namespace BuecherwurmAPI.Models
-{
-    public interface ILendRepo
-    {
-        IEnumerable<Lend> GetAllLends();
-        Lend GetLendById(int id);
-    }
-}

Models/IRepository.cs

@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-using BuecherwurmAPI.Models;
-using Microsoft.EntityFrameworkCore.Metadata.Conventions;
-
-namespace BuecherwurmAPI.Models
-{
-    public interface IRepository
-    {
-        IEnumerable<Lend> GetAllLends();
-        Lend GetLendById(long id);
-        bool IdExits(string table, long id);
-    }
-}

Models/Interfaces.cs

@@ -0,0 +1,9 @@
+using Microsoft.Data.Sqlite;
+
+namespace BuecherwurmAPI.Models
+{
+    public interface IModel
+    {
+        
+    }
+}

Models/Item.cs

@@ -4,8 +4,7 @@ namespace BuecherwurmAPI.Models
 {
     public class Item
     {
-        [Key]
+        [Key, Required]
-        [Required]
         public int Id { get; set; }
         [Required]
         public int BookId { get; set; }

Models/Lend.cs

@@ -5,12 +5,24 @@ namespace BuecherwurmAPI.Models
 {
     public class Lend
     {
-        [Key]
+        [Key, Required]
-        [Required]
         public long Id { get; set; }
+        [Required]
         public long ItemId { get; set;}
+        [Required]
         public DateTime ReturnDate { get; set; }
+        [Required]
         public string Customer { get; set;  }
+        [Required]
         public bool Returned { get; set; }
     }
+
+    public class LendSeed
+    {
+        public long ItemId {get; set;}
+
+        public DateTime ReturnDate {get; set;}
+
+        public string Customer {get; set;}
+    }
 } 

Models/LendModel.cs

@@ -6,15 +6,13 @@ using Microsoft.VisualBasic.CompilerServices;
 
 namespace BuecherwurmAPI.Models
 {
-    internal class Repository : IRepository
+    internal class LendModel : IModel
     {
-        private SqliteConnection _dbConnection;
+        public SqliteConnection _dbConnection;
         
-        public Repository()
+        public LendModel(SqliteConnection connection)
         {
-            var connectionBuilder = new SqliteConnectionStringBuilder {DataSource = "LongWormMemory.db"};
+            _dbConnection = connection;
-            _dbConnection = new SqliteConnection(connectionBuilder.ConnectionString);
-            _dbConnection.Open();
         }
 
         public bool IdExits(string table, long id)
@@ -94,5 +92,26 @@ namespace BuecherwurmAPI.Models
             }
             return null;
         }
+
+        public long insertLendReturningId(LendSeed lend)
+        {
+            using (var command = _dbConnection.CreateCommand())
+            {
+                command.CommandText = "INSERT INTO Lends VALUES (NULL, @itemId, @returnDate, @customer, false)";
+                command.Parameters.Add(new SqliteParameter("@itemId", lend.ItemId));
+                command.Parameters.Add(new SqliteParameter("@returnDate", lend.ReturnDate));
+                command.Parameters.Add(new SqliteParameter("@customer", lend.Customer));
+
+                var success = command.ExecuteNonQuery();
+
+                if (success == 1)
+                {
+                    command.CommandText = @"SELECT last_insert_rowid()";
+                    return (long)command.ExecuteScalar();
+                }
+
+                return -1;
+            }
+        }
     }
 }

Startup.cs

@@ -32,7 +32,7 @@ namespace BuecherwurmAPI
             // Adds a service that is created once per connection.
             // It takes an interface and a specific implementation.
             // That allows to swap the implementation easily.
-            services.AddScoped<IRepository, Repository>();
+            services.AddScoped<IModel, LendModel>();
 
             services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
         }