Release 1.6.0 beta.1 (#20)

* Updat api * Update client * Bump UI mapview * Wrap up release changes * Remove uneeded campus code
lcbc-digital · Oct 5, 2020 · 7a34b03 · 7a34b03
1 parent c892382
commit 7a34b03
Show file tree

Hide file tree

Showing 57 changed files with 1,749 additions and 617 deletions.
diff --git a/apollos-church-api/.env.shared.enc b/apollos-church-api/.env.shared.enc
diff --git a/apollos-church-api/.gitignore b/apollos-church-api/.gitignore
@@ -94,3 +94,5 @@ storyLoader.js
 # generated markdown docs
 packages/**/docs/generated/*
 
+# shared secrets
+.env.shared
diff --git a/apollos-church-api/apollos.json b/apollos-church-api/apollos.json
@@ -1,4 +1,4 @@
 {
-    "version": "1.5.0",
+    "version": "1.6.0-beta.1",
     "environment": "api"
-}
+}
diff --git a/apollos-church-api/load-tests/Apollos App Testing.jmx b/apollos-church-api/load-tests/Apollos App Testing.jmx
diff --git a/apollos-church-api/local.graphql b/apollos-church-api/local.graphql
@@ -4,6 +4,7 @@ enum ACTION_FEATURE_ACTION {
   READ_CONTENT
   READ_EVENT
   OPEN_URL
+  OPEN_NODE
   SHARE_IMAGE
 }
 
@@ -86,6 +87,10 @@ type AudioMediaSource implements MediaSource {
   uri: String
 }
 
+interface AudioNode {
+  audios: [AudioMedia]
+}
+
 type AuthenticatedUser {
   id: ID!
   profile: Person
@@ -128,6 +133,12 @@ input CampusLocationInput {
   longitude: Float
 }
 
+interface Card {
+  title(hyphenated: Boolean): String
+  coverImage: ImageMedia
+  summary: String
+}
+
 type CardListItem {
   id: ID!
   hasAction: Boolean
@@ -152,6 +163,11 @@ type ContentChannel implements Node {
   iconName: String
 }
 
+interface ContentChildNode {
+  parentChannel: ContentChannel
+  siblingContentItemsConnection(first: Int, after: String): ContentItemsConnection
+}
+
 interface ContentItem {
   id: ID!
   title(hyphenated: Boolean): String
@@ -165,6 +181,8 @@ interface ContentItem {
   siblingContentItemsConnection(first: Int, after: String): ContentItemsConnection
   parentChannel: ContentChannel
   theme: Theme
+  isLiked: Boolean
+  likedCount: Int
   sharing: SharableContentItem
 }
 
@@ -184,7 +202,17 @@ input ContentItemsConnectionInput {
   after: String
 }
 
-type ContentSeriesContentItem implements ContentItem & Node {
+interface ContentNode {
+  title(hyphenated: Boolean): String
+  coverImage: ImageMedia
+  htmlContent: String
+}
+
+interface ContentParentNode {
+  childContentItemsConnection(first: Int, after: String): ContentItemsConnection
+}
+
+type ContentSeriesContentItem implements ContentItem & Node & ContentNode & Card & VideoNode & AudioNode & ContentChildNode & ContentParentNode & ThemedNode & ProgressNode & LikableNode & ShareableNode & FeaturesNode {
   id: ID!
   title(hyphenated: Boolean): String
   coverImage: ImageMedia
@@ -200,6 +228,8 @@ type ContentSeriesContentItem implements ContentItem & Node {
   percentComplete: Float
   upNext: ContentItem
   scriptures: [Scripture]
+  isLiked: Boolean
+  likedCount: Int
   sharing: SharableContentItem
   features: [Feature]
 }
@@ -210,7 +240,7 @@ type Device implements Node {
   notificationsEnabled: Boolean!
 }
 
-type DevotionalContentItem implements ContentItem & Node {
+type DevotionalContentItem implements ContentItem & Node & ContentNode & Card & VideoNode & AudioNode & ContentChildNode & ContentParentNode & ThemedNode & ScriptureNode & LikableNode & ShareableNode {
   id: ID!
   title(hyphenated: Boolean): String
   coverImage: ImageMedia
@@ -224,6 +254,8 @@ type DevotionalContentItem implements ContentItem & Node {
   parentChannel: ContentChannel
   theme: Theme
   scriptures: [Scripture]
+  isLiked: Boolean
+  likedCount: Int
   sharing: SharableContentItem
 }
 
@@ -248,6 +280,10 @@ type FeatureAction {
   title: String
 }
 
+interface FeaturesNode {
+  features: [Feature]
+}
+
 enum GENDER {
   Male
   Female
@@ -314,6 +350,25 @@ type InteractionResult {
 
 scalar InteractionValue
 
+interface LikableNode {
+  isLiked: Boolean
+  likedCount: Int
+}
+
+enum LIKE_OPERATION {
+  Like
+  Unlike
+}
+
+input LikeEntityInput {
+  nodeId: ID!
+  operation: LIKE_OPERATION!
+}
+
+interface LiveNode {
+  liveStream: LiveStream
+}
+
 type LiveStream {
   isLive: Boolean
   eventStartTime: String
@@ -328,7 +383,7 @@ interface Media {
   sources: [MediaSource]
 }
 
-type MediaContentItem implements ContentItem & Node {
+type MediaContentItem implements ContentItem & Node & ContentNode & Card & VideoNode & AudioNode & ContentChildNode & ContentParentNode & ThemedNode & ScriptureNode & LikableNode & ShareableNode {
   id: ID!
   title(hyphenated: Boolean): String
   coverImage: ImageMedia
@@ -342,6 +397,8 @@ type MediaContentItem implements ContentItem & Node {
   parentChannel: ContentChannel
   theme: Theme
   scriptures: [Scripture]
+  isLiked: Boolean
+  likedCount: Int
   features: [Feature]
   sharing: SharableContentItem
 }
@@ -358,6 +415,8 @@ interface MediaSource {
 
 type Mutation {
   _placeholder: Boolean
+  updateLikeEntity(input: LikeEntityInput!): ContentItem @deprecated(reason: "Use the more general updateLikeNode instead")
+  updateLikeNode(input: LikeEntityInput!): Node
   updateProfileField(input: UpdateProfileInput!): Person
   updateProfileFields(input: [UpdateProfileInput]!): Person
   uploadProfileImage(file: Upload!, size: Int!): Person
@@ -449,6 +508,11 @@ type PrayerRequest implements Node {
   isPrayed: Boolean
 }
 
+interface ProgressNode {
+  percentComplete: Float
+  upNext: ContentItem
+}
+
 input PushSettingsInput {
   enabled: Boolean
   pushProviderUserId: String
@@ -457,6 +521,7 @@ input PushSettingsInput {
 type Query {
   _placeholder: Boolean
   node(id: ID!): Node
+  likedContent(first: Int, after: String): ContentItemsConnection
   contentChannels: [ContentChannel]
   campaigns: ContentItemsConnection
   userFeed(first: Int, after: String): ContentItemsConnection
@@ -494,6 +559,10 @@ type ScriptureFeature implements Feature & Node {
   sharing: SharableFeature
 }
 
+interface ScriptureNode {
+  scriptures: [Scripture]
+}
+
 type SearchResult {
   cursor: String
   title: String
@@ -532,6 +601,10 @@ type ShareableImageFeature implements Feature & Node {
   title: String
 }
 
+interface ShareableNode {
+  sharing: SharableContentItem
+}
+
 type SmsPinResult {
   success: Boolean
   userAuthStatus: USER_AUTH_STATUS
@@ -557,12 +630,16 @@ type ThemeColors {
   alert: Color
 }
 
+interface ThemedNode {
+  theme: Theme
+}
+
 enum ThemeType {
   LIGHT
   DARK
 }
 
-type UniversalContentItem implements ContentItem & Node {
+type UniversalContentItem implements ContentItem & Node & ContentNode & Card & VideoNode & AudioNode & ContentChildNode & ContentParentNode & ThemedNode & LikableNode & ShareableNode {
   id: ID!
   title(hyphenated: Boolean): String
   coverImage: ImageMedia
@@ -575,6 +652,8 @@ type UniversalContentItem implements ContentItem & Node {
   siblingContentItemsConnection(first: Int, after: String): ContentItemsConnection
   parentChannel: ContentChannel
   theme: Theme
+  isLiked: Boolean
+  likedCount: Int
   sharing: SharableContentItem
 }
 
@@ -631,6 +710,10 @@ type VideoMediaSource implements MediaSource {
   uri: String
 }
 
+interface VideoNode {
+  videos: [VideoMedia]
+}
+
 type WebviewFeature implements Feature & Node {
   id: ID!
   order: Int
@@ -639,7 +722,7 @@ type WebviewFeature implements Feature & Node {
   url: String
 }
 
-type WeekendContentItem implements ContentItem & Node {
+type WeekendContentItem implements ContentItem & Node & ContentNode & Card & VideoNode & AudioNode & ContentChildNode & ContentParentNode & ThemedNode & LikableNode & LiveNode & ShareableNode & FeaturesNode {
   id: ID!
   title(hyphenated: Boolean): String
   coverImage: ImageMedia
@@ -652,6 +735,8 @@ type WeekendContentItem implements ContentItem & Node {
   siblingContentItemsConnection(first: Int, after: String): ContentItemsConnection
   parentChannel: ContentChannel
   theme: Theme
+  isLiked: Boolean
+  likedCount: Int
   liveStream: LiveStream
   sharing: SharableContentItem
   features: [Feature]

diff --git a/apollos-church-api/package.json b/apollos-church-api/package.json
@@ -38,21 +38,21 @@
     ]
   },
   "dependencies": {
-    "@apollosproject/bugsnag": "1.5.0",
-    "@apollosproject/config": "1.5.0",
-    "@apollosproject/data-connector-algolia-search": "1.5.0",
-    "@apollosproject/data-connector-analytics": "1.5.0",
-    "@apollosproject/data-connector-bible": "1.5.0",
-    "@apollosproject/data-connector-church-online": "1.5.0",
-    "@apollosproject/data-connector-cloudinary": "1.5.0",
-    "@apollosproject/data-connector-onesignal": "1.5.0",
-    "@apollosproject/data-connector-passes": "1.5.0",
-    "@apollosproject/data-connector-redis-cache": "1.5.0",
-    "@apollosproject/data-connector-rock": "1.5.0",
-    "@apollosproject/data-connector-twilio": "1.5.0",
-    "@apollosproject/data-schema": "1.5.0",
-    "@apollosproject/rock-apollo-data-source": "1.4.4-alpha.37",
-    "@apollosproject/server-core": "1.5.0",
+    "@apollosproject/bugsnag": "^1.6.0-beta.0",
+    "@apollosproject/config": "^1.6.0-beta.0",
+    "@apollosproject/data-connector-algolia-search": "^1.6.0-beta.1",
+    "@apollosproject/data-connector-analytics": "^1.6.0-beta.0",
+    "@apollosproject/data-connector-bible": "^1.6.0-beta.1",
+    "@apollosproject/data-connector-church-online": "^1.6.0-beta.1",
+    "@apollosproject/data-connector-cloudinary": "^1.6.0-beta.0",
+    "@apollosproject/data-connector-onesignal": "^1.6.0-beta.1",
+    "@apollosproject/data-connector-passes": "^1.6.0-beta.1",
+    "@apollosproject/data-connector-redis-cache": "^1.6.0-beta.0",
+    "@apollosproject/data-connector-rock": "^1.6.0-beta.1",
+    "@apollosproject/data-connector-twilio": "^1.6.0-beta.0",
+    "@apollosproject/data-schema": "^1.6.0-beta.0",
+    "@apollosproject/rock-apollo-data-source": "^1.6.0-beta.1",
+    "@apollosproject/server-core": "^1.6.0-beta.1",
     "apollo-server": "^2.14.2",
     "apollo-server-express": "2.14.2",
     "color": "3.0.0",
@@ -63,9 +63,9 @@
     "randomcolor": "0.5.3"
   },
   "devDependencies": {
-    "@apollosproject/apollo-server-env-mock": "1.4.3",
-    "@apollosproject/babel-preset-apollos": "1.4.3",
-    "@apollosproject/eslint-config": "1.4.3",
+    "@apollosproject/apollo-server-env-mock": "^1.6.0-beta.0",
+    "@apollosproject/babel-preset-apollos": "^1.6.0-beta.0",
+    "@apollosproject/eslint-config": "^1.6.0-beta.1",
     "@babel/cli": "^7.4.5",
     "@babel/core": "^7.4.5",
     "@babel/node": "^7.7.4",

diff --git a/apollos-church-api/scripts/add-packages.sh b/apollos-church-api/scripts/add-packages.sh
@@ -0,0 +1,30 @@
+# get list of apollosproject packages to update
+
+# get devDependencies line number
+DEVDEPSLINE=$(grep -n "devDependencies" package.json | sed -E "s/^([0-9]+):.*/\1/g")
+
+# get dependecies line number
+DEPSLINE=$(grep -n "dependencies" package.json | sed -E "s/^([0-9]+):.*/\1/g")
+
+# determine what npm tag to update to
+if [ "$#" -ne 1 ]; then
+	echo "pass npm tag like this: ./add-packages.sh <TAG>"
+	exit 1
+else
+	TAG=$1
+fi;
+
+# replace package names with version tag
+JSON=$(sed -E "s/^.*\"(@apollosproject\/[a-z\-]+)\".*$/\1@$TAG /g" package.json)
+
+# if packages are listed first and dev packages second...
+if [ $DEVDEPSLINE -gt $DEPSLINE ]
+then
+		PKGS=$(echo "$JSON" | sed -n "$DEPSLINE","$DEVDEPSLINE"p | grep "@apollosproject" | tr -d "\n")
+		DEVPKGS=$(echo "$JSON" | sed -n "$DEVDEPSLINE",/^$/p | grep "@apollosproject" | tr -d "\n")
+else
+		PKGS=$(echo "$JSON" | sed -n "$DEPSLINE",/^$/p | grep "@apollosproject" | tr -d "\n")
+		DEVPKGS=$(echo "$JSON" | sed -n "$DEVDEPSLINE","$DEPSLINE"p | grep "@apollosproject" | tr -d "\n")
+fi
+yarn add --dev $DEVPKGS --ignore-scripts
+yarn add $PKGS --ignore-scripts
diff --git a/apollos-church-api/scripts/generateLocalSchema.sh b/apollos-church-api/scripts/generateLocalSchema.sh
@@ -5,24 +5,11 @@ if eval "$PING_SERVER"; then
   ./node_modules/.bin/get-graphql-schema http://localhost:4000 > local.graphql
   echo 'Done. Check local.graphql'
 else
-  echo $*
-  if [ "$*" = "--start-server" ]; then
-    echo 'Server not running, starting server'
-    PORT=4000 npm run start:prod > /tmp/server-log.txt &
-    SERVER_PID=$!
-    echo "Server running... (PID $SERVER_PID)"
-  fi
   sleep 1
   until eval "$PING_SERVER"; do
       sleep 1
       echo 'Waiting for server to boot....'
   done
   echo 'Curling Server for most recent schema.'
   ./node_modules/.bin/get-graphql-schema http://localhost:4000 > local.graphql
-  # echo 'Publishing Schema to Apollo Engine.'
-  # npx apollo schema:publish --endpoint=http://localhost:4000
-  if [ "$*" = "--start-server" ]; then
-    echo "Killing Server (PID $SERVER_PID)"
-    kill -9 $SERVER_PID
-  fi
 fi
diff --git a/apollos-church-api/scripts/init.sh b/apollos-church-api/scripts/init.sh
@@ -0,0 +1,7 @@
+# create .env file
+if test -f .env; then
+	echo ".env file already exists!"
+	exit 1
+fi
+echo "ROCK_API=
+ROCK_TOKEN=" > .env