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

Administrator
2 parents bce5562a f2ca21bc
Showing 13 changed files with 273 additions and 4 deletions Show diff stats
src/Maps/Controllers/SettlementAddressLinkController.cs
src/Maps/Startup.cs
src/MapsDb/DataService/SettlementAddressLinkDs.cs
src/MapsDb/DataService/SettlementLocationDs.cs
src/MapsDb/Interfaces/ISettlementAddressLinkDs.cs
src/MapsDb/Interfaces/ISettlementLocationDs.cs
src/MapsDb/Models/SettlementAddressLink.cs
src/MapsDb/Models/SettlementLocation.cs
src/MapsDb/PostgresDbContext.cs
src/MapsModels/DsModels/SettlementAddressLinkEditDsM.cs
src/MapsModels/DsModels/SettlementLocationSelectListDsM.cs
src/MapsModels/ViewModels/CatalogListVm.cs
src/MapsModels/ViewModels/SettlementAddressLinkListVm.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 SettlementAddressLinkController : Controller
+    {
+        private readonly ISettlementAddressLinkDs _settlementAddressLinkDs;
+        private readonly IRoadDs _roadDs;
+        private readonly ISettlementDs _settlementDs;
+        private readonly IRegionDs _regionDs;
+        private readonly ISettlementLocationDs _settlementLocationDs;
+
+        public SettlementAddressLinkController(ISettlementAddressLinkDs SettlementAddressLinkDs, IRoadDs RoadDs, ISettlementDs SettlementDs, IRegionDs RegionDs, ISettlementLocationDs SettlementLocationDs)
+        {
+            _settlementAddressLinkDs = SettlementAddressLinkDs;
+            _roadDs = RoadDs;    
+            _settlementDs = SettlementDs;    
+            _regionDs = RegionDs;
+            _settlementLocationDs = SettlementLocationDs;
+        }
+
+        // GET: SettlementAddressLink
+        [HttpGet]
+        public async Task<IActionResult> Index([FromQuery] PaginationDsM data)
+        {
+            try
+            {
+                var settlementAddressLinks = await _settlementAddressLinkDs.GetIndexListAsync(data);
+
+                SettlementAddressLinkListVm vm = new SettlementAddressLinkListVm
+                {
+                    SettlementAddressLinkEditDsM = settlementAddressLinks.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 Settlement = await _settlementDs.GetSelectListAsync();
+            var Road = await _roadDs.GetSelectListAsync();
+            var Region = await _regionDs.GetSelectListAsync();
+            var SettlementLocation = await _settlementLocationDs.GetSelectListAsync();
+
+            CatalogListVm vm = new CatalogListVm
+            {
+                SettlementSelectListDsM = Settlement.ToList(),
+                RoadSelectListDsM = Road.ToList(),
+                RegionSelectListDsM = Region.ToList(),
+                SettlementLocationSelectListDsM = SettlementLocation.ToList()
+            };
+            return Json(vm);
+        }
+
+
+        [HttpPost]
+        public async Task<IActionResult> Create([FromBody] SettlementAddressLinkEditDsM data)
+        {
+            var result = await _settlementAddressLinkDs.CreateAsync(data);
+            return Json(result);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> Update(int id, [FromBody] SettlementAddressLinkEditDsM data){
+                await _settlementAddressLinkDs.UpdateAsync(data,id);
+                return Json(String.Empty);
+        }
+
+     
+        [HttpDelete]
+        public async Task<IActionResult> Delete(int id)
+        {   
+            try
+            {
+                int settlementAddressLink = await _settlementAddressLinkDs.DeleteAsync(id);
+                 return Json(settlementAddressLink);
+            }
+            catch (ArgumentNullException )
+            {
+                return NotFound();
+            }
+        }
+    }
+}
@@ -53,6 +53,8 @@ namespace Maps
                 cnf.CreateMap<BusStopEditDsM, BusStop>();
                 cnf.CreateMap<RoadService, RoadServiceEditDsM>();
                 cnf.CreateMap<RoadServiceEditDsM, RoadService>();
+                cnf.CreateMap<SettlementAddressLink, SettlementAddressLinkEditDsM>();
+                cnf.CreateMap<SettlementAddressLinkEditDsM, SettlementAddressLink>();
             });
  
             services.AddScoped<IBusStopDs, BusStopDs>();
@@ -73,6 +75,8 @@ namespace Maps
             services.AddScoped<IRoadTypeDs, RoadTypeDs>();
             services.AddScoped<IOrganizationDs, OrganizationDs>();
             services.AddScoped<IRoadServiceDs, RoadServiceDs>();
+            services.AddScoped<ISettlementLocationDs, SettlementLocationDs>();
+            services.AddScoped<ISettlementAddressLinkDs, SettlementAddressLinkDs>();
             // Add framework services.
             services.AddApplicationInsightsTelemetry(Configuration);
  
+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 SettlementAddressLinkDs : ISettlementAddressLinkDs
+    {
+        private PostgresDbContext _context;
+        public SettlementAddressLinkDs(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<SettlementAddressLinkEditDsM>> GetIndexListAsync(PaginationDsM pagination){
+            return Task.Factory.StartNew(()=> { return GetAllSettlementAddressLink(pagination); });
+        }
+        private IList<SettlementAddressLinkEditDsM> GetAllSettlementAddressLink(PaginationDsM pagination)
+        {
+            var data =  _context.SettlementAddressLink.Select(SettlementAddressLink => Mapper.Map<SettlementAddressLinkEditDsM>(SettlementAddressLink)).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<SettlementAddressLink> CreateAsync(SettlementAddressLinkEditDsM data){
+              return Task.Factory.StartNew(()=> { return Create(data); });
+        }
+        private SettlementAddressLink Create(SettlementAddressLinkEditDsM data)
+        {   
+            
+            SettlementAddressLink Model = InsertModel(data);
+            _context.SettlementAddressLink.Add(Model);
+            _context.SaveChanges();
+            return Model;
+        }
+        public Task<SettlementAddressLink> UpdateAsync(SettlementAddressLinkEditDsM data, int id){
+            return Task.Factory.StartNew(()=> { return Update(data, id); });
+        }
+        private SettlementAddressLink Update(SettlementAddressLinkEditDsM data, int id)
+        {   
+            SettlementAddressLink Model = InsertModel(data);
+            Model.Id = id;
+            _context.SettlementAddressLink.Update(Model);
+            _context.SaveChanges();
+            return Model;
+        }
+        public SettlementAddressLink InsertModel(SettlementAddressLinkEditDsM data){
+            SettlementAddressLink Model = Mapper.Map<SettlementAddressLink>(data);
+            return Model;
+        }
+        public async Task<int> DeleteAsync(int Id)
+        {
+            var settlementAddressLink = await _context.SettlementAddressLink.SingleOrDefaultAsync(x => x.Id == Id);
+            _context.SettlementAddressLink.Remove(settlementAddressLink);
+            return await _context.SaveChangesAsync();
+        }
+    }
+}
 \ 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 SettlementLocationDs : ISettlementLocationDs
+    {
+        private PostgresDbContext _context;
+        public SettlementLocationDs(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<SettlementLocationSelectListDsM>> GetSelectListAsync(){
+            return Task.Factory.StartNew(GetSelectList);
+        }
+        private IList<SettlementLocationSelectListDsM> GetSelectList()
+        {
+           return _context.SettlementLocation.Select(x => new SettlementLocationSelectListDsM
+            {
+                Id = x.Id, 
+                Name = x.Value
+            }).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 ISettlementAddressLinkDs
+    {
+        Task<IList<SettlementAddressLinkEditDsM>> GetIndexListAsync(PaginationDsM pagination);
+        Task<SettlementAddressLink> CreateAsync(SettlementAddressLinkEditDsM settlementAddressLink);
+        Task<SettlementAddressLink> UpdateAsync(SettlementAddressLinkEditDsM settlementAddressLink, 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 ISettlementLocationDs
+    {
+         Task<IList<SettlementLocationSelectListDsM>> GetSelectListAsync();
+    }
+}
 \ No newline at end of file
@@ -5,7 +5,7 @@ namespace MapsDb.Models
 {
     public partial class SettlementAddressLink
     {
-        public int SettlementAddressLinkId { get; set; }
+        public int Id { get; set; }
         public int? RoadId { get; set; }
         public int? RegionId { get; set; }
         public int? SettlementLocationId { get; set; }
@@ -10,7 +10,7 @@ namespace MapsDb.Models
             SettlementAddressLink = new HashSet<SettlementAddressLink>();
         }
  
-        public int SettlementLocationId { get; set; }
+        public int Id { get; set; }
         public string Value { get; set; }
  
         public virtual ICollection<SettlementAddressLink> SettlementAddressLink { get; set; }
@@ -728,7 +728,7 @@ namespace MapsDb
             {
                 entity.ToTable("settlement_address_link");
  
-                entity.Property(e => e.SettlementAddressLinkId).HasColumnName("settlement_address_link_id");
+                entity.Property(e => e.Id).HasColumnName("id");
  
                 entity.Property(e => e.Begin).HasColumnName("begin");
  
@@ -773,7 +773,7 @@ namespace MapsDb
             {
                 entity.ToTable("settlement_location");
  
-                entity.Property(e => e.SettlementLocationId).HasColumnName("settlement_location_id");
+                entity.Property(e => e.Id).HasColumnName("id");
  
                 entity.Property(e => e.Value)
                     .IsRequired()
+namespace MapsModels.DsModels
+{
+    public class SettlementAddressLinkEditDsM
+    {
+        public int Id { get; set; }
+        public int? RoadId { get; set; }
+        public int? RegionId { get; set; }
+        public int? SettlementLocationId { get; set; }
+        public int? SettlementId { get; set; }
+        public double? Begin { get; set; }
+        public double? End { get; set; }
+        public double? Distance { get; set; }
+
+    }
+}
 \ No newline at end of file
+namespace MapsModels.DsModels
+{
+    public class SettlementLocationSelectListDsM
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}
 \ No newline at end of file
@@ -16,5 +16,6 @@ namespace MapsModels.ViewModels
         public List<SurfaceTreatmentSelectListDsM> SurfaceTreatmentSelectListDsM { get; set; }
         public List<RoadTypeSelectListDsM> RoadTypeSelectListDsM { get; set; }
         public List<OrganizationSelectListDsM> OrganizationSelectListDsM { get; set; }
+        public List<SettlementLocationSelectListDsM> SettlementLocationSelectListDsM { get; set; }
     }
 }
+using System.Collections.Generic;
+using MapsModels.DsModels;
+
+namespace MapsModels.ViewModels
+{
+    public class SettlementAddressLinkListVm
+    {
+        public List<SettlementAddressLinkEditDsM> SettlementAddressLinkEditDsM { get; set; }
+    }
+}