refactor(): refactored photo kit service to use result type

Author: Christian Elies

Sources/RemoteImage/private/Services/PhotoKitService.swift

@@ -6,35 +6,31 @@ protocol PhotoKitServiceProvider {
 
 protocol PhotoKitServiceProtocol {
     func getPhotoData(localIdentifier: String,
-                      success: @escaping (Data) -> Void,
-                      failure: @escaping (Error) -> Void)
+                      _ completion: @escaping (Result<Data, Error>) -> Void)
 }
 
-final class PhotoKitService {
-	
-}
+final class PhotoKitService {}
 
 extension PhotoKitService: PhotoKitServiceProtocol {
     func getPhotoData(localIdentifier: String,
-                      success: @escaping (Data) -> Void,
-                      failure: @escaping (Error) -> Void) {
+                      _ completion: @escaping (Result<Data, Error>) -> Void) {
         let fetchAssetsResult = PHAsset.fetchAssets(withLocalIdentifiers: [localIdentifier], options: nil)
         guard let phAsset = fetchAssetsResult.firstObject else {
-            failure(PhotoKitServiceError.phAssetNotFound(localIdentifier: localIdentifier))
+            completion(.failure(PhotoKitServiceError.phAssetNotFound(localIdentifier: localIdentifier)))
             return
         }
-        
+
         let options = PHImageRequestOptions()
         options.isNetworkAccessAllowed = true
         PHImageManager.default().requestImageDataAndOrientation(for: phAsset,
                                                                 options: options,
                                                                 resultHandler: { data, _, _, info in
             if let error = info?[PHImageErrorKey] as? Error {
-                failure(error)
+                completion(.failure(error))
             } else if let data = data {
-                success(data)
+                completion(.success(data))
             } else {
-                failure(PhotoKitServiceError.missingData)
+                completion(.failure(PhotoKitServiceError.missingData))
             }
         })
     }

Sources/RemoteImage/public/Services/RemoteImageService.swift

@@ -78,15 +78,18 @@ extension RemoteImageService {
             return
         }
 
-        dependencies.photoKitService.getPhotoData(localIdentifier: localIdentifier, success: { data in
-            if let image = PlatformSpecificImageType(data: data) {
-                Self.cache.setObject(image, forKey: cacheKey)
-                self.state = .image(image)
-            } else {
-                self.state = .error(RemoteImageServiceError.couldNotCreateImage)
+        dependencies.photoKitService.getPhotoData(localIdentifier: localIdentifier) { result in
+            switch result {
+            case .success(let data):
+                if let image = PlatformSpecificImageType(data: data) {
+                    Self.cache.setObject(image, forKey: cacheKey)
+                    self.state = .image(image)
+                } else {
+                    self.state = .error(RemoteImageServiceError.couldNotCreateImage)
+                }
+            case .failure(let error):
+                self.state = .error(error)
             }
-        }) { error in
-            self.state = .error(error)
         }
     }
 }