Refactor clean up login in storage

Author: kudoleh

ExampleMVVM/Data/PersistentStorages/MoviesQueriesStorage/CoreDataStorage/CoreDataMoviesQueriesStorage.swift

@@ -65,7 +65,7 @@ extension CoreDataMoviesQueriesStorage {
         var result = try context.fetch(request)
 
         removeDuplicates(for: query, in: &result, inContext: context)
-        removeMore(than: maxStorageLimit - 1, in: result, inContext: context)
+        removeQueries(limit: maxStorageLimit - 1, in: result, inContext: context)
     }
 
     private func removeDuplicates(for query: MovieQuery, in queries: inout [MovieQueryEntity], inContext context: NSManagedObjectContext) {
@@ -75,7 +75,7 @@ extension CoreDataMoviesQueriesStorage {
         queries.removeAll { $0.query == query.query }
     }
 
-    private func removeMore(than limit: Int, in queries: [MovieQueryEntity], inContext context: NSManagedObjectContext) {
+    private func removeQueries(limit: Int, in queries: [MovieQueryEntity], inContext context: NSManagedObjectContext) {
         guard queries.count > limit else { return }
 
         queries.suffix(queries.count - limit)

ExampleMVVM/Data/PersistentStorages/MoviesQueriesStorage/UserDefaultsStorage/UserDefaultsMoviesQueriesStorage.swift

@@ -34,12 +34,13 @@ final class UserDefaultsMoviesQueriesStorage {
         }
     }
 
-    private func removeOldQueries(_ queries: [MovieQuery]) -> [MovieQuery] {
-        return queries.count <= maxStorageLimit ? queries : Array(queries[0..<maxStorageLimit])
+    private func removeQueries(limit: Int, in queries: [MovieQuery]) -> [MovieQuery] {
+        return queries.count <= limit ? queries : Array(queries[0..<limit])
     }
 }
 
 extension UserDefaultsMoviesQueriesStorage: MoviesQueriesStorage {
+
     func fetchRecentsQueries(maxCount: Int, completion: @escaping (Result<[MovieQuery], Error>) -> Void) {
         DispatchQueue.global(qos: .userInitiated).async { [weak self] in
             guard let self = self else { return }
@@ -48,13 +49,14 @@ extension UserDefaultsMoviesQueriesStorage: MoviesQueriesStorage {
             completion(.success(queries))
         }
     }
+
     func saveRecentQuery(query: MovieQuery, completion: @escaping (Result<MovieQuery, Error>) -> Void) {
         DispatchQueue.global(qos: .userInitiated).async { [weak self] in
             guard let self = self else { return }
             var queries = self.fetchMoviesQuries()
             queries = queries.filter { $0 != query }
             queries.insert(query, at: 0)
-            self.persist(moviesQuries: self.removeOldQueries(queries))
+            self.persist(moviesQuries: self.removeQueries(limit: self.maxStorageLimit, in: queries))
             completion(.success(query))
         }
     }