fix(location): Simplify location data model

Author: bebraw

src/locations/elisa-appelsiini.js

@@ -6,13 +6,11 @@ module.exports = {
     "In addition to being a silver sponsor of the event, Elisa is supporting the event by providing space for our workshops",
   image: "sponsors/elisa.svg",
   social: sponsor.social,
-  location: {
-    country: {
-      name: "Finland",
-      code: "FI",
-    },
-    city: "Helsinki",
-    address: "Kaarlenkatu 11", 
+  country: {
+    name: "Finland",
+    code: "FI",
   },
+  city: "Helsinki",
+  address: "Kaarlenkatu 11", 
   keywords: sponsor.keywords
 };

src/locations/valkoinen-sali.js

@@ -5,12 +5,10 @@ module.exports = {
   social: {
     homepage: "http://www.valkoinensali.com/",
   },
-  location: {
-    country: {
-      name: "Finland",
-      code: "FI",
-    },
-    city: "Helsinki",
-    address: "Aleksanterinkatu 16", 
+  country: {
+    name: "Finland",
+    code: "FI",
   },
+  city: "Helsinki",
+  address: "Aleksanterinkatu 16", 
 };

src/type-defs.js

@@ -31,7 +31,9 @@ module.exports = `
     speakers: [Contact],
     tickets: [Ticket],
     keywords: [String],
-    location: Location
+    country: Country,
+    city: String,
+    address: String
   }
 
   type Page {

tests.js

@@ -8,6 +8,12 @@ assert.equal(
   "Andrey Okonetchnikov"
 );
 
+assert.equal(
+  content.workshops.find(o => o.title === "Styleguide-driven Development")
+    .location.address,
+  "Aleksanterinkatu 16"
+);
+
 assert.equal(
   content.speakers.find(o => o.name === "Andrey Okonetchnikov").workshops[0]
     .title,
@@ -42,7 +48,7 @@ assert.equal(
 );
 
 assert.equal(
-  content.locations.find(o => o.name === "Valkoinen Sali").location.address,
+  content.locations.find(o => o.name === "Valkoinen Sali").address,
   "Aleksanterinkatu 16"
 );