Merge pull request #149 from fga-gpp-mds/adapter_refactoration

Aplicando o padrão adapter

Author: ThalissonMelo

app/adapters/adapter.rb

@@ -0,0 +1,57 @@
+module Adapter
+  class GitHubProject
+    def initialize(request)
+      @logged_user = AuthorizeApiRequest.call(request.headers).result
+      @client = Octokit::Client.new(access_token: @logged_user.access_token)
+    end
+
+    def get_github_user
+      user_login = @client.user.login
+      p user_login
+      return user_login
+    end
+
+    def get_github_repos(user_login)
+      @client.repositories(user_login)
+      end
+
+    def get_github_orgs(user_login)
+      @client.organizations(user_login)
+    end
+
+    def get_github_orgs_repos(org)
+      @client.organization_repositories(org.login)
+    end
+
+    def get_contributors(github_slug)
+      @client.contributors(github_slug)
+    end
+  end
+
+  class GitHubIssue
+    def initialize(request)
+      @logged_user = AuthorizeApiRequest.call(request.headers).result
+      @client = Octokit::Client.new(access_token: @logged_user.access_token)
+    end
+
+    def get_github_user
+      user_login = @client.user.login
+    end
+
+    def list_issues(github_slug)
+      @client.list_issues(github_slug)
+    end
+
+    def create_issue(github_slug, issue_params)
+      @client.create_issue(github_slug, issue_params[:name], issue_params[:body])
+    end
+
+    def update_issue(github_slug, issue_params)
+      @client.update_issue(github_slug, issue_params[:number], issue_params[:name], issue_params[:body])
+    end
+
+    def close_issue(path, issue_params)
+      @client.close_issue(path, issue_params[:number])
+    end
+  end
+end

app/controllers/issues_controller.rb

@@ -5,7 +5,9 @@ class IssuesController < ApplicationController
   before_action :set_path, except: [:update_assignees]
 
   def index
-    @issues = @client.list_issues(@path)
+    client = Adapter::GitHubIssue.new(request)
+
+    @issues = client.list_issues(@path)
 
     convert_form_params(@issues)
 
@@ -25,25 +27,31 @@ def index
   end
 
   def create
-    @issue = @client.create_issue(@path, issue_params[:name], issue_params[:body])
+    client = Adapter::GitHubIssue.new(request)
+
+    @issue = client.create_issue(@project.github_slug, issue_params)
 
     convert_form_params(@issue)
 
     render json: @form_params, status: :created
   end
 
   def update
-    @issue = @client.update_issue(@path, issue_params[:number], issue_params[:name], issue_params[:body])
+    client = Adapter::GitHubIssue.new(request)
+
+    @issue = client.update_issue(@project.github_slug, issue_params)
 
     convert_form_params(@issue)
 
     render json: @form_params
   end
 
   def close
-    @issue = @client.close_issue(@path, issue_params[:number])
+    client = Adapter::GitHubIssue.new(request)
 
-    render status: 200
+    client.close_issue(@path, issue_params)
+
+    render status: :ok
   end
 
   def update_assignees
@@ -70,8 +78,7 @@ def update_assignees
   private
 
     def set_authorization
-      @current_user = AuthorizeApiRequest.call(request.headers).result
-      @client = Octokit::Client.new(access_token: @current_user.access_token)
+      client = Adapter::GitHubIssue.new(request)
     end
 
     def set_project
@@ -84,9 +91,10 @@ def set_path
       if @project.name.include? "/"
         @path = @project.name
       else
-        @name = @client.user.login
+        client = Adapter::GitHubIssue.new(request)
+        @name = client.get_github_user
         @repo = @project.name
-        @path = @name + "/" + @repo
+        @path = @name.to_s + "/" + @repo
       end
 
       @path

app/controllers/projects_controller.rb

@@ -29,35 +29,34 @@ def get_gpa
   end
 
   def github_projects_list
-    @current_user = AuthorizeApiRequest.call(request.headers).result
-    @client = Octokit::Client.new(access_token: @current_user.access_token)
+    client = Adapter::GitHubProject.new(request)
+
+    user_login = client.get_github_user
+
+    @form_params_user = { user: [] }
+    @form_params_user[:user].push(login: user_login)
 
-    user_login = @client.user.login
     user_repos = []
-    @repos = @client.repositories(user_login)
-    @form_params = { user: [] }
-    @form_params[:user].push(login: user_login)
 
-    @repos.each do |repo|
+    (client.get_github_repos(user_login)).each do |repo|
       user_repos.push(repo.name)
     end
-    @form_params[:user].push(repos: user_repos)
 
-    @orgs = @client.organizations(user_login)
-    @form_params2 = { orgs: [] }
-    @orgs.each do |org|
-      repos = @client.organization_repositories(org.login)
+    @form_params_user[:user].push(repos: user_repos)
+
+    @form_params_orgs = { orgs: [] }
+
+    (client.get_github_orgs(user_login)).each do |org|
       repos_names = []
-      repos.each do |repo|
+      (client.get_github_orgs_repos(org)).each do |repo|
         repos_names.push(repo.name)
       end
-      @form_params2[:orgs].push(name: org.login, repos: repos_names)
+      @form_params_orgs[:orgs].push(name: org.login, repos: repos_names)
     end
 
-    @form_params3 = @form_params2.merge(@form_params)
-
+    @form_params_user_orgs = @form_params_orgs.merge(@form_params_user)
 
-    render json: @form_params3
+    render json: @form_params_user_orgs
   end
 
   def show
@@ -68,8 +67,6 @@ def create
     @project = Project.create(project_params)
     @project.user_id = @current_user.id
 
-    puts @project.github_slug
-
     if @project.save
       render json: @project, status: :created
     else
@@ -90,12 +87,11 @@ def destroy
   end
 
   def get_contributors
-    @current_user = AuthorizeApiRequest.call(request.headers).result
-    @client = Octokit::Client.new(access_token: @current_user.access_token)
+    client = Adapter::GitHubProject.new(request)
 
     contributors = []
 
-    @client.contributors(@project.github_slug).each do |contributor|
+    (client.get_contributors(@project.github_slug)).each do |contributor|
       contributors.push(contributor.login)
     end