gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

ios: attempt to fix weird core data crashes, but related to hashes

Browse source
This commit is contained in:
Emin 2024-10-29 16:49:27 +05:00
parent e32a9d2665
commit babef10504
4 changed files with 25 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
iphone/Maps/Tourism/Data/Db/PersistenceControllers/HashesPersistenceController.swift
View file

@ -19,46 +19,18 @@ class HashesPersistenceController {
}
// MARK: - CRUD Operations
func putOneHash(_ hash: Hash) {
putHash(hash, shouldSave: true)
}
func putHashes(hashes: [Hash]) {
hashes.forEach { hash in
putHash(hash, shouldSave: false) // Don't save in each iteration
}
// Save the context once after all inserts/updates
func insertHashes(hashes: [Hash]) {
let context = container.viewContext
do {
try context.save()
} catch {
print("Failed to save context: \(error)")
}
}
func putHash(_ hash: Hash, shouldSave: Bool) {
let context = container.viewContext
let fetchRequest: NSFetchRequest<HashEntity> = HashEntity.fetchRequest()
fetchRequest.predicate = NSPredicate(format: "categoryId == %lld", hash.categoryId)
fetchRequest.fetchLimit = 1
do {
let result = try context.fetch(fetchRequest).first
if let existingHash = result {
existingHash.value = hash.value
} else {
for hash in hashes {
let newHash = HashEntity(context: context)
newHash.categoryId = hash.categoryId
newHash.value = hash.value
}
if shouldSave {
try context.save()
}
try context.save()
} catch {
print("Failed to insert or update hash: \(error)")
print("Failed to save context: \(error)")
}
}
@ -96,4 +68,20 @@ class HashesPersistenceController {
return []
}
}
func deleteHash(hash: Hash) {
let context = container.viewContext
let fetchRequest: NSFetchRequest<HashEntity> = HashEntity.fetchRequest()
fetchRequest.predicate = NSPredicate(format: "categoryId == %lld", hash.categoryId)
do {
if let hash = try context.fetch(fetchRequest).first {
context.delete(hash)
try context.save()
}
} catch {
print(error)
print("Failed to delete review: \(error)")
}
}
}

34
iphone/Maps/Tourism/Data/Db/PersistenceControllers/PlacesPersistenceController.swift
View file

@ -35,40 +35,6 @@ class PlacesPersistenceController: NSObject, NSFetchedResultsControllerDelegate
}
// MARK: Places
func putPlaces(_ places: [PlaceFull], categoryId: Int64) {
let context = container.viewContext
places.forEach { place in
putPlace(place, categoryId: categoryId, context: context)
}
// Save the context once after all inserts/updates
do {
try context.save()
} catch {
print("Failed to save context: \(error)")
}
}
private func putPlace(_ place: PlaceFull, categoryId: Int64, context: NSManagedObjectContext) {
let fetchRequest: NSFetchRequest<PlaceEntity> = PlaceEntity.fetchRequest()
fetchRequest.predicate = NSPredicate(format: "id == %lld", place.id)
fetchRequest.fetchLimit = 1
do {
if let existingPlace = try context.fetch(fetchRequest).first {
updatePlace(existingPlace, with: place, categoryId: categoryId)
} else {
// Insert a new place
let newPlace = PlaceEntity(context: context)
newPlace.id = place.id
updatePlace(newPlace, with: place, categoryId: categoryId)
}
} catch {
print("Failed to insert or update place: \(error)")
}
}
func insertPlaces(_ places: [PlaceFull], categoryId: Int64) {
let context = container.viewContext

47
iphone/Maps/Tourism/Data/Db/PersistenceControllers/ReviewsPersistenceController.swift
View file

@ -24,54 +24,7 @@ class ReviewsPersistenceController: NSObject, NSFetchedResultsControllerDelegate
}
// MARK: - Review Operations
func putReview(_ review: Review) {
let context = container.viewContext
let fetchRequest: NSFetchRequest<ReviewEntity> = ReviewEntity.fetchRequest()
fetchRequest.predicate = NSPredicate(format: "id == %lld", review.id)
do {
let results = try context.fetch(fetchRequest)
if let existingReview = results.first {
// Update existing review
updateReviewEntity(existingReview, with: review)
} else {
let newReview = ReviewEntity(context: context)
newReview.id = review.id
updateReviewEntity(newReview, with: review)
}
try context.save()
} catch {
print(error)
print("Failed to insert/update review: \(error)")
}
}
func putReviews(_ reviews: [Review]) {
let context = container.viewContext
let fetchRequest: NSFetchRequest<ReviewEntity> = ReviewEntity.fetchRequest()
do {
for review in reviews {
fetchRequest.predicate = NSPredicate(format: "id == %lld", review.id)
let results = try context.fetch(fetchRequest)
if let existingReview = results.first {
// Update existing review
updateReviewEntity(existingReview, with: review)
} else {
let newReview = ReviewEntity(context: context)
newReview.id = review.id
updateReviewEntity(newReview, with: review)
}
}
try context.save()
} catch {
print(error)
print("Failed to insert/update reviews: \(error)")
}
}
func insertReviews(_ reviews: [Review]) {
print("inserting")
let context = container.viewContext
do {

10
iphone/Maps/Tourism/Data/Repositories/PlacesRepositoryImpl.swift
View file

@ -91,7 +91,7 @@ class PlacesRepositoryImpl: PlacesRepository {
}
// update hashes
hashesPersistenceController.putHashes(hashes: [
hashesPersistenceController.insertHashes(hashes: [
Hash(categoryId: PlaceCategory.sights.id, value: allData.attractionsHash),
Hash(categoryId: PlaceCategory.restaurants.id, value: allData.restaurantsHash),
Hash(categoryId: PlaceCategory.hotels.id, value: allData.accommodationsHash)
@ -162,10 +162,10 @@ class PlacesRepositoryImpl: PlacesRepository {
}
// update hash
hashesPersistenceController.putHash(
Hash(categoryId: hash!.categoryId, value: resource.hash),
shouldSave: true
)
hashesPersistenceController.deleteHash(hash: hash!)
hashesPersistenceController.insertHashes(hashes: [
Hash(categoryId: hash!.categoryId, value: resource.hash)
])
}
}