Support no placeId with timezone

therehq · Jul 2, 2019 · df5cab3 · df5cab3
1 parent cd65fd7
commit df5cab3
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 11 deletions.
diff --git a/helpers/google/getTzAndLoc.js b/helpers/google/getTzAndLoc.js
@@ -1,7 +1,13 @@
 import { client as mapsClient } from './maps'
 
 export default async placeId => {
-  const { json: { result } } = await mapsClient
+  if (!placeId) {
+    return {}
+  }
+
+  const {
+    json: { result },
+  } = await mapsClient
     .place({
       placeid: placeId,
       language: 'en',
@@ -12,11 +18,15 @@ export default async placeId => {
   const {
     name: city,
     formatted_address: fullLocation,
-    geometry: { location: { lat, lng } },
+    geometry: {
+      location: { lat, lng },
+    },
   } = result
 
   // Fetch timezone string based on geometry (Lat/Lng)
-  const { json: { timeZoneId: timezone } } = await mapsClient
+  const {
+    json: { timeZoneId: timezone },
+  } = await mapsClient
     .timezone({
       location: [lat, lng],
       timestamp: Date.now() / 1000,

diff --git a/resolvers/addManualPerson.js b/resolvers/addManualPerson.js
@@ -6,13 +6,27 @@ import followingList from './followingList'
 
 export default async (
   obj,
-  { firstName, lastName, twitterHandle, placeId, photoUrl, photoCloudObject },
+  {
+    firstName,
+    lastName,
+    twitterHandle,
+    placeId,
+    timezone: inputTimezone,
+    photoUrl,
+    photoCloudObject,
+  },
   ctx,
   info,
 ) => {
   // Find timezone and exact location based on placeId
-  const { city, fullLocation, timezone } = await getTzAndLoc(placeId)
+  let { city, fullLocation, timezone } = await getTzAndLoc(placeId)
 
+  // For UTC
+  if (!placeId && !city && inputTimezone) {
+    city = null
+    fullLocation = null
+    timezone = inputTimezone
+  }
   // Create and save place
   const savedPerson = await ManualPerson.create({
     firstName,

diff --git a/resolvers/addManualPlace.js b/resolvers/addManualPlace.js
@@ -3,10 +3,23 @@ import getTzAndLoc from '../helpers/google/getTzAndLoc'
 import followingList from './followingList'
 
 export default async (obj, args, ctx, info) => {
-  const { name, placeId, photoUrl, photoCloudObject } = args
+  const {
+    name,
+    timezone: inputTimezone,
+    placeId,
+    photoUrl,
+    photoCloudObject,
+  } = args
 
   // Find timezone and exact location based on placeId
-  const { city, fullLocation, timezone } = await getTzAndLoc(placeId)
+  let { city, fullLocation, timezone } = await getTzAndLoc(placeId)
+
+  // Used for UTC
+  if (!placeId && !city && inputTimezone) {
+    city = null
+    fullLocation = null
+    timezone = inputTimezone
+  }
 
   // Create and save place
   const savedPlace = await ManualPlace.create({

diff --git a/resolvers/updateManualPerson.js b/resolvers/updateManualPerson.js
@@ -8,7 +8,7 @@ export default async (obj, args, ctx) => {
     throw new Error('No ID was specified.')
   }
 
-  const { id, placeId, ...newValues } = args
+  const { id, placeId, timezone: inputTimezone, ...newValues } = args
 
   if (Boolean(placeId)) {
     // Only update location if it has been changed
@@ -19,6 +19,11 @@ export default async (obj, args, ctx) => {
     newValues.fullLocation = fullLocation
   }
 
+  // UTC
+  if (Boolean(inputTimezone)) {
+    newValues.timezone = inputTimezone
+  }
+
   const [affected] = await ManualPerson.update(newValues, {
     where: { id },
   })

diff --git a/resolvers/updateManualPlace.js b/resolvers/updateManualPlace.js
@@ -8,7 +8,7 @@ export default async (obj, args, ctx) => {
     throw new Error('No ID was specified.')
   }
 
-  const { id, placeId, ...newValues } = args
+  const { id, placeId, timezone: inputTimezone, ...newValues } = args
 
   if (Boolean(placeId)) {
     // Only update location if it has been changed
@@ -19,6 +19,11 @@ export default async (obj, args, ctx) => {
     newValues.fullLocation = fullLocation
   }
 
+  // UTC
+  if (Boolean(inputTimezone)) {
+    newValues.timezone = inputTimezone
+  }
+
   const [affected] = await ManualPlace.update(newValues, {
     where: { id },
   })

diff --git a/schema/typeDefs.js b/schema/typeDefs.js
@@ -46,14 +46,16 @@ const typeDefs = gql`
 
     addManualPlace(
       name: String!
-      placeId: ID!
+      placeId: ID
+      timezone: String
       photoUrl: String
       photoCloudObject: String
     ): ManualPlace!
     updateManualPlace(
       id: ID!
       name: String!
       placeId: ID # It's not required for update
+      timezone: String
       photoUrl: String
       photoCloudObject: String
     ): ManualPlace
@@ -64,7 +66,8 @@ const typeDefs = gql`
     addManualPerson(
       firstName: String!
       lastName: String
-      placeId: ID!
+      placeId: ID
+      timezone: String
       twitterHandle: String
       photoUrl: String
       photoCloudObject: String
@@ -74,6 +77,7 @@ const typeDefs = gql`
       firstName: String!
       lastName: String
       placeId: ID # It's not required for update
+      timezone: String # used for UTC
       twitterHandle: String
       photoUrl: String
       photoCloudObject: String