ossboard-org · likeath · Sep 25, 2017
diff --git a/apps/web/assets/stylesheets/_leaderboard.scss b/apps/web/assets/stylesheets/_leaderboard.scss
diff --git a/apps/web/assets/stylesheets/main.scss b/apps/web/assets/stylesheets/main.scss
@@ -1,4 +1,3 @@
-@import 'leaderboard';
 @import 'settings';
 @import 'buttons';
 @import 'labels';

diff --git a/apps/web/config/routes.rb b/apps/web/config/routes.rb
@@ -1,7 +1,5 @@
 root to: 'main#index'
 
-get '/leaderboards', to: 'leaderboards#index'
-
 get '/about',        to: 'static#about', as: 'about'
 get '/how-to-help',  to: 'static#help',  as: 'help'
 

diff --git a/apps/web/controllers/leaderboards/index.rb b/apps/web/controllers/leaderboards/index.rb
diff --git a/apps/web/templates/leaderboards/index.html.slim b/apps/web/templates/leaderboards/index.html.slim
diff --git a/apps/web/views/leaderboards/index.rb b/apps/web/views/leaderboards/index.rb
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
@@ -1,5 +1,3 @@
 :schedule:
   RefreshUserReposWorker:
     every: 12h
-  CalculatePointsWorker:
-    every: 12h
diff --git a/lib/container.rb b/lib/container.rb
@@ -4,7 +4,7 @@
 %w[markdown http_request].each { |file| require_relative "ossboard/core/#{file}" }
 
 %w[
-  analytic_reporter url_shortener points_calculator task_tweeter
+  analytic_reporter url_shortener task_tweeter
 ].each { |file| require_relative "ossboard/services/#{file}" }
 
 require_relative 'tasks/matchers/git_host'
@@ -19,7 +19,6 @@ class Container
 
   namespace('services') do
     register('analytic_reporter', Services::AnalyticReporter.new)
-    register('points_calculator', Services::PointsCalculator.new)
     register('task_twitter', Services::TaskTwitter.new)
     register('url_shortener', Services::UrlShortener.new)
   end

diff --git a/lib/ossboard/entities/point.rb b/lib/ossboard/entities/point.rb
diff --git a/lib/ossboard/entities/user.rb b/lib/ossboard/entities/user.rb
@@ -13,7 +13,6 @@ class User < Hanami::Entity
     attribute :created_at_day, Types::Date
 
     attribute :tasks,    Types::Collection(Task)
-    attribute :points,   Types::Collection(Point)
     attribute :repos,    Types::Collection(Repo)
     attribute :accounts, Types::Collection(Account)
   end

diff --git a/lib/ossboard/repositories/point_repository.rb b/lib/ossboard/repositories/point_repository.rb
diff --git a/lib/ossboard/repositories/user_repository.rb b/lib/ossboard/repositories/user_repository.rb
@@ -3,7 +3,6 @@ class UserRepository < Hanami::Repository
     has_many :tasks
     has_many :accounts
     has_many :repos
-    has_many :points
   end
 
   def admins
@@ -35,10 +34,6 @@ def find_with_tasks(id)
     aggregate(:tasks).where(id: id).map_to(User).one
   end
 
-  def all_with_points_and_tasks
-    aggregate(:points, :tasks).map_to(User).to_a
-  end
-
   private
 
   def all_from_date_request(from)

diff --git a/lib/ossboard/services/points_calculator.rb b/lib/ossboard/services/points_calculator.rb
diff --git a/lib/ossboard/workers/calculate_points_worker.rb b/lib/ossboard/workers/calculate_points_worker.rb
diff --git a/spec/ossboard/entities/point_spec.rb b/spec/ossboard/entities/point_spec.rb
diff --git a/spec/ossboard/repositories/point_repository_spec.rb b/spec/ossboard/repositories/point_repository_spec.rb
diff --git a/spec/ossboard/repositories/user_repository_spec.rb b/spec/ossboard/repositories/user_repository_spec.rb
@@ -89,23 +89,4 @@
     it { expect(subject.tasks).to be_a Array }
     it { expect(subject.tasks.count).to eq 1 }
   end
-
-  describe '#all_with_points_and_tasks' do
-    let(:task_repo) { TaskRepository.new }
-
-    let(:user) { Fabricate.create(:user, uuid: 'test') }
-
-    before do
-      Fabricate.create(:task, title: 'bad', user_id: user.id )
-      Fabricate.create(:task, title: 'good', approved: true)
-    end
-
-    subject { repo.all_with_points_and_tasks }
-
-    it { expect(subject).to be_a Array }
-
-    it { expect(subject[0]).to be_a User }
-    it { expect(subject[0].points).to be_a Array }
-    it { expect(subject[0].tasks).to be_a Array }
-  end
 end