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 78% rename from CarParkValidationAPI/CarParkValidationAPI.csproj rename to CarParkValidationAPI.csproj index e5e76ee..cff46cb 100644 --- a/CarParkValidationAPI/CarParkValidationAPI.csproj +++ b/CarParkValidationAPI.csproj @@ -5,13 +5,14 @@ - - - - + + + + + - + 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 87% rename from CarParkValidationAPI/Interface/IAdminUser.cs rename to Interface/IAdminUser.cs index f85aa35..8aa0790 100644 --- a/CarParkValidationAPI/Interface/IAdminUser.cs +++ b/Interface/IAdminUser.cs @@ -11,6 +11,7 @@ namespace CarParkValidationAPI.Interface public interface IAdminUser { Task>> LoadAdminUserAsync(bool OnlyActive); + Task> CheckAdminUserByStaffLinkNoAsync(string staffLinkNo); Task> SaveAdminUserAsync(AdminUserDto item); Task> LoadAdminUserByIdAsync(int id); Task> DeleteAdminUserAsync(int id); 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 91% rename from CarParkValidationAPI/Repository/AdminUserFakeRepository.cs rename to Repository/AdminUserFakeRepository.cs index 4d6b3ae..186de8c 100644 --- a/CarParkValidationAPI/Repository/AdminUserFakeRepository.cs +++ b/Repository/AdminUserFakeRepository.cs @@ -60,7 +60,15 @@ namespace CarParkValidationAPI.Repository model.AddedOn = dto.AddedOn; return model; } - + public async Task> CheckAdminUserByStaffLinkNoAsync(string staffLinkNo) + { + var list = await _context.AdminUsers.Where(x => x.StafflinkNo == staffLinkNo).ToListAsync(); + return new ResultModel() + { + Data = false, + StatusCode = 1 + }; + } public async Task>> LoadAdminUserAsync(bool onlyActive) { /* @@ -89,7 +97,8 @@ namespace CarParkValidationAPI.Repository throw ex; } */ - for (int i =0; i < 10; i++) + var list = await _context.AdminUsers.Where(x => x.Active == onlyActive).ToListAsync(); + for (int i =0; i < list.Count; i++) { AdminUserViewDto dto = new AdminUserViewDto(); dto.Id = i; @@ -110,7 +119,7 @@ namespace CarParkValidationAPI.Repository public async Task> LoadAdminUserByIdAsync(int id) { AdminUserDto result = null; - /* + try { if (id > 0) @@ -124,9 +133,7 @@ namespace CarParkValidationAPI.Repository { throw ex; } - */ - return new ResultModel() { Data = result, diff --git a/CarParkValidationAPI/Repository/AdminUserRepository.cs b/Repository/AdminUserRepository.cs similarity index 81% rename from CarParkValidationAPI/Repository/AdminUserRepository.cs rename to Repository/AdminUserRepository.cs index c799975..1c88c06 100644 --- a/CarParkValidationAPI/Repository/AdminUserRepository.cs +++ b/Repository/AdminUserRepository.cs @@ -119,6 +119,37 @@ namespace CarParkValidationAPI.Repository Message = error }; } + public async Task> CheckAdminUserByStaffLinkNoAsync(string staffLinkNo) + { + bool result = false; + int statuscode = 0; + string error = ""; + try + { + if (!string.IsNullOrEmpty(staffLinkNo)) + { + var list = await _context.AdminUsers.Where( x=> x.StafflinkNo == staffLinkNo).ToListAsync(); + if (list.Count > 0) + { + result = true; + statuscode = 1; + } + } + } + catch (Exception ex) + { + error = ex.ToString(); + statuscode = 0; + throw ex; + } + + return new ResultModel() + { + Data = result, + StatusCode = statuscode, + Message = error + }; + } public async Task> LoadAdminUserByIdAsync(int id) { AdminUserDto result = null; @@ -162,17 +193,32 @@ namespace CarParkValidationAPI.Repository model.LastModified = DateTime.Now; model.LastModifiedId = _currentUser; await _context.SaveChangesAsync(); - + result = model.UserID; + statuscode = 1; + } else { - model = new AdminUser(); - model = FillAdminUser(item, model); - _context.AdminUsers.Add(model); - await _context.SaveChangesAsync(); + + ResultModel found = await CheckAdminUserByStaffLinkNoAsync(item.StafflinkNo); + + if (!found.Data) + { + model = new AdminUser(); + model = FillAdminUser(item, model); + _context.AdminUsers.Add(model); + await _context.SaveChangesAsync(); + result = model.UserID; + statuscode = 1; + } + else + { + error = "staff link No '" + item.StafflinkNo + "' already in admin user"; + statuscode = 0; + result = 0; + } } - result = model.UserID; - statuscode = 1; + } catch (Exception ex) { diff --git a/CarParkValidationAPI/Repository/ConcessionTypeRepository.cs b/Repository/ConcessionTypeRepository.cs similarity index 92% rename from CarParkValidationAPI/Repository/ConcessionTypeRepository.cs rename to Repository/ConcessionTypeRepository.cs index 2eeb75b..88fcfcc 100644 --- a/CarParkValidationAPI/Repository/ConcessionTypeRepository.cs +++ b/Repository/ConcessionTypeRepository.cs @@ -12,6 +12,7 @@ using CarParkValidationAPI.Datas; using CarParkValidationAPI.Interface; using Microsoft.EntityFrameworkCore; using System; +using AutoMapper; namespace CarParkValidationAPI.Repository { @@ -20,12 +21,13 @@ namespace CarParkValidationAPI.Repository private DataContext _context; private string _currentUser = ""; private readonly AppSettings _appSettings; - - public ConcessionTypeRepository( + private readonly IMapper _mapper; + public ConcessionTypeRepository( DataContext context, - - IOptions appSettings) + IMapper mapper, + IOptions appSettings) { + _mapper = mapper; _context = context; _appSettings = appSettings.Value; } @@ -57,6 +59,7 @@ namespace CarParkValidationAPI.Repository string error = ""; try { + /* result = await _context.ConcessionTypes.Select( x => new ConcessionTypeDto() { @@ -65,6 +68,9 @@ namespace CarParkValidationAPI.Repository Display = x.ConcessionDisplay, Active = x.Active }).ToListAsync(); + */ + var olist = await _context.ConcessionTypes.ToListAsync(); + result = _mapper.Map>(olist); statuscode = 1; result.Sort((x, y) => x.Description.CompareTo(y.Description)); } @@ -92,7 +98,8 @@ namespace CarParkValidationAPI.Repository try { result = await _context.ConcessionTypes.FindAsync(id); - dto = FillConcessionTypeDto(result); + dto = _mapper.Map(result); + //dto = FillConcessionTypeDto(result); //result = _list.Find(x => x.Id == id); //var dto = await Task.Run(() => result); statuscode = 1; 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 91% rename from CarParkValidationAPI/Repository/UserFakeRepository.cs rename to Repository/UserFakeRepository.cs index 0204a96..785d336 100644 --- a/CarParkValidationAPI/Repository/UserFakeRepository.cs +++ b/Repository/UserFakeRepository.cs @@ -89,10 +89,10 @@ namespace CarParkValidationAPI.Repository if (loginInfo != null && loginInfo.result) { myUser = new User(); - myUser.Email = loginInfo.Email; - myUser.FirstName = loginInfo.FirstName; - myUser.LastName = loginInfo.LastName; - myUser.Username = loginInfo.StafflinkNo; + myUser.Email = loginInfo.email; + myUser.FirstName = loginInfo.firstName; + myUser.LastName = loginInfo.lastName; + myUser.Username = loginInfo.stafflinkNo; //now check the adminuser table var user = _context.AdminUsers.SingleOrDefault(x => x.StafflinkNo == model.Username); if (user != null) @@ -178,10 +178,10 @@ namespace CarParkValidationAPI.Repository if (loginInfo != null && loginInfo.result) { myUser = new User(); - myUser.Email = loginInfo.Email; - myUser.FirstName = loginInfo.FirstName; - myUser.LastName = loginInfo.LastName; - myUser.Username = loginInfo.StafflinkNo; + myUser.Email = loginInfo.email; + myUser.FirstName = loginInfo.firstName; + myUser.LastName = loginInfo.lastName; + myUser.Username = loginInfo.stafflinkNo; statuscode = 1; } @@ -222,10 +222,10 @@ namespace CarParkValidationAPI.Repository MyADObject myADObj = staffLink.SearchStaff(username); User user = new() { - Username = myADObj.StafflinkNo, - Email = myADObj.Email, - FirstName = myADObj.FirstName, - LastName = myADObj.LastName + Username = myADObj.stafflinkNo, + Email = myADObj.email, + FirstName = myADObj.firstName, + LastName = myADObj.lastName }; // myADObj.JobTitle; return user; @@ -239,10 +239,10 @@ namespace CarParkValidationAPI.Repository MyADObject myADObj = staffLink.CheckADCredentials(username,password); User user = new() { - Username = myADObj.StafflinkNo, - Email = myADObj.Email, - FirstName = myADObj.FirstName, - LastName = myADObj.LastName + Username = myADObj.stafflinkNo, + Email = myADObj.email, + FirstName = myADObj.firstName, + LastName = myADObj.lastName }; // myADObj.JobTitle; return user; diff --git a/CarParkValidationAPI/Repository/UserRepository.cs b/Repository/UserRepository.cs similarity index 88% rename from CarParkValidationAPI/Repository/UserRepository.cs rename to Repository/UserRepository.cs index ee1f7e5..bd8f6d8 100644 --- a/CarParkValidationAPI/Repository/UserRepository.cs +++ b/Repository/UserRepository.cs @@ -55,14 +55,14 @@ namespace CarParkValidationAPI.Repository int statuscode = 0; string webAPIUrl = _appSettings.LoginWebAPI; - var loginInfo = await CommonAD.WebAPIUtil.GetLoginADAsync(webAPIUrl, "CheckADCredentials", model.Username, model.Password); + var loginInfo = await CommonAD.WebAPIUtil.PostLoginADAsync(webAPIUrl, "CheckCredentials", model.Username, model.Password); if (loginInfo != null && loginInfo.result) { myUser = new User(); - myUser.Email = loginInfo.Email; - myUser.FirstName = loginInfo.FirstName; - myUser.LastName = loginInfo.LastName; - myUser.Username = loginInfo.StafflinkNo; + myUser.Email = loginInfo.email; + myUser.FirstName = loginInfo.firstName; + myUser.LastName = loginInfo.lastName; + myUser.Username = loginInfo.stafflinkNo; //now check the adminuser table var user = _context.AdminUsers. SingleOrDefault(x => x.StafflinkNo == model.Username @@ -154,10 +154,10 @@ namespace CarParkValidationAPI.Repository if (loginInfo != null && loginInfo.result) { myUser = new User(); - myUser.Email = loginInfo.Email; - myUser.FirstName = loginInfo.FirstName; - myUser.LastName = loginInfo.LastName; - myUser.Username = loginInfo.StafflinkNo; + myUser.Email = loginInfo.email; + myUser.FirstName = loginInfo.firstName; + myUser.LastName = loginInfo.lastName; + myUser.Username = loginInfo.stafflinkNo; statuscode = 1; } @@ -198,10 +198,10 @@ namespace CarParkValidationAPI.Repository MyADObject myADObj = staffLink.SearchStaff(username); User user = new() { - Username = myADObj.StafflinkNo, - Email = myADObj.Email, - FirstName = myADObj.FirstName, - LastName = myADObj.LastName + Username = myADObj.stafflinkNo, + Email = myADObj.email, + FirstName = myADObj.firstName, + LastName = myADObj.lastName }; // myADObj.JobTitle; return user; @@ -215,10 +215,10 @@ namespace CarParkValidationAPI.Repository MyADObject myADObj = staffLink.CheckADCredentials(username,password); User user = new() { - Username = myADObj.StafflinkNo, - Email = myADObj.Email, - FirstName = myADObj.FirstName, - LastName = myADObj.LastName + Username = myADObj.stafflinkNo, + Email = myADObj.email, + FirstName = myADObj.firstName, + LastName = myADObj.lastName }; // myADObj.JobTitle; return user; 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 99% rename from CarParkValidationAPI/Startup.cs rename to Startup.cs index 7ddb5f6..1effd13 100644 --- a/CarParkValidationAPI/Startup.cs +++ b/Startup.cs @@ -66,6 +66,7 @@ namespace CarParkValidationAPI }; }); + services.AddAutoMapper(typeof(Startup)); //** //publish need to take comment out diff --git a/CarParkValidationAPI/appsettings.Development.json b/appsettings.Development.json similarity index 85% rename from CarParkValidationAPI/appsettings.Development.json rename to appsettings.Development.json index b6c155b..eb4634b 100644 --- a/CarParkValidationAPI/appsettings.Development.json +++ b/appsettings.Development.json @@ -2,9 +2,9 @@ "AppSettings": { "Secret": "Nepean Blue Mountain Super Secret SIGN AND VERIFY JWT TOKENS, BEARER TOKEN USE WHEN CALLING THIS API.", "SQLConnectionString": "Server=NEPHICT-040931L;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;", - "LDAPPath": "LDAP://ldap.nswhealth.net:389/OU=Accounts,DC=nswhealth,DC=net", - "LDAPUser": "SRV-NBMS-BIDSPMS", - "LDAPPassword": "42Ytp2AE3nN16eBoyia86UZH6", + "LDAPPath": "", + "LDAPUser": "S", + "LDAPPassword": "", "ADTimeOut": "30", "LoginWebAPI": "http://NEPHMDB-SQL007/CommonWebApiAD/api/AD" }, diff --git a/CarParkValidationAPI/appsettings.json b/appsettings.json similarity index 88% rename from CarParkValidationAPI/appsettings.json rename to appsettings.json index 6d37de4..a4143fe 100644 --- a/CarParkValidationAPI/appsettings.json +++ b/appsettings.json @@ -2,9 +2,9 @@ "AppSettings": { "Secret": "Nepean Blue Mountain Super Secret SIGN AND VERIFY JWT TOKENS, BEARER TOKEN USE WHEN CALLING THIS API.", "SQLConnectionString": "Server=NEPHICT-040931L;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;", - "LDAPPath": "LDAP://ldap.nswhealth.net:389/OU=Accounts,DC=nswhealth,DC=net", - "LDAPUser": "SRV-NBMS-BIDSPMS", - "LDAPPassword": "42Ytp2AE3nN16eBoyia86UZH6", + "LDAPPath": "", + "LDAPUser": "S", + "LDAPPassword": "", "ADTimeOut": "30", "LoginWebAPI": "http://NEPHMDB-SQL007/CommonWebApiAD/api/AD" diff --git a/CarParkValidationAPI/web.config b/web.config similarity index 100% rename from CarParkValidationAPI/web.config rename to web.config