Stopper nå alle kjørende bestillinger, uten cutoff time.

navikt · Sep 6, 2024 · b71188c · b71188c
1 parent 9d92043
commit b71188c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendLifecycle.java b/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendLifecycle.java
@@ -5,6 +5,7 @@
 import no.nav.dolly.repository.BestillingRepository;
 import org.springframework.context.SmartLifecycle;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 @Component
 @RequiredArgsConstructor
@@ -32,10 +33,11 @@ public int getPhase() {
     }
 
     @Override
+    @Transactional
     public void start() {
         isRunning = true;
-        var result = repository.stopOrphanedRunning();
-        log.info("Stopped {} orphans", result);
+        var unfinished = repository.stopAllUnfinished();
+        log.info("Stoppet {} kjørende bestilling(er)", unfinished);
     }
 
     @Override

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/repository/BestillingRepository.java b/apps/dolly-backend/src/main/java/no/nav/dolly/repository/BestillingRepository.java
@@ -84,15 +84,12 @@ public interface BestillingRepository extends CrudRepository<Bestilling, Long> {
     Optional<Bestilling> findByIdAndLock(@Param("id") Long id);
 
     @Modifying
-    @Query(
-            nativeQuery = true,
-            value = """
-                update bestilling b
-                set ferdig = true, stoppet = true
-                where b.ferdig = false
-                  and b.sist_oppdatert < now() - interval '2 minutes'
-"""
-    )
-    int stopOrphanedRunning();
+    @Query("""
+        update Bestilling b
+        set b.ferdig = true,
+            b.stoppet = true
+        where b.ferdig = false
+""")
+    int stopAllUnfinished();
 
 }