add RoadSurfaceController

Administrator
1 parent f89dc177
Showing 12 changed files with 195 additions and 59 deletions Show diff stats
src/Maps/Controllers/BusStopController.cs
src/Maps/Controllers/RoadSurfaceController.cs
src/Maps/Controllers/ServiceObjectController.cs
src/MapsDb/DataService/RoadDirectionDs.cs
src/MapsDb/DataService/SurfaceTreatmentDs.cs
src/MapsDb/Interfaces/IRoadDirectionDs.cs
src/MapsDb/Interfaces/ISurfaceTreatmentDs.cs
src/MapsDb/Models/RoadDirection.cs
src/MapsDb/PostgresDbContext.cs
src/MapsModels/DsModels/RoadDirectionSelectListDsM.cs
src/MapsModels/DsModels/SurfaceTreatmentSelectListDsM.cs
src/MapsModels/ViewModels/CatalogListVm.cs
@@ -46,12 +46,12 @@ namespace Maps.Controllers
                 return Json(vm);
             }
-            catch (NullReferenceException e)
+            catch (NullReferenceException)
             {
                 Response.StatusCode = 400;
                 return Json("There is no field with name " + data.sort);
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return NotFound();
             }
@@ -19,74 +19,102 @@ namespace Maps.Controllers
         private readonly ISurfaceTypeDs _surfaceTypeDs;
         private readonly IStateCommonDs _stateCommonDs;
         private readonly IRoadSurfaceDs _roadSurfaceDs;
-        public RoadSurfaceController(IRoadSurfaceDs RoadSurfaceDs, IStateCommonDs StateCommonDs, IRoadDs RoadDs, IRegionDs RegionDs, ISurfaceTypeDs SurfaceTypeDs)
+        private readonly IRoadDirectionDs _roadDirectionDs;
+        private readonly ISurfaceTreatmentDs _surfaceTreatmentDs;
+        public RoadSurfaceController(
+            IRoadSurfaceDs RoadSurfaceDs, 
+            IStateCommonDs StateCommonDs, 
+            IRoadDs RoadDs, 
+            IRegionDs RegionDs, 
+            ISurfaceTypeDs SurfaceTypeDs,
+            ISurfaceTreatmentDs SurfaceTreatmentDs,
+            IRoadDirectionDs RoadDirectionDs
+            )
         {
             _roadDs = RoadDs;    
             _surfaceTypeDs = SurfaceTypeDs;    
             _regionDs = RegionDs;    
             _stateCommonDs = StateCommonDs;     
-            _roadSurfaceDs = RoadSurfaceDs;     
+            _roadSurfaceDs = RoadSurfaceDs;
+            _surfaceTreatmentDs = SurfaceTreatmentDs;
+            _roadDirectionDs = RoadDirectionDs;     
         }
         // GET: BusStop
         [HttpGet]
         public async Task<IActionResult> Index([FromQuery] PaginationDsM data)
         {
-            var Data = await _roadSurfaceDs.GetIndexListAsync(data);
-            RoadSurfaceListVm vm = new RoadSurfaceListVm
+            try
             {
-                RoadSurfaceEditDsM = Data.ToList()
-            };
+                var Data = await _roadSurfaceDs.GetIndexListAsync(data);
-            return Json(vm);
+                RoadSurfaceListVm vm = new RoadSurfaceListVm
+                {
+                    RoadSurfaceEditDsM = Data.ToList()
+                };
+
+                return Json(vm);
+            }
+            catch (NullReferenceException)
+            {
+                Response.StatusCode = 400;
+                return Json("There is no field with name " + data.sort);
+            }
+            catch (Exception)
+            {
+                return NotFound();
+            }
         }
-        //[HttpGet]
-        // public async Task<IActionResult> Directory(){
-        //     var DepartmentAffiliation = await _departmentAffiliationDs.GetSelectListAsync();
-        //     var Settlement = await _settlementDs.GetSelectListAsync();
-        //     var Road = await _roadDs.GetSelectListAsync();
-        //     var Region = await _regionDs.GetSelectListAsync();
-        //     var ServiceObjectType = await _serviceObjectTypeDs.GetSelectListAsync();
-        //     CatalogListVm vm = new CatalogListVm
-        //     {
-        //         DepartmentAffiliationSelectListDsM = DepartmentAffiliation.ToList(),
-        //         SettlementSelectListDsM = Settlement.ToList(),
-        //         ServiceObjectTypeSelectListDsM = ServiceObjectType.ToList(),
-        //         RoadSelectListDsM = Road.ToList(),
-        //         RegionSelectListDsM = Region.ToList()
-        //     };
-        //     return Json(vm);
-        // }
+        [HttpGet]
+        public async Task<IActionResult> Directory(){
+            var Road = await _roadDs.GetSelectListAsync();
+            var Region = await _regionDs.GetSelectListAsync();
+            var SurfaceType = await _surfaceTypeDs.GetSelectListAsync();
+            var StateCommon = await _stateCommonDs.GetSelectListAsync();
+            var SurfaceTreatment = await _surfaceTreatmentDs.GetSelectListAsync();
+            var RoadDirection = await _roadDirectionDs.GetSelectListAsync();
+
+            CatalogListVm vm = new CatalogListVm
+            {
+                RoadSelectListDsM = Road.ToList(),
+                RegionSelectListDsM = Region.ToList(),
+                SurfaceTypeSelectListDsM = SurfaceType.ToList(),
+                StateCommonSelectListDsM = StateCommon.ToList(),
+                SurfaceTreatmentSelectListDsM = SurfaceTreatment.ToList(),
+                RoadDirectionSelectListDsM = RoadDirection.ToList()
+            };
+            return Json(vm);
+        }
-        // [HttpPost]
-        // public async Task<IActionResult> Create([FromBody] ServiceObjectEditDsM data)
-        // {
-        //     var result = await _serviceObjectDs.CreateAsync(data);
-        //     return Json(result);
-        // }
+        [HttpPost]
+        public async Task<IActionResult> Create([FromBody] RoadSurfaceEditDsM data)
+        {
+            var result = await _roadSurfaceDs.CreateAsync(data);
+            return Json(result);
+        }
-        // [HttpPost]
-        // public async Task<IActionResult> Update(int id, [FromBody] ServiceObjectEditDsM data){
-        //         await _serviceObjectDs.UpdateAsync(data,id);
-        //         return Json(String.Empty);
-        // }
+        [HttpPost]
+        public async Task<IActionResult> Update(int id, [FromBody] RoadSurfaceEditDsM data){
+                await _roadSurfaceDs.UpdateAsync(data,id);
+                return Json(String.Empty);
+        }
-        // [HttpDelete]
-        // public async Task<IActionResult> Delete(int id)
-        // {   
-        //     try
-        //     {
-        //          int data = await _serviceObjectDs.DeleteAsync(id);
-        //          return Json(data);
-        //     }
-        //     catch (ArgumentNullException )
-        //     {
-        //         return NotFound();
-        //     }
-        // }
+        [HttpDelete]
+        public async Task<IActionResult> Delete(int id)
+        {   
+            try
+            {
+                 int data = await _roadSurfaceDs.DeleteAsync(id);
+                 return Json(data);
+            }
+            catch (ArgumentNullException )
+            {
+                return NotFound();
+            }
+        }
     }
 }
@@ -35,14 +35,26 @@ namespace Maps.Controllers
         [HttpGet]
         public async Task<IActionResult> Index([FromQuery] PaginationDsM data)
         {
-            var Data = await _serviceObjectDs.GetIndexListAsync(data);
-
-            ServiceObjectListVm vm = new ServiceObjectListVm
+            try
             {
-                ServiceObjectEditDsM = Data.ToList()
-            };
+                var Data = await _serviceObjectDs.GetIndexListAsync(data);
-            return Json(vm);
+                ServiceObjectListVm vm = new ServiceObjectListVm
+                {
+                    ServiceObjectEditDsM = Data.ToList()
+                };
+
+                return Json(vm);
+            }
+            catch (NullReferenceException)
+            {
+                Response.StatusCode = 400;
+                return Json("There is no field with name " + data.sort);
+            }
+            catch (Exception)
+            {
+                return NotFound();
+            }
         }
         [HttpGet]
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using MapsDb.Interfaces;
+using MapsDb.Models;
+using MapsModels.DsModels;
+namespace MapsDb.DataService
+{
+    public class RoadDirectionDs : IRoadDirectionDs
+    {
+        private PostgresDbContext _context;
+        public RoadDirectionDs(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<RoadDirectionSelectListDsM>> GetSelectListAsync(){
+            return Task.Factory.StartNew(GetSelectList);
+        }
+        private IList<RoadDirectionSelectListDsM> GetSelectList()
+        {
+           return _context.RoadDirection.Select(x => new RoadDirectionSelectListDsM
+            {
+                RoadDirectionId = x.RoadDirectionId, 
+                Name = x.Name
+            }).ToList();
+        }
+
+    }
+}
 \ No newline at end of file
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using MapsDb.Interfaces;
+using MapsDb.Models;
+using MapsModels.DsModels;
+namespace MapsDb.DataService
+{
+    public class SurfaceTreatmentDs : ISurfaceTreatmentDs
+    {
+        private PostgresDbContext _context;
+        public SurfaceTreatmentDs(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<SurfaceTreatmentSelectListDsM>> GetSelectListAsync(){
+            return Task.Factory.StartNew(GetSelectList);
+        }
+        private IList<SurfaceTreatmentSelectListDsM> GetSelectList()
+        {
+           return _context.SurfaceTreatment.Select(x => new SurfaceTreatmentSelectListDsM
+            {
+                SurfaceTreatmentId = x.SurfaceTreatmentId, 
+                Name = x.Name
+            }).ToList();
+        }
+
+    }
+}
 \ No newline at end of file
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MapsModels.DsModels;
+using MapsDb.Models;
+namespace MapsDb.Interfaces
+{
+    public interface IRoadDirectionDs
+    {
+         Task<IList<RoadDirectionSelectListDsM>> GetSelectListAsync();
+    }
+}
 \ No newline at end of file
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MapsModels.DsModels;
+using MapsDb.Models;
+namespace MapsDb.Interfaces
+{
+    public interface ISurfaceTreatmentDs
+    {
+         Task<IList<SurfaceTreatmentSelectListDsM>> GetSelectListAsync();
+    }
+}
 \ No newline at end of file
@@ -13,7 +13,7 @@ namespace MapsDb.Models
         }
         public int RoadDirectionId { get; set; }
-        public string DirectionName { get; set; }
+        public string Name { get; set; }
         public virtual ICollection<FlowIntensity> FlowIntensity { get; set; }
         public virtual ICollection<RoadService> RoadService { get; set; }
@@ -353,9 +353,9 @@ namespace MapsDb
                 entity.Property(e => e.RoadDirectionId).HasColumnName("road_direction_id");
-                entity.Property(e => e.DirectionName)
+                entity.Property(e => e.Name)
                     .IsRequired()
-                    .HasColumnName("direction_name")
+                    .HasColumnName("name")
                     .HasColumnType("varchar")
                     .HasMaxLength(255);
             });
+namespace MapsModels.DsModels
+{
+    public class RoadDirectionSelectListDsM
+    {
+        public int RoadDirectionId { get; set; }
+        public string Name { get; set; }
+    }
+}
 \ No newline at end of file
+namespace MapsModels.DsModels
+{
+    public class SurfaceTreatmentSelectListDsM
+    {
+        public int SurfaceTreatmentId { get; set; }
+        public string Name { get; set; }
+    }
+}
 \ No newline at end of file
@@ -12,5 +12,7 @@ namespace MapsModels.ViewModels
         public List<SettlementSelectListDsM> SettlementSelectListDsM { get; set; }
         public List<RoadSelectListDsM> RoadSelectListDsM { get; set; }
         public List<RegionSelectListDsM> RegionSelectListDsM { get; set; }
+        public List<RoadDirectionSelectListDsM> RoadDirectionSelectListDsM { get; set; }
+        public List<SurfaceTreatmentSelectListDsM> SurfaceTreatmentSelectListDsM { get; set; }
     }
 }