Fix issue in countries with no neighbors

The type of the borders array returned by the API is optional

Author: modmani

CountriesSwiftUI/Repositories/Database/CountriesDBRepository.swift

@@ -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 {

CountriesSwiftUI/Repositories/Models/CountryDetails.swift

@@ -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
@@ -33,6 +33,6 @@ extension ApiModel {
  struct CountryDetails: Codable, Equatable {
  let capital: String
  let currencies: [Currency]
- let borders: [String]
+ let borders: [String]?
  }
 }

CountriesSwiftUI/UI/CountryDetails/CountryDetailsView.swift

@@ -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())