diff --git a/src/Server/Controllers/JobListingController.cs b/src/Server/Controllers/JobListingController.cs index 647050c..d4f4ddf 100644 --- a/src/Server/Controllers/JobListingController.cs +++ b/src/Server/Controllers/JobListingController.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore.Mvc; using BoredCareers.Services.DatabaseService; using BoredCareers.Entities; -using Org.BouncyCastle.Tls; namespace BoredCareers.Controllers { [ApiController] diff --git a/src/Server/Services/DatabaseService/JobListing.cs b/src/Server/Services/DatabaseService/JobListing.cs index 28029ca..5acab3d 100644 --- a/src/Server/Services/DatabaseService/JobListing.cs +++ b/src/Server/Services/DatabaseService/JobListing.cs @@ -17,45 +17,45 @@ namespace BoredCareers.Services.DatabaseService { string limit = " LIMIT @PageSize OFFSET @PageNumber;"; List Filters = new List(); - List Parameters = new List(); + List Parameters = new List(); List ParameterName = new List(); if (PostalCodes != null) { for (int i = 0; i < PostalCodes.Length; i++) { Filters.Add("PostalCode"); Parameters.Add(PostalCodes[i]); - ParameterName.Add("@PostalCode" + i); + ParameterName.Add(" = @PostalCode" + i); } } if (CountryCode != null) { Filters.Add("Country"); Parameters.Add(CountryCode); - ParameterName.Add("@CountryCode"); + ParameterName.Add(" = @CountryCode"); } if (JobType != null) { Filters.Add("JobType"); Parameters.Add(JobType); - ParameterName.Add("@JobType"); + ParameterName.Add(" = @JobType"); } if (Remote != null) { Filters.Add("Remote"); - Parameters.Add(Remote.Value.ToString()); - ParameterName.Add("@Remote"); + Parameters.Add(Remote.Value); + ParameterName.Add(" = @Remote"); } if (SalaryMin != null) { Filters.Add("SalaryMin"); - Parameters.Add(SalaryMin.Value.ToString()); - ParameterName.Add("@SalaryMin"); + Parameters.Add(SalaryMin.Value); + ParameterName.Add(" >= @SalaryMin"); } if (SalaryMax != null) { Filters.Add("SalaryMax"); - Parameters.Add(SalaryMax.Value.ToString()); - ParameterName.Add("@SalaryMax"); + Parameters.Add(SalaryMax.Value); + ParameterName.Add(" <= @SalaryMax"); } string filter = " WHERE IsDeleted = False"; @@ -65,14 +65,14 @@ namespace BoredCareers.Services.DatabaseService { } else { filter += " AND "; } - filter += Filters[i] + " = " + ParameterName[i]; + filter += Filters[i] + ParameterName[i]; } MySqlCommand cmd = new MySqlCommand(select + filter + order + limit, connection); cmd.Parameters.AddWithValue("@PageSize", CountPerPage); cmd.Parameters.AddWithValue("@PageNumber", (PageNumber - 1) * CountPerPage); for (int i = 0; i < Filters.Count; i++) { - cmd.Parameters.AddWithValue( ParameterName[i], Parameters[i] ); + cmd.Parameters.AddWithValue( ParameterName[i].Split(' ').Last(), Parameters[i] ); } using (DbDataReader reader = await cmd.ExecuteReaderAsync()) {