Add latest changes from gitlab-org/gitlab@master

2 files changed, 58 insertions, 0 deletions

diff --git a/app/graphql/resolvers/crm/contacts_resolver.rb b/app/graphql/resolvers/crm/contacts_resolver.rb
new file mode 100644
index 00000000000..9e235669657
--- /dev/null
+++ b/app/graphql/resolvers/crm/contacts_resolver.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Resolvers
+  module Crm
+    class ContactsResolver < BaseResolver
+      include Gitlab::Graphql::Authorize::AuthorizeResource
+
+      authorize :read_crm_contact
+
+      type Types::CustomerRelations::ContactType, null: true
+
+      argument :search, GraphQL::Types::String,
+               required: false,
+               description: 'Search term to find contacts with.'
+
+      argument :state, Types::CustomerRelations::ContactStateEnum,
+               required: false,
+               description: 'State of the contacts to search for.'
+
+      def resolve(**args)
+        ::Crm::ContactsFinder.new(current_user, { group: group }.merge(args)).execute
+      end
+
+      def group
+        object.respond_to?(:sync) ? object.sync : object
+      end
+    end
+  end
+end
diff --git a/app/graphql/resolvers/crm/organizations_resolver.rb b/app/graphql/resolvers/crm/organizations_resolver.rb
new file mode 100644
index 00000000000..ef0c930a94a
--- /dev/null
+++ b/app/graphql/resolvers/crm/organizations_resolver.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Resolvers
+  module Crm
+    class OrganizationsResolver < BaseResolver
+      include Gitlab::Graphql::Authorize::AuthorizeResource
+
+      authorize :read_crm_organization
+
+      type Types::CustomerRelations::OrganizationType, null: true
+
+      argument :search, GraphQL::Types::String,
+               required: false,
+               description: 'Search term used to find organizations with.'
+
+      argument :state, Types::CustomerRelations::OrganizationStateEnum,
+               required: false,
+               description: 'State of the organization to search for.'
+
+      def resolve(**args)
+        ::Crm::OrganizationsFinder.new(current_user, { group: group }.merge(args)).execute
+      end
+
+      def group
+        object.respond_to?(:sync) ? object.sync : object
+      end
+    end
+  end
+end