update search view. (#59)

Co-authored-by: Jiaqi Feng <jiaqi.feng@transcarent.com>

Packages/HackerNewsKit/Sources/HackerNewsKit/Models/SearchFilter.swift

@@ -1,23 +1,48 @@
-public protocol SearchFilter: Equatable {
-    var query: String { get }
-}
-
-public class StoryFilter: SearchFilter {
-    public let query: String = "story"
+import Foundation
 
-    public static func == (lhs: StoryFilter, rhs: StoryFilter) -> Bool {
-        lhs.query == rhs.query
+public enum SearchFilter: Equatable, Hashable {
+    case story
+    case comment
+    case dateRange(Date, Date)
+
+    var query: String {
+        switch(self){
+        case .story:
+            return "story"
+        case .comment:
+            return "comment"
+        case .dateRange(let startDate, let endDate):
+            let startTimestamp = Int(startDate.timeIntervalSince1970.rounded())
+            let endTimestamp = Int(endDate.timeIntervalSince1970.rounded())
+
+            if startTimestamp != endTimestamp {
+                return "created_at_i>=\(startTimestamp),created_at_i<=\(endTimestamp)"
+            } else {
+                let updatedStartDate = Calendar.current.date(
+                    byAdding: .hour,
+                    value: -24,
+                    to: startDate)
+                let updatedStartTimestamp = updatedStartDate?.timeIntervalSince1970
+
+                if let updatedStartTimestamp = updatedStartTimestamp?.rounded() {
+                    return "created_at_i>=\(Int(updatedStartTimestamp)),created_at_i<=\(endTimestamp)"
+                }
+
+                return .init()
+            }
+        }
     }
-
-    public init() { }
-}
-
-public class CommentFilter: SearchFilter {
-    public let query: String = "comment"
-
-    public static func == (lhs: CommentFilter, rhs: CommentFilter) -> Bool {
-        lhs.query == rhs.query
+
+    var isNumericFilter: Bool {
+        switch(self){
+        case .story, .comment:
+            return false
+        case .dateRange:
+            return true
+        }
+    }
+
+    var isTagFilter: Bool {
+        !isNumericFilter
     }
-
-    public init() { }
 }

Packages/HackerNewsKit/Sources/HackerNewsKit/Models/SearchParams.swift

@@ -1,10 +1,10 @@
 import Foundation
 
-public class SearchParams {
+public class SearchParams: Equatable {
     public let page: Int
     public let query: String
     public let sorted: Bool
-    public let filters: [any SearchFilter]
+    public let filters: Set<SearchFilter>
 
     public var filteredQuery: String {
         var buffer = String()
@@ -13,33 +13,51 @@ public class SearchParams {
         if sorted {
             buffer.append("search_by_date?query=\(encodedQuery)")
         } else {
-            buffer.append("search?query=?query=\(encodedQuery)")
+            buffer.append("search?query=\(encodedQuery)")
         }
 
-        if filters.isEmpty == false {
-            buffer.append("&tags=")
+        if !filters.isEmpty {
+            let numericFilters = filters.filter({ $0.isNumericFilter })
+            let tagFilters = filters.filter({ $0.isTagFilter })
 
-            for filter in filters {
-                buffer.append(filter.query)
-                buffer.append(",")
+            if !numericFilters.isEmpty {
+                buffer.append("&numericFilters=")
+                for filter in filters.filter({ $0.isNumericFilter }) {
+                    buffer.append(filter.query)
+                    buffer.append(",")
+                }
+                buffer = String(buffer.dropLast(1))
             }
-
-            buffer = String(buffer.dropLast(1))
+
+            if !tagFilters.isEmpty {
+                buffer.append("&tags=(")
+                for filter in filters.filter({ $0.isTagFilter }) {
+                    buffer.append(filter.query)
+                    buffer.append(",")
+                }
+                buffer = String(buffer.dropLast(1))
+                buffer.append(")")
+            }
+
         }
 
         buffer.append("&page=\(page)");
 
         return buffer
     }
 
-    public init(page: Int, query: String, sorted: Bool, filters: [any SearchFilter]) {
+    public init(page: Int, query: String, sorted: Bool, filters: Set<SearchFilter>) {
         self.page = page
         self.query = query
         self.sorted = sorted
         self.filters = filters
     }
 
-    public func copyWith(page: Int? = nil, query: String? = nil, sorted: Bool? = nil, filters: [any SearchFilter]? = nil) -> SearchParams {
+    public func copyWith(page: Int? = nil, query: String? = nil, sorted: Bool? = nil, filters: Set<SearchFilter>? = nil) -> SearchParams {
         return SearchParams(page: page ?? self.page, query: query ?? self.query, sorted: sorted ?? self.sorted, filters: filters ?? self.filters)
     }
+
+    public static func == (lhs: SearchParams, rhs: SearchParams) -> Bool {
+        return lhs.page == rhs.page && lhs.query == rhs.query && lhs.sorted == rhs.sorted && lhs.filters == rhs.filters
+    }
 }

Packages/HackerNewsKit/Sources/HackerNewsKit/Models/User.swift

@@ -9,23 +9,23 @@ public struct User: Decodable, Equatable {
     public let submitted: [Int]?
 
     public init() {
-        self.id = String()
-        self.about = String()
-        self.created = Int()
-        self.delay = Int()
-        self.karma = Int()
-        self.submitted = [Int]()
+        self.id = .init()
+        self.about = .init()
+        self.created = .init()
+        self.delay = .init()
+        self.karma = .init()
+        self.submitted = .init()
     }
 
     /// If a user does not have any activity, the user endpoint will not return anything.
     /// in that case, we create a user with only username.
     public init(id: String) {
         self.id = id
-        self.about = String()
-        self.created = Int()
-        self.delay = Int()
-        self.karma = Int()
-        self.submitted = [Int]()
+        self.about = .init()
+        self.created = .init()
+        self.delay = .init()
+        self.karma = .init()
+        self.submitted = .init()
     }
 
     init(id: String?, about: String?, created: Int?, delay: Int?, karma: Int?, submitted: [Int]?) {

Packages/HackerNewsKit/Sources/HackerNewsKit/Repositories/AuthRepository.swift

@@ -3,7 +3,7 @@ import Alamofire
 import Security
 
 public class AuthRepository {
-    public static let shared = AuthRepository()
+    public static let shared: AuthRepository = .init()
 
     private let server: String = "news.ycombinator.com"
     private let baseUrl: String = "https://news.ycombinator.com"

Packages/HackerNewsKit/Sources/HackerNewsKit/Repositories/SearchRepository.swift

@@ -2,15 +2,15 @@ import Foundation
 import Alamofire
 
 public class SearchRepository {
-    public static let shared = SearchRepository()
+    public static let shared: SearchRepository = .init()
 
     private init() {}
 
-    private let baseUrl = "http://hn.algolia.com/api/v1/"
+    private let baseUrl = "https://hn.algolia.com/api/v1/"
 
     public func search(params: SearchParams, onItemFetched: @escaping (any Item) -> Void) async -> Void {
-        let urlStr = "\(baseUrl)\(params.filteredQuery)"
-        guard let url = URL(string: urlStr) else { return }
+        guard let urlStr = "\(baseUrl)\(params.filteredQuery)".addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed),
+              let url = URL(string: urlStr) else { return }
         let response = await AF.request(url).serializingString().response
 
         guard let result = try? response.result.get(),

Packages/HackerNewsKit/Sources/HackerNewsKit/Repositories/StoriesRepository.swift

@@ -2,7 +2,7 @@ import Foundation
 import Alamofire
 
 public class StoriesRepository {
-    public static let shared = StoriesRepository()
+    public static let shared: StoriesRepository = .init()
 
     private let baseUrl: String = "https://hacker-news.firebaseio.com/v0/"
 

ShareExtension/ShareViewController.swift

@@ -31,7 +31,7 @@ class ShareViewController: SLComposeServiceViewController {
         }
     }
 
-    override func didSelectPost() { }
+    override func didSelectPost() {}
 
     override func configurationItems() -> [Any]! {
         return []

Shared/Models/Action.swift

@@ -62,7 +62,7 @@ enum Action: Equatable {
         case .copy:
             return "Copied"
         case .none:
-            return String()
+            return .init()
         }
     }
 }

Shared/Models/AppNotification.swift

@@ -10,12 +10,12 @@ private extension Calendar {
 }
 
 class AppNotification {
-    private let auth = Authentication.shared
-    private let repo = StoriesRepository.shared
+    private let auth: Authentication = .shared
+    private let repo: StoriesRepository = .shared
 
-    static let shared = AppNotification()
+    static let shared: AppNotification = .init()
 
-    private init() { }
+    private init() {}
 
     func scheduleFetching() {
         let request = BGAppRefreshTaskRequest(identifier: Constants.AppNotification.backgroundTaskId)

Shared/Models/Authentication.swift

@@ -3,10 +3,10 @@ import HackerNewsKit
 
 public class Authentication: ObservableObject {
     @Published var username: String?
-    @Published var loggedIn = Bool()
+    @Published var loggedIn: Bool = .init()
     @Published var user: User?
 
-    static let shared = Authentication()
+    static let shared: Authentication = .init()
 
     private init() {
         Task {

Shared/Models/Router.swift

@@ -2,11 +2,11 @@ import SwiftUI
 import HackerNewsKit
 
 class Router: ObservableObject {
-    @Published var path = NavigationPath()
+    @Published var path: NavigationPath = .init()
 
-    static let shared = Router()
+    static let shared: Router = .init()
 
-    private init() { }
+    private init() {}
 
     func to(_ destination: Destination) {
         path.append(destination)

Shared/Models/Settings.swift

@@ -1,10 +1,10 @@
 import Foundation
 
 class Settings: ObservableObject {
-    @Published var favList = Array<Int>()
-    @Published var pinList = Array<Int>()
+    @Published var favList: [Int] = .init()
+    @Published var pinList: [Int] = .init()
 
-    static let shared = Settings()
+    static let shared: Settings = .init()
 
     private init() {
         if let favList = UserDefaults.standard.array(forKey: Constants.UserDefaults.favListKey) as? [Int] {

Shared/Models/Stores/FavStore.swift

@@ -6,10 +6,10 @@ import HackerNewsKit
 extension FavView {
     @MainActor
     class FavStore: ObservableObject {
-        @Published var items = [any Item]()
+        @Published var items: [any Item] = .init()
         @Published var status: Status = .idle
 
-        private let settingsStore = Settings.shared
+        private let settingsStore: Settings = .shared
         private let pageSize: Int = 10
         private var currentPage: Int = 0
         private var cancellable: AnyCancellable?

Shared/Models/Stores/ItemStore.swift

@@ -5,7 +5,7 @@ import HackerNewsKit
 extension ItemView {
     @MainActor
     class ItemStore : ObservableObject {
-        @Published var kids = [Comment]()
+        @Published var kids: [Comment] = .init()
         @Published var status: Status = .idle
         @Published var item: (any Item)?
         @Published var loadingItem: Int?

Shared/Models/Stores/PinStore.swift

@@ -6,9 +6,9 @@ import HackerNewsKit
 extension PinView {
     @MainActor
     class PinStore: ObservableObject {
-        @Published var pinnedItems = [any Item]()
+        @Published var pinnedItems: [any Item] = .init()
         @Published var status: Status = .idle
-        private let settings = Settings.shared
+        private let settings: Settings = .shared
         private(set) var pinnedIds: [Int] = [Int]() {
             didSet {
                 Task {