✨ Implement watch list

Signed-off-by: Peter Friese <[email protected]>

Author: peterfriese

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/App/FriendlyFlixApp.swift

@@ -18,6 +18,9 @@
 
 import SwiftUI
 import Firebase
+import FirebaseAuth
+import FirebaseDataConnect
+import FriendlyFlixSDK
 
 @main
 struct FriendlyFlixApp: App {
@@ -31,15 +34,26 @@ struct FriendlyFlixApp: App {
 #endif
   }
 
-  init () {
+  var authenticationService: AuthenticationService?
+
+  init() {
     loadRocketSimConnect()
     FirebaseApp.configure()
+
+    authenticationService = AuthenticationService()
+    authenticationService?.onSignUp { user in
+      print("User signed in \(user.displayName ?? "(no fullname)") with email \(user.email ?? "(no email)")")
+      let userName = String(user.email?.split(separator: "@").first ?? "(unknown)")
+      Task {
+        try await DataConnect.friendlyFlixConnector.upsertUserMutation.execute(username: userName)
+      }
+    }
   }
 
   var body: some Scene {
     WindowGroup {
       RootView()
-        .environment(AuthenticationService())
+        .environment(authenticationService)
     }
   }
 }

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Authentication/AuthenticationService.swift

@@ -44,13 +44,23 @@ class AuthenticationService {
     }
   }
 
+  private var onSignUp: ((User) -> Void)?
+  public func onSignUp(_ action: @escaping (User) -> Void) {
+    onSignUp = action
+  }
+
   func signInWithEmailPassword(email: String, password: String) async throws {
     try await Auth.auth().signIn(withEmail: email, password: password)
     authenticationState = .authenticated
   }
 
   func signUpWithEmailPassword(email: String, password: String) async throws {
     try await Auth.auth().createUser(withEmail: email, password: password)
+
+    if let onSignUp, let user = Auth.auth().currentUser {
+      onSignUp(user)
+    }
+    
     authenticationState = .authenticated
   }
 

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Details/MovieCardView.swift

@@ -19,12 +19,43 @@
 
 import SwiftUI
 import NukeUI
+import FirebaseDataConnect
+import FriendlyFlixSDK
 
 struct MovieCardView: View {
-  var showDetails: Bool = false
+  public var showDetails: Bool = false
+  public var movie: Movie
 
-  var movie: Movie
+  private var connector = DataConnect.friendlyFlixConnector
 
+  public init(showDetails: Bool, movie: Movie) {
+    self.showDetails = showDetails
+    self.movie = movie
+
+    isFavouriteRef = connector.getIfFavoritedMovieQuery.ref(movieId: movie.id)
+  }
+
+  private let isFavouriteRef: QueryRefObservation<GetIfFavoritedMovieQuery.Data, GetIfFavoritedMovieQuery.Variables>
+  private var isFavourite: Bool {
+    isFavouriteRef.data?.favorite_movie?.movieId != nil
+  }
+
+  func toggleFavourite() {
+    Task {
+      if isFavourite {
+        let _ = try await connector.deleteFavoritedMovieMutation.execute(movieId: movie.id)
+        let _ = try await isFavouriteRef.execute()
+      }
+      else {
+        let _ = try await connector.addFavoritedMovieMutation.execute(movieId: movie.id)
+        let _ = try await isFavouriteRef.execute()
+      }
+    }
+  }
+
+}
+
+extension MovieCardView {
   var body: some View {
     CardView(showDetails: showDetails) {
       if let imageUrl = URL(string: movie.imageUrl) {
@@ -71,8 +102,25 @@ struct MovieCardView: View {
       }
     } details: {
       Text(movie.title)
+      Button {
+        toggleFavourite()
+      } label: {
+        Label(
+          isFavourite ? "Remove from watch list" : "Add to watch list",
+          systemImage: isFavourite ? "heart.slash" :"heart"
+        )
+      }
+
 //      MovieDetailsView(movie: movie)
     }
+    .task {
+      do {
+        let _ = try await isFavouriteRef.execute()
+      }
+      catch {
+        print(error)
+      }
+    }
   }
 }
 

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Home/HomeScreen.swift

@@ -54,9 +54,9 @@ struct HomeScreen: View {
       .data?.movies.map(Movie.init) ?? []
   }
 
+  let watchListRef: QueryRefObservation<GetUserFavoriteMoviesQuery.Data, GetUserFavoriteMoviesQuery.Variables>
   private var watchList: [Movie] {
-    /// TODO: build a query that retrieves the user's watch list
-    connector.listMoviesQuery.ref().data?.movies.map(Movie.init) ?? []
+    watchListRef.data?.user?.favoriteMovies.map(Movie.init) ?? []
   }
 
   private var featuredMovies: [Movie] {
@@ -68,6 +68,10 @@ struct HomeScreen: View {
       })
       .data?.movies.map(Movie.init) ?? []
   }
+
+  init() {
+    watchListRef = connector.getUserFavoriteMoviesQuery.ref()
+  }
 }
 
 extension HomeScreen {
@@ -93,6 +97,11 @@ extension HomeScreen {
         Group {
           MovieListSection(namespace: namespace, title: "Top Movies", movies: topMovies)
           MovieListSection(namespace: namespace, title: "Watch List", movies: watchList)
+            .onAppear {
+              Task {
+                try await watchListRef.execute()
+              }
+            }
           MovieListSection(namespace: namespace, title: "Featured", movies: featuredMovies)
         }
         .navigationDestination(for: [Movie].self) { movies in

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Library/LibraryScreen.swift

@@ -17,19 +17,39 @@
 // limitations under the License.
 
 import SwiftUI
+import FirebaseDataConnect
+import FriendlyFlixSDK
 
 struct LibraryScreen: View {
   @Namespace var namespace
   @Environment(AuthenticationService.self) var authenticationViewModel
 
+  private var connector = DataConnect.friendlyFlixConnector
+
+  init() {
+    watchListRef = connector.getUserFavoriteMoviesQuery.ref()
+  }
+
+  private let watchListRef: QueryRefObservation<GetUserFavoriteMoviesQuery.Data, GetUserFavoriteMoviesQuery.Variables>
+  private var watchList: [Movie] {
+    watchListRef.data?.user?.favoriteMovies.map(Movie.init) ?? []
+  }
+}
+
+extension LibraryScreen {
   var body: some View {
-    @Bindable var authenticationViewModel = authenticationViewModel
     NavigationStack {
       ScrollView {
         if authenticationViewModel.authenticationState == .authenticated {
           Group {
-            MovieListSection(namespace: namespace, title: "Watch List", movies: Movie.watchList)
-            MovieListSection(namespace: namespace, title: "Favourites", movies: Movie.featured)
+            MovieListSection(namespace: namespace, title: "Watch List", movies: watchList)
+              .onAppear {
+                Task {
+                  try await watchListRef.execute()
+                }
+              }
+
+            // TODO: insert section with list of all movies the user has rated
           }
           .padding()
         }

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Features/Search/SearchScreen.swift

@@ -64,7 +64,7 @@ struct SearchScreen: View {
 
   private var filteredMovies: [Movie] {
     connector.listMoviesByPartialTitleQuery
-      .ref(searchTerm: searchText)
+      .ref(searchTerm: searchText.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines))
       .data?.movies.map(Movie.init) ?? []
   }
 

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Model/Movie+DataConnect.swift

@@ -17,6 +17,7 @@ import FriendlyFlixSDK
 
 extension Movie {
   init(from: ListMoviesQuery.Data.Movie) {
+    self.id = from.id
     self.title = from.title
     self.description = from.description ?? ""
     self.releaseYear = from.releaseYear
@@ -25,11 +26,21 @@ extension Movie {
   }
 
   init(from: ListMoviesByPartialTitleQuery.Data.Movie) {
+    self.id = from.id
     self.title = from.title
     self.description = from.description ?? ""
     self.releaseYear = from.releaseYear
     self.rating = from.rating
     self.imageUrl = from.imageUrl
   }
+
+  init(from: GetUserFavoriteMoviesQuery.Data.User.FavoriteMovieFavoriteMovies) {
+    self.id = from.movie.id
+    self.title = from.movie.title
+    self.description = from.movie.description ?? ""
+    self.releaseYear = from.movie.releaseYear
+    self.rating = from.movie.rating
+    self.imageUrl = from.movie.imageUrl
+  }
 }
 

Examples/FriendlyFlix/app/FriendlyFlix/FriendlyFlix/Model/Movie.swift

@@ -20,12 +20,28 @@ import Foundation
 import SwiftUI
 
 struct Movie: Identifiable, Hashable {
-  let id = UUID()
+  let id: UUID
   let title: String
   let description: String
   let releaseYear: Int?
   var rating: Double?
   let imageUrl: String
+
+  init(
+    id: UUID = UUID(),
+    title: String,
+    description: String,
+    releaseYear: Int?,
+    rating: Double? = nil,
+    imageUrl: String
+  ) {
+    self.id = id
+    self.title = title
+    self.description = description
+    self.releaseYear = releaseYear
+    self.rating = rating
+    self.imageUrl = imageUrl
+  }
 }
 
 extension Movie: Mockable {

Examples/FriendlyFlix/app/FriendlyFlixSDK/README.md

@@ -323,6 +323,39 @@ DataConnect.friendlyFlixConnector.listMoviesByPartialTitleQuery.execute(...)
 ```
 
 
+## GetUserFavoriteMoviesQuery
+
+
+### Using the Query Reference
+```
+struct MyView: View {
+   var getUserFavoriteMoviesQueryRef = DataConnect.friendlyFlixConnector.getUserFavoriteMoviesQuery.ref(...)
+
+  var body: some View {
+    VStack {
+      if let data = getUserFavoriteMoviesQueryRef.data {
+        // use data in View
+      }
+      else {
+        Text("Loading...")
+      }
+    }
+    .task {
+        do {
+          let _ = try await getUserFavoriteMoviesQueryRef.execute()
+        } catch {
+        }
+      }
+  }
+}
+```
+
+### One-shot execute
+```
+DataConnect.friendlyFlixConnector.getUserFavoriteMoviesQuery.execute(...)
+```
+
+
 # Mutations
 ## UpsertUserMutation
 

Examples/FriendlyFlix/app/FriendlyFlixSDK/Sources/FriendlyFlixClient.swift

@@ -43,6 +43,7 @@ public class FriendlyFlixConnector {
     self.getIfFavoritedMovieQuery = GetIfFavoritedMovieQuery(dataConnect: dataConnect)
     self.searchAllQuery = SearchAllQuery(dataConnect: dataConnect)
     self.listMoviesByPartialTitleQuery = ListMoviesByPartialTitleQuery(dataConnect: dataConnect)
+    self.getUserFavoriteMoviesQuery = GetUserFavoriteMoviesQuery(dataConnect: dataConnect)
 
   }
 
@@ -64,6 +65,7 @@ public let getCurrentUserQuery: GetCurrentUserQuery
 public let getIfFavoritedMovieQuery: GetIfFavoritedMovieQuery
 public let searchAllQuery: SearchAllQuery
 public let listMoviesByPartialTitleQuery: ListMoviesByPartialTitleQuery
+public let getUserFavoriteMoviesQuery: GetUserFavoriteMoviesQuery
 
 
 }