Merge branch 'master' of gitlab.artweb.com.ua:root/FirstFullmaps

Administrator
2 parents 21446fef 8d5b2697
Showing 14 changed files with 281 additions and 8 deletions Show diff stats
src/Maps/Controllers/RoadServiceController.cs
src/Maps/Startup.cs
src/MapsDb/DataService/BusStopDs.cs
src/MapsDb/DataService/OrganizationDs.cs
src/MapsDb/DataService/RoadServiceDs.cs
src/MapsDb/Interfaces/IOrganizationDs.cs
src/MapsDb/Interfaces/IRoadServiceDs.cs
src/MapsDb/Models/Organization.cs
src/MapsDb/Models/RoadService.cs
src/MapsDb/PostgresDbContext.cs
src/MapsModels/DsModels/OrganizationSelectListDsM.cs
src/MapsModels/DsModels/RoadServiceEditDsM.cs
src/MapsModels/ViewModels/CatalogListVm.cs
src/MapsModels/ViewModels/RoadServiceListVm.cs
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore;
+using MapsDb;
+using MapsDb.Interfaces;
+using MapsDb.DataService;
+using MapsModels.ViewModels;
+using MapsModels.DsModels;
+using System;
+
+namespace Maps.Controllers
+{
+    public class RoadServiceController : Controller
+    {
+        private readonly IRoadServiceDs _roadServiceDs;
+        private readonly IRoadDs _roadDs;
+        private readonly IRegionDs _regionDs;
+        private readonly IOrganizationDs _organizationDs;
+        private readonly IRoadDirectionDs _roadDirectionDs;
+
+        public RoadServiceController(IRoadServiceDs RoadServiceDs, IRoadDs RoadDs, IRegionDs RegionDs, IOrganizationDs OrganizationDs, IRoadDirectionDs RoadDirectionDs)
+        {
+            _roadServiceDs = RoadServiceDs;
+            _roadDs = RoadDs;    
+            _regionDs = RegionDs;
+            _organizationDs = OrganizationDs;
+            _roadDirectionDs = RoadDirectionDs;
+        }
+
+        // GET: RoadService
+        [HttpGet]
+        public async Task<IActionResult> Index([FromQuery] PaginationDsM data)
+        {
+            try
+            {
+                var roadServices = await _roadServiceDs.GetIndexListAsync(data);
+
+                RoadServiceListVm vm = new RoadServiceListVm
+                {
+                    RoadServiceEditDsM = roadServices.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 Road = await _roadDs.GetSelectListAsync();
+            var Region = await _regionDs.GetSelectListAsync();
+            var Organization = await _organizationDs.GetSelectListAsync();
+            var RoadDirection = await _roadDirectionDs.GetSelectListAsync();
+
+            CatalogListVm vm = new CatalogListVm
+            {
+                RoadSelectListDsM = Road.ToList(),
+                RegionSelectListDsM = Region.ToList(),
+                OrganizationSelectListDsM = Organization.ToList(),
+                RoadDirectionSelectListDsM = RoadDirection.ToList(),
+            };
+            return Json(vm);
+        }
+
+
+        [HttpPost]
+        public async Task<IActionResult> Create([FromBody] RoadServiceEditDsM data)
+        {
+            var result = await _roadServiceDs.CreateAsync(data);
+            return Json(result);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> Update(int id, [FromBody] RoadServiceEditDsM data){
+                await _roadServiceDs.UpdateAsync(data,id);
+                return Json(String.Empty);
+        }
+
+     
+        [HttpDelete]
+        public async Task<IActionResult> Delete(int id)
+        {   
+            try
+            {
+                int roadService = await _roadServiceDs.DeleteAsync(id);
+                 return Json(roadService);
+            }
+            catch (ArgumentNullException )
+            {
+                return NotFound();
+            }
+        }
+    }
+}
@@ -12,6 +12,9 @@ using MapsDb;
 using MapsDb.Interfaces;
 using MapsDb.DataService;
 using MapsModels;
+using AutoMapper;
+using MapsDb.Models;
+using MapsModels.DsModels;
 namespace Maps
 {
@@ -45,6 +48,13 @@ namespace Maps
              }));
             services.AddScoped<PostgresDbContext>();
+            Mapper.Initialize(cnf => {
+                cnf.CreateMap<BusStop, BusStopEditDsM>();
+                cnf.CreateMap<BusStopEditDsM, BusStop>();
+                cnf.CreateMap<RoadService, RoadServiceEditDsM>();
+                cnf.CreateMap<RoadServiceEditDsM, RoadService>();
+            });
+
             services.AddScoped<IBusStopDs, BusStopDs>();
             services.AddScoped<IRoadDs, RoadDs>();
             services.AddScoped<IRegionDs, RegionDs>();
@@ -61,6 +71,8 @@ namespace Maps
             services.AddScoped<IFlowIntensityDs, FlowIntensityDs>();
             services.AddScoped<ICrossSectionDs, CrossSectionDs>();
             services.AddScoped<IRoadTypeDs, RoadTypeDs>();
+            services.AddScoped<IOrganizationDs, OrganizationDs>();
+            services.AddScoped<IRoadServiceDs, RoadServiceDs>();
             // Add framework services.
             services.AddApplicationInsightsTelemetry(Configuration);
@@ -17,10 +17,6 @@ namespace MapsDb.DataService
         private PostgresDbContext _context;
         public BusStopDs(){
             _context = new PostgresDbContext();
-            Mapper.Initialize(cnf => {
-                cnf.CreateMap<BusStop, BusStopEditDsM>();
-                cnf.CreateMap<BusStopEditDsM, BusStop>();
-            });            
         }
         public Task<IList<BusStopEditDsM>> GetIndexListAsync(PaginationDsM pagination){
             return Task.Factory.StartNew(()=> { return GetAllBusStop(pagination); });
+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 OrganizationDs : IOrganizationDs
+    {
+        private PostgresDbContext _context;
+        public OrganizationDs(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<OrganizationSelectListDsM>> GetSelectListAsync(){
+            return Task.Factory.StartNew(GetSelectList);
+        }
+        private IList<OrganizationSelectListDsM> GetSelectList()
+        {
+           return _context.Organization.Select(x => new OrganizationSelectListDsM
+            {
+                Id = x.Id, 
+                Name = x.Name
+            }).ToList();
+        }
+
+    }
+}
 \ No newline at end of file
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using AutoMapper;
+using MapsDb.Interfaces;
+using MapsDb.Models;
+using MapsModels.DsModels;
+using Microsoft.EntityFrameworkCore;
+
+namespace MapsDb.DataService
+{
+    public class RoadServiceDs : IRoadServiceDs
+    {
+        private PostgresDbContext _context;
+        public RoadServiceDs(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<RoadServiceEditDsM>> GetIndexListAsync(PaginationDsM pagination){
+            return Task.Factory.StartNew(()=> { return GetAllRoadService(pagination); });
+        }
+        private IList<RoadServiceEditDsM> GetAllRoadService(PaginationDsM pagination)
+        {
+            var data =  _context.RoadService.Select(RoadService => Mapper.Map<RoadServiceEditDsM>(RoadService)).Skip(pagination.from).Take(pagination.perPage);
+            switch (pagination.orderType())
+            {
+                case "ASC":
+                    return data.OrderBy(i => i.GetType().GetProperty(pagination.sort).GetValue(i, null)).ToList();
+          
+                case "DESC":
+                    return data.OrderByDescending(i => i.GetType().GetProperty(pagination.sort).GetValue(i, null)).ToList();
+            
+                default:
+                    return data.OrderByDescending(i => i.Id).ToList();
+            }     
+            
+        }
+
+        public Task<RoadService> CreateAsync(RoadServiceEditDsM data){
+              return Task.Factory.StartNew(()=> { return Create(data); });
+        }
+        private RoadService Create(RoadServiceEditDsM data)
+        {   
+            
+            RoadService Model = InsertModel(data);
+            _context.RoadService.Add(Model);
+            _context.SaveChanges();
+            return Model;
+        }
+        public Task<RoadService> UpdateAsync(RoadServiceEditDsM data, int id){
+            return Task.Factory.StartNew(()=> { return Update(data, id); });
+        }
+        private RoadService Update(RoadServiceEditDsM data, int id)
+        {   
+            RoadService Model = InsertModel(data);
+            Model.Id = id;
+            _context.RoadService.Update(Model);
+            _context.SaveChanges();
+            return Model;
+        }
+        public RoadService InsertModel(RoadServiceEditDsM data){
+            RoadService Model = Mapper.Map<RoadService>(data);
+            return Model;
+        }
+        public async Task<int> DeleteAsync(int Id)
+        {
+            var roadService = await _context.RoadService.SingleOrDefaultAsync(x => x.Id == Id);
+            _context.RoadService.Remove(roadService);
+            return await _context.SaveChangesAsync();
+        }
+    }
+}
 \ 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 IOrganizationDs
+    {
+         Task<IList<OrganizationSelectListDsM>> 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 IRoadServiceDs
+    {
+        Task<IList<RoadServiceEditDsM>> GetIndexListAsync(PaginationDsM pagination);
+        Task<RoadService> CreateAsync(RoadServiceEditDsM roadService);
+        Task<RoadService> UpdateAsync(RoadServiceEditDsM roadService, int id);
+        Task<int> DeleteAsync(int Id);
+    }
+}
 \ No newline at end of file
@@ -10,7 +10,7 @@ namespace MapsDb.Models
             RoadService = new HashSet<RoadService>();
         }
-        public int OrganizationId { get; set; }
+        public int Id { get; set; }
         public string Name { get; set; }
         public int? DateAdd { get; set; }
@@ -5,7 +5,7 @@ namespace MapsDb.Models
 {
     public partial class RoadService
     {
-        public int RoadServiceId { get; set; }
+        public int Id { get; set; }
         public int? RoadId { get; set; }
         public int? RegionId { get; set; }
         public int? RoadDirectionId { get; set; }
@@ -288,7 +288,7 @@ namespace MapsDb
             {
                 entity.ToTable("organization");
-                entity.Property(e => e.OrganizationId).HasColumnName("organization_id");
+                entity.Property(e => e.Id).HasColumnName("id");
                 entity.Property(e => e.DateAdd).HasColumnName("date_add");
@@ -419,7 +419,7 @@ namespace MapsDb
             {
                 entity.ToTable("road_service");
-                entity.Property(e => e.RoadServiceId).HasColumnName("road_service_id");
+                entity.Property(e => e.Id).HasColumnName("id");
                 entity.Property(e => e.Begin).HasColumnName("begin");
+namespace MapsModels.DsModels
+{
+    public class OrganizationSelectListDsM
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}
 \ No newline at end of file
+namespace MapsModels.DsModels
+{
+    public class RoadServiceEditDsM
+    {
+        public int Id { get; set; }
+        public int? RoadId { get; set; }
+        public int? RegionId { get; set; }
+        public int? RoadDirectionId { get; set; }
+        public int? OrganizationId { get; set; }
+        public double? Begin { get; set; }
+        public double? End { get; set; }
+        public int? YearBegin { get; set; }
+
+    }
+}
 \ No newline at end of file
@@ -15,5 +15,6 @@ namespace MapsModels.ViewModels
         public List<RoadDirectionSelectListDsM> RoadDirectionSelectListDsM { get; set; }
         public List<SurfaceTreatmentSelectListDsM> SurfaceTreatmentSelectListDsM { get; set; }
         public List<RoadTypeSelectListDsM> RoadTypeSelectListDsM { get; set; }
+        public List<OrganizationSelectListDsM> OrganizationSelectListDsM { get; set; }
     }
 }
+using System.Collections.Generic;
+using MapsModels.DsModels;
+
+namespace MapsModels.ViewModels
+{
+    public class RoadServiceListVm
+    {
+        public List<RoadServiceEditDsM> RoadServiceEditDsM { get; set; }
+    }
+}