From 0bfa047a5a39e2014493c2ec38ea1153aa599a3b Mon Sep 17 00:00:00 2001
From: Grzegorz Leoniec <greg@app-interactive.de>
Date: Tue, 8 Jan 2019 15:12:44 +0100
Subject: [PATCH] Fixed issues for non german / english languages

---
 src/middleware/userMiddleware.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/middleware/userMiddleware.js b/src/middleware/userMiddleware.js
index c4cba0c63..2d8de6a77 100644
--- a/src/middleware/userMiddleware.js
+++ b/src/middleware/userMiddleware.js
@@ -24,13 +24,27 @@ const createOrUpdateLocations = async (userId, locationName, driver) => {
     return
   }
   const mapboxToken = process.env.MAPBOX_TOKEN
-  const res = await fetch(`https://api.mapbox.com/geocoding/v5/mapbox.places/${encodeURIComponent(locationName)}.json?access_token=${mapboxToken}&types=region,place,country&language=en,de,fr,nl,it,es,pt,pl&limit=1`)
+  const res = await fetch(`https://api.mapbox.com/geocoding/v5/mapbox.places/${encodeURIComponent(locationName)}.json?access_token=${mapboxToken}&types=region,place,country&language=en,de,fr,nl,it,es,pt,pl`)
 
   if (!res || !res.features || !res.features[0]) {
     throw new UserInputError('locationName is invalid')
   }
 
-  const data = res.features[0]
+  let data
+
+  res.features.forEach(item => {
+    if (item.matching_place_name === locationName) {
+      data = item
+    }
+  })
+  if (!data) {
+    data = res.features[0]
+  }
+
+  if (!data) {
+    throw new UserInputError('locationName is invalid')
+  }
+
   const session = driver.session()
   await session.run(
     'MERGE (l:Location {id: $id}) ' +
@@ -125,8 +139,6 @@ export default {
       return result
     },
     UpdateUser: async (resolve, root, args, context, info) => {
-      console.log(context.req.headers['accept-language'])
-      console.log(context.req.headers)
       const result = await resolve(root, args, context, info)
       await createOrUpdateLocations(context.user.id, args.locationName, context.driver)
       return result