From 83aabca88ee2a04f8a955e4e2ddb39a39ee8a832 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Fri, 11 May 2018 18:41:16 +0200
Subject: [PATCH] Update mirror queries to work after data migration

---
 lib/gitlab_monitor/database/row_count.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/gitlab_monitor/database/row_count.rb b/lib/gitlab_monitor/database/row_count.rb
index 096dda4..90a9211 100644
--- a/lib/gitlab_monitor/database/row_count.rb
+++ b/lib/gitlab_monitor/database/row_count.rb
@@ -29,48 +29,48 @@ module GitLab
           mirrors_ready_to_sync: MIRROR_QUERY.merge( # EE only
             where: <<~SQL
               #{WHERE_MIRROR_ENABLED}
-              AND projects.import_status NOT IN ('scheduled', 'started')
+              AND project_mirror_data.status NOT IN ('scheduled', 'started')
               AND project_mirror_data.next_execution_timestamp <= NOW()
             SQL
           ),
           mirrors_not_updated_recently: MIRROR_QUERY.merge( # EE only
             where: <<~SQL
               #{WHERE_MIRROR_ENABLED}
-              AND projects.import_status NOT IN ('scheduled', 'started')
-              AND (project_mirror_data.next_execution_timestamp - projects.mirror_last_update_at) <= '30 minutes'::interval
-              AND projects.mirror_last_update_at < NOW() - '30 minutes'::interval
+              AND project_mirror_data.status NOT IN ('scheduled', 'started')
+              AND (project_mirror_data.next_execution_timestamp - project_mirror_data.last_update_at) <= '30 minutes'::interval
+              AND project_mirror_data.last_update_at < NOW() - '30 minutes'::interval
             SQL
           ),
           mirrors_updated_very_recently: MIRROR_QUERY.merge( # EE only
             where: <<~SQL
               #{WHERE_MIRROR_ENABLED}
-              AND projects.import_status NOT IN ('scheduled', 'started')
-              AND projects.mirror_last_update_at >= NOW() - '30 seconds'::interval
+              AND project_mirror_data.status NOT IN ('scheduled', 'started')
+              AND project_mirror_data.last_update_at >= NOW() - '30 seconds'::interval
             SQL
           ),
           mirrors_behind_schedule: MIRROR_QUERY.merge( # EE only
             where: <<~SQL
               #{WHERE_MIRROR_ENABLED}
-              AND projects.import_status NOT IN ('scheduled', 'started')
+              AND project_mirror_data.status NOT IN ('scheduled', 'started')
               AND project_mirror_data.next_execution_timestamp <= NOW() - '10 seconds'::interval
             SQL
           ),
           mirrors_scheduled_or_started: MIRROR_QUERY.merge( # EE only
             where: <<~SQL
               #{WHERE_MIRROR_ENABLED}
-              AND projects.import_status IN ('scheduled', 'started')
+              AND project_mirror_data.status IN ('scheduled', 'started')
             SQL
           ),
           mirrors_scheduled: MIRROR_QUERY.merge( # EE only
             where: <<~SQL
               #{WHERE_MIRROR_ENABLED}
-              AND projects.import_status = 'scheduled'
+              AND project_mirror_data.status = 'scheduled'
             SQL
           ),
           mirrors_started: MIRROR_QUERY.merge( # EE only
             where: <<~SQL
               #{WHERE_MIRROR_ENABLED}
-              AND projects.import_status = 'started'
+              AND project_mirror_data.status = 'started'
             SQL
           ),
           soft_deleted_projects: { select: :projects, where: "pending_delete=true" },
-- 
GitLab