From 0cce3b3834ae2c8e5938c53d7325624d4733909e Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Thu, 7 Jun 2018 23:17:13 +0100
Subject: [PATCH] jobs with username are only allowed one attempt to unskip

---
 lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm b/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm
index d18f5fa2..b472ff05 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm
@@ -19,8 +19,10 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
         AND ds.device IS NULL)
 
   SELECT my_jobs.*,
-         CASE WHEN (my_jobs.username IS NOT NULL OR
-                    my_jobs.action = ANY (string_to_array(btrim(?, '{"}'), '","')))
+         CASE WHEN ( (my_jobs.username IS NOT NULL AND (ds.deferrals = 0
+                                                        OR ds.last_defer IS NULL
+                                                        OR my_jobs.entered > ds.last_defer))
+                    OR (my_jobs.action = ANY (string_to_array(btrim(?, '{"}'), '","'))) )
               THEN 100
               ELSE 0
           END AS job_priority
@@ -29,7 +31,9 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
     LEFT OUTER JOIN device_skip ds
       ON (ds.backend = ? AND ds.device = my_jobs.device)
 
-   WHERE ((ds.deferrals < ?) OR my_jobs.username IS NOT NULL)
+   WHERE ((ds.deferrals < ?) OR (my_jobs.username IS NOT NULL AND (ds.deferrals = 0
+                                                                   OR ds.last_defer IS NULL
+                                                                   OR my_jobs.entered > ds.last_defer)))
       OR (ds.deferrals IS NULL AND ds.last_defer IS NULL)
       OR ds.last_defer <= ( LOCALTIMESTAMP - ?::interval )