Finished FDC Quickstart

dataconnect/.gitignore

@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related
@@ -41,3 +43,5 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+/lib/firebase_options.dart

dataconnect/android/app/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
     <application
         android:label="dataconnect"
         android:name="${applicationName}"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"

dataconnect/android/app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain>10.0.2.2</domain>
+    </domain-config>
+</network-security-config>

dataconnect/connector/connector.yaml → dataconnect/dataconnect/connector/connector.yaml

@@ -1,5 +1,5 @@
 connectorId: movies
 generate:
   dartSdk:
-    outputDir: ../lib/movies_connector
+    outputDir: ../../lib/movies_connector
     package: movies_connector

dataconnect/connector/mutations.gql → dataconnect/dataconnect/connector/mutations.gql

@@ -1,8 +1,9 @@
-mutation UpsertUser($username: String!) @auth(level: USER) {
+mutation UpsertUser($username: String!, $name: String!) @auth(level: USER) {
   user_upsert(
     data: {
       id_expr: "auth.uid"
       username: $username
+      name: $name
     }
   )
 }
@@ -20,7 +21,7 @@ mutation DeleteFavoritedMovie($movieId: UUID!) @auth(level: USER) {
 # Add a review for a movie
 mutation AddReview($movieId: UUID!, $rating: Int!, $reviewText: String!)
 @auth(level: USER) {
-  review_insert(
+  review_upsert(
     data: {
       userId_expr: "auth.uid"
       movieId: $movieId

dataconnect/connector/queries.gql → dataconnect/dataconnect/connector/queries.gql

@@ -17,6 +17,32 @@ query ListMovies($orderByRating: OrderDirection, $orderByReleaseYear: OrderDirec
     description
   }
 }
+query ListMoviesByGenre($genre: String!, $orderByRating: OrderDirection, $orderByReleaseYear: OrderDirection, $limit: Int) @auth(level: PUBLIC) {
+  movies(where: {
+    genre: {
+      eq: $genre
+    }
+  }, orderBy: [
+      { rating: $orderByRating },
+      { releaseYear: $orderByReleaseYear }
+    ]
+    limit: $limit) {
+    id
+    title
+    imageUrl
+    releaseYear
+    genre
+    rating
+    tags
+    description
+  }
+}
+
+query ListGenres @auth(level: PUBLIC) {
+  genres {
+    genre
+  }
+}
 
 # Get movie by id
 query GetMovieById($id: UUID!) @auth(level: PUBLIC) {
@@ -88,6 +114,7 @@ query GetCurrentUser @auth(level: USER) {
   user(key: { id_expr: "auth.uid" }) {
     id
     username
+    name
     reviews: reviews_on_user {
       id
       rating
@@ -116,12 +143,13 @@ query GetCurrentUser @auth(level: USER) {
   }
 }
 
-query GetIfFavoritedMovie($movieId: UUID!) @auth(level: USER) {
+query GetMovieInfoForUser($movieId: UUID!) @auth(level: USER) {
   favorite_movie(key: { userId_expr: "auth.uid", movieId: $movieId }) {
     movieId
   }
 }
 
+
 # Search for movies, actors, and reviews
 query SearchAll(
   $input: String
@@ -210,16 +238,16 @@ query SearchAll(
 
 # # The queries below are unused by the application, but are useful examples for more complex cases
 
-# # List movies by partial title match
-# query ListMoviesByPartialTitle($input: String!) @auth(level: PUBLIC) {
-#   movies(where: { title: { contains: $input } }) {
-#     id
-#     title
-#     genre
-#     rating
-#     imageUrl
-#   }
-# }
+# List movies by partial title match
+query ListMoviesByPartialTitle($input: String!) @auth(level: PUBLIC) {
+  movies(where: { title: { contains: $input } }) {
+    id
+    title
+    genre
+    rating
+    imageUrl
+  }
+}
 
 # # List movies by tag
 # query ListMoviesByTag($tag: String!) @auth(level: PUBLIC) {

dataconnect/dataconnect.yaml → dataconnect/dataconnect/dataconnect.yaml

@@ -5,8 +5,8 @@ schema:
   source: "./schema"
   datasource:
     postgresql:
-      database: "fdcdb2"
+      database: "fdcdb"
       cloudSql:
-        instanceId: "fdc-sql"
+        instanceId: "dataconnect-fdc"
       # schemaValidation: "COMPATIBLE"
 connectorDirs: ["./connector"]