ebushuev · ggotchaa · Jun 6, 2023
diff --git a/Controllers/TodoItemsController.cs b/Controllers/TodoItemsController.cs
@@ -3,33 +3,40 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using TodoApi.Models;
+using TodoApiDTO.Models;
+using TodoApiDTO.Repositories;
+using Microsoft.Extensions.Logging;
+
+using TodoApiDTO.DTO;
 
 namespace TodoApi.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
     public class TodoItemsController : ControllerBase
     {
-        private readonly TodoContext _context;
+        private readonly ILogger _logger;
+        private readonly ITodoRepository _repository;
 
-        public TodoItemsController(TodoContext context)
+        public TodoItemsController(ILoggerFactory loggerFactory,
+            ITodoRepository repository)
         {
-            _context = context;
+            _logger = loggerFactory.CreateLogger("FileLogger");
+            _repository = repository;
         }
 
         [HttpGet]
         public async Task<ActionResult<IEnumerable<TodoItemDTO>>> GetTodoItems()
         {
-            return await _context.TodoItems
-                .Select(x => ItemToDTO(x))
-                .ToListAsync();
+            var todoItems = await _repository.GetTodoItemsAsync();
+
+            return todoItems.Select(x => ItemToDTO(x)).ToArray();
         }
 
         [HttpGet("{id}")]
         public async Task<ActionResult<TodoItemDTO>> GetTodoItem(long id)
         {
-            var todoItem = await _context.TodoItems.FindAsync(id);
+            var todoItem = await _repository.GetTodoItemAsync(id);
 
             if (todoItem == null)
             {
@@ -47,7 +54,7 @@ public async Task<IActionResult> UpdateTodoItem(long id, TodoItemDTO todoItemDTO
                 return BadRequest();
             }
 
-            var todoItem = await _context.TodoItems.FindAsync(id);
+            var todoItem = await _repository.GetTodoItemAsync(id);
             if (todoItem == null)
             {
                 return NotFound();
@@ -58,10 +65,12 @@ public async Task<IActionResult> UpdateTodoItem(long id, TodoItemDTO todoItemDTO
 
             try
             {
-                await _context.SaveChangesAsync();
+                await _repository.SaveChangesAsync();
             }
-            catch (DbUpdateConcurrencyException) when (!TodoItemExists(id))
+            catch (DbUpdateConcurrencyException) when (!_repository.TodoItemExists(id))
             {
+                _logger.LogError($"Item not found by id {id}");
+
                 return NotFound();
             }
 
@@ -77,8 +86,8 @@ public async Task<ActionResult<TodoItemDTO>> CreateTodoItem(TodoItemDTO todoItem
                 Name = todoItemDTO.Name
             };
 
-            _context.TodoItems.Add(todoItem);
-            await _context.SaveChangesAsync();
+            _repository.CreateTodoItem(todoItem);
+            await _repository.SaveChangesAsync();
 
             return CreatedAtAction(
                 nameof(GetTodoItem),
@@ -89,28 +98,25 @@ public async Task<ActionResult<TodoItemDTO>> CreateTodoItem(TodoItemDTO todoItem
         [HttpDelete("{id}")]
         public async Task<IActionResult> DeleteTodoItem(long id)
         {
-            var todoItem = await _context.TodoItems.FindAsync(id);
+            var todoItem = await _repository.GetTodoItemAsync(id);
 
             if (todoItem == null)
             {
                 return NotFound();
             }
 
-            _context.TodoItems.Remove(todoItem);
-            await _context.SaveChangesAsync();
+            _repository.DeleteTodoItem(todoItem);
+            await _repository.SaveChangesAsync();
 
             return NoContent();
         }
 
-        private bool TodoItemExists(long id) =>
-             _context.TodoItems.Any(e => e.Id == id);
-
         private static TodoItemDTO ItemToDTO(TodoItem todoItem) =>
             new TodoItemDTO
             {
                 Id = todoItem.Id,
                 Name = todoItem.Name,
                 IsComplete = todoItem.IsComplete
-            };       
+            };
     }
-}
+}
diff --git a/Models/TodoContext.cs → DL/TodoContext.cs b/Models/TodoContext.cs → DL/TodoContext.cs
@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
+using TodoApiDTO.Models;
 
-namespace TodoApi.Models
+namespace TodoApiDTO.Data
 {
     public class TodoContext : DbContext
     {

diff --git a/Models/TodoItemDTO.cs → DTO/TodoItemDTO.cs b/Models/TodoItemDTO.cs → DTO/TodoItemDTO.cs
@@ -1,4 +1,4 @@
-namespace TodoApi.Models
+namespace TodoApiDTO.DTO
 {
     #region snippet
     public class TodoItemDTO
@@ -8,4 +8,4 @@ public class TodoItemDTO
         public bool IsComplete { get; set; }
     }
     #endregion
-}
+}
diff --git a/Logger/FileLogger.cs b/Logger/FileLogger.cs
@@ -0,0 +1,38 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.IO;
+
+namespace TodoApiDTO.Logger
+{
+    public class FileLogger : ILogger
+    {
+        private string _path;
+        private static object _lock = new object();
+
+        public FileLogger(string path)
+        {
+            _path = path;
+        }
+
+        public IDisposable BeginScope<TState>(TState state)
+        {
+            return null;
+        }
+
+        public bool IsEnabled(LogLevel logLevel)
+        {
+            return logLevel == LogLevel.Error;
+        }
+
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+        {
+            if (IsEnabled(logLevel) && formatter != null)
+            {
+                lock (_lock)
+                {
+                    File.AppendAllText(_path, formatter(state, exception) + Environment.NewLine);
+                }
+            }
+        }
+    }
+}
diff --git a/Logger/FileLoggerExtensions.cs b/Logger/FileLoggerExtensions.cs
@@ -0,0 +1,14 @@
+using Microsoft.Extensions.Logging;
+
+namespace TodoApiDTO.Logger
+{
+    public static class FileLoggerExtensions
+    {
+        public static ILoggerFactory AddFile(this ILoggerFactory factory,
+                                        string filePath)
+        {
+            factory.AddProvider(new FileLoggerProvider(filePath));
+            return factory;
+        }
+    }
+}
diff --git a/Logger/FileLoggerProvider.cs b/Logger/FileLoggerProvider.cs
@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Logging;
+
+namespace TodoApiDTO.Logger
+{
+    public class FileLoggerProvider : ILoggerProvider
+    {
+        private string _path;
+        public FileLoggerProvider(string path)
+        {
+            _path = path;
+        }
+
+        public ILogger CreateLogger(string categoryName)
+        {
+            return new FileLogger(_path);
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+}
diff --git a/Models/TodoItem.cs b/Models/TodoItem.cs
@@ -1,12 +1,10 @@
-namespace TodoApi.Models
+namespace TodoApiDTO.Models
 {
-    #region snippet
     public class TodoItem
     {
         public long Id { get; set; }
         public string Name { get; set; }
         public bool IsComplete { get; set; }
         public string Secret { get; set; }
     }
-    #endregion
 }
diff --git a/Repo/ITodoRepository.cs b/Repo/ITodoRepository.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using TodoApiDTO.Models;
+
+namespace TodoApiDTO.Repositories
+{
+    public interface ITodoRepository
+    {
+        Task<IEnumerable<TodoItem>> GetTodoItemsAsync();
+        Task<TodoItem> GetTodoItemAsync(long id);
+        void CreateTodoItem(TodoItem todoItem);
+        void DeleteTodoItem(TodoItem todoItem);
+        Task SaveChangesAsync();
+        bool TodoItemExists(long id);
+    }
+}
diff --git a/Repo/TodoRepository.cs b/Repo/TodoRepository.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using TodoApiDTO.Models;
+using TodoApiDTO.Data;
+
+namespace TodoApiDTO.Repositories
+{
+    public class TodoRepository : ITodoRepository
+    {
+        private readonly TodoContext _context;
+
+        public TodoRepository(TodoContext context)
+        {
+            _context = context;
+        }
+
+        public async Task<IEnumerable<TodoItem>> GetTodoItemsAsync()
+        {
+            return (IEnumerable<TodoItem>)await _context.TodoItems.ToListAsync();
+        }
+
+        public async Task<TodoItem> GetTodoItemAsync(long id)
+        {
+            return await _context.TodoItems.FindAsync(id);
+        }
+
+        public void CreateTodoItem(TodoItem todoItem)
+        {
+            _context.TodoItems.Add(todoItem);
+        }
+
+        public void DeleteTodoItem(TodoItem todoItem)
+        {
+            _context.TodoItems.Remove(todoItem);
+        }
+
+        public async Task SaveChangesAsync()
+        {
+            await _context.SaveChangesAsync();
+        }
+
+        public bool TodoItemExists(long id) =>
+             _context.TodoItems.Any(e => e.Id == id);
+    }
+}
diff --git a/Startup.cs b/Startup.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
@@ -11,7 +12,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using TodoApi.Models;
+using Microsoft.OpenApi.Models;
+using TodoApiDTO.Data;
+using TodoApiDTO.Logger;
+using TodoApiDTO.Repositories;
 
 namespace TodoApi
 {
@@ -27,17 +31,37 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
+            //services.AddDbContext<TodoContext>(opt =>
+            //   opt.UseInMemoryDatabase("TodoList"));
+
             services.AddDbContext<TodoContext>(opt =>
-               opt.UseInMemoryDatabase("TodoList"));
+                opt.UseSqlServer(Configuration.GetConnectionString("TodoList")));
+
+            services.AddScoped<ITodoRepository, TodoRepository>();
+
             services.AddControllers();
+            services.AddSwaggerGen(c =>
+            {
+                c.SwaggerDoc("v1", new OpenApiInfo { Title = "Todo API", Version = "v1" });
+            });
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
         {
+            loggerFactory.AddFile(Path.Combine(Directory.GetCurrentDirectory(), "logs", "logger.txt"));
+
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
+                app.UseSwagger();
+                app.UseSwaggerUI(c =>
+                {
+                    c.SwaggerEndpoint("/swagger/v1/swagger.json", "Todo API v1");
+
+                    // To serve SwaggerUI at application's root page, set the RoutePrefix property to an empty string.
+                    c.RoutePrefix = string.Empty;
+                });
             }
 
             app.UseHttpsRedirection();
@@ -52,4 +76,4 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             });
         }
     }
-}
+}
diff --git a/appsettings.Development.json b/appsettings.Development.json
@@ -5,5 +5,8 @@
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     }
+  },
+  "ConnectionStrings": {
+    "TodoList": "Server=(localdb)\\mssqllocaldb;Database=TodoList;Trusted_Connection=True;"
   }
 }