From 2bc079164c3139400c899760f002ac207cf7b198 Mon Sep 17 00:00:00 2001 From: Victor Pereira Date: Mon, 26 Oct 2020 11:22:29 +0100 Subject: [PATCH] Refactor method project_ready_to_autoclean? Order the validations by complexity --- .../app/jobs/project_create_auto_cleanup_requests_job.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/api/app/jobs/project_create_auto_cleanup_requests_job.rb b/src/api/app/jobs/project_create_auto_cleanup_requests_job.rb index a7b9568d179..ceed8093fde 100644 --- a/src/api/app/jobs/project_create_auto_cleanup_requests_job.rb +++ b/src/api/app/jobs/project_create_auto_cleanup_requests_job.rb @@ -50,10 +50,6 @@ def perform private def autoclean_project(prj) - # open requests do block the cleanup - return if open_requests_count(prj.name).positive? - - # check the time in project attribute return unless project_ready_to_autoclean?(prj) begin @@ -84,7 +80,9 @@ def create_request(project:, description: DESCRIPTION, cleanup_time: 5) def project_ready_to_autoclean?(project) # project may be locked? - return false if project.nil? || project.is_locked? + return false if project.is_locked? + # open requests do block the cleanup + return false if open_requests_count(project.name).positive? return false unless project.check_weak_dependencies? true