Skip to content

Commit 11f1ebd

Browse files
committed
Refactor number to maxCount
1 parent 5b5c6cc commit 11f1ebd

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

ExampleMVVM/Data/PersistentStorages/CoreDataStorage/CoreDataMoviesQueriesStorage.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ final class CoreDataMoviesQueriesStorage {
6262

6363
extension CoreDataMoviesQueriesStorage: MoviesQueriesStorage {
6464

65-
func fetchRecentsQueries(number: Int, completion: @escaping (Result<[MovieQuery], Error>) -> Void) {
65+
func fetchRecentsQueries(maxCount: Int, completion: @escaping (Result<[MovieQuery], Error>) -> Void) {
6666

6767
persistentContainer.performBackgroundTask { context in
6868
do {
6969
let request: NSFetchRequest<MovieQueryEntity> = MovieQueryEntity.fetchRequest()
7070
request.sortDescriptors = [NSSortDescriptor(key: #keyPath(MovieQueryEntity.createdAt),
7171
ascending: false)]
72-
request.fetchLimit = number
72+
request.fetchLimit = maxCount
7373
let resut = try context.fetch(request).map(MovieQuery.init)
7474

7575
completion(.success(resut))

ExampleMVVM/Data/PersistentStorages/MoviesQueriesStorage.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
import Foundation
99

1010
protocol MoviesQueriesStorage {
11-
func fetchRecentsQueries(number: Int, completion: @escaping (Result<[MovieQuery], Error>) -> Void)
11+
func fetchRecentsQueries(maxCount: Int, completion: @escaping (Result<[MovieQuery], Error>) -> Void)
1212
func saveRecentQuery(query: MovieQuery, completion: @escaping (Result<MovieQuery, Error>) -> Void)
1313
}

ExampleMVVM/Data/PersistentStorages/UserDefaultsStorage/UserDefaultsMoviesQueriesStorage.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ final class UserDefaultsMoviesQueriesStorage {
4040
}
4141

4242
extension UserDefaultsMoviesQueriesStorage: MoviesQueriesStorage {
43-
func fetchRecentsQueries(number: Int, completion: @escaping (Result<[MovieQuery], Error>) -> Void) {
43+
func fetchRecentsQueries(maxCount: Int, completion: @escaping (Result<[MovieQuery], Error>) -> Void) {
4444
DispatchQueue.global(qos: .userInitiated).async { [weak self] in
4545
guard let self = self else { return }
4646
var queries = self.fetchMoviesQuries()
47-
queries = queries.count < self.maxStorageLimit ? queries : Array(queries[0..<number])
47+
queries = queries.count < self.maxStorageLimit ? queries : Array(queries[0..<maxCount])
4848
completion(.success(queries))
4949
}
5050
}

ExampleMVVM/Data/Repositories/DefaultMoviesQueriesRepository.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ final class DefaultMoviesQueriesRepository {
2121

2222
extension DefaultMoviesQueriesRepository: MoviesQueriesRepository {
2323

24-
func fetchRecentsQueries(number: Int, completion: @escaping (Result<[MovieQuery], Error>) -> Void) {
25-
return moviesQueriesPersistentStorage.fetchRecentsQueries(number: number, completion: completion)
24+
func fetchRecentsQueries(maxCount: Int, completion: @escaping (Result<[MovieQuery], Error>) -> Void) {
25+
return moviesQueriesPersistentStorage.fetchRecentsQueries(maxCount: maxCount, completion: completion)
2626
}
2727

2828
func saveRecentQuery(query: MovieQuery, completion: @escaping (Result<MovieQuery, Error>) -> Void) {

ExampleMVVM/Domain/Interfaces/Repositories/MoviesQueriesRepository.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
import Foundation
99

1010
protocol MoviesQueriesRepository {
11-
func fetchRecentsQueries(number: Int, completion: @escaping (Result<[MovieQuery], Error>) -> Void)
11+
func fetchRecentsQueries(maxCount: Int, completion: @escaping (Result<[MovieQuery], Error>) -> Void)
1212
func saveRecentQuery(query: MovieQuery, completion: @escaping (Result<MovieQuery, Error>) -> Void)
1313
}

ExampleMVVM/Domain/UseCases/FetchRecentMovieQueriesUseCase.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Foundation
1111
final class FetchRecentMovieQueriesUseCase: UseCase {
1212

1313
struct RequestValue {
14-
let number: Int
14+
let maxCount: Int
1515
}
1616
typealias ResultValue = (Result<[MovieQuery], Error>)
1717

@@ -28,7 +28,7 @@ final class FetchRecentMovieQueriesUseCase: UseCase {
2828
}
2929

3030
func start() -> Cancellable? {
31-
moviesQueriesRepository.fetchRecentsQueries(number: requestValue.number) { result in
31+
moviesQueriesRepository.fetchRecentsQueries(maxCount: requestValue.maxCount) { result in
3232
// Note: here self must be strong because we will create use case every time we use it, without holding reference to it
3333
switch result {
3434
case .success(let movieQueries):

ExampleMVVM/Presentation/MoviesScene/MoviesQueriesList/ViewModel/MoviesQueryListViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ final class DefaultMoviesQueryListViewModel: MoviesQueryListViewModel {
4646
}
4747

4848
private func updateMoviesQueries() {
49-
let request = FetchRecentMovieQueriesUseCase.RequestValue(number: numberOfQueriesToShow)
49+
let request = FetchRecentMovieQueriesUseCase.RequestValue(maxCount: numberOfQueriesToShow)
5050
let completion: (FetchRecentMovieQueriesUseCase.ResultValue) -> Void = { [weak self] result in
5151
guard let self = self else { return }
5252
switch result {

ExampleMVVMTests/Domain/UseCases/SearchMoviesUseCaseTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class SearchMoviesUseCaseTests: XCTestCase {
2525
class MoviesQueriesRepositoryMock: MoviesQueriesRepository {
2626
var recentQueries: [MovieQuery] = []
2727

28-
func fetchRecentsQueries(number: Int, completion: @escaping (Result<[MovieQuery], Error>) -> Void) {
28+
func fetchRecentsQueries(maxCount: Int, completion: @escaping (Result<[MovieQuery], Error>) -> Void) {
2929
completion(.success(recentQueries))
3030
}
3131
func saveRecentQuery(query: MovieQuery, completion: @escaping (Result<MovieQuery, Error>) -> Void) {
@@ -63,7 +63,7 @@ class SearchMoviesUseCaseTests: XCTestCase {
6363
}
6464
// then
6565
var recents = [MovieQuery]()
66-
moviesQueriesRepository.fetchRecentsQueries(number: 1) { result in
66+
moviesQueriesRepository.fetchRecentsQueries(maxCount: 1) { result in
6767
recents = (try? result.get()) ?? []
6868
expectation.fulfill()
6969
}
@@ -87,7 +87,7 @@ class SearchMoviesUseCaseTests: XCTestCase {
8787
}
8888
// then
8989
var recents = [MovieQuery]()
90-
moviesQueriesRepository.fetchRecentsQueries(number: 1) { result in
90+
moviesQueriesRepository.fetchRecentsQueries(maxCount: 1) { result in
9191
recents = (try? result.get()) ?? []
9292
expectation.fulfill()
9393
}

0 commit comments

Comments
 (0)