Finish busStop model rest crud

Administrator
1 parent e6477bbf
Showing 4 changed files with 70 additions and 35 deletions Show diff stats
src/Maps/Controllers/BusStopController.cs
src/MapsDb/DataService/BusStopDs.cs
src/MapsDb/Interfaces/IBusStopDs.cs
src/MapsModels/DsModels/BusStopEditDsM.cs
@@ -7,6 +7,7 @@ using MapsDb;
 using MapsDb.Interfaces;
 using MapsDb.DataService;
 using MapsModels.ViewModels;
+using MapsModels.DsModels;
 using System;
 namespace Maps.Controllers
@@ -86,26 +87,37 @@ namespace Maps.Controllers
         }
-        // // POST: BusStop/Create
-        // // To protect from overposting attacks, please enable the specific properties you want to bind to, for 
-        // // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
-        // [HttpPost]
-        // [ValidateAntiForgeryToken]
-        // public async Task<IActionResult> Create( busStop)
-        // {
-        //     if (ModelState.IsValid)
-        //     {
-        //         _context.Add(busStop);
-        //         await _context.SaveChangesAsync();
-        //         return RedirectToAction("Index");
-        //     }
-        //     ViewData["RegionId"] = new SelectList(_context.Region, "RegionId", "RegionId", busStop.RegionId);
-        //     ViewData["RoadId"] = new SelectList(_context.Road, "RoadId", "RoadId", busStop.RoadId);
-        //     ViewData["SettlementId"] = new SelectList(_context.Settlement, "SettlementId", "Name", busStop.SettlementId);
-        //     ViewData["StateCommonId"] = new SelectList(_context.StateCommon, "StateCommonId", "StateCommonId", busStop.StateCommonId);
-        //     ViewData["SurfaceTypeId"] = new SelectList(_context.SurfaceType, "SurfaceTypeId", "SurfaceTypeId", busStop.SurfaceTypeId);
-        //     return View(busStop);
-        // }
+        // POST: BusStop/Create
+        // To protect from overposting attacks, please enable the specific properties you want to bind to, for 
+        // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> Create(BusStopEditDsM busStop)
+        {
+            if (ModelState.IsValid)
+            {
+                await _busStopDs.SaveAsync(busStop);
+                return Ok();
+            } else {
+                return NotFound();
+            }
+
+            // var SurfaceType = await _surfaceTypeDs.GetSelectListAsync();
+            // var StateCommon = await _stateCommonDs.GetSelectListAsync();
+            // var Settlement = await _settlementDs.GetSelectListAsync();
+            // var Road = await _roadDs.GetSelectListAsync();
+            // var Region = await _regionDc.GetSelectListAsync();
+
+            // CreateBusStopVm vm = new CreateBusStopVm
+            // {
+            //     SurfaceTypeSelectListDsM = SurfaceType.ToList(),
+            //     StateCommonSelectListDsM = StateCommon.ToList(),
+            //     SettlementSelectListDsM = Settlement.ToList(),
+            //     RoadSelectListDsM = Road.ToList(),
+            //     RegionSelectListDsM = Region.ToList()
+            // };
+            // return Json(vm);
+        }
         [HttpDelete]
         public async Task<IActionResult> Delete(int? id)
@@ -120,7 +132,7 @@ namespace Maps.Controllers
                 int busStop = await _busStopDs.DeleteAsync(id);
                  return Json(busStop);
             }
-            catch (ArgumentNullException e)
+            catch (ArgumentNullException )
             {
                 return NotFound();
             }
@@ -5,7 +5,6 @@ using MapsDb.Interfaces;
 using MapsDb.Models;
 using MapsModels.DsModels;
 using Microsoft.EntityFrameworkCore;
-
 namespace MapsDb.DataService
 {
     public class BusStopDs : IBusStopDs
@@ -30,20 +29,36 @@ namespace MapsDb.DataService
             }).ToList();
         }
-        public Task SaveAsync(BusStop busStop){
-              return Task.Factory.StartNew(()=> { Save(busStop); });
+        public Task SaveAsync(BusStopEditDsM busStop, int? id = null){
+              return Task.Factory.StartNew(()=> { Save(busStop, id); });
         }
-        private void Save(BusStop busStop)
-        {
-            var busStopFromDb = _context.BusStop.SingleOrDefault(x => x.BusStopId == busStop.BusStopId);;
+        private void Save(BusStopEditDsM busStop, int? id)
+        {   
+            BusStop Bs = new BusStop{
+                RoadId = busStop.RoadId,
+                RegionId = busStop.RegionId,
+                SettlementId = busStop.SettlementId,
+                LocationLeft = busStop.LocationLeft,
+                LocationRight = busStop.LocationRight,
+                SurfaceTypeId = busStop.SurfaceTypeId,
+                AreaStopAvailability = busStop.AreaStopAvailability,
+                AreaLandAvailability = busStop.AreaLandAvailability,
+                PocketAvailability = busStop.PocketAvailability,
+                ToiletAvailability = busStop.ToiletAvailability,
+                YearBuild = busStop.YearBuild,
+                YearRepair = busStop.YearRepair,
+                StateCommonId = busStop.StateCommonId
+            };
+            var busStopFromDb = _context.BusStop.SingleOrDefault(x => x.BusStopId == id);
             if(busStopFromDb != null)
             {
-                busStopFromDb = busStop;
+                busStopFromDb = Bs;
             }
             else
             {
-                _context.BusStop.Add(busStop);
+                _context.BusStop.Add(Bs);
             }
+            _context.SaveChanges();
         }
         public Task<BusStopDetailsDsM> FindOneDetailsAsync(int Id){
              return Task.Factory.StartNew(()=> { return FindOneDetails(Id); });
@@ -7,7 +7,7 @@ namespace MapsDb.Interfaces
     public interface IBusStopDs
     {
         Task<IList<BusStopListDsM>> GetIndexListAsync();
-        Task SaveAsync(BusStop busStop);
+        Task SaveAsync(BusStopEditDsM busStop);
         Task<BusStopDetailsDsM> FindOneDetailsAsync(int Id);
         Task<int> DeleteAsync(int? Id);
     }
 namespace MapsModels.DsModels
 {
-    public class BusStopListDsM
+    public class BusStopEditDsM
     {
-        public string Road { get; set; }
-        public string Region { get; set; }
-        public string Settlement { get; set; }
+        public int? RoadId { get; set; }
+        public int? RegionId { get; set; }
+        public int? SettlementId { get; set; }
         public double? LocationLeft { get; set; }
         public double? LocationRight { get; set; }
-        public string StateCommon { get; set; }
+        public int? SurfaceTypeId { get; set; }
+        public int? AreaStopAvailability { get; set; }
+        public int? AreaLandAvailability { get; set; }
+        public int? PocketAvailability { get; set; }
+        public int? ToiletAvailability { get; set; }
+        public int? YearBuild { get; set; }
+        public int? YearRepair { get; set; }
+        public int? StateCommonId { get; set; }
+
     }
 }
 \ No newline at end of file