add update and create methods

Administrator
1 parent 27918c1f
Showing 14 changed files with 147 additions and 111 deletions Show diff stats
src/Maps/Controllers/BusStopController.cs
src/Maps/Controllers/ServiceObjectController.cs
src/Maps/Startup.cs
src/MapsDb/DataService/BusStopDs.cs
src/MapsDb/DataService/DepartmentAffiliationDs.cs
src/MapsDb/DataService/ServiceObjectDs.cs
src/MapsDb/DataService/ServiceObjectTypeDs.cs
src/MapsDb/Interfaces/IBusStopDs.cs
src/MapsDb/Interfaces/IDepartmentAffiliationDs.cs
src/MapsDb/Interfaces/IServiceObjectDs.cs
src/MapsDb/Interfaces/IServiceObjectTypeDs.cs
src/MapsModels/DsModels/DepartmentAffiliationListDsM.cs → src/MapsModels/DsModels/DepartmentAffiliationSelectListDsM.cs
src/MapsModels/DsModels/ServiceObjectTypeSelectListDsM.cs
src/MapsModels/ViewModels/CatalogListVm.cs
@@ -68,27 +68,22 @@ namespace Maps.Controllers
         [HttpPost]
         public async Task<IActionResult> Create([FromBody] BusStopEditDsM data)
         {
-            var result = await _busStopDs.SaveAsync(data);
+            var result = await _busStopDs.CreateAsync(data);
             return Json(result);
         }
  
         [HttpPost]
         public async Task<IActionResult> Update(int id, [FromBody] BusStopEditDsM data){
-                await _busStopDs.SaveAsync(data,id);
+                await _busStopDs.UpdateAsync(data,id);
                 return Json(String.Empty);
         }
  
  
         [HttpDelete]
-        public async Task<IActionResult> Delete(int? id)
+        public async Task<IActionResult> Delete(int id)
         {   
             try
             {
-                if (id == null)
-                {
-                    return NotFound();
-                }
-       
                 int busStop = await _busStopDs.DeleteAsync(id);
                  return Json(busStop);
             }
@@ -15,18 +15,20 @@ namespace Maps.Controllers
     public class ServiceObjectController : Controller
     {
         private readonly IServiceObjectDs _serviceObjectDs;
+        private readonly IServiceObjectTypeDs _serviceObjectTypeDs;
         private readonly IRoadDs _roadDs;
         private readonly ISettlementDs _settlementDs;
         private readonly IRegionDs _regionDs;
         private readonly IDepartmentAffiliationDs _departmentAffiliationDs;
  
-        public ServiceObjectController(IServiceObjectDs ServiceObjectDs, IRoadDs RoadDs, ISettlementDs SettlementDs, IRegionDs RegionDs, IDepartmentAffiliationDs DepartmentAffiliationDs)
+        public ServiceObjectController(IServiceObjectTypeDs ServiceObjectTypeDs, IServiceObjectDs ServiceObjectDs, IRoadDs RoadDs, ISettlementDs SettlementDs, IRegionDs RegionDs, IDepartmentAffiliationDs DepartmentAffiliationDs)
         {
             _serviceObjectDs = ServiceObjectDs;
             _roadDs = RoadDs;    
             _settlementDs = SettlementDs;    
             _regionDs = RegionDs;    
-            _departmentAffiliationDs = DepartmentAffiliationDs;        
+            _departmentAffiliationDs = DepartmentAffiliationDs;
+            _serviceObjectTypeDs =  ServiceObjectTypeDs;       
         }
  
         // GET: BusStop
@@ -49,11 +51,12 @@ namespace Maps.Controllers
             var Settlement = await _settlementDs.GetSelectListAsync();
             var Road = await _roadDs.GetSelectListAsync();
             var Region = await _regionDs.GetSelectListAsync();
-
+            var ServiceObjectType = await _serviceObjectTypeDs.GetSelectListAsync();
             CatalogListVm vm = new CatalogListVm
             {
-                DepartmentAffiliationDsM = DepartmentAffiliation.ToList(),
+                DepartmentAffiliationSelectListDsM = DepartmentAffiliation.ToList(),
                 SettlementSelectListDsM = Settlement.ToList(),
+                ServiceObjectTypeSelectListDsM = ServiceObjectType.ToList(),
                 RoadSelectListDsM = Road.ToList(),
                 RegionSelectListDsM = Region.ToList()
             };
@@ -64,28 +67,23 @@ namespace Maps.Controllers
         [HttpPost]
         public async Task<IActionResult> Create([FromBody] ServiceObjectEditDsM data)
         {
-            var result = await _serviceObjectDs.SaveAsync(data);
+            var result = await _serviceObjectDs.CreateAsync(data);
             return Json(result);
         }
  
         [HttpPost]
         public async Task<IActionResult> Update(int id, [FromBody] ServiceObjectEditDsM data){
-                await _serviceObjectDs.SaveAsync(data,id);
+                await _serviceObjectDs.UpdateAsync(data,id);
                 return Json(String.Empty);
         }
  
  
         [HttpDelete]
-        public async Task<IActionResult> Delete(int? id)
+        public async Task<IActionResult> Delete(int id)
         {   
             try
             {
-                if (id == null)
-                {
-                    return NotFound();
-                }
-       
-                int data = await _serviceObjectDs.DeleteAsync(id);
+                 int data = await _serviceObjectDs.DeleteAsync(id);
                  return Json(data);
             }
             catch (ArgumentNullException )
@@ -50,6 +50,7 @@ namespace Maps
             services.AddScoped<IStateCommonDs, StateCommonDs>();
             services.AddScoped<ISurfaceTypeDs, SurfaceTypeDs>();
             services.AddScoped<IServiceObjectDs, ServiceObjectDs>();
+            services.AddScoped<IServiceObjectTypeDs, ServiceObjectTypeDs>();
             services.AddScoped<ISettlementDs, SettlementDs>();
             services.AddScoped<IDepartmentAffiliationDs, DepartmentAffiliationDs>();
             // Add framework services.
@@ -37,51 +37,47 @@ namespace MapsDb.DataService
             }).OrderByDescending(BusStop => BusStop.BusStopId).ToList();
         }
  
-        public Task<BusStop> SaveAsync(BusStopEditDsM busStop, int? id = null){
-              return Task.Factory.StartNew(()=> { return Save(busStop, id); });
+        public Task<BusStop> CreateAsync(BusStopEditDsM data){
+              return Task.Factory.StartNew(()=> { return Create(data); });
         }
-        private BusStop Save(BusStopEditDsM busStop, int? id)
+        private BusStop Create(BusStopEditDsM data)
         {   
-            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.FirstOrDefault(x => x.BusStopId == id);
-            if(busStopFromDb != null)
-            {
-                busStopFromDb.RoadId = busStop.RoadId;
-                busStopFromDb.RegionId = busStop.RegionId;
-                busStopFromDb.SettlementId = busStop.SettlementId;
-                busStopFromDb.LocationLeft = busStop.LocationLeft;
-                busStopFromDb.LocationRight = busStop.LocationRight;
-                busStopFromDb.SurfaceTypeId = busStop.SurfaceTypeId;
-                busStopFromDb.AreaStopAvailability = busStop.AreaStopAvailability;
-                busStopFromDb.AreaLandAvailability = busStop.AreaLandAvailability;
-                busStopFromDb.PocketAvailability = busStop.PocketAvailability;
-                busStopFromDb.ToiletAvailability = busStop.ToiletAvailability;
-                busStopFromDb.YearBuild = busStop.YearBuild;
-                busStopFromDb.YearRepair = busStop.YearRepair;
-                busStopFromDb.StateCommonId = busStop.StateCommonId;
-            }
-            else
-            {
-                _context.BusStop.Add(Bs);
-            }
+            
+            BusStop Model = InsertModel(data);
+            _context.BusStop.Add(Model);
             _context.SaveChanges();
-            return Bs;
+            return Model;
+        }
+        public Task<BusStop> UpdateAsync(BusStopEditDsM data, int id){
+            return Task.Factory.StartNew(()=> { return Update(data, id); });
+        }
+        private BusStop Update(BusStopEditDsM data, int id)
+        {   
+            BusStop Model = InsertModel(data);
+            Model.BusStopId = id;
+            _context.BusStop.Update(Model);
+            _context.SaveChanges();
+            return Model;
+        }
+        public BusStop InsertModel(BusStopEditDsM data){
+            BusStop Model = new BusStop{
+                RoadId = data.RoadId,
+                RegionId = data.RegionId,
+                SettlementId = data.SettlementId,
+                LocationLeft = data.LocationLeft,
+                LocationRight = data.LocationRight,
+                SurfaceTypeId = data.SurfaceTypeId,
+                AreaStopAvailability = data.AreaStopAvailability,
+                AreaLandAvailability = data.AreaLandAvailability,
+                PocketAvailability = data.PocketAvailability,
+                ToiletAvailability = data.ToiletAvailability,
+                YearBuild = data.YearBuild,
+                YearRepair = data.YearRepair,
+                StateCommonId = data.StateCommonId
+            };
+            return Model;
         }
-        public async Task<int> DeleteAsync(int? Id)
+        public async Task<int> DeleteAsync(int Id)
         {
             var busStop = await _context.BusStop.SingleOrDefaultAsync(x => x.BusStopId == Id);
             _context.BusStop.Remove(busStop);
@@ -12,12 +12,12 @@ namespace MapsDb.DataService
         public DepartmentAffiliationDs(){
             _context = new PostgresDbContext();
         }
-        public Task<IList<DepartmentAffiliationListDsM>> GetSelectListAsync(){
+        public Task<IList<DepartmentAffiliationSelectListDsM>> GetSelectListAsync(){
             return Task.Factory.StartNew(GetSelectList);
         }
-        private IList<DepartmentAffiliationListDsM> GetSelectList()
+        private IList<DepartmentAffiliationSelectListDsM> GetSelectList()
         {
-           return _context.DepartmentAffiliation.Select(x => new DepartmentAffiliationListDsM
+           return _context.DepartmentAffiliation.Select(x => new DepartmentAffiliationSelectListDsM
             {
                 DepartmentAffiliationId = x.DepartmentAffiliationId, 
                 Name = x.Name
@@ -35,49 +35,45 @@ namespace MapsDb.DataService
             }).OrderByDescending(ServiceObject => ServiceObject.ServiceObjectId).ToList();
         }
  
-        public Task<ServiceObject> SaveAsync(ServiceObjectEditDsM serviceObject, int? id = null){
-              return Task.Factory.StartNew(()=> { return Save(serviceObject, id); });
+        public Task<ServiceObject> CreateAsync(ServiceObjectEditDsM data){
+            return Task.Factory.StartNew(()=> { return Create(data); });
         }
-        private ServiceObject Save(ServiceObjectEditDsM serviceObject, int? id)
+        private ServiceObject Create(ServiceObjectEditDsM data)
         {   
-            ServiceObject Data = new ServiceObject{
-                ServiceObjectId = serviceObject.ServiceObjectId,
-                RoadId = serviceObject.RoadId,
-                RegionId = serviceObject.RegionId,
-                SettlementId = serviceObject.SettlementId,
-                LocationLeft = serviceObject.LocationLeft,
-                LocationRight = serviceObject.LocationRight,
-                ServiceObjectTypeId = serviceObject.ServiceObjectTypeId,
-                DepartmentAffiliationId = serviceObject.DepartmentAffiliationId,
-                LocationAxis = serviceObject.LocationAxis,
-                Distance = serviceObject.Distance,
-                Capacity = serviceObject.Capacity,
-                ArrangementElements = serviceObject.ArrangementElements,
-            };
-            var ServiceObjectFromDb = _context.ServiceObject.FirstOrDefault(x => x.ServiceObjectId == id);
-            if(ServiceObjectFromDb != null)
-            {
-                ServiceObjectFromDb.ServiceObjectId = Data.ServiceObjectId;
-                ServiceObjectFromDb.RoadId = Data.RoadId;
-                ServiceObjectFromDb.RegionId = Data.RegionId;
-                ServiceObjectFromDb.SettlementId = Data.SettlementId;
-                ServiceObjectFromDb.LocationLeft = Data.LocationLeft;
-                ServiceObjectFromDb.LocationRight = Data.LocationRight;
-                ServiceObjectFromDb.ServiceObjectTypeId = Data.ServiceObjectTypeId;
-                ServiceObjectFromDb.DepartmentAffiliationId = Data.DepartmentAffiliationId;
-                ServiceObjectFromDb.LocationAxis = Data.LocationAxis;
-                ServiceObjectFromDb.Distance = Data.Distance;
-                ServiceObjectFromDb.Capacity = Data.Capacity;
-                ServiceObjectFromDb.ArrangementElements = Data.ArrangementElements;
-            }
-            else
-            {
-                _context.ServiceObject.Add(Data);
-            }
+            ServiceObject Model = InsertModel(data);
+            _context.ServiceObject.Add(Model);
             _context.SaveChanges();
-            return Data;
+            return Model;
+        }
+        public Task<ServiceObject> UpdateAsync(ServiceObjectEditDsM data, int id){
+            return Task.Factory.StartNew(()=> { return Update(data, id); });
+        }
+        private ServiceObject Update(ServiceObjectEditDsM data, int id)
+        {   
+            ServiceObject Model = InsertModel(data);
+            Model.ServiceObjectId = id;
+            _context.ServiceObject.Update(Model);
+            _context.SaveChanges();
+            return Model;
+        }
+        public ServiceObject InsertModel(ServiceObjectEditDsM data){
+         ServiceObject Model = new ServiceObject{
+                ServiceObjectId = data.ServiceObjectId,
+                RoadId = data.RoadId,
+                RegionId = data.RegionId,
+                SettlementId = data.SettlementId,
+                LocationLeft = data.LocationLeft,
+                LocationRight = data.LocationRight,
+                ServiceObjectTypeId = data.ServiceObjectTypeId,
+                DepartmentAffiliationId = data.DepartmentAffiliationId,
+                LocationAxis = data.LocationAxis,
+                Distance = data.Distance,
+                Capacity = data.Capacity,
+                ArrangementElements = data.ArrangementElements,
+            };
+            return Model;
         }
-        public async Task<int> DeleteAsync(int? Id)
+        public async Task<int> DeleteAsync(int Id)
         {
             var ServiceObject = await _context.ServiceObject.SingleOrDefaultAsync(x => x.ServiceObjectId == Id);
             _context.ServiceObject.Remove(ServiceObject);
+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 ServiceObjectTypeDs : IServiceObjectTypeDs
+    {
+        private PostgresDbContext _context;
+        public ServiceObjectTypeDs(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<ServiceObjectTypeSelectListDsM>> GetSelectListAsync(){
+            return Task.Factory.StartNew(GetSelectList);
+        }
+        private IList<ServiceObjectTypeSelectListDsM> GetSelectList()
+        {
+           return _context.ServiceObjectType.Select(x => new ServiceObjectTypeSelectListDsM
+            {
+                ServiceObjectTypeId = x.ServiceObjectTypeId, 
+                Name = x.Name
+            }).ToList();
+        }
+
+    }
+}
 \ No newline at end of file
@@ -7,7 +7,8 @@ namespace MapsDb.Interfaces
     public interface IBusStopDs
     {
         Task<IList<BusStopEditDsM>> GetIndexListAsync();
-        Task<BusStop> SaveAsync(BusStopEditDsM busStop, int? id = null);
-        Task<int> DeleteAsync(int? Id);
+        Task<BusStop> CreateAsync(BusStopEditDsM busStop);
+        Task<BusStop> UpdateAsync(BusStopEditDsM busStop, int id);
+        Task<int> DeleteAsync(int Id);
     }
 }
 \ No newline at end of file
@@ -6,6 +6,6 @@ namespace MapsDb.Interfaces
 {
     public interface IDepartmentAffiliationDs
     {
-         Task<IList<DepartmentAffiliationListDsM>> GetSelectListAsync();
+         Task<IList<DepartmentAffiliationSelectListDsM>> GetSelectListAsync();
     }
 }
 \ No newline at end of file
@@ -7,8 +7,9 @@ namespace MapsDb.Interfaces
     public interface IServiceObjectDs
     {
         Task<IList<ServiceObjectEditDsM>> GetIndexListAsync();
-        Task<ServiceObject> SaveAsync(ServiceObjectEditDsM serviceObject, int? id = null);
-        Task<int> DeleteAsync(int? Id);
+        Task<ServiceObject> CreateAsync(ServiceObjectEditDsM serviceObject);
+        Task<ServiceObject> UpdateAsync(ServiceObjectEditDsM serviceObject, int id);
+        Task<int> DeleteAsync(int Id);
  
     }
 }
 \ 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 IServiceObjectTypeDs
+    {
+         Task<IList<ServiceObjectTypeSelectListDsM>> GetSelectListAsync();            
+    }
+}
 \ No newline at end of file
 namespace MapsModels.DsModels
 {
-    public class DepartmentAffiliationListDsM
+    public class DepartmentAffiliationSelectListDsM
     {
         public int DepartmentAffiliationId { get; set; }
         public string Name { get; set; }
+namespace MapsModels.DsModels
+{
+    public class ServiceObjectTypeSelectListDsM
+    {
+        public int ServiceObjectTypeId { get; set; }
+        public string Name { get; set; }
+    }
+}
 \ No newline at end of file
@@ -5,8 +5,9 @@ namespace MapsModels.ViewModels
 {
     public class CatalogListVm
     {
-        public List<DepartmentAffiliationListDsM> DepartmentAffiliationDsM { get; set; }
+        public List<DepartmentAffiliationSelectListDsM> DepartmentAffiliationSelectListDsM { get; set; }
         public List<SurfaceTypeSelectListDsM> SurfaceTypeSelectListDsM { get; set; }
+        public List<ServiceObjectTypeSelectListDsM> ServiceObjectTypeSelectListDsM { get; set; }
         public List<StateCommonSelectListDsM> StateCommonSelectListDsM { get; set; }
         public List<SettlementSelectListDsM> SettlementSelectListDsM { get; set; }
         public List<RoadSelectListDsM> RoadSelectListDsM { get; set; }