Skip to content

Quick fix for the new API rule for \all route #110

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 2 commits into from
Jul 14, 2025
Merged

Quick fix for the new API rule for \all route #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d16b1c
Add fields to \all endpoint
modmani Jun 12, 2025
c0a177a
Fix issue in countries with no neighbors
modmani Jun 12, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CountriesSwiftUI/Repositories/Database/CountriesDBRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ extension MainDBRepository: CountriesDBRepository {
let alpha3Code = country.alpha3Code
try modelContext.transaction {
let currencies = countryDetails.currencies.map { $0.dbModel() }
let neighborsFetch = FetchDescriptor(predicate: #Predicate<DBModel.Country> {
countryDetails.borders.contains($0.alpha3Code)
let neighborsFetch = FetchDescriptor(predicate: #Predicate<DBModel.Country> { countryDBModel in
countryDetails.borders?.contains(countryDBModel.alpha3Code) == true
})
let neighbors = try modelContext.fetch(neighborsFetch)
currencies.forEach {
Expand Down
4 changes: 2 additions & 2 deletions CountriesSwiftUI/Repositories/Models/CountryDetails.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ extension DBModel {
@Attribute(.unique) var alpha3Code: String
var capital: String
var currencies: [Currency]
var neighbors: [Country]
var neighbors: [Country]?

init(alpha3Code: String, capital: String, currencies: [Currency], neighbors: [Country]) {
self.alpha3Code = alpha3Code
Expand All @@ -33,6 +33,6 @@ extension ApiModel {
struct CountryDetails: Codable, Equatable {
let capital: String
let currencies: [Currency]
let borders: [String]
let borders: [String]?
}
}
2 changes: 1 addition & 1 deletion CountriesSwiftUI/Repositories/WebAPI/CountriesWebRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ extension RealCountriesWebRepository.API: APICall {
var path: String {
switch self {
case .allCountries:
return "/all"
return "/all?fields=name,translations,population,flag,alpha3Code"
case let .countryDetails(countryName):
let encodedName = countryName.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)
return "/name/\(encodedName ?? countryName)"
Expand Down
6 changes: 4 additions & 2 deletions CountriesSwiftUI/UI/CountryDetails/CountryDetailsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,10 @@ private extension CountryDetails {
if countryDetails.currencies.count > 0 {
currenciesSectionView(currencies: countryDetails.currencies)
}
if countryDetails.neighbors.count > 0 {
neighborsSectionView(neighbors: countryDetails.neighbors)
if let neighbors = countryDetails.neighbors {
if neighbors.count > 0 {
neighborsSectionView(neighbors: neighbors)
}
}
}
.listStyle(GroupedListStyle())
Expand Down