Skip to content

Fix country query service #54

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

Merged
merged 4 commits into from
Aug 22, 2025
Merged

Fix country query service #54

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d8ac30
fix(country): use Object instead of dynamic for empty list type
fulleni Aug 22, 2025
7b78c66
refactor(country): improve type safety in aggregation pipeline
fulleni Aug 22, 2025
0b9354c
fix(country): update aggregation queries for country IDs
fulleni Aug 22, 2025
e88fb05
fix(country): replace text search with regex for case-insensitive search
fulleni Aug 22, 2025
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
25 changes: 17 additions & 8 deletions lib/src/services/country_query_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@ class CountryQueryService {
}

/// Builds the MongoDB aggregation pipeline based on the provided filters.
List<Map<String, dynamic>> _buildAggregationPipeline(
List<Map<String, Object>> _buildAggregationPipeline(
Map<String, dynamic> filter,
PaginationOptions? pagination,
List<SortOption>? sort,
) {
final pipeline = <Map<String, dynamic>>[];
final pipeline = <Map<String, Object>>[];
final compoundMatchStages = <Map<String, dynamic>>[];

// --- Stage 1: Initial Match for active status, text search, and other filters ---
Expand All @@ -131,7 +131,10 @@ class CountryQueryService {
final qValue = filter['q'];
if (qValue is String && qValue.isNotEmpty) {
compoundMatchStages.add({
r'$text': {r'$search': qValue},
'name': {
r'$regex': qValue,
r'$options': 'i', // Case-insensitive
},
});
}

Expand Down Expand Up @@ -163,7 +166,10 @@ class CountryQueryService {
{
r'$match': {
r'$expr': {
r'$eq': [r'$headquarters._id', r'$$countryId'],
r'$eq': [
r'$headquarters.id',
{r'$toString': r'$$countryId'},
],
},
'status': ContentStatus.active.name,
},
Expand All @@ -174,7 +180,7 @@ class CountryQueryService {
});
pipeline.add({
r'$match': {
'matchingSources': {r'$ne': <dynamic>[]},
'matchingSources': {r'$ne': <Object>[]},
},
});
}
Expand All @@ -191,7 +197,10 @@ class CountryQueryService {
{
r'$match': {
r'$expr': {
r'$eq': [r'$eventCountry._id', r'$$countryId'],
r'$eq': [
r'$eventCountry.id',
{r'$toString': r'$$countryId'},
],
},
'status': ContentStatus.active.name,
},
Expand All @@ -202,14 +211,14 @@ class CountryQueryService {
});
pipeline.add({
r'$match': {
'matchingHeadlines': {r'$ne': <dynamic>[]},
'matchingHeadlines': {r'$ne': <Object>[]},
},
});
}

// --- Stage 4: Sorting ---
if (sort != null && sort.isNotEmpty) {
final sortStage = <String, dynamic>{};
final sortStage = <String, Object>{};
for (final option in sort) {
sortStage[option.field] = option.order == SortOrder.asc ? 1 : -1;
}
Expand Down
Loading