Test

Author: kath0809

PG5602_H24-4/Entities/Search.swift

@@ -5,4 +5,17 @@
 //  Created by Karima Thingvold on 04/12/2024.
 //
 
-import Foundation
+//import Foundation
+//import SwiftData
+//
+//@Model
+//class Search: Identifiable {
+//    @Attribute(.unique) var query: String
+//    var timestamp: Date
+//
+//    init(query: String, timestamp: Date = Date()) {
+//        self.query = query
+//        self.timestamp = timestamp
+//    }
+//}
+

PG5602_H24-4/PG5602_H24_4App.swift

@@ -12,7 +12,7 @@ import SwiftData
 struct PG5602_H24_4App: App {
     var sharedModelContainer: ModelContainer = {
         do {
-            let schema = Schema([Article.self])
+            let schema = Schema([Article.self, Category.self, Country.self])
             return try ModelContainer(for: schema)
         } catch {
             fatalError("Could not create model container: \(error)")

PG5602_H24-4/Services/NewsAPIService.swift

@@ -12,7 +12,6 @@ class NewsApiService {
     private let topHeadlinesURL = "https://newsapi.org/v2/top-headlines"
     private let everythingURL = "https://newsapi.org/v2/everything"
 
-        // Hent nyheter basert på en spesifikk type søk (top-headlines eller everything)
     func fetchNews(endpoint: String, query: String? = nil, completion: @escaping (Result<[NewsArticle], Error>) -> Void) {
 //#if DEBUG
             // Bruk mock-data for å unngå ekte API-kall i preview
@@ -78,6 +77,11 @@ class NewsApiService {
 
         // Hent toppnyheter
     func fetchTopHeadlines(country: String? = nil, category: String? = nil, pageSize: Int = 20, completion: @escaping (Result<[NewsArticle], Error>) -> Void) {
+//#if DEBUG
+//        completion(.success(MockData.articles))
+//        return
+//        #endif
+        
         let apiKey = APIConfig.apiKey
         guard !apiKey.isEmpty else {
             completion(.failure(NSError(domain: "", code: 401, userInfo: [NSLocalizedDescriptionKey: "API key is missing"])))
@@ -131,18 +135,67 @@ class NewsApiService {
         }.resume()
     }
 
-    
-        // Hent nyheter med et spesifikt søkeord
-    func searchArticles(query: String, completion: @escaping (Result<[NewsArticle], Error>) -> Void) {
-        fetchNews(endpoint: everythingURL, query: query, completion: completion)
+    func searchArticles(query: String, sortBy: String, completion: @escaping (Result<[NewsArticle], Error>) -> Void) {
+//#if DEBUG
+//        completion(.success(MockData.articles))
+//        return
+//        #endif
+        
+        guard !query.isEmpty else {
+            completion(.failure(NSError(domain: "", code: 400, userInfo: [NSLocalizedDescriptionKey: "Query is empty"])))
+            return
+        }
+        
+        var queryItems = [
+            URLQueryItem(name: "apiKey", value: APIConfig.apiKey),
+            URLQueryItem(name: "q", value: query),
+            URLQueryItem(name: "pageSize", value: "20")
+        ]
+        
+        queryItems.append(URLQueryItem(name: "sortBy", value: sortBy))
+        
+        guard var urlComponents = URLComponents(string: everythingURL) else {
+            completion(.failure(NSError(domain: "", code: 400, userInfo: [NSLocalizedDescriptionKey: "Invalid URL"])))
+            return
+        }
+        
+        urlComponents.queryItems = queryItems
+        
+        guard let url = urlComponents.url else {
+            completion(.failure(NSError(domain: "", code: 400, userInfo: [NSLocalizedDescriptionKey: "Invalid URL"])))
+            return
+        }
+        
+        URLSession.shared.dataTask(with: url) { data, response, error in
+            if let error = error {
+                completion(.failure(error))
+                return
+            }
+            
+            guard let data = data else {
+                completion(.failure(NSError(domain: "", code: 500, userInfo: [NSLocalizedDescriptionKey: "No data received"])))
+                return
+            }
+            
+            do {
+                let decoder = JSONDecoder()
+                decoder.dateDecodingStrategy = .iso8601
+                let newsResponse = try decoder.decode(ArticlesResponse.self, from: data)
+                completion(.success(newsResponse.articles))
+            } catch {
+                completion(.failure(error))
+            }
+        }.resume()
     }
+
 }
 
 struct MockData {
     static let articles = [
         NewsArticle(author: "Mock Author",title: "Mock Title 1",  description: "This is a mock description 1", url: "https://example.com/1", urlToImage: "https://seeklogo.com/images/N/new-york-times-logo-EE0F194CA3-seeklogo.com.png", publishedAt: "2024-12-01T10:00:00Z"),
-        
+    
         NewsArticle(author: "Mock Author 2",title: "Mock Title 2",  description: "This is a mock description 2", url: "https://example.com/2", urlToImage: "https://seeklogo.com/images/B/bbc-news-logo-8648ABD044-seeklogo.com.png", publishedAt: "2024-12-01T10:00:00Z"),
+        
         NewsArticle(author: "Mock Author 3",title: "Mock Title 3",  description: "This is a mock description 2", url: "https://example.com/3", urlToImage: "https://download.logo.wine/logo/CNN/CNN-Logo.wine.png", publishedAt: "2024-12-01T10:00:00Z"),
     ]
 }

PG5602_H24-4/Views/ArticleDetailedView.swift

@@ -187,16 +187,16 @@ struct ArticleDetailView: View {
     }
 }
 
-#Preview {
-    let exampleArticle = NewsArticle(
-        author: "John Doe",
-        title: "Breaking News: Swift is Awesome!",
-        description: "SwiftUI helps you build great-looking apps across all Apple platforms with the power of Swift — and surprisingly little code. You can bring even better experiences to everyone, on any Apple device, using just one set of tools and APIs.",
-        url: "https://developer.apple.com/xcode/swiftui/",
-        urlToImage: "https://developer.apple.com/xcode/swiftui/images/hero-lockup-swiftui-large_2x.webp",
-        publishedAt: "2024-11-25T12:10:00Z"
-    )
-
-    ArticleDetailView(article: exampleArticle)
-        .modelContainer(for: [Article.self]) // Mock ModelContext for SwiftData
-}
+//#Preview {
+//    let exampleArticle = NewsArticle(
+//        author: "John Doe",
+//        title: "Breaking News: Swift is Awesome!",
+//        description: "SwiftUI helps you build great-looking apps across all Apple platforms with the power of Swift — and surprisingly little code. You can bring even better experiences to everyone, on any Apple device, using just one set of tools and APIs.",
+//        url: "https://developer.apple.com/xcode/swiftui/",
+//        urlToImage: "https://developer.apple.com/xcode/swiftui/images/hero-lockup-swiftui-large_2x.webp",
+//        publishedAt: "2024-11-25T12:10:00Z"
+//    )
+//
+//    ArticleDetailView(article: exampleArticle)
+//        .modelContainer(for: [Article.self]) // Mock ModelContext for SwiftData
+//}

PG5602_H24-4/Views/MainLayoutView.swift

@@ -10,7 +10,7 @@ struct MainLayoutView: View {
     var body: some View {
         TabView {
             Tab("My Artichles", systemImage: "doc.text") {
-                NewsTickerView()
+                //NewsTickerView()
                 ArticlesView()
             }
             Tab("Search", systemImage: "magnifyingglass") {

PG5602_H24-4/Views/SearchView.swift

@@ -6,35 +6,79 @@
 //
 
 import SwiftUI
+import SwiftData
+
+enum SortOption: String, CaseIterable {
+    case relevance = "Relevance"
+    case popularity = "Popularity"
+    case publishedAt = "Newest"
+}
 
 struct SearchView: View {
+    @Environment(\.modelContext) private var modelContext
+    //@Query(sort: \Search.timestamp, order: .reverse) var searchHistory: [Search]
+    //@State var searchHistory: [Search] = []
+
     @State var query: String = ""
     @State var articles: [NewsArticle] = []
-    @State var isLoading: Bool = false
+    @State var isLoading = false
     @State var errorMessage: String?
+    @State var selectedSortOption: SortOption = .relevance
+    @State var selectedQuery = ""
 
     var body: some View {
         NavigationStack {
             VStack {
                 HStack {
                     Image(systemName: "magnifyingglass")
-                        .foregroundColor(.gray)
+                        .foregroundStyle(.gray)
                     TextField("Search for articles", text: $query, onCommit: {
                         search()
                     })
                     .textFieldStyle(PlainTextFieldStyle())
+//                    Menu {
+//                        ForEach(searchHistory) { search in
+//                            Button(action: {
+//                                query = search.query // Sett søkefeltet til valgt søkeord
+//                                performSearch() // Utfør søket
+//                            }) {
+//                                Text(search.query)
+//                            }
+//                        }
+//                    } label: {
+//                        Image(systemName: "arrowtriangle.down.fill")
+//                            .foregroundColor(.blue)
+//                            .padding(.horizontal, 8)
+//                    }
                 }
                 .padding(10)
                 .background(Color(.systemGray6))
                 .cornerRadius(8)
                 .padding()
 
+                HStack {
+                    ForEach(SortOption.allCases, id: \.self) { option in
+                        Button(action: {
+                            selectedSortOption = option
+                            sortArticles()
+                        }) {
+                            Text(option.rawValue)
+                                .padding()
+                                .background(selectedSortOption == option ? Color.blue : Color.gray.opacity(0.3))
+                                .foregroundStyle(.white)
+                                .clipShape(RoundedRectangle(cornerRadius: 8))
+                                //.padding()
+                            
+                        }
+                    }
+                }
+                
                 if isLoading {
                     ProgressView("Loading articles")
                         .padding()
                 } else if let errorMessage = errorMessage {
                     Text(errorMessage)
-                        .foregroundColor(.red)
+                        .foregroundStyle(.red)
                         .padding()
                 } else {
                     List(articles, id: \.url) { article in
@@ -63,7 +107,7 @@ struct SearchView: View {
 
         let newsService = NewsApiService()
 
-        newsService.searchArticles(query: query) { result in
+        newsService.searchArticles(query: query, sortBy: selectedSortOption.rawValue.lowercased()) { result in
             DispatchQueue.main.async {
                 isLoading = false
                 switch result {
@@ -75,6 +119,42 @@ struct SearchView: View {
             }
         }
     }
+    
+    func sortArticles() {
+        switch selectedSortOption {
+        case .relevance:
+            articles.sort { $0.title > $1.title }
+        case .popularity:
+            articles.sort { $0.author ?? "" > $1.author ?? "" }
+        case .publishedAt:
+            articles.sort { $0.publishedAt > $1.publishedAt }
+        }
+    }
+    func performSearch() {
+        guard !query.isEmpty else { return }
+        isLoading = true
+        errorMessage = nil
+        //saveSearch(query: query)
+        
+        let newsService = NewsApiService()
+        newsService.searchArticles(query: query, sortBy: "relevance") { result in
+            DispatchQueue.main.async {
+                isLoading = false
+                switch result {
+                case .success(let articles):
+                    self.articles = articles
+                case .failure(let error):
+                    self.errorMessage = "Something went wrong: \(error.localizedDescription)"
+                }
+            }
+        }
+    }
+//    func saveSearch(query: String) {
+//        if !searchHistory.contains(where: { $0.query == query }) {
+//            let newSearch = Search(query: query)
+//            modelContext.insert(newSearch)
+//        }
+//    }
 }
 
 #Preview {