Refactor Configurations to Config Feature

jioo · jioo · commit 88f396238ddc · 2018-10-14T14:31:44.000+08:00
- Adjusted model, dbcontext, seed
- Updated migrations
diff --git a/WebApi/Entities/Config.cs b/WebApi/Entities/Config.cs
@@ -2,7 +2,7 @@
 
 namespace WebApi.Entities
 {
-    public class Configuration
+    public class Config
     {
         public Guid Id { get; set; }
         public string TimeIn { get; set; }
diff --git a/WebApi/Features/Config/ConfigController.cs b/WebApi/Features/Config/ConfigController.cs
@@ -0,0 +1,33 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using MediatR;
+
+namespace WebApi.Features.Config
+{
+    [Authorize(Roles = "Admin")]
+    [Route("api/[controller]"), ApiController]
+    public class ConfigController : ControllerBase
+    {
+        private readonly IMediator _mediator;
+
+        public ConfigController(IMediator mediator)
+        {
+            _mediator = mediator;
+        }
+
+        // GET api/config
+        [HttpGet]
+        public async Task<ConfigViewModel> Index()
+        {
+            return await _mediator.Send(new Details.Query());
+        }
+
+        // PUT api/config
+        [HttpPut]
+        public async Task<ConfigViewModel> Update(ConfigViewModel viewModel)
+        {
+            return await _mediator.Send(new Update.Command(viewModel));
+        }
+    }
+}
diff --git a/WebApi/Features/Config/ConfigProfile.cs b/WebApi/Features/Config/ConfigProfile.cs
@@ -0,0 +1,14 @@
+using WebApi.Entities;
+using AutoMapper;
+
+namespace WebApi.Features.Config
+{
+    public class ConfigProfile : Profile
+    {
+        public ConfigProfile()
+        {
+            CreateMap<Entities.Config, ConfigViewModel>();
+            CreateMap<ConfigViewModel, Entities.Config>();
+        }
+    }
+}
diff --git a/WebApi/Features/Config/ConfigViewModel.cs b/WebApi/Features/Config/ConfigViewModel.cs
@@ -1,8 +1,8 @@
 using System;
 
-namespace WebApi.Features.Configurations
+namespace WebApi.Features.Config
 {
-    public class ConfigurationViewModel
+    public class ConfigViewModel
     {
         public Guid Id { get; set; }
         public string TimeIn { get; set; }
diff --git a/WebApi/Features/Config/Details.cs b/WebApi/Features/Config/Details.cs
@@ -6,13 +6,16 @@
 using Microsoft.EntityFrameworkCore;
 using WebApi.Infrastructure;
 
-namespace WebApi.Features.Configurations
+namespace WebApi.Features.Config
 {
+    /// <summary>
+    /// Get current attendance config
+    /// </summary>
     public class Details
     {
-        public class Query : IRequest<ConfigurationViewModel> { }
+        public class Query : IRequest<ConfigViewModel> { }
 
-        public class QueryHandler : IRequestHandler<Query, ConfigurationViewModel>
+        public class QueryHandler : IRequestHandler<Query, ConfigViewModel>
         {
             private readonly ApplicationDbContext _context;
             private readonly IMapper _mapper;
@@ -23,13 +26,16 @@ public QueryHandler(ApplicationDbContext context, IMapper mapper)
                 _mapper = mapper;
             }
             
-            public async Task<ConfigurationViewModel> Handle(Query request, CancellationToken cancellationToken)
+            public async Task<ConfigViewModel> Handle(Query request, CancellationToken cancellationToken)
             {
 
                 try
                 {
-                    var model = await _context.Configurations.FirstOrDefaultAsync(cancellationToken);
-                    return _mapper.Map<ConfigurationViewModel>(model);
+                    // Get the current config model
+                    var model = await _context.Config.FirstOrDefaultAsync(cancellationToken);
+
+                    // Map model to view model
+                    return _mapper.Map<ConfigViewModel>(model);
                 }
                 catch (Exception e)
                 {
diff --git a/WebApi/Features/Config/Update.cs b/WebApi/Features/Config/Update.cs
@@ -6,21 +6,24 @@
 using Microsoft.EntityFrameworkCore;
 using WebApi.Infrastructure;
 
-namespace WebApi.Features.Configurations
+namespace WebApi.Features.Config
 {
+    /// <summary>
+    /// Update attendance config
+    /// </summary>
     public class Update
     {
-        public class Command : IRequest
+        public class Command : IRequest<ConfigViewModel>
         {
-            public Command(ConfigurationViewModel viewModel)
+            public Command(ConfigViewModel viewModel)
             {
                 ViewModel = viewModel;
             }
 
-            public ConfigurationViewModel ViewModel { get; }
+            public ConfigViewModel ViewModel { get; }
         }
 
-        public class CommandHandler : AsyncRequestHandler<Command>
+        public class CommandHandler : IRequestHandler<Command, ConfigViewModel>
         {
 
             private readonly ApplicationDbContext _context;
@@ -32,15 +35,22 @@ public CommandHandler(ApplicationDbContext context, IMapper mapper)
                 _mapper = mapper;
             }
 
-            protected override async Task Handle(Command request, CancellationToken cancellationToken)
+            public async Task<ConfigViewModel> Handle(Command request, CancellationToken cancellationToken)
             {
                 try
                 {
-                    var model = await _context.Configurations.FindAsync(request.ViewModel.Id);
+                    // Get the old model
+                    var model = await _context.Config.FirstAsync();
+
+                    // Map the view model into old model
                     _mapper.Map(request.ViewModel, model);
 
+                    // Change entity state to update
                     _context.Entry(model).State = EntityState.Modified;
                     await _context.SaveChangesAsync();
+
+                    // Map the result to view model
+                    return _mapper.Map<ConfigViewModel>(model);
                 }
                 catch (Exception e)
                 {
diff --git a/WebApi/Features/Configurations/ConfigurationController.cs b/WebApi/Features/Configurations/ConfigurationController.cs
diff --git a/WebApi/Features/Configurations/ConfigurationProfile.cs b/WebApi/Features/Configurations/ConfigurationProfile.cs
diff --git a/WebApi/Infrastructure/ApplicationDbContext.cs b/WebApi/Infrastructure/ApplicationDbContext.cs
@@ -13,7 +13,6 @@ public ApplicationDbContext(DbContextOptions options) : base(options)
 
         public DbSet<Employee> Employees { get; set; }
         public DbSet<Log> Logs { get; set; }
-
-        public DbSet<Configuration> Configurations { get; set; }
+        public DbSet<Config> Config { get; set; }
     }
 }
diff --git a/WebApi/Migrations/20181014061742_init.Designer.cs b/WebApi/Migrations/20181014061742_init.Designer.cs
diff --git a/WebApi/Migrations/20181014061742_init.cs b/WebApi/Migrations/20181014061742_init.cs
@@ -48,7 +48,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 });
 
             migrationBuilder.CreateTable(
-                name: "Configurations",
+                name: "Config",
                 columns: table => new
                 {
                     Id = table.Column<Guid>(nullable: false),
@@ -58,7 +58,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_Configurations", x => x.Id);
+                    table.PrimaryKey("PK_Config", x => x.Id);
                 });
 
             migrationBuilder.CreateTable(
@@ -285,7 +285,7 @@ protected override void Down(MigrationBuilder migrationBuilder)
                 name: "AspNetUserTokens");
 
             migrationBuilder.DropTable(
-                name: "Configurations");
+                name: "Config");
 
             migrationBuilder.DropTable(
                 name: "Logs");
diff --git a/WebApi/Migrations/ApplicationDbContextModelSnapshot.cs b/WebApi/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -129,7 +129,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("AspNetUserTokens");
                 });
 
-            modelBuilder.Entity("WebApi.Entities.Configuration", b =>
+            modelBuilder.Entity("WebApi.Entities.Config", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd();
@@ -142,7 +142,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("Id");
 
-                    b.ToTable("Configurations");
+                    b.ToTable("Config");
                 });
 
             modelBuilder.Entity("WebApi.Entities.Employee", b =>
diff --git a/WebApi/SeedData.cs b/WebApi/SeedData.cs
@@ -62,10 +62,10 @@ public static async Task AttendanceConfiguration(IServiceProvider services, ICon
         {
             var context = services.GetRequiredService<ApplicationDbContext>();
             // Check if configuration already exists
-            if (!context.Configurations.Any())
+            if (!context.Config.Any())
             {
                 // Add default configurations from config file
-                await context.Configurations.AddAsync(new Configuration
+                await context.Config.AddAsync(new Config
                 {
                     TimeIn = configuration["AttendanceConfig:TimeIn"],
                     TimeOut = configuration["AttendanceConfig:TimeOut"],

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace WebApi.Entities`
`4`	`4`	`{`
`5`		`- public class Configuration`
	`5`	`+ public class Config`
`6`	`6`	`{`
`7`	`7`	`public Guid Id { get; set; }`
`8`	`8`	`public string TimeIn { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-namespace WebApi.Features.Configurations`
	`3`	`+namespace WebApi.Features.Config`
`4`	`4`	`{`
`5`		`- public class ConfigurationViewModel`
	`5`	`+ public class ConfigViewModel`
`6`	`6`	`{`
`7`	`7`	`public Guid Id { get; set; }`
`8`	`8`	`public string TimeIn { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,16 @@`
`6`	`6`	`using Microsoft.EntityFrameworkCore;`
`7`	`7`	`using WebApi.Infrastructure;`
`8`	`8`
`9`		`-namespace WebApi.Features.Configurations`
	`9`	`+namespace WebApi.Features.Config`
`10`	`10`	`{`
	`11`	`+ /// <summary>`
	`12`	`+ /// Get current attendance config`
	`13`	`+ /// </summary>`
`11`	`14`	`public class Details`
`12`	`15`	`{`
`13`		`- public class Query : IRequest<ConfigurationViewModel> { }`
	`16`	`+ public class Query : IRequest<ConfigViewModel> { }`
`14`	`17`
`15`		`- public class QueryHandler : IRequestHandler<Query, ConfigurationViewModel>`
	`18`	`+ public class QueryHandler : IRequestHandler<Query, ConfigViewModel>`
`16`	`19`	`{`
`17`	`20`	`private readonly ApplicationDbContext _context;`
`18`	`21`	`private readonly IMapper _mapper;`
`@@ -23,13 +26,16 @@ public QueryHandler(ApplicationDbContext context, IMapper mapper)`
`23`	`26`	`_mapper = mapper;`
`24`	`27`	`}`
`25`	`28`
`26`		`- public async Task<ConfigurationViewModel> Handle(Query request, CancellationToken cancellationToken)`
	`29`	`+ public async Task<ConfigViewModel> Handle(Query request, CancellationToken cancellationToken)`
`27`	`30`	`{`
`28`	`31`
`29`	`32`	`try`
`30`	`33`	`{`
`31`		`- var model = await _context.Configurations.FirstOrDefaultAsync(cancellationToken);`
`32`		`- return _mapper.Map<ConfigurationViewModel>(model);`
	`34`	`+ // Get the current config model`
	`35`	`+ var model = await _context.Config.FirstOrDefaultAsync(cancellationToken);`
	`36`	`+`
	`37`	`+ // Map model to view model`
	`38`	`+ return _mapper.Map<ConfigViewModel>(model);`
`33`	`39`	`}`
`34`	`40`	`catch (Exception e)`
`35`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,21 +6,24 @@`
`6`	`6`	`using Microsoft.EntityFrameworkCore;`
`7`	`7`	`using WebApi.Infrastructure;`
`8`	`8`
`9`		`-namespace WebApi.Features.Configurations`
	`9`	`+namespace WebApi.Features.Config`
`10`	`10`	`{`
	`11`	`+ /// <summary>`
	`12`	`+ /// Update attendance config`
	`13`	`+ /// </summary>`
`11`	`14`	`public class Update`
`12`	`15`	`{`
`13`		`- public class Command : IRequest`
	`16`	`+ public class Command : IRequest<ConfigViewModel>`
`14`	`17`	`{`
`15`		`- public Command(ConfigurationViewModel viewModel)`
	`18`	`+ public Command(ConfigViewModel viewModel)`
`16`	`19`	`{`
`17`	`20`	`ViewModel = viewModel;`
`18`	`21`	`}`
`19`	`22`
`20`		`- public ConfigurationViewModel ViewModel { get; }`
	`23`	`+ public ConfigViewModel ViewModel { get; }`
`21`	`24`	`}`
`22`	`25`
`23`		`- public class CommandHandler : AsyncRequestHandler<Command>`
	`26`	`+ public class CommandHandler : IRequestHandler<Command, ConfigViewModel>`
`24`	`27`	`{`
`25`	`28`
`26`	`29`	`private readonly ApplicationDbContext _context;`
`@@ -32,15 +35,22 @@ public CommandHandler(ApplicationDbContext context, IMapper mapper)`
`32`	`35`	`_mapper = mapper;`
`33`	`36`	`}`
`34`	`37`
`35`		`- protected override async Task Handle(Command request, CancellationToken cancellationToken)`
	`38`	`+ public async Task<ConfigViewModel> Handle(Command request, CancellationToken cancellationToken)`
`36`	`39`	`{`
`37`	`40`	`try`
`38`	`41`	`{`
`39`		`- var model = await _context.Configurations.FindAsync(request.ViewModel.Id);`
	`42`	`+ // Get the old model`
	`43`	`+ var model = await _context.Config.FirstAsync();`
	`44`	`+`
	`45`	`+ // Map the view model into old model`
`40`	`46`	`_mapper.Map(request.ViewModel, model);`
`41`	`47`
	`48`	`+ // Change entity state to update`
`42`	`49`	`_context.Entry(model).State = EntityState.Modified;`
`43`	`50`	`await _context.SaveChangesAsync();`
	`51`	`+`
	`52`	`+ // Map the result to view model`
	`53`	`+ return _mapper.Map<ConfigViewModel>(model);`
`44`	`54`	`}`
`45`	`55`	`catch (Exception e)`
`46`	`56`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public ApplicationDbContext(DbContextOptions options) : base(options)`
`13`	`13`
`14`	`14`	`public DbSet<Employee> Employees { get; set; }`
`15`	`15`	`public DbSet<Log> Logs { get; set; }`
`16`		`-`
`17`		`- public DbSet<Configuration> Configurations { get; set; }`
	`16`	`+ public DbSet<Config> Config { get; set; }`
`18`	`17`	`}`
`19`	`18`	`}`