Revert "Vehicle type and transport interface"

This reverts commit c3d4fc5.

Author: xuorig

app/models/graph/schema.rb

@@ -1,8 +1,5 @@
 module Graph
   Schema = GraphQL::Schema.define do
     query Graph::Types::Query
-    resolve_type ->(obj, ctx) do
-      MySchema.types.values.find { |type| type.name == obj.class.name }
-    end
   end
 end

app/models/graph/types/query.rb

@@ -48,15 +48,6 @@ module Types
       field :starships, types[Graph::Types::Starship] do
         resolve ->(_, _, _) { ::Starship.all }
       end
-
-      field :vehicle, Graph::Types::Vehicle do
-        argument :id, types.ID
-        resolve ->(_, args, _) { ::Vehicle.find(args['id']) }
-      end
-
-      field :vehicles, types[Graph::Types::Vehicle] do
-        resolve ->(_, _, _) { ::Vehicle.all }
-      end
     end
   end
 end

app/models/graph/types/starship.rb

@@ -4,17 +4,28 @@ module Types
       name "Starship"
       description "A single transport craft that has hyperdrive capability."
 
-      interfaces [Graph::Types::TransportInterface]
+      field :id, types.ID, "The ID of this species."
 
-      field :id, types.ID, "The ID of this starship."
-
-      # Starship Specific Fields
+      field :name, types.String, "The name of this starship. The common name, such as \"Death Star\"."
+      field :model, types.String, "The model or official name of this starship. Such as \"T-65 X-wing\" or \"DS-1 Orbital Battle Station\"."
 
       field :starshipClass, types.String do
         description "The class of this starship, such as \"Starfighter\" or \"Deep Space Mobile Battlestation\""
         property :starship_class
       end
 
+      field :manufacturer, types.String, "The manufacturer of this starship."
+      field :costInCredits, types.Float, "The cost of this starship new, in galactic credits", property: :cost_in_credits
+      field :length, types.Float, "The length of this starship in meters."
+      field :crew, types.String, "The number of personnel needed to run or pilot this starship."
+      field :passengers, types.String, "The number of non-essential people this starship can transport."
+
+      field :maxAtmospheringSpeed, types.Int do
+        description "The maximum speed of this starship in atmosphere. null
+          if this starship is incapable of atmosphering flight."
+        property :max_atmosphering_speed
+      end
+
       field :hyperdriveRating, types.Float, "The class of this starships hyperdrive.", property: :hyperdrive_rating
 
       field :MGLT, types.Int do
@@ -28,23 +39,6 @@ module Types
         property :mglt
       end
 
-      # Transport Interface Fields
-
-      field :name, types.String, "The name of this starship. The common name, such as \"Death Star\"."
-      field :model, types.String, "The model or official name of this starship. Such as \"T-65 X-wing\" or \"DS-1 Orbital Battle Station\"."
-
-      field :manufacturer, types.String, "The manufacturer of this starship."
-      field :costInCredits, types.Float, "The cost of this starship new, in galactic credits", property: :cost_in_credits
-      field :length, types.Float, "The length of this starship in meters."
-      field :crew, types.String, "The number of personnel needed to run or pilot this starship."
-      field :passengers, types.String, "The number of non-essential people this starship can transport."
-
-      field :maxAtmospheringSpeed, types.Int do
-        description "The maximum speed of this starship in atmosphere. null
-          if this starship is incapable of atmosphering flight."
-        property :max_atmosphering_speed
-      end
-
       field :cargoCapacity, types.Float do
         description "The maximum number of kilograms that this starship can transport."
         property :cargo_capacity

app/models/graph/types/transport_interface.rb

@@ -77,27 +77,6 @@ class GraphQLControllerTest < ActionDispatch::IntegrationTest
             { "name" => "Nien Nunb" }
           ],
           "starshipClass" => "Light freighter"
-        },
-        "vehicle" => {
-          "id" => "82948950",
-          "name" => "Snowspeeder",
-          "model" => "t-47 airspeeder",
-          "cargoCapacity" => 10.0,
-          "consumables" => "none",
-          "costInCredits" => nil,
-          "created_at" => "2014-12-15 12:22:12 UTC",
-          "crew" => "2",
-          "length" => 4.5,
-          "manufacturer" => "Incom corporation",
-          "maxAtmospheringSpeed" => 650,
-          "passengers" => "0",
-          "pilots" => [
-            { "name" => "Luke Skywalker" },
-            { "name" => "Wedge Antilles" },
-            { "name" => "Luke Skywalker" },
-            { "name" => "Wedge Antilles" },
-          ],
-          "vehicleClass"=>"airspeeder"
         }
       }
     }
@@ -109,7 +88,7 @@ class GraphQLControllerTest < ActionDispatch::IntegrationTest
 
   def full_graphql_query
     "
-      query Full($personID: ID, $filmID: ID, $planetID: ID, $starshipID: ID, $speciesID: ID, $vehicleID: ID) {
+      query Full($personID: ID, $filmID: ID, $planetID: ID, $starshipID: ID, $speciesID: ID) {
         person(id: $personID) {
           birthYear
           eyeColor
@@ -173,22 +152,6 @@ def full_graphql_query
           pilots { name }
           starshipClass
         }
-        vehicle(id: $vehicleID) {
-          id
-          name
-          model
-          cargoCapacity
-          consumables
-          costInCredits
-          created_at
-          crew
-          length
-          manufacturer
-          maxAtmospheringSpeed
-          passengers
-          pilots { name }
-          vehicleClass
-        }
       }
     "
   end
@@ -199,15 +162,13 @@ def default_variables
     film = films(:"a-new-hope")
     planet = planets(:alderaan)
     species = species(:hutt)
-    vehicle = vehicles(:snowspeeder)
 
     {
       "starshipID" => starship.id,
       "personID" => person.id,
       "filmID" => film.id,
       "planetID" => planet.id,
-      "speciesID" => species.id,
-      "vehicleID" => vehicle.id
+      "speciesID" => species.id
     }
   end
 end