Added core relational logic

OscarMichelH · OscarMichelH · commit c34bb974bff9 · 2019-04-20T14:32:48.000-05:00
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
@@ -5,121 +5,84 @@ class RepositoriesController < ApplicationController
   # GET /repositories
   # GET /repositories.json
   def index
-     @username = current_user.username
+    @username = current_user.username
     set_initial_variables
   end
 
   # GET /repositories/1
   # GET /repositories/1.json
   def show
-     github = Octokit::Client.new access_token: current_user.oauth_token
-     @id = @repository.id
-     repop = github.repo @repository.full_name
-     total = 0
-     if repop
-         @name_repo = repop.full_name
-         commits = github.commits @name_repo
-         @data=Hash.new
-
-         commits.each do |c|
-             cTemp = github.commit @name_repo, c.sha
-             if @data.has_key? cTemp.commit.author.email
-                 @data[cTemp.commit.author.email]["name"] =cTemp.commit.author.name.to_s
-                @data[cTemp.commit.author.email]["additions"] = @data[cTemp.commit.author.email]["additions"].to_i +  cTemp.stats.additions.to_i
-                @data[cTemp.commit.author.email]["deletions"] = @data[cTemp.commit.author.email]["deletions"].to_i + cTemp.stats.deletions.to_i
-                @data[cTemp.commit.author.email]["modified"] = @data[cTemp.commit.author.email]["modified"].to_i + cTemp.stats.modifiedw.to_i
-             else
-                 @data[cTemp.commit.author.email] = {
-                     name: cTemp.commit.author.name.to_s,
-                     additions: cTemp.stats.additions.to_i,
-                     deletions: cTemp.stats.deletions.to_i,
-                     modified: cTemp.stats.modified.to_i
-                }
-            end
-
-        end
-        # @name_repo = repop.full_name
-    else
-        @name_repo = "nil"
-    end
-     @username = current_user.username
-
-
-      @chart = LazyHighCharts::HighChart.new('pie') do |f|
-          f.chart({:defaultSeriesType=>"pie" ,
+    @authors = @repository.authors
+    @username = current_user.username
+    @chart = LazyHighCharts::HighChart.new('pie') do |f|
+      f.chart({:defaultSeriesType=>"pie" ,
                :margin=> [50, 200, 60, 170]},
 
-            )
-
-          f.series(
-              :type=> 'pie',
-              :name=> 'percentage contribution',
-              :data=> [
-                 ['Sam',   45.0],
-                 ['Pedro',       15.0],
-                 ['Juan',   30.0],
-                 ['Thomas',    5.0],
-                 ['Jeff',   5.0]
-                 ])
-          f.legend(:layout=> 'vertical',:style=> {:left=> 'auto', :bottom=> 'auto',:right=> '50px',:top=> '100px'})
-          f.plot_options(:pie=>{
-            :allowPointSelect=>true,
-            :cursor=>"pointer" ,
-            :dataLabels=>{
+              )
+
+      f.series(
+          :type=> 'pie',
+          :name=> 'percentage contribution',
+          :data=> [
+              ['Sam',   45.0],
+              ['Pedro',       15.0],
+              ['Juan',   30.0],
+              ['Thomas',    5.0],
+              ['Jeff',   5.0]
+          ])
+      f.legend(:layout=> 'vertical',:style=> {:left=> 'auto', :bottom=> 'auto',:right=> '50px',:top=> '100px'})
+      f.plot_options(:pie=>{
+          :allowPointSelect=>true,
+          :cursor=>"pointer" ,
+          :dataLabels=>{
               :enabled=>true,
               :color=>"black",
               :style=>{
-                :font=>"13px Trebuchet MS, Verdana, sans-serif"
+                  :font=>"13px Trebuchet MS, Verdana, sans-serif"
               }
-            }
-          })
-      end
-      @data_in_series = []
-      @data.each do |key,value|
-          @data_in_series.push([value["name"],value["additions"] + value["modified"]])
-
-      end
-      
-
-      @chart2 = LazyHighCharts::HighChart.new('pie') do |c|
-         c.chart(
-            plotBackgroundColor: nil,
-            plotBorderWidth: nil,
-            plotShadow: false,
-            type: 'pie'
-        )
-        c.title(
-            text: 'Contributions to repo'
-        )
-        c.tooltip(
-            pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
-        )
-        #c.options[:chart][:height] = 800
-        #c.options[:chart][:width] = 800
-        c.plotOptions(
-            pie: {
-                allowPointSelect: true,
-                cursor: 'pointer',
-                dataLabels: {
-                    enabled: true,
-                    format: '<b>{point.name}</b>: {point.percentage:.1f} %',
-                    style: {
-                        color: 'black'
-                    }
-                }
-            }
-        )
-        c.series(
-            :type=> 'pie',
-            :name=> 'percentage contribution',
-            :data=> @data_in_series
-        )
+          }
+      })
+    end
+    @data_in_series = []
+    @authors.each do |author|
+      @data_in_series.push([author.name, @repository.commits.where(author_username: author.username).sum(&:additions) + @repository.commits.where(author_username: author.username).sum(&:files_changed) ])
     end
-end
-
-
-
 
+    @chart2 = LazyHighCharts::HighChart.new('pie') do |c|
+      c.chart(
+          plotBackgroundColor: nil,
+          plotBorderWidth: nil,
+          plotShadow: false,
+          type: 'pie'
+      )
+      c.title(
+          text: 'Contributions to repo'
+      )
+      c.tooltip(
+          pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
+      )
+      #c.options[:chart][:height] = 800
+      #c.options[:chart][:width] = 800
+      c.plotOptions(
+          pie: {
+              allowPointSelect: true,
+              cursor: 'pointer',
+              dataLabels: {
+                  enabled: true,
+                  format: '<b>{point.name}</b>: {point.percentage:.1f} %',
+                  style: {
+                      color: 'black'
+                  }
+              }
+          }
+      )
+      c.series(
+          :type=> 'pie',
+          :name=> 'percentage contribution',
+          :data=> @data_in_series
+      )
+    end
+  end
 
   # GET /repositories/1/edit
   def edit
@@ -128,7 +91,40 @@ def edit
   # POST /repositories
   # POST /repositories.json
   def create
+    github = Octokit::Client.new access_token: current_user.oauth_token
     @repository = Repository.new(repository_params)
+    repop = github.repo @repository.full_name
+    if repop
+      @name_repo = repop.full_name
+      commits = github.commits @name_repo
+      commits.each do |c|
+        cTemp = github.commit @name_repo, c.sha
+        commit = Commit.new
+        #if Author not exists in that repository
+        if !Author.where(username: cTemp.commit.author.email.to_s).any?
+          author = Author.new
+          author.username = cTemp.commit.author.email.to_s
+          author.name = cTemp.commit.author.name.to_s
+          author.repositories << @repository
+          author.save
+        else
+          author = Author.where(username: cTemp.commit.author.email.to_s).first
+          if !author.repositories.where(id: @repository.id).any?
+            author.repositories << @repository
+          end
+          author.save
+        end
+        commit.message = cTemp.commit.message.to_s
+        commit.additions = cTemp.stats.additions.to_i
+        commit.deletions = cTemp.stats.deletions.to_i
+        commit.files_changed = cTemp.files.count.to_i
+        commit.author_username = Author.where(username: cTemp.commit.author.email.to_s).first.username
+        commit.repository = @repository
+        commit.save
+      end
+    else
+      @name_repo = "nil"
+    end
 
     respond_to do |format|
       if @repository.save
@@ -160,41 +156,41 @@ def update
   def destroy
     @repository.destroy
     respond_to do |format|
-      format.html { redirect_to repositories_url, notice: 'Repository was successfully destroyed.' }
+      format.html { redirect_to repositories_path, notice: 'Repository was successfully destroyed.' }
       format.json { head :no_content }
     end
   end
 
   private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_repository
-      @repository = Repository.find(params[:id])
-    end
+  # Use callbacks to share common setup or constraints between actions.
+  def set_repository
+    @repository = Repository.find(params[:id])
+  end
 
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def repository_params
-      params.require(:repository).permit(:github_id, :url, :name, :full_name, :description, :size, :collaborator)
-    end
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def repository_params
+    params.require(:repository).permit(:github_id, :url, :name, :full_name, :description, :size, :collaborator)
+  end
 
-    def set_initial_variables
-      github = Octokit::Client.new access_token: current_user.oauth_token
-      repos = Repository.all.to_a
-      github.repos.each do |item|
-        if !Repository.where(github_id: item.id).any?
-          repo = Repository.new
-          repo.github_id = item.id
-          repo.url = item.html_url
-          repo.name = item.name
-          repo.full_name = item.full_name
-          repo.description = item.description
-          repo.size = item.size
-          repo.collaborator = item.collaborator
-          repos.push(repo)
-        end
+  def set_initial_variables
+    github = Octokit::Client.new access_token: current_user.oauth_token
+    repos = Repository.all.to_a
+    github.repos.each do |item|
+      if !Repository.where(github_id: item.id).any?
+        repo = Repository.new
+        repo.github_id = item.id
+        repo.url = item.html_url
+        repo.name = item.name
+        repo.full_name = item.full_name
+        repo.description = item.description
+        repo.size = item.size
+        repo.collaborator = item.collaborator
+        repos.push(repo)
       end
-
-      @repositories = repos
-      @repo = Repository.new
-      # @site = github.oauth.login
     end
+
+    @repositories = repos
+    @repo = Repository.new
+    # @site = github.oauth.login
+  end
 end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
@@ -1,5 +1,6 @@
 class SessionsController < ApplicationController
   def new
+    redirect_to repositories_path if current_user
   end
 
   def create
diff --git a/app/models/author.rb b/app/models/author.rb
@@ -1,2 +1,4 @@
 class Author < ApplicationRecord
+  has_many :repository_authors
+  has_many :repositories, through: :repository_authors
 end
diff --git a/app/models/commit.rb b/app/models/commit.rb
@@ -1,2 +1,3 @@
 class Commit < ApplicationRecord
+  belongs_to :repository
 end
diff --git a/app/models/organization.rb b/app/models/organization.rb
@@ -1,2 +1,4 @@
 class Organization < ApplicationRecord
+  belongs_to :user
+  has_many :repositories
 end
diff --git a/app/models/repository.rb b/app/models/repository.rb
@@ -1,2 +1,5 @@
 class Repository < ApplicationRecord
+  has_many :commits, dependent: :destroy
+  has_many :repository_authors, dependent: :destroy
+  has_many :authors, through: :repository_authors, dependent: :destroy
 end
diff --git a/app/models/repository_author.rb b/app/models/repository_author.rb
@@ -0,0 +1,4 @@
+class RepositoryAuthor < ApplicationRecord
+  belongs_to :repository
+  belongs_to :author
+end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -1,4 +1,6 @@
 class User < ApplicationRecord
+  has_many :organizations
+
   def self.from_omniauth(auth)
     where(provider: auth.provider, uid: auth.uid).first_or_initialize.tap do |user|
       user.email = auth.info.email
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
@@ -19,13 +19,12 @@
                     <div class="card-title text-center "> Colaboradores</div>
 
                     <ul class="list-group" data-spy="scroll" style="overflow: scroll; max-height: 300px;">
-                        <% @data.each do |email, value| %>
+                        <% @authors.each do |author| %>
                             <li class="list-group-item">
-                                 Name: <%=value["name"] %>
-                                 A: <%=value["additions"] %>
-                                 D: <%=value["deletions"] %>
-                                 M: <%=value["modified"] %>
-
+                                 Name: <%= author.name %>
+                                 A: <%= @repository.commits.where(author_username: author.username).sum(&:additions) %>
+                                 D: <%= @repository.commits.where(author_username: author.username).sum(&:deletions) %>
+                                 M: <%= @repository.commits.where(author_username: author.username).sum(&:files_changed) %>
                             </li>
                         <%end%>
 
diff --git a/config.ru b/config.ru
@@ -1,5 +1,6 @@
 # This file is used by Rack-based servers to start the application.
 
 require_relative 'config/environment'
-
+Octokit.auto_paginate = true
 run Rails.application
+
diff --git a/db/migrate/20190331221631_create_commits.rb b/db/migrate/20190331221631_create_commits.rb
@@ -1,11 +1,11 @@
 class CreateCommits < ActiveRecord::Migration[5.2]
   def change
     create_table :commits do |t|
-      t.string :title
-      t.string :description
+      t.string :message
+      t.string :author_username
       t.integer :additions
       t.integer :deletions
-      t.integer :changed_files
+      t.integer :files_changed
 
       t.timestamps
     end
diff --git a/db/migrate/20190419212251_add_user_id_to_organizations.rb b/db/migrate/20190419212251_add_user_id_to_organizations.rb
@@ -0,0 +1,5 @@
+class AddUserIdToOrganizations < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :organizations, :user, foreign_key: true
+  end
+end
diff --git a/db/migrate/20190419212732_add_organization_id_to_repositories.rb b/db/migrate/20190419212732_add_organization_id_to_repositories.rb
@@ -0,0 +1,5 @@
+class AddOrganizationIdToRepositories < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :repositories, :organization, foreign_key: true
+  end
+end
diff --git a/db/migrate/20190419212805_add_repository_id_to_commits.rb b/db/migrate/20190419212805_add_repository_id_to_commits.rb
@@ -0,0 +1,5 @@
+class AddRepositoryIdToCommits < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :commits, :repository, foreign_key: true
+  end
+end
diff --git a/db/migrate/20190420073929_create_repository_authors.rb b/db/migrate/20190420073929_create_repository_authors.rb
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/spec/models/repository_author_spec.rb b/spec/models/repository_author_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`class Commit < ApplicationRecord`
	`2`	`+ belongs_to :repository`
`2`	`3`	`end`