diff --git a/CarParkValidationAPI/.config/dotnet-tools.json b/.config/dotnet-tools.json similarity index 100% rename from CarParkValidationAPI/.config/dotnet-tools.json rename to .config/dotnet-tools.json diff --git a/CarParkValidationAPI/Authorization/AllowAnonymousAttribute.cs b/Authorization/AllowAnonymousAttribute.cs similarity index 100% rename from CarParkValidationAPI/Authorization/AllowAnonymousAttribute.cs rename to Authorization/AllowAnonymousAttribute.cs diff --git a/CarParkValidationAPI/Authorization/AuthorizeAttribute.cs b/Authorization/AuthorizeAttribute.cs similarity index 100% rename from CarParkValidationAPI/Authorization/AuthorizeAttribute.cs rename to Authorization/AuthorizeAttribute.cs diff --git a/CarParkValidationAPI/Authorization/JwtMiddleware.cs b/Authorization/JwtMiddleware.cs similarity index 100% rename from CarParkValidationAPI/Authorization/JwtMiddleware.cs rename to Authorization/JwtMiddleware.cs diff --git a/CarParkValidationAPI/Authorization/JwtUtils.cs b/Authorization/JwtUtils.cs similarity index 100% rename from CarParkValidationAPI/Authorization/JwtUtils.cs rename to Authorization/JwtUtils.cs diff --git a/CarParkValidationAPI/CarParkValidationAPI.csproj b/CarParkValidationAPI.csproj similarity index 100% rename from CarParkValidationAPI/CarParkValidationAPI.csproj rename to CarParkValidationAPI.csproj diff --git a/CarParkValidationAPI.sln b/CarParkValidationAPI.sln deleted file mode 100644 index c71d102..0000000 --- a/CarParkValidationAPI.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31515.178 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarParkValidationAPI", "CarParkValidationAPI\CarParkValidationAPI.csproj", "{FCD8F53F-967F-4E66-B42C-DCD0C83B2670}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonAD", "..\..\CommonAD\CommonAD.csproj", "{8FB49AA9-08D8-400E-BA06-250C479A2296}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FCD8F53F-967F-4E66-B42C-DCD0C83B2670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCD8F53F-967F-4E66-B42C-DCD0C83B2670}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCD8F53F-967F-4E66-B42C-DCD0C83B2670}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCD8F53F-967F-4E66-B42C-DCD0C83B2670}.Release|Any CPU.Build.0 = Release|Any CPU - {8FB49AA9-08D8-400E-BA06-250C479A2296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8FB49AA9-08D8-400E-BA06-250C479A2296}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FB49AA9-08D8-400E-BA06-250C479A2296}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8FB49AA9-08D8-400E-BA06-250C479A2296}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {B6C27BFF-4D28-4CB3-954C-F3B6C100B5EC} - EndGlobalSection -EndGlobal diff --git a/CarParkValidationAPI/Controllers/AdminUserController.cs b/Controllers/AdminUserController.cs similarity index 100% rename from CarParkValidationAPI/Controllers/AdminUserController.cs rename to Controllers/AdminUserController.cs diff --git a/CarParkValidationAPI/Controllers/ConcessionTypeController.cs b/Controllers/ConcessionTypeController.cs similarity index 100% rename from CarParkValidationAPI/Controllers/ConcessionTypeController.cs rename to Controllers/ConcessionTypeController.cs diff --git a/CarParkValidationAPI/Controllers/ConcessionValidationController.cs b/Controllers/ConcessionValidationController.cs similarity index 100% rename from CarParkValidationAPI/Controllers/ConcessionValidationController.cs rename to Controllers/ConcessionValidationController.cs diff --git a/CarParkValidationAPI/Controllers/FallbackController.cs b/Controllers/FallbackController.cs similarity index 100% rename from CarParkValidationAPI/Controllers/FallbackController.cs rename to Controllers/FallbackController.cs diff --git a/CarParkValidationAPI/Controllers/LookupCodeController.cs b/Controllers/LookupCodeController.cs similarity index 100% rename from CarParkValidationAPI/Controllers/LookupCodeController.cs rename to Controllers/LookupCodeController.cs diff --git a/CarParkValidationAPI/Controllers/UsersController.cs b/Controllers/UsersController.cs similarity index 100% rename from CarParkValidationAPI/Controllers/UsersController.cs rename to Controllers/UsersController.cs diff --git a/CarParkValidationAPI/Controllers/ValidationPointController.cs b/Controllers/ValidationPointController.cs similarity index 100% rename from CarParkValidationAPI/Controllers/ValidationPointController.cs rename to Controllers/ValidationPointController.cs diff --git a/Datas/AutoMapping.cs b/Datas/AutoMapping.cs new file mode 100644 index 0000000..f9ca640 --- /dev/null +++ b/Datas/AutoMapping.cs @@ -0,0 +1,27 @@ +using AutoMapper; +using CarParkValidationAPI.Entities; +using CarParkValidationAPI.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace CarParkValidationAPI.Datas +{ + public class AutoMapping: Profile + { + public AutoMapping() + { + CreateMap() + .ForMember( dest => dest.Id, opt => opt.MapFrom(src => src.ConcessionTypeID)) + .ForMember(dest => dest.Description , opt=> opt.MapFrom(src=> src.ConcessionDesc)) + .ForMember(dest => dest.Display, opt => opt.MapFrom(src => src.ConcessionDisplay)) + .ReverseMap(); + CreateMap() + .ForMember(dest => dest.Id , opt => opt.MapFrom(src => src.ValidationPointID)) + .ForMember(dest => dest.Display, opt => opt.MapFrom(src => src.DisplayName)) + .ReverseMap(); + /*etc...*/ + } + } +} diff --git a/CarParkValidationAPI/Datas/DataContext.cs b/Datas/DataContext.cs similarity index 100% rename from CarParkValidationAPI/Datas/DataContext.cs rename to Datas/DataContext.cs diff --git a/CarParkValidationAPI/Entities/AdminUserDto.cs b/Entities/AdminUserDto.cs similarity index 100% rename from CarParkValidationAPI/Entities/AdminUserDto.cs rename to Entities/AdminUserDto.cs diff --git a/CarParkValidationAPI/Entities/ApiException.cs b/Entities/ApiException.cs similarity index 100% rename from CarParkValidationAPI/Entities/ApiException.cs rename to Entities/ApiException.cs diff --git a/CarParkValidationAPI/Entities/ConcessionTypeDto.cs b/Entities/ConcessionTypeDto.cs similarity index 100% rename from CarParkValidationAPI/Entities/ConcessionTypeDto.cs rename to Entities/ConcessionTypeDto.cs diff --git a/CarParkValidationAPI/Entities/ConcessionValidationDto.cs b/Entities/ConcessionValidationDto.cs similarity index 100% rename from CarParkValidationAPI/Entities/ConcessionValidationDto.cs rename to Entities/ConcessionValidationDto.cs diff --git a/CarParkValidationAPI/Entities/FileContent.cs b/Entities/FileContent.cs similarity index 100% rename from CarParkValidationAPI/Entities/FileContent.cs rename to Entities/FileContent.cs diff --git a/CarParkValidationAPI/Entities/LookupCodeDto.cs b/Entities/LookupCodeDto.cs similarity index 100% rename from CarParkValidationAPI/Entities/LookupCodeDto.cs rename to Entities/LookupCodeDto.cs diff --git a/CarParkValidationAPI/Entities/Role.cs b/Entities/Role.cs similarity index 100% rename from CarParkValidationAPI/Entities/Role.cs rename to Entities/Role.cs diff --git a/CarParkValidationAPI/Entities/ValidationPointDto.cs b/Entities/ValidationPointDto.cs similarity index 100% rename from CarParkValidationAPI/Entities/ValidationPointDto.cs rename to Entities/ValidationPointDto.cs diff --git a/CarParkValidationAPI/Helpers/ErrorHandlerMiddleware.cs b/Helpers/ErrorHandlerMiddleware.cs similarity index 100% rename from CarParkValidationAPI/Helpers/ErrorHandlerMiddleware.cs rename to Helpers/ErrorHandlerMiddleware.cs diff --git a/CarParkValidationAPI/Interface/IAdminUser.cs b/Interface/IAdminUser.cs similarity index 100% rename from CarParkValidationAPI/Interface/IAdminUser.cs rename to Interface/IAdminUser.cs diff --git a/CarParkValidationAPI/Interface/IConcessionType.cs b/Interface/IConcessionType.cs similarity index 100% rename from CarParkValidationAPI/Interface/IConcessionType.cs rename to Interface/IConcessionType.cs diff --git a/CarParkValidationAPI/Interface/IConcessionValidation.cs b/Interface/IConcessionValidation.cs similarity index 100% rename from CarParkValidationAPI/Interface/IConcessionValidation.cs rename to Interface/IConcessionValidation.cs diff --git a/CarParkValidationAPI/Interface/IJwtUtils.cs b/Interface/IJwtUtils.cs similarity index 100% rename from CarParkValidationAPI/Interface/IJwtUtils.cs rename to Interface/IJwtUtils.cs diff --git a/CarParkValidationAPI/Interface/ILookupCode.cs b/Interface/ILookupCode.cs similarity index 100% rename from CarParkValidationAPI/Interface/ILookupCode.cs rename to Interface/ILookupCode.cs diff --git a/CarParkValidationAPI/Interface/IUser.cs b/Interface/IUser.cs similarity index 100% rename from CarParkValidationAPI/Interface/IUser.cs rename to Interface/IUser.cs diff --git a/CarParkValidationAPI/Interface/IValidationPoint.cs b/Interface/IValidationPoint.cs similarity index 100% rename from CarParkValidationAPI/Interface/IValidationPoint.cs rename to Interface/IValidationPoint.cs diff --git a/CarParkValidationAPI/Interface/SpreadsheetLight.dll b/Interface/SpreadsheetLight.dll similarity index 100% rename from CarParkValidationAPI/Interface/SpreadsheetLight.dll rename to Interface/SpreadsheetLight.dll diff --git a/CarParkValidationAPI/Models/AdminUser.cs b/Models/AdminUser.cs similarity index 100% rename from CarParkValidationAPI/Models/AdminUser.cs rename to Models/AdminUser.cs diff --git a/CarParkValidationAPI/Models/AppSettings.cs b/Models/AppSettings.cs similarity index 100% rename from CarParkValidationAPI/Models/AppSettings.cs rename to Models/AppSettings.cs diff --git a/CarParkValidationAPI/Models/ConcessionType.cs b/Models/ConcessionType.cs similarity index 100% rename from CarParkValidationAPI/Models/ConcessionType.cs rename to Models/ConcessionType.cs diff --git a/CarParkValidationAPI/Models/ConcessionValidation.cs b/Models/ConcessionValidation.cs similarity index 100% rename from CarParkValidationAPI/Models/ConcessionValidation.cs rename to Models/ConcessionValidation.cs diff --git a/CarParkValidationAPI/Models/ResultModel.cs b/Models/ResultModel.cs similarity index 100% rename from CarParkValidationAPI/Models/ResultModel.cs rename to Models/ResultModel.cs diff --git a/CarParkValidationAPI/Models/User.cs b/Models/User.cs similarity index 100% rename from CarParkValidationAPI/Models/User.cs rename to Models/User.cs diff --git a/CarParkValidationAPI/Models/Users/AuthenticateRequest.cs b/Models/Users/AuthenticateRequest.cs similarity index 100% rename from CarParkValidationAPI/Models/Users/AuthenticateRequest.cs rename to Models/Users/AuthenticateRequest.cs diff --git a/CarParkValidationAPI/Models/Users/AuthenticateResponse.cs b/Models/Users/AuthenticateResponse.cs similarity index 100% rename from CarParkValidationAPI/Models/Users/AuthenticateResponse.cs rename to Models/Users/AuthenticateResponse.cs diff --git a/CarParkValidationAPI/Models/ValidationPoint.cs b/Models/ValidationPoint.cs similarity index 100% rename from CarParkValidationAPI/Models/ValidationPoint.cs rename to Models/ValidationPoint.cs diff --git a/CarParkValidationAPI/Program.cs b/Program.cs similarity index 100% rename from CarParkValidationAPI/Program.cs rename to Program.cs diff --git a/CarParkValidationAPI/Properties/launchSettings.json b/Properties/launchSettings.json similarity index 100% rename from CarParkValidationAPI/Properties/launchSettings.json rename to Properties/launchSettings.json diff --git a/CarParkValidationAPI/Repository/AdminUserFakeRepository.cs b/Repository/AdminUserFakeRepository.cs similarity index 100% rename from CarParkValidationAPI/Repository/AdminUserFakeRepository.cs rename to Repository/AdminUserFakeRepository.cs diff --git a/CarParkValidationAPI/Repository/AdminUserRepository.cs b/Repository/AdminUserRepository.cs similarity index 100% rename from CarParkValidationAPI/Repository/AdminUserRepository.cs rename to Repository/AdminUserRepository.cs diff --git a/CarParkValidationAPI/Repository/ConcessionTypeRepository.cs b/Repository/ConcessionTypeRepository.cs similarity index 100% rename from CarParkValidationAPI/Repository/ConcessionTypeRepository.cs rename to Repository/ConcessionTypeRepository.cs diff --git a/CarParkValidationAPI/Repository/ConcessionValidationReportRepository.cs b/Repository/ConcessionValidationReportRepository.cs similarity index 100% rename from CarParkValidationAPI/Repository/ConcessionValidationReportRepository.cs rename to Repository/ConcessionValidationReportRepository.cs diff --git a/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs b/Repository/ConcessionValidationRepository.cs similarity index 100% rename from CarParkValidationAPI/Repository/ConcessionValidationRepository.cs rename to Repository/ConcessionValidationRepository.cs diff --git a/CarParkValidationAPI/Repository/LookupCodeRepository.cs b/Repository/LookupCodeRepository.cs similarity index 100% rename from CarParkValidationAPI/Repository/LookupCodeRepository.cs rename to Repository/LookupCodeRepository.cs diff --git a/CarParkValidationAPI/Repository/UserFakeRepository.cs b/Repository/UserFakeRepository.cs similarity index 100% rename from CarParkValidationAPI/Repository/UserFakeRepository.cs rename to Repository/UserFakeRepository.cs diff --git a/CarParkValidationAPI/Repository/UserRepository.cs b/Repository/UserRepository.cs similarity index 100% rename from CarParkValidationAPI/Repository/UserRepository.cs rename to Repository/UserRepository.cs diff --git a/CarParkValidationAPI/Repository/ValidationPointFackRepository.cs b/Repository/ValidationPointFackRepository.cs similarity index 100% rename from CarParkValidationAPI/Repository/ValidationPointFackRepository.cs rename to Repository/ValidationPointFackRepository.cs diff --git a/CarParkValidationAPI/Repository/ValidationPointRepository.cs b/Repository/ValidationPointRepository.cs similarity index 100% rename from CarParkValidationAPI/Repository/ValidationPointRepository.cs rename to Repository/ValidationPointRepository.cs diff --git a/CarParkValidationAPI/Startup.cs b/Startup.cs similarity index 100% rename from CarParkValidationAPI/Startup.cs rename to Startup.cs diff --git a/CarParkValidationAPI/appsettings.Development.json b/appsettings.Development.json similarity index 100% rename from CarParkValidationAPI/appsettings.Development.json rename to appsettings.Development.json diff --git a/CarParkValidationAPI/appsettings.json b/appsettings.json similarity index 100% rename from CarParkValidationAPI/appsettings.json rename to appsettings.json diff --git a/CarParkValidationAPI/web.config b/web.config similarity index 100% rename from CarParkValidationAPI/web.config rename to web.config