add feed network

SwiftBuddiesTR · Nov 2, 2024 · ca6a30a · ca6a30a
1 parent 012018a
commit ca6a30a
Show file tree

Hide file tree

Showing 15 changed files with 189 additions and 64 deletions.
diff --git a/SwiftBuddiesIOS/Sources/SwiftBuddiesIOSApp.swift b/SwiftBuddiesIOS/Sources/SwiftBuddiesIOSApp.swift
@@ -1,6 +1,7 @@
 import SwiftUI
 import GoogleSignIn
 import Core
+import Feed
 
 @main
 struct SwiftBuddiesIOSApp: App {

diff --git a/SwiftBuddiesIOS/Targets/FeedModule/Sources/Comments/CommentCell.swift b/SwiftBuddiesIOS/Targets/FeedModule/Sources/Comments/CommentCell.swift
@@ -17,7 +17,7 @@ struct CommentCell: View {
 
                 // MARK: - User photo
 
-                Image(user.profileImageUrl)
+                Image(user.profileImageUrl ?? "")
                     .resizable()
                     .scaledToFill()
                     .frame(width: 35, height: 35)

diff --git a/SwiftBuddiesIOS/Targets/FeedModule/Sources/Comments/CommentView.swift b/SwiftBuddiesIOS/Targets/FeedModule/Sources/Comments/CommentView.swift
@@ -15,9 +15,9 @@ struct CommentView: View {
             VStack{
                 ScrollView{
                     LazyVStack(spacing: 12) {
-                        ForEach(PostModel.MockPosts) { post in
-                            CommentCell(post: post)
-                        }
+//                        ForEach(PostModel.MockPosts) { post in
+//                            CommentCell(post: post)
+//                        }
                     }
                     .padding(.top, 20)
                     .padding(.horizontal, 12)

diff --git a/SwiftBuddiesIOS/Targets/FeedModule/Sources/FeedNetwork/FeedResponse.swift b/SwiftBuddiesIOS/Targets/FeedModule/Sources/FeedNetwork/FeedResponse.swift
@@ -0,0 +1,32 @@
+//
+//  FeedResponse.swift
+//  SwiftBuddiesIOS
+//
+//  Created by Kate Kashko on 1.11.2024.
+//
+
+import Foundation
+
+struct FeedResponse: Codable {
+    let feed: [PostResponse]?
+}
+
+struct PostResponse: Codable {
+    let user: UserResponse?
+    let post: PostDataResponse?
+}
+
+struct UserResponse: Codable {
+    let name: String?
+    let picture: String?
+}
+
+struct PostDataResponse: Codable {
+    let uid: String
+    let sharedDate: String
+    let content: String
+    let images: [String]?
+    let likeCount: Int
+    let commentCount: Int
+}
+
diff --git a/SwiftBuddiesIOS/Targets/FeedModule/Sources/Model/PostModel.swift b/SwiftBuddiesIOS/Targets/FeedModule/Sources/Model/PostModel.swift
@@ -16,37 +16,54 @@ struct PostModel: Identifiable, Hashable, Codable {
     let content: String
     let imageUrl: String?
     var user: UserModel?
+
+    public init(id: String,
+                authorId: String,
+                likeCount: Int,
+                commentsCount: Int,
+                content: String,
+                imageUrl: String?,
+                user: UserModel?
+    ) {
+        self.id = id
+        self.authorId = authorId
+        self.likeCount = likeCount
+        self.commentsCount = commentsCount
+        self.content = content
+        self.imageUrl = imageUrl
+        self.user = user
+    }
 }
 
-extension PostModel {
-    static var MockPosts: [PostModel] = [
-        .init(
-            id: NSUUID().uuidString,
-            authorId: NSUUID().uuidString,
-            likeCount: 98,
-            commentsCount: 10,
-            content: "Lets do it...",
-            imageUrl: "example",
-            user: UserModel.MockUsers[0]
-        ),
-        .init(
-            id: NSUUID().uuidString,
-            authorId: NSUUID().uuidString,
-            likeCount: 123,
-            commentsCount: 15,
-            content: "Hello everyone",
-            imageUrl: "",
-            user: UserModel.MockUsers[0]
-        ),
-        .init(
-            id: NSUUID().uuidString,
-            authorId: NSUUID().uuidString,
-            likeCount: 120,
-            commentsCount: 20,
-            content: "Our first steps in project...",
-            imageUrl: "logo",
-            user: UserModel.MockUsers[0]
-        )
-
-    ]
-}
+//extension PostModel {
+//    static var MockPosts: [PostModel] = [
+//        .init(
+//            id: NSUUID().uuidString,
+//            authorId: NSUUID().uuidString,
+//            likeCount: 98,
+//            commentsCount: 10,
+//            content: "Lets do it...",
+//            imageUrl: "example",
+//            user: UserModel.MockUsers[0]
+//        ),
+//        .init(
+//            id: NSUUID().uuidString,
+//            authorId: NSUUID().uuidString,
+//            likeCount: 123,
+//            commentsCount: 15,
+//            content: "Hello everyone",
+//            imageUrl: "",
+//            user: UserModel.MockUsers[0]
+//        ),
+//        .init(
+//            id: NSUUID().uuidString,
+//            authorId: NSUUID().uuidString,
+//            likeCount: 120,
+//            commentsCount: 20,
+//            content: "Our first steps in project...",
+//            imageUrl: "logo",
+//            user: UserModel.MockUsers[0]
+//        )
+//        
+//    ]
+//}
diff --git a/SwiftBuddiesIOS/Targets/FeedModule/Sources/Model/UserModel.swift b/SwiftBuddiesIOS/Targets/FeedModule/Sources/Model/UserModel.swift
@@ -11,13 +11,13 @@ import Foundation
 struct UserModel: Identifiable, Hashable, Codable {
     let id: String
     let name: String
-    let profileImageUrl: String
+    let profileImageUrl: String?
 }
 
-extension UserModel {
-    static var MockUsers: [UserModel] = [
-        .init(id: NSUUID().uuidString, name: "Tim Cook", profileImageUrl: "timcook"),
-        .init(id: NSUUID().uuidString, name: "Tim Cook", profileImageUrl: "timcook"),
-        .init(id: NSUUID().uuidString, name: "Tim Cook", profileImageUrl: "timcook")
-    ]
-}
+//extension UserModel {
+//    static var MockUsers: [UserModel] = [
+//        .init(id: NSUUID().uuidString, name: "Tim Cook", profileImageUrl: "timcook"),
+//        .init(id: NSUUID().uuidString, name: "Tim Cook", profileImageUrl: "timcook"),
+//        .init(id: NSUUID().uuidString, name: "Tim Cook", profileImageUrl: "timcook")
+//    ]
+//}
diff --git a/...FeedModule/Sources/ActionButtonView.swift → ...odule/Sources/View/ActionButtonView.swift b/...FeedModule/Sources/ActionButtonView.swift → ...odule/Sources/View/ActionButtonView.swift
diff --git a/...Targets/FeedModule/Sources/FeedCell.swift → ...ts/FeedModule/Sources/View/FeedCell.swift b/...Targets/FeedModule/Sources/FeedCell.swift → ...ts/FeedModule/Sources/View/FeedCell.swift
@@ -26,7 +26,7 @@ struct FeedCell: View {
         .clipShape(RoundedRectangle(cornerRadius: 15))
     }
 }
-
-#Preview {
-    FeedCell(post: PostModel.MockPosts[0])
-}
+//
+//#Preview {
+//    FeedCell(post: PostModel.MockPosts[0])
+//}
diff --git a/...dModule/Sources/FeedCellContentView.swift → ...le/Sources/View/FeedCellContentView.swift b/...dModule/Sources/FeedCellContentView.swift → ...le/Sources/View/FeedCellContentView.swift
@@ -28,7 +28,7 @@ struct FeedCellContentView: View {
         }
     }
 }
-
-#Preview {
-    FeedCellContentView(post: PostModel.MockPosts[0])
-}
+//
+//#Preview {
+//    FeedCellContentView(post: PostModel.MockPosts[0])
+//}
diff --git a/...Module/Sources/FeedCellCountersView.swift → ...e/Sources/View/FeedCellCountersView.swift b/...Module/Sources/FeedCellCountersView.swift → ...e/Sources/View/FeedCellCountersView.swift
@@ -33,6 +33,6 @@ struct FeedCellCountersView: View {
     }
 }
 
-#Preview {
-    FeedCellCountersView(post: PostModel.MockPosts[0])
-}
+//#Preview {
+//    FeedCellCountersView(post: PostModel.MockPosts[0])
+//}
diff --git a/...edModule/Sources/FeedCellHeaderView.swift → ...ule/Sources/View/FeedCellHeaderView.swift b/...edModule/Sources/FeedCellHeaderView.swift → ...ule/Sources/View/FeedCellHeaderView.swift
@@ -16,7 +16,7 @@ struct FeedCellHeaderView: View {
         HStack {
             if let user = post.user {
                 // MARK: - User photo
-                Image(user.profileImageUrl, bundle: DesignResources.bundle)
+                Image(user.profileImageUrl ?? "", bundle: DesignResources.bundle)
                     .resizable()
                     .scaledToFill()
                     .frame(width: 43, height: 43)
@@ -46,6 +46,6 @@ struct FeedCellHeaderView: View {
     }
 }
 
-#Preview {
-    FeedCellHeaderView(post: PostModel.MockPosts[0])
-}
+//#Preview {
+//    FeedCellHeaderView(post: PostModel.MockPosts[0])
+//}
diff --git a/...Targets/FeedModule/Sources/FeedView.swift → ...ts/FeedModule/Sources/View/FeedView.swift b/...Targets/FeedModule/Sources/FeedView.swift → ...ts/FeedModule/Sources/View/FeedView.swift
@@ -2,16 +2,18 @@ import SwiftUI
 import Design
 
 public struct FeedView: View {
-
+    @StateObject private var viewModel = FeedViewModel()
     @State private var addPost = false
 
     public init() {}
     public var body: some View {
         NavigationStack {
             ScrollView {
                 LazyVStack(spacing: 10) {
-                    ForEach(PostModel.MockPosts) { post in
-                        FeedCell(post: post)
+                    if let posts = viewModel.posts {
+                        ForEach(posts) { post in
+                            FeedCell(post: post)
+                        }
                     }
                 }
                 .padding(.top, 20)
@@ -45,6 +47,9 @@ public struct FeedView: View {
             .sheet(isPresented: $addPost) {
                 AddPostView()
             }
+            .task {
+                await viewModel.fetchFeed()
+            }
         }
     }
 }

diff --git a/SwiftBuddiesIOS/Targets/FeedModule/Sources/ViewModel/FeedViewModel.swift b/SwiftBuddiesIOS/Targets/FeedModule/Sources/ViewModel/FeedViewModel.swift
@@ -0,0 +1,61 @@
+//
+//  FeedViewModel.swift
+//  SwiftBuddiesIOS
+//
+//  Created by Kate Kashko on 1.11.2024.
+//
+
+import Foundation
+import BuddiesNetwork
+import Network
+
+@MainActor
+class FeedViewModel: ObservableObject {
+    @Published var posts: [PostModel]? 
+    private let apiClient: BuddiesClient
+
+    init() {
+        self.apiClient = .shared
+    }
+
+    func fetchFeed() async {
+        var request = FeedRequest(range: "0-2")
+
+        do {
+            let response = try await apiClient.perform(request)
+            self.posts = response.feed?.map { postResponse in
+                PostModel(
+                    id: postResponse.post?.uid ?? "",
+                    authorId: "", // Add authorId if available
+                    likeCount: postResponse.post?.likeCount ?? 0,
+                    commentsCount: postResponse.post?.commentCount ?? 0,
+                    content: postResponse.post?.content ?? "",
+                    imageUrl: postResponse.post?.images?.first ?? "",
+                    user: UserModel(
+                        id: UUID().uuidString,  // Use a unique ID
+                        name: postResponse.user?.name ?? "",
+                        profileImageUrl: postResponse.user?.picture
+                    )
+                )
+            }
+        } catch {
+            print("Failed to fetch feed: \(error)")
+        }
+    }
+}
+
+// MARK: - FeedRequest
+struct FeedRequest: Requestable {
+    var range: String
+
+    typealias Data = FeedResponse
+
+    func toUrlRequest() throws -> URLRequest {
+        // Construct the base URL with the endpoint
+        try URLProvider.returnUrlRequest(
+            method: .get,
+            url: APIs.Feed.getFeed.url(),
+            data: self
+        )
+    }
+}
diff --git a/SwiftBuddiesIOS/Targets/LoginModule/Sources/ViewModels/AuthenticationViewModel.swift b/SwiftBuddiesIOS/Targets/LoginModule/Sources/ViewModels/AuthenticationViewModel.swift
@@ -7,13 +7,12 @@ import BuddiesNetwork
 @MainActor
 final public class AuthenticationViewModel: ObservableObject {
     private let apiClient: BuddiesClient
-    private let authManager: AuthWithSSOProtocol
+    private var authManager: AuthWithSSOProtocol
 //    @Dependency(\.authManager) var authManager
 
     public init() {
         self.authManager = AuthenticationManager(authService: .shared)
         self.apiClient = .shared
-        self.authManager = AuthenticationManager(authService: .shared)
     }
 
     func signIn(provider: AuthProviderOption) throws {

diff --git a/SwiftBuddiesIOS/Targets/NetworkModule/Sources/EndpointManager/EndpointManager.swift b/SwiftBuddiesIOS/Targets/NetworkModule/Sources/EndpointManager/EndpointManager.swift
@@ -18,6 +18,16 @@ public enum APIs {
             }
         }
     }
+
+    public enum Feed: Endpoint {
+        case getFeed
+
+        public var value: String {
+            switch self {
+            case .getFeed: return "getFeed"
+            }
+        }
+    }
 }
 
 extension Endpoint {