add marge commit

Administrator
2 parents 6dc44586 4f948d42
Showing 5 changed files with 136 additions and 51 deletions Show diff stats
src/Maps/Controllers/BusStopController.cs
src/Maps/Startup.cs
src/Maps/project.json
src/MapsDb/DataService/BusStopDs.cs
src/MapsDb/project.json
@@ -35,8 +35,7 @@ namespace Maps.Controllers
         [HttpGet]
         public async Task<IActionResult> Index([FromQuery] PaginationDsM data)
         {
-            try
-            {
+     
                 var busStops = await _busStopDs.GetIndexListAsync(data);
                 BusStopListVm vm = new BusStopListVm
@@ -45,16 +44,7 @@ namespace Maps.Controllers
                 };
                 return Json(vm);
-            }
-            catch (NullReferenceException)
-            {
-                Response.StatusCode = 400;
-                return Json("There is no field with name " + data.sort);
-            }
-            catch (Exception)
-            {
-                return NotFound();
-            }
+   
         }
@@ -12,6 +12,7 @@ using MapsDb;
 using MapsDb.Interfaces;
 using MapsDb.DataService;
 using MapsModels;
+
 namespace Maps
 {
     public class Startup
@@ -59,6 +60,7 @@ namespace Maps
             services.AddScoped<IRoadWidthDs, RoadWidthDs>();
             services.AddScoped<IFlowIntensityDs, FlowIntensityDs>();
             services.AddScoped<ICrossSectionDs, CrossSectionDs>();
+            services.AddScoped<IRoadTypeDs, RoadTypeDs>();
             // Add framework services.
             services.AddApplicationInsightsTelemetry(Configuration);
@@ -36,7 +36,8 @@
         "Npgsql.EntityFrameworkCore.PostgreSQL": "1.0.2",
         "Npgsql.EntityFrameworkCore.PostgreSQL.Design": "1.0.2",
         "MapsDb": "1.0.0-*",
-        "MapsModels": "1.0.0-*"
+        "MapsModels": "1.0.0-*",
+        "AutoMapper": "5.2.0"
     },
     "tools": {
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using AutoMapper;
 using MapsDb.Interfaces;
 using MapsDb.Models;
 using MapsModels.DsModels;
 using Microsoft.EntityFrameworkCore;
+
 namespace MapsDb.DataService
 {
     public class BusStopDs : IBusStopDs
@@ -13,41 +17,42 @@ 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); });
         }
         private IList<BusStopEditDsM> GetAllBusStop(PaginationDsM pagination)
         {
-            var filter =  "Крым";
-            var data =  _context.BusStop.Where(x => x.Region.Name == filter ).Select(BusStop => new BusStopEditDsM
-            {
-                Id = BusStop.Id,
-                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
-            }).Skip(pagination.from).Take(pagination.perPage);
-            
+
+            var filter =  pagination.filter;
+
+            IQueryable<BusStop> data = _context.BusStop
+            .Include(d=>d.Road)
+            .Include(d=>d.Region)
+            .Include(d=>d.SurfaceType)
+            .Include(d=>d.StateCommon);
+            data = Filtering(pagination.filter, data);
+            //.Where(d => d.Region.Name == filter);
+
+            IQueryable<BusStopEditDsM> result = data
+            .Select(BusStop => Mapper.Map<BusStopEditDsM>(BusStop))
+            .Skip(pagination.from)
+            .Take(pagination.perPage);
+
             switch (pagination.orderType())
             {
                 case "ASC":
-                    return data.OrderBy(i => i.GetType().GetProperty(pagination.sort).GetValue(i, null)).ToList();
+                    return result.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();
+                    return result.OrderByDescending(i => i.GetType().GetProperty(pagination.sort).GetValue(i, null)).ToList();
                 default:
-                    return data.OrderByDescending(i => i.Id).ToList();
+                    return result.OrderByDescending(i => i.Id).ToList();
             }     
         }
@@ -75,23 +80,109 @@ namespace MapsDb.DataService
             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
-            };
+            BusStop Model = Mapper.Map<BusStop>(data);
             return Model;
         }
+        public IQueryable<BusStop> Filtering(string filters, IQueryable<BusStop> data){
+            if(filters != null){
+               string[] FilterWords = filters.Split(';').Where(x => !string.IsNullOrEmpty(x)).ToArray();
+                foreach(string word in FilterWords){
+                    string[] filter = Regex.Split(word.Substring(1), "(.*)_(.*)");
+                    if(filter.Length < 3 ){
+                        continue;
+                    }
+                    string field = char.ToUpper(filter[1][0]) + filter[1].Substring(1);
+                    if(word.StartsWith("$")){
+                        data = FilterByEndWith(field, filter[2], data);
+                    }
+                    else if(word.StartsWith("^")){
+                        data = FilterByStartWith(field, filter[2], data);
+                    }
+                    else if(word.StartsWith("*")){
+                        data = FilterByComtains(field, filter[2], data);
+                    }
+                    else if(word.StartsWith("!")){
+                        data = FilterByNotEquals(field, filter[2], data);
+                    }
+                    else if(word.StartsWith("=")){
+                        data = FilterByEquals(field, filter[2], data);
+                    }
+                }
+            
+            }
+            return data;
+        }
+        public IQueryable<BusStop> FilterByComtains(string field, string param, IQueryable<BusStop> data){
+            switch(field){
+                case "RoadId":
+                    return data.Where(i => i.Road.Name.Contains(param) );
+                case "RegionId":
+                    return data.Where(i => i.Region.Name.Contains(param) );
+                case "SurfaceTypeId":
+                    return data.Where(i => i.SurfaceType.Name.Contains(param) );
+                case "StateCommonId":
+                    return data.Where(i => i.StateCommon.Value.Contains(param) );
+                default:
+                    return data.Where(i => Convert.ToString(i.GetType().GetProperty(field).GetValue(i, null)).Contains(param) );
+            }
+        }
+        public IQueryable<BusStop> FilterByEquals(string field, string param, IQueryable<BusStop> data){
+            switch(field){
+                case "RoadId":
+                    return data.Where(i => i.Road.Name == param );
+                case "RegionId":
+                    return data.Where(i => i.Region.Name == param );
+                case "SurfaceTypeId":
+                    return data.Where(i => i.SurfaceType.Name == param );
+                case "StateCommonId":
+                    return data.Where(i => i.StateCommon.Value == param );
+                default:
+                return data.Where(i => Convert.ToString(i.GetType().GetProperty(field).GetValue(i, null)) == param );
+            }
+
+        }
+        public IQueryable<BusStop> FilterByNotEquals(string field, string param, IQueryable<BusStop> data){
+           switch(field){
+                case "RoadId":
+                    return data.Where(i => i.Road.Name != param );
+                case "RegionId":
+                    return data.Where(i => i.Region.Name != param );
+                case "SurfaceTypeId":
+                    return data.Where(i => i.SurfaceType.Name != param );
+                case "StateCommonId":
+                    return data.Where(i => i.StateCommon.Value != param );
+                default:
+                return data.Where(i => Convert.ToString(i.GetType().GetProperty(field).GetValue(i, null)) != param );
+            }
+        }
+        public IQueryable<BusStop> FilterByStartWith(string field, string param, IQueryable<BusStop> data){
+            switch(field){
+                case "RoadId":
+                    return data.Where(i => i.Road.Name.StartsWith(param) );
+                case "RegionId":
+                    return data.Where(i => i.Region.Name.StartsWith(param) );
+                case "SurfaceTypeId":
+                    return data.Where(i => i.SurfaceType.Name.StartsWith(param) );
+                case "StateCommonId":
+                    return data.Where(i => i.StateCommon.Value.StartsWith(param) );
+                default:
+                return data.Where(i => Convert.ToString(i.GetType().GetProperty(field).GetValue(i, null)).StartsWith(param) );
+            }
+        }
+        public IQueryable<BusStop> FilterByEndWith(string field, string param, IQueryable<BusStop> data){
+          switch(field){
+                case "RoadId":
+                    return data.Where(i => i.Road.Name.EndsWith(param) );
+                case "RegionId":
+                    return data.Where(i => i.Region.Name.EndsWith(param) );
+                case "SurfaceTypeId":
+                    return data.Where(i => i.SurfaceType.Name.EndsWith(param) );
+                case "StateCommonId":
+                    return data.Where(i => i.StateCommon.Value.EndsWith(param) );
+                default:
+                return data.Where(i => Convert.ToString(i.GetType().GetProperty(field).GetValue(i, null)).EndsWith(param) );
+            }
+        }
         public async Task<int> DeleteAsync(int Id)
         {
             var busStop = await _context.BusStop.SingleOrDefaultAsync(x => x.Id == Id);
@@ -13,7 +13,8 @@
             "version": "1.0.0"
         },
         "Npgsql.EntityFrameworkCore.PostgreSQL": "1.0",
-        "MapsModels": "1.0.0-*"
+        "MapsModels": "1.0.0-*",
+        "AutoMapper": "5.2.0",
     },
     "frameworks": {
         "netcoreapp1.0": {