osso 0.0.3.9 → 0.0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f0c8535a6ba6dd39ada0f3ba0aa0617ff96bd880ef6985149c0ecbeca57bc1a
-  data.tar.gz: da6bec63d5e071b1c0520e42cd67c3971851445bfad8ec597f1b9d1aef0759d8
+  metadata.gz: ffe9bf4e6f4de963af60c998d318a471e1ff3e33ef5a6c544c8923de762020bc
+  data.tar.gz: a994f84634c584268e517688ec62b61315da4fa1ab2ea05787305b34deb964f5
 SHA512:
-  metadata.gz: 3e3938abd7b541d6e272cb1b1420e9f4dc75738edd763cc1c35e82db4b315852c125f268ad8ed36528373252c23bdea79b7ac865711abb1c52159cae709c47c5
-  data.tar.gz: fa63314128c1833ddd1136ea1cdacee8e8f4cbfb92a6eaffc0c8ae8dfc0ccb93b62effcac55e0cf916033a32cd1941e5ea915959f032ed6a983133711f4610e0
+  metadata.gz: 6c4e301385bb83a8ca5f7d66e4a3b3383c7ea3f58f395dc83e1cbadadb2a6896e1852ed787ae9a33a37a2871c3d5c28e5f33e072b7980ad904f958e95b4addb8
+  data.tar.gz: 8529f13cc30d05946b7fa798b117483dd20b9415d27b6caccecfff228a666b73bfd1f36ceb7e19d7977803159a56aff0eca9075cb380fe7fde3ce560a1847217

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osso (0.0.3.9)
+    osso (0.0.3.11)
       activesupport (>= 6.0.3.2)
       graphql
       jwt

data/lib/osso/graphql/query.rb

@@ -4,7 +4,10 @@ module Osso
   module GraphQL
     module Types
       class QueryType < ::GraphQL::Schema::Object
-        field :enterprise_accounts, null: true, resolver: Resolvers::EnterpriseAccounts
+        field :enterprise_accounts, null: true, resolver: Resolvers::EnterpriseAccounts do
+          argument :sort_column, String, required: false
+          argument :sort_order, String, required: false
+        end
         field :oauth_clients, null: true, resolver: Resolvers::OAuthClients
 
         field :enterprise_account, null: true, resolver: Resolvers::EnterpriseAccount do

data/lib/osso/graphql/resolvers/enterprise_accounts.rb

@@ -4,12 +4,20 @@ module Osso
   module GraphQL
     module Resolvers
       class EnterpriseAccounts < ::GraphQL::Schema::Resolver
-        type [Types::EnterpriseAccount], null: true
+        type Types::EnterpriseAccount.connection_type, null: true
 
-        def resolve
-          return Osso::Models::EnterpriseAccount.all if context[:scope] == :admin
+        def resolve(sort_column: nil, sort_order: nil)
+          return Array(Osso::Models::EnterpriseAccount.find_by(domain: context[:scope])) if context[:scope] != :admin
 
-          Array(Osso::Models::EnterpriseAccount.find_by(domain: context[:scope]))
+          accounts = Osso::Models::EnterpriseAccount
+
+          accounts = accounts.order(sort_column => sort_order_sym(sort_order)) if sort_column && sort_order
+
+          accounts.all
+        end
+
+        def sort_order_sym(order_string)
+          order_string == 'ascend' ? :asc : :desc
         end
       end
     end

data/lib/osso/graphql/types/base_connection.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Osso
+  module GraphQL
+    module Types
+      class BaseConnection < ::GraphQL::Types::Relay::BaseConnection
+        field :total_count, Integer, null: false
+
+        def total_count
+          object.items&.count
+        end
+      end
+    end
+  end
+end

data/lib/osso/graphql/types/base_object.rb

@@ -6,6 +6,8 @@ module Osso
   module GraphQL
     module Types
       class BaseObject < ::GraphQL::Schema::Object
+        connection_type_class GraphQL::Types::BaseConnection
+
         field :created_at, ::GraphQL::Types::ISO8601DateTime, null: false
         field :updated_at, ::GraphQL::Types::ISO8601DateTime, null: false
       end

data/lib/osso/graphql/types.rb

@@ -5,6 +5,7 @@ module Osso
   end
 end
 
+require_relative 'types/base_connection'
 require_relative 'types/base_object'
 require_relative 'types/base_enum'
 require_relative 'types/base_input_object'

data/lib/osso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Osso
-  VERSION = '0.0.3.9'
+  VERSION = '0.0.3.11'
 end

data/spec/graphql/query/enterprise_accounts_spec.rb

@@ -7,37 +7,51 @@ describe Osso::GraphQL::Schema do
     describe 'for an admin user' do
       let(:current_scope) { :admin }
 
-      it 'returns Enterprise Accounts' do
-        create_list(:enterprise_account, 2)
+      it 'returns paginated Enterprise Accounts' do
+        %w[A B C].map do |name|
+          create(:enterprise_account, name: name)
+        end
 
         query = <<~GRAPHQL
-          query EnterpriseAccounts {
-            enterpriseAccounts {
-              domain
-              id
-              identityProviders {
-                id
-                service
-                domain
-                acsUrl
-                ssoCert
-                ssoUrl
-                status
+          query EnterpriseAccounts($first: Int, $sortColumn: String, $sortOrder: String) {
+            enterpriseAccounts(first: $first, sortColumn: $sortColumn, sortOrder: $sortOrder) {
+              pageInfo {
+                hasNextPage
+                endCursor
+              }
+              totalCount
+              edges {
+                node {
+                  domain
+                  id
+                  identityProviders {
+                    id
+                    service
+                    domain
+                    acsUrl
+                    ssoCert
+                    ssoUrl
+                    status
+                  }
+                  name
+                  status
+                }
               }
-              name
-              status
             }
           }
         GRAPHQL
 
         response = described_class.execute(
           query,
-          variables: nil,
+          variables: { first: 2, sortOrder: 'descending', sortColumn: 'name' },
           context: { scope: current_scope },
         )
 
         expect(response['errors']).to be_nil
-        expect(response.dig('data', 'enterpriseAccounts').count).to eq(2)
+        expect(response.dig('data', 'enterpriseAccounts', 'edges').count).to eq(2)
+        expect(response.dig('data', 'enterpriseAccounts', 'edges', 0, 'node', 'name')).to eq('C')
+        expect(response.dig('data', 'enterpriseAccounts', 'totalCount')).to eq(3)
+        expect(response.dig('data', 'enterpriseAccounts', 'pageInfo', 'hasNextPage')).to eq(true)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osso
 version: !ruby/object:Gem::Version
-  version: 0.0.3.9
+  version: 0.0.3.11
 platform: ruby
 authors:
 - Sam Bauch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-24 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -285,6 +285,7 @@ files:
 - lib/osso/graphql/resolvers/oauth_clients.rb
 - lib/osso/graphql/schema.rb
 - lib/osso/graphql/types.rb
+- lib/osso/graphql/types/base_connection.rb
 - lib/osso/graphql/types/base_enum.rb
 - lib/osso/graphql/types/base_input_object.rb
 - lib/osso/graphql/types/base_object.rb