Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions DevLog/App/Assembler/DomainAssembler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,12 @@ private extension DomainAssembler {
}

func registerTodoUseCases(_ container: DIContainer) {
container.register(FetchPinnedTodosUseCase.self) {
FetchPinnedTodosUseCaseImpl(container.resolve(TodoRepository.self))
}

container.register(FetchTodoByIDUseCase.self) {
FetchTodoByIDUseCaseImpl(container.resolve(TodoRepository.self))
}

container.register(FetchTodosByKindUseCase.self) {
FetchTodosByKindUseCaseImpl(container.resolve(TodoRepository.self))
}

container.register(FetchTodosByDateRangeUseCase.self) {
FetchTodosByDateRangeUseCaseImpl(container.resolve(TodoRepository.self))
}

container.register(FetchTodosByKeywordUseCase.self) {
FetchTodosByKeywordUseCaseImpl(container.resolve(TodoRepository.self))
container.register(FetchTodosUseCase.self) {
FetchTodosUseCaseImpl(container.resolve(TodoRepository.self))
}

container.register(UpsertTodoUseCase.self) {
Expand Down
2 changes: 1 addition & 1 deletion DevLog/Data/DTO/TodoCursorDTO.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
import Foundation

struct TodoCursorDTO {
let createdAt: Date
let orderedAt: Date
let documentID: String
}
4 changes: 2 additions & 2 deletions DevLog/Data/Mapper/TodoMapping.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ extension TodoResponse {
extension TodoCursorDTO {
func toDomain() -> TodoCursor {
TodoCursor(
createdAt: createdAt,
orderedAt: orderedAt,
documentID: documentID
)
}

static func fromDomain(_ cursor: TodoCursor) -> Self {
TodoCursorDTO(
createdAt: cursor.createdAt,
orderedAt: cursor.orderedAt,
documentID: cursor.documentID
)
}
Expand Down
2 changes: 1 addition & 1 deletion DevLog/Domain/Entity/TodoCursor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
import Foundation

struct TodoCursor {
let createdAt: Date
let orderedAt: Date
let documentID: String
}
66 changes: 56 additions & 10 deletions DevLog/Domain/Entity/TodoQuery.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,77 @@
import Foundation

struct TodoQuery {
let kind: TodoKind?
let keyword: String?
let isPinned: Bool?
let createdAtFrom: Date?
let createdAtTo: Date?
let createdAtDescending: Bool
let pageSize: Int
let fetchAllPages: Bool
enum SortTarget: Equatable, Hashable {
case createdAt
case updatedAt

var fieldName: String {
switch self {
case .createdAt:
return "createdAt"
case .updatedAt:
return "updatedAt"
}
}
}

enum SortOrder: Equatable, Hashable {
case latest
case oldest

var isDescending: Bool {
self == .latest
}
}

enum CompletionFilter: Equatable, Hashable {
case all
case incomplete
case completed

var isCompletedValue: Bool? {
switch self {
case .all:
return nil
case .incomplete:
return false
case .completed:
return true
}
}
}

var kind: TodoKind?
var keyword: String?
var isPinned: Bool?
var completionFilter: CompletionFilter
var createdAtFrom: Date?
var createdAtTo: Date?
var sortTarget: SortTarget
var sortOrder: SortOrder
var pageSize: Int
var fetchAllPages: Bool

init(
kind: TodoKind? = nil,
keyword: String? = nil,
isPinned: Bool? = nil,
completionFilter: CompletionFilter = .all,
createdAtFrom: Date? = nil,
createdAtTo: Date? = nil,
createdAtDescending: Bool = true,
sortTarget: SortTarget = .createdAt,
sortOrder: SortOrder = .latest,
pageSize: Int = 20,
fetchAllPages: Bool = false
) {
self.kind = kind
self.keyword = keyword
self.isPinned = isPinned
self.completionFilter = completionFilter
self.createdAtFrom = createdAtFrom
self.createdAtTo = createdAtTo
self.createdAtDescending = createdAtDescending
self.sortTarget = sortTarget
self.sortOrder = sortOrder
self.pageSize = pageSize
self.fetchAllPages = fetchAllPages
}
Expand Down
10 changes: 0 additions & 10 deletions DevLog/Domain/UseCase/Todo/Fetch/FetchPinnedTodosUseCase.swift

This file was deleted.

20 changes: 0 additions & 20 deletions DevLog/Domain/UseCase/Todo/Fetch/FetchPinnedTodosUseCaseImpl.swift

This file was deleted.

10 changes: 0 additions & 10 deletions DevLog/Domain/UseCase/Todo/Fetch/FetchTodosByKeywordUseCase.swift

This file was deleted.

This file was deleted.

10 changes: 10 additions & 0 deletions DevLog/Domain/UseCase/Todo/Fetch/FetchTodosUseCase.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
//
// FetchTodosUseCase.swift
// DevLog
//
// Created by opfic on 3/3/26.
//

protocol FetchTodosUseCase {
func execute(_ query: TodoQuery, cursor: TodoCursor?) async throws -> TodoPage
}
18 changes: 18 additions & 0 deletions DevLog/Domain/UseCase/Todo/Fetch/FetchTodosUseCaseImpl.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//
// FetchTodosUseCaseImpl.swift
// DevLog
//
// Created by opfic on 3/3/26.
//

final class FetchTodosUseCaseImpl: FetchTodosUseCase {
private let repository: TodoRepository

init(_ repository: TodoRepository) {
self.repository = repository
}

func execute(_ query: TodoQuery, cursor: TodoCursor?) async throws -> TodoPage {
try await repository.fetchTodos(query, cursor: cursor)
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading