Merge pull request #1 from marvelapp/feature/new-graphql-schema

Update to work with the new Marvel GraphQL Schema

Author: maximedegreve

Sources/App/Controllers/Slack/SlackAddPeopleController.swift

@@ -163,7 +163,7 @@ final class SlackAddPeopleController {
 
 
         // Check if error
-        if let errorMessage = result.data["errors"]?["message"]?.string{
+        if let errorMessage = result.data["errors"]?.array?.first?["message"]?.string{
             return try Error.custom(text: errorMessage)
         }
 

Sources/App/Controllers/Slack/SlackExternalController.swift

@@ -34,11 +34,13 @@ final class SlackExternalController {
 
         // Compare the verifications token (Security)
         if vertificationTokenRequest != verificationToken{
+            Swift.print("Verification tokens don't match")
             throw Abort.badRequest
         }
 
         // Check if known callback
         guard let slackCallback = SlackExternalCallbacks(rawValue: name) else{
+            Swift.print("Callback id with '\(name)' doesn't exist")
             throw Abort.badRequest
         }
 

Sources/App/Controllers/Slack/SlackProjectsController.swift

@@ -107,7 +107,7 @@ final class SlackProjectsController {
                 [
                     "title": projectFound.name,
                     "title_link": projectFound.prototypeUrl,
-                    "thumb_url": projectFound.images.first?.url ?? "",
+                    "thumb_url": projectFound.screens.first?.content?.url ?? "",
                     "footer": "Marvel Prototyping",
                     "fields": [
                         [

Sources/App/Tools/Marvel/GraphQueries.swift

@@ -37,41 +37,47 @@ final class GraphQueries {
 
     static let projects =
     """
+        fragment image on ImageScreen {
+          filename
+          url
+        }
+
         query {
-          user {
-            projects(first: 50) {
-              edges {
-                node {
-                  pk
-                  name
-                  prototypeUrl
-                  lastModified
-                  collaborators {
+                user {
+                  projects(first: 40) {
                     edges {
                       node {
                         pk
-                        username
-                        email
-                      }
-                    }
-                  }
-                  images {
-                    edges {
-                      node {
-                        displayName
-                        fileName
-                        url
-                        width
-                        height
-                        uuid
+                        name
+                        prototypeUrl
+                        lastModified
+                        collaborators {
+                          edges {
+                            node {
+                              pk
+                              username
+                              email
+                            }
+                          }
+                        }
+                        screens(first: 2) {
+                          edges {
+                            node {
+                              name
+                              uuid
+                              modifiedAt
+                              content {
+                                __typename
+                                ... image
+                              }
+                            }
+                          }
+                        }
                       }
                     }
                   }
                 }
               }
-            }
-          }
-        }
     """
 
     static func createProject(name: String) -> String{

Sources/App/Tools/Marvel/MarvelContent.swift

@@ -0,0 +1,21 @@
+//
+//  MarvelContent.swift
+//  App
+//
+//  Created by Maxime De Greve on 06/03/2018.
+//
+
+import Vapor
+
+final class MarvelContent {
+
+    // Non optionals
+    var fileName = ""
+    var url = ""
+
+    init(with node: Node?) {
+        fileName = node?["filename"]?.string ?? ""
+        url = node?["url"]?.string ?? ""
+    }
+
+}

Sources/App/Tools/Marvel/MarvelProject.swift

@@ -15,7 +15,7 @@ final class MarvelProject {
     var name = ""
     var prototypeUrl = ""
     var lastModified = Date()
-    var images = [MarvelImage]()
+    var screens = [MarvelScreen]()
     var collaborators = [MarvelMember]()
 
     init(with node: Node?) {
@@ -28,10 +28,10 @@ final class MarvelProject {
             lastModified = date
         }
 
-        if let imagesArray = node?["images"]?["edges"]?.array {
-            for image in imagesArray{
-                let image = MarvelImage(with: image["node"])
-                images.append(image)
+        if let screensArray = node?["screens"]?["edges"]?.array {
+            for screen in screensArray{
+                let screen = MarvelScreen(with: screen["node"])
+                screens.append(screen)
             }
         }
 

…urces/App/Tools/Marvel/MarvelImage.swift …rces/App/Tools/Marvel/MarvelScreen.swiftSources/App/Tools/Marvel/MarvelImage.swift renamed to Sources/App/Tools/Marvel/MarvelScreen.swift Sources/App/Tools/Marvel/MarvelImage.swift renamed to Sources/App/Tools/Marvel/MarvelScreen.swift

@@ -7,23 +7,25 @@
 
 import Vapor
 
-final class MarvelImage {
+final class MarvelScreen {
 
     // Non optionals
     var uuid = ""
     var width = 0
     var height = 0
-    var displayName = ""
-    var fileName = ""
-    var url = ""
+    var name = ""
+    var content: MarvelContent?
 
     init(with node: Node?) {
         uuid = node?["uuid"]?.string ?? ""
         width = node?["width"]?.int ?? 0
         height = node?["height"]?.int ?? 0
-        url = node?["url"]?.string ?? ""
-        fileName = node?["fileName"]?.string ?? ""
-        displayName = node?["displayName"]?.string ?? ""
+        name = node?["name"]?.string ?? ""
+
+        if let contentNode = node?["content"]{
+            content = MarvelContent(with: contentNode)
+        }
+
     }
 
 }