Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Olhaholiak/workshop filter tests #258

Merged
merged 12 commits into from
Aug 5, 2021
Merged

Olhaholiak/workshop filter tests #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8d67a02
divide mapping tests into two classes
OlhaHoliak Jul 29, 2021
2f0905e
add elasticsearch service registration test
OlhaHoliak Jul 29, 2021
371c701
delete method GetAll in Workshop controller
OlhaHoliak Jul 29, 2021
98eb8b4
add rating controller tests
OlhaHoliak Jul 29, 2021
74facff
refactored filter logic by city
OlhaHoliak Jul 29, 2021
671ef38
combined workshop service tests
OlhaHoliak Jul 29, 2021
db03585
rewrited logic of get all workshops
OlhaHoliak Aug 2, 2021
41b2df8
fix price search, add workshop service tests
OlhaHoliak Aug 2, 2021
e1c4185
add elasticsearch workshop service tests
OlhaHoliak Aug 3, 2021
a4a4925
remove search by ProviderDescription
OlhaHoliak Aug 3, 2021
b992614
fix code smells
OlhaHoliak Aug 5, 2021
1d06fb5
remove check that doubles
OlhaHoliak Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions OutOfSchool/OutOfSchool.ElasticsearchData/ESWorkshopProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,14 @@ private QueryContainer CreateQueryFromFilter(WorkshopFilterES filter)
return queryContainer;
}

if (!string.IsNullOrEmpty(filter.SearchText))
if (!string.IsNullOrWhiteSpace(filter.SearchText))
{
queryContainer &= new MultiMatchQuery()
{
Fields = Infer.Field<WorkshopES>(w => w.Title)
.And(Infer.Field<WorkshopES>(w => w.ProviderTitle))
.And(Infer.Field<WorkshopES>(w => w.Keywords))
.And(Infer.Field<WorkshopES>(w => w.Description))
.And(Infer.Field<WorkshopES>(w => w.ProviderDescription)),
.And(Infer.Field<WorkshopES>(w => w.Description)),
Query = filter.SearchText,
Fuzziness = Fuzziness.Auto,
};
Expand Down Expand Up @@ -95,7 +94,7 @@ private QueryContainer CreateQueryFromFilter(WorkshopFilterES filter)
Value = 0,
};
}
else if (!filter.IsFree && !(filter.MinPrice == 0 || filter.MaxPrice == int.MaxValue))
else if (!filter.IsFree && !(filter.MinPrice == 0 && filter.MaxPrice == int.MaxValue))
{
queryContainer &= new NumericRangeQuery()
{
Expand All @@ -104,7 +103,7 @@ private QueryContainer CreateQueryFromFilter(WorkshopFilterES filter)
LessThanOrEqualTo = filter.MaxPrice,
};
}
else if (filter.IsFree && !(filter.MinPrice == 0 || filter.MaxPrice == int.MaxValue))
else if (filter.IsFree && !(filter.MinPrice == 0 && filter.MaxPrice == int.MaxValue))
{
var tempQuery = new QueryContainer();

Expand Down Expand Up @@ -152,11 +151,14 @@ private QueryContainer CreateQueryFromFilter(WorkshopFilterES filter)
};
}

queryContainer &= new MatchQuery()
if (!string.IsNullOrWhiteSpace(filter.City))
{
Field = Infer.Field<WorkshopES>(w => w.Address.City),
Query = filter.City,
};
queryContainer &= new MatchQuery()
{
Field = Infer.Field<WorkshopES>(w => w.Address.City),
Query = filter.City,
};
}

return queryContainer;
}
Expand Down Expand Up @@ -192,7 +194,7 @@ private List<ISort> CreateSortFromFilter(WorkshopFilterES filter)
break;

default:
sorts.Add(new FieldSort() { Field = Infer.Field<WorkshopES>(w => w.Rating), Order = SortOrder.Descending });
sorts.Add(new FieldSort() { Field = Infer.Field<WorkshopES>(w => w.Id), Order = SortOrder.Ascending });
break;
}

Expand Down
3 changes: 1 addition & 2 deletions OutOfSchool/OutOfSchool.ElasticsearchData/ElasticsearchProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Runtime.ExceptionServices;
using System.Threading;
using System.Threading.Tasks;
Expand Down
1 change: 1 addition & 0 deletions OutOfSchool/OutOfSchool.ElasticsearchData/Enums/OrderBy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{
public enum OrderBy
{
Id,
Statistic,
Rating,
PriceDesc,
Expand Down
2 changes: 0 additions & 2 deletions OutOfSchool/OutOfSchool.ElasticsearchData/Models/WorkshopES.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ public class WorkshopES

public string ProviderTitle { get; set; }

public string ProviderDescription { get; set; }

public string Description { get; set; }

public int MinAge { get; set; }
Expand Down
4 changes: 2 additions & 2 deletions OutOfSchool/OutOfSchool.ElasticsearchData/Models/WorkshopFilterES.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class WorkshopFilterES

public string SearchText { get; set; } = string.Empty;

public string OrderByField { get; set; } = OrderBy.Rating.ToString();
public string OrderByField { get; set; } = OrderBy.Id.ToString();

public int MinAge { get; set; } = 0;

Expand All @@ -23,7 +23,7 @@ public class WorkshopFilterES

public List<long> DirectionIds { get; set; } = new List<long> { 0 };

public string City { get; set; } = "Київ";
public string City { get; set; } = string.Empty;

public bool WithDisabilityOptions { get; set; } = false;

Expand Down
Loading