Merge pull request #2676 from mlorb/ml-sci-4786

Revert default_scope for active repositories [SCI-4786]

app/controllers/at_who_controller.rb

@@ -51,7 +51,7 @@ class AtWhoController < ApplicationController
   end
 
   def repositories
-    repositories = Repository.accessible_by_teams(@team)
+    repositories = Repository.active.accessible_by_teams(@team)
     respond_to do |format|
       format.json do
         render json: {

app/controllers/my_module_repositories_controller.rb

@@ -115,7 +115,7 @@ class MyModuleRepositoriesController < ApplicationController
   end
 
   def load_repository
-    @repository = Repository.with_archived.find_by(id: params[:id])
+    @repository = Repository.find_by(id: params[:id])
     render_404 unless @repository
   end
 

app/controllers/reports_controller.rb

@@ -478,7 +478,8 @@ class ReportsController < ApplicationController
 
   def load_available_repositories
     @available_repositories = []
-    repositories = Repository.accessible_by_teams(current_team)
+    repositories = Repository.active
+                             .accessible_by_teams(current_team)
                              .name_like(search_params[:q])
                              .limit(Constants::SEARCH_LIMIT)
                              .select(:id, :name, :team_id, :permission_level)

app/controllers/repositories_controller.rb

@@ -368,13 +368,17 @@ class RepositoriesController < ApplicationController
 
   def load_repository
     repository_id = params[:id] || params[:repository_id]
-    @repository = Repository.accessible_by_teams(current_team).with_archived.find_by(id: repository_id)
+    @repository = Repository.accessible_by_teams(current_team).find_by(id: repository_id)
     render_404 unless @repository
   end
 
   def load_repositories
     @repositories = Repository.accessible_by_teams(current_team).order('repositories.created_at ASC')
-    @repositories = @repositories.archived if params[:archived] || @repository&.archived?
+    @repositories = if params[:archived] || @repository&.archived?
+                      @repositories.archived
+                    else
+                      @repositories.active
+                    end
   end
 
   def set_inline_name_editing
@@ -428,7 +432,7 @@ class RepositoriesController < ApplicationController
 
   def selected_repos_params
     process_ids = params[:selected_repos].map(&:to_i).uniq
-    Repository.where(id: process_ids, team_id: current_team).with_archived.pluck(:id)
+    Repository.where(id: process_ids, team_id: current_team).pluck(:id)
   end
 
   def repository_response(message)

app/controllers/repository_rows_controller.rb

@@ -204,7 +204,6 @@ class RepositoryRowsController < ApplicationController
 
   def load_repository
     @repository = Repository.accessible_by_teams(current_team)
-                            .with_archived
                             .eager_load(:repository_columns)
                             .find_by(id: params[:repository_id])
     render_404 unless @repository

app/helpers/reports_helper.rb

@@ -123,7 +123,7 @@ module ReportsHelper
   end
 
   def assign_repository_or_snapshot(my_module, element_id, snapshot, repository)
-    original_repository = Repository.with_archived.find_by(id: element_id) if element_id
+    original_repository = Repository.find_by(id: element_id) if element_id
     repository ||= snapshot
     repository || my_module.active_snapshot_or_live(original_repository) || original_repository
   end

app/models/activity.rb

@@ -48,8 +48,7 @@ class Activity < ApplicationRecord
   }
 
   scope :repositories_joins, lambda {
-    joins("LEFT JOIN repositories ON subject_type = 'RepositoryBase' AND subject_id = repositories.id " \
+    joins("LEFT JOIN repositories ON subject_type = 'RepositoryBase' AND subject_id = repositories.id")
-            "AND repositories.archived != TRUE")
   }
 
   scope :reports_joins, lambda {

app/models/repository.rb

@@ -32,6 +32,9 @@ class Repository < RepositoryBase
             uniqueness: { scope: :team_id, case_sensitive: false },
             length: { maximum: Constants::NAME_MAX_LENGTH }
 
+  scope :active, -> { where(archived: false) }
+  scope :archived, -> { where(archived: true) }
+
   scope :accessible_by_teams, lambda { |teams|
     left_outer_joins(:team_repositories)
       .where('repositories.team_id IN (?) '\
@@ -45,9 +48,6 @@ class Repository < RepositoryBase
       .distinct
   }
 
-  default_scope { where.not(archived: true) }
-  scope :with_archived, -> { unscope(where: :archived) }
-  scope :archived, -> { with_archived.where(archived: true) }
   scope :used_on_task_but_unshared, lambda { |task, team|
     where(id: task.repository_rows
       .select(:repository_id))
@@ -57,13 +57,13 @@ class Repository < RepositoryBase
   def self.within_global_limits?
     return true unless Rails.configuration.x.global_repositories_limit.positive?
 
-    with_archived.count < Rails.configuration.x.global_repositories_limit
+    count < Rails.configuration.x.global_repositories_limit
   end
 
   def self.within_team_limits?(team)
     return true unless Rails.configuration.x.team_repositories_limit.positive?
 
-    team.repositories.with_archived.count < Rails.configuration.x.team_repositories_limit
+    team.repositories.count < Rails.configuration.x.team_repositories_limit
   end
 
   def self.search(

app/models/repository_snapshot.rb

@@ -5,7 +5,7 @@ class RepositorySnapshot < RepositoryBase
   after_save :refresh_report_references, if: :saved_change_to_selected
   before_destroy :refresh_report_references_for_destroy, prepend: true
 
-  belongs_to :original_repository, -> { unscope(where: :archived) },
+  belongs_to :original_repository,
              foreign_key: :parent_id,
              class_name: 'Repository',
              inverse_of: :repository_snapshots,

app/services/dashboard/recent_work_service.rb

@@ -32,6 +32,7 @@ module Dashboard
                       .projects_joins(:from_experiments)
                       .repositories_joins
                       .reports_joins
+                      .where('repositories.archived IS NOT TRUE')
                       .where('projects.archived IS NOT TRUE')
                       .where('experiments.archived IS NOT TRUE')
                       .where('my_modules.archived IS NOT TRUE')

app/services/repositories/archive_repository_service.rb

@@ -7,14 +7,15 @@ module Repositories
 
       ActiveRecord::Base.transaction do
         @repositories.each do |repository|
-          log_activity(:archive_inventory, repository)
-
           repository.archive!(@user)
+
           RepositoryActions::ArchiveRowsService.call(repository: repository,
                                                      repository_rows: repository.repository_rows.pluck(:id),
                                                      user: @user,
                                                      team: @team,
                                                      log_activities: false)
+
+          log_activity(:archive_inventory, repository)
         end
       rescue ActiveRecord::RecordNotSaved
         @errors[:archiving_error] = I18n.t('repositories.archive_inventories.unsuccess_flash')

app/services/repositories/restore_repository_service.rb

@@ -28,7 +28,7 @@ module Repositories
     private
 
     def scoped_repositories(ids)
-      Repository.where(id: ids, team_id: @team).with_archived
+      Repository.where(id: ids, team_id: @team)
     end
   end
 end

app/views/reports/new/modal/_module_contents_inner.html.erb

@@ -69,7 +69,7 @@
           <%= form.check_box :module_activity, label: t("projects.reports.elements.modals.module_contents_inner.activity") %>
         </li>
         <% # List all repositories, no matter whether rows are assigned or not %>
-        <% Repository.accessible_by_teams(@project.team).with_archived.order(created_at: :asc).select(:id, :name).find_each do |repository| %>
+        <% Repository.accessible_by_teams(@project.team).order(created_at: :asc).select(:id, :name).find_each do |repository| %>
           <li>
             <%= form.check_box "module_repository_#{repository.id}", label: repository.name.capitalize, data: { id: repository.id } %>
           </li>

spec/models/repository_spec.rb

@@ -47,18 +47,22 @@ describe Repository, type: :model do
   end
 
   describe 'Scopes' do
-    describe 'default_scope' do
+    describe '#active and #archived' do
       before do
         create :repository
         create :repository, :archived
       end
 
       it 'returns only active rows' do
-        expect(Repository.count).to be_eql 1
+        expect(Repository.active.count).to be_eql 1
+      end
+
+      it 'returns only archived rows' do
+        expect(Repository.archived.count).to be_eql 1
       end
 
       it 'returns all rows' do
-        expect(Repository.with_archived.count).to be_eql 2
+        expect(Repository.count).to be_eql 2
       end
     end
   end