solidus_graphql_api 0.1.0 → 0.2.0

data/lib/generators/solidus_graphql_api/install/install_generator.rb

@@ -3,6 +3,25 @@
 module SolidusGraphqlApi
   module Generators
     class InstallGenerator < Rails::Generators::Base
+      class_option :auto_run_migrations, type: :boolean, default: false
+      source_root File.expand_path('templates', __dir__)
+
+      def copy_initializer
+        template 'initializer.rb', 'config/initializers/solidus_graphql_api.rb'
+      end
+
+      def add_migrations
+        run 'bin/rails railties:install:migrations FROM=solidus_graphql_api'
+      end
+
+      def run_migrations
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]')) # rubocop:disable Layout/LineLength
+        if run_migrations
+          run 'bin/rails db:migrate'
+        else
+          puts 'Skipping bin/rails db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
+        end
+      end
     end
   end
 end

data/lib/generators/solidus_graphql_api/install/templates/initializer.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+SolidusGraphqlApi.configure do |config|
+  # TODO: Remember to change this with the actual preferences you have implemented!
+  # config.sample_preference = 'sample_value'
+end

data/lib/graphql_docs/landing_pages/index.md

@@ -0,0 +1,16 @@
+---
+title: Solidus GraphQL documentation
+---
+
+# Solidus GraphQL API
+
+This is the GraphQL documentation for the [Solidus](https://github.com/solidusio/solidus) ecommerce platform.
+
+## Quick Reference
+
+- Solidus's GraphQL API endpoint is located at `/graphql`.
+- Check out GraphQL's [official documentation](https://graphql.org/)
+
+## Need help?
+
+Join the [SolidusSlack#support-channel](http://slack.solidus.io/) and start a conversation.

data/lib/solidus_graphql_api/batch_loader/has_many_through.rb

@@ -24,6 +24,7 @@ module SolidusGraphqlApi
         base_relation
           .joins(through_reflection.name)
           .where("#{through_reflection.table_name}.#{through_reflection.foreign_key}" => object_ids)
+          .distinct
       end
 
       def group_records_by_parent(records)

data/lib/solidus_graphql_api/configuration.rb

@@ -1,14 +1,6 @@
 # frozen_string_literal: true
 
 module SolidusGraphqlApi
-  def self.configure
-    yield configuration
-  end
-
-  def self.configuration
-    @configuration ||= Configuration.new
-  end
-
   class Configuration
     attr_accessor :payment_sources
 
@@ -16,4 +8,16 @@ module SolidusGraphqlApi
       @payment_sources = ['SolidusGraphqlApi::Types::CreditCard']
     end
   end
+
+  class << self
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    alias config configuration
+
+    def configure
+      yield configuration
+    end
+  end
 end

data/lib/solidus_graphql_api/context.rb

@@ -22,7 +22,11 @@ module SolidusGraphqlApi
     end
 
     def current_user
-      @current_user ||= Spree.user_class.find_by(spree_api_key: bearer_token)
+      @current_user ||= begin
+        return nil unless bearer_token&.present?
+
+        Spree.user_class.find_by(spree_api_key: bearer_token)
+      end
     end
 
     def current_ability
@@ -60,6 +64,8 @@ module SolidusGraphqlApi
     end
 
     def current_order_by_guest_token
+      return if order_token.blank?
+
       incomplete_orders = Spree::Order.incomplete
       incomplete_orders = incomplete_orders.where(store: current_store) if current_store
 

data/lib/solidus_graphql_api/engine.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/core'
-require 'solidus_graphql_api'
+require 'solidus_core'
+require 'solidus_support'
 
 module SolidusGraphqlApi
   class Engine < Rails::Engine

data/lib/solidus_graphql_api/mutations/base_mutation.rb

@@ -33,10 +33,10 @@ module SolidusGraphqlApi
       def user_errors(*path, errors)
         return [] if errors.empty?
 
-        errors.map do |attribute, message|
+        errors.map do |error|
           {
-            path: ["input", *path].concat(attribute.to_s.camelize(:lower).split('.')),
-            message: message,
+            path: ["input", *path].concat(error.attribute.to_s.camelize(:lower).split('.')),
+            message: error.message,
           }
         end
       end

data/lib/solidus_graphql_api/mutations/checkout/add_payment_to_checkout.rb

@@ -13,7 +13,7 @@ module SolidusGraphqlApi
         field :order, Types::Order, null: true
         field :errors, [Types::UserError], null: false
 
-        def resolve(payment_method:, amount: nil, source:)
+        def resolve(payment_method:, source:, amount: nil)
           current_order.update(state: :payment)
 
           update_params = {

data/lib/solidus_graphql_api/mutations/user/{mark_default_address.rb → mark_default_ship_address.rb}

@@ -3,7 +3,7 @@
 module SolidusGraphqlApi
   module Mutations
     module User
-      class MarkDefaultAddress < BaseMutation
+      class MarkDefaultShipAddress < BaseMutation
         null true
 
         argument :address_id, ID, required: true, loads: Types::Address
@@ -11,7 +11,7 @@ module SolidusGraphqlApi
         field :user, Types::User, null: true
 
         def resolve(address:)
-          current_user.mark_default_address(address)
+          current_user.mark_default_ship_address(address)
 
           { user: current_user.reload }
         end

data/lib/solidus_graphql_api/mutations/user/save_in_address_book.rb

@@ -4,16 +4,22 @@ module SolidusGraphqlApi
   module Mutations
     module User
       class SaveInAddressBook < BaseMutation
+        class AddressTypeInput < Types::Base::Enum
+          value "shipping"
+          value "billing"
+        end
+
         null true
 
         argument :address, Types::InputObjects::AddressInput, required: true
         argument :default, Boolean, required: false
+        argument :address_type, AddressTypeInput, required: false, default_value: "shipping"
 
         field :user, Types::User, null: true
         field :errors, [Types::UserError], null: false
 
-        def resolve(address:, default: false)
-          address = current_user.save_in_address_book(address, default)
+        def resolve(address:, address_type:, default: false)
+          address = current_user.save_in_address_book(address, default, address_type.to_sym)
 
           {
             user: current_user,

data/lib/solidus_graphql_api/queries/option_value/option_type_query.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module SolidusGraphqlApi
+  module Queries
+    module OptionValue
+      class OptionTypeQuery
+        attr_reader :option_value
+
+        def initialize(option_value:)
+          @option_value = option_value
+        end
+
+        def call
+          SolidusGraphqlApi::BatchLoader.for(option_value, :option_type)
+        end
+      end
+    end
+  end
+end

data/lib/solidus_graphql_api/queries/shipping_rate/shipping_method_query.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module SolidusGraphqlApi
+  module Queries
+    module ShippingRate
+      class ShippingMethodQuery
+        attr_reader :shipping_rate
+
+        def initialize(shipping_rate:)
+          @shipping_rate = shipping_rate
+        end
+
+        def call
+          SolidusGraphqlApi::BatchLoader.for(shipping_rate, :shipping_method)
+        end
+      end
+    end
+  end
+end

data/lib/solidus_graphql_api/queries/variant/default_price_query.rb

@@ -11,7 +11,7 @@ module SolidusGraphqlApi
         end
 
         def call
-          SolidusGraphqlApi::BatchLoader.for(variant, :default_price)
+          variant.default_price
         end
       end
     end

data/lib/solidus_graphql_api/{factories → testing_support/factories}/address_factory.rb

@@ -2,7 +2,6 @@
 
 FactoryBot.modify do
   factory :address do
-    firstname { 'John' }
-    lastname { nil }
+    name { 'John Von Doe' }
   end
 end

data/lib/solidus_graphql_api/{factories → testing_support/factories}/taxonomy_factory.rb

@@ -22,5 +22,15 @@ FactoryBot.modify do
         )
       end
     end
+
+    trait :with_root_icon do
+      after :create do |taxonomy|
+        taxonomy.root.update(icon: Spree::Core::Engine.root.join('lib',
+                                                                 'spree',
+                                                                 'testing_support',
+                                                                 'fixtures',
+                                                                 'blank.jpg').open)
+      end
+    end
   end
 end

data/lib/solidus_graphql_api/testing_support/factories.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'solidus_graphql_api/testing_support/factories/address_factory'
+require 'solidus_graphql_api/testing_support/factories/country_factory'
+require 'solidus_graphql_api/testing_support/factories/store_factory'
+require 'solidus_graphql_api/testing_support/factories/taxonomy_factory'
+
+FactoryBot.define do
+end

data/lib/solidus_graphql_api/types/address.rb

@@ -12,8 +12,7 @@ module SolidusGraphqlApi
       field :company, String, null: true
       field :country, Country, null: false
       field :created_at, GraphQL::Types::ISO8601DateTime, null: true
-      field :firstname, String, null: false
-      field :lastname, String, null: true
+      field :name, String, null: false
       field :phone, String, null: false
       field :state_name, String, null: true
       field :state, State, null: true

data/lib/solidus_graphql_api/types/base/relay_node.rb

@@ -4,7 +4,7 @@ module SolidusGraphqlApi
   module Types
     module Base
       class RelayNode < Base::Object
-        implements GraphQL::Relay::Node.interface
+        implements GraphQL::Types::Relay::Node
 
         global_id_field :id
       end

data/lib/solidus_graphql_api/types/input_objects/address_input.rb

@@ -12,8 +12,7 @@ module SolidusGraphqlApi
         argument :city, String, required: true
         argument :company, String, required: false
         argument :country_id, ID, required: true, loads: Types::Country
-        argument :firstname, String, required: true
-        argument :lastname, String, required: false
+        argument :name, String, required: true
         argument :phone, String, required: true
         argument :state_name, String, required: false
         argument :state_id, ID, required: false, loads: Types::State

data/lib/solidus_graphql_api/types/json.rb

@@ -4,6 +4,7 @@ module SolidusGraphqlApi
   module Types
     class Json < GraphQL::Types::JSON
       def self.coerce_input(value, ctx)
+        value = value.is_a?(ActionController::Parameters) ? value.permit!.to_h : value.to_h
         value.each do |key, field|
           case field
           when String
@@ -27,9 +28,10 @@ module SolidusGraphqlApi
 
       def self.decode_array(array, ctx)
         array.map do |value|
-          if value.is_a?(Hash) || value.is_a?(ActionController::Parameters)
+          case value
+          when Hash, ActionController::Parameters
             coerce_input(value, ctx)
-          elsif value.is_a?(String)
+          when String
             decode(value)
           else
             value
@@ -39,7 +41,8 @@ module SolidusGraphqlApi
 
       def self.decode_if_relay_id(value)
         GraphQL::Schema::UniqueWithinType.decode(value)
-      rescue ArgumentError
+      # As of graphql v1.10.8 a GraphQL::ExecutionError is raised instead of an ArgumentError
+      rescue ArgumentError, GraphQL::ExecutionError
         [nil, nil]
       end
 

data/lib/solidus_graphql_api/types/mutation.rb

@@ -5,7 +5,7 @@ module SolidusGraphqlApi
     class Mutation < Base::Object
       field :save_in_address_book, mutation: Mutations::User::SaveInAddressBook
       field :remove_from_address_book, mutation: Mutations::User::RemoveFromAddressBook
-      field :mark_default_address, mutation: Mutations::User::MarkDefaultAddress
+      field :mark_default_ship_address, mutation: Mutations::User::MarkDefaultShipAddress
       field :add_addresses_to_checkout, mutation: Mutations::Checkout::AddAddressesToCheckout
       field :select_shipping_rate, mutation: Mutations::Checkout::SelectShippingRate
       field :add_payment_to_checkout, mutation: Mutations::Checkout::AddPaymentToCheckout

data/lib/solidus_graphql_api/types/option_value.rb

@@ -10,6 +10,11 @@ module SolidusGraphqlApi
       field :position, String, null: false
       field :presentation, String, null: false
       field :updated_at, GraphQL::Types::ISO8601DateTime, null: true
+      field :option_type, OptionType, null: false
+
+      def option_type
+        Queries::OptionValue::OptionTypeQuery.new(option_value: object).call
+      end
     end
   end
 end

data/lib/solidus_graphql_api/types/query.rb

@@ -4,10 +4,10 @@ module SolidusGraphqlApi
   module Types
     class Query < Base::Object
       # Used by Relay to lookup objects by UUID:
-      field :node, field: GraphQL::Relay::Node.field
+      add_field(GraphQL::Types::Relay::NodeField)
 
       # Fetches a list of objects given a list of UUIDs
-      field :nodes, field: GraphQL::Relay::Node.plural_field
+      add_field(GraphQL::Types::Relay::NodesField)
 
       field :countries, Country.connection_type,
             null: false,

data/lib/solidus_graphql_api/types/shipping_method.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module SolidusGraphqlApi
+  module Types
+    class ShippingMethod < Base::RelayNode
+      description 'Shipping Method.'
+
+      field :name, String, null: false
+      field :tracking_url, String, null: true
+      field :admin_name, String, null: true
+      field :code, String, null: true
+      field :carrier, String, null: true
+      field :service_level, String, null: true
+      field :available_to_users, Boolean, null: false
+      field :available_to_all, Boolean, null: false
+      field :created_at, GraphQL::Types::ISO8601DateTime, null: true
+      field :updated_at, GraphQL::Types::ISO8601DateTime, null: true
+    end
+  end
+end

data/lib/solidus_graphql_api/types/shipping_rate.rb

@@ -10,6 +10,11 @@ module SolidusGraphqlApi
       field :currency, String, null: false
       field :selected, Boolean, null: false
       field :updated_at, GraphQL::Types::ISO8601DateTime, null: true
+      field :shipping_method, ShippingMethod, null: false
+
+      def shipping_method
+        Queries::ShippingRate::ShippingMethodQuery.new(shipping_rate: object).call
+      end
     end
   end
 end

data/lib/solidus_graphql_api/types/user.rb

@@ -9,7 +9,7 @@ module SolidusGraphqlApi
       field :bill_address, Types::Address, null: true
       field :created_at, GraphQL::Types::ISO8601DateTime, null: true
       field :current_sign_in_at, GraphQL::Types::ISO8601DateTime, null: true
-      field :default_address, Types::Address, null: true
+      field :ship_address, Types::Address, null: true
       field :email, String, null: false
       field :last_sign_in_at, GraphQL::Types::ISO8601DateTime, null: true
       field :login, String, null: true

data/lib/solidus_graphql_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusGraphqlApi
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/solidus_graphql_api.rb

@@ -3,9 +3,6 @@
 require 'graphql'
 require 'batch-loader'
 
-require 'solidus_core'
-require 'solidus_support'
-
 require 'solidus_graphql_api/version'
 require 'solidus_graphql_api/engine'
 require 'solidus_graphql_api/configuration'