chore: bring files from branch to latest versions of main branch

Signed-off-by: Jonas <[email protected]>

Author: mejo-

lib/Db/SessionMapper.php

@@ -178,12 +178,12 @@ public function deleteOldSessions(int $ageInSeconds): int {
 		return $deletedCount;
 	}
 
-	public function deleteOrphanedSteps(): int {
+	public function deleteOrphanedSteps(int $ageInSeconds): int {
 		$startTime = microtime(true);
 		$maxExecutionSeconds = 30;
 		$batchSize = 1000;
 		$deletedCount = 0;
-		$safetyBufferTime = time() - 86400;
+		$ageThreshold = time() - $ageInSeconds;
 
 		do {
 			$orphanedStepsQb = $this->db->getQueryBuilder();
@@ -192,7 +192,7 @@ public function deleteOrphanedSteps(): int {
 				->leftJoin('st', 'text_sessions', 's', $orphanedStepsQb->expr()->eq('st.document_id', 's.document_id'))
 				->leftJoin('st', 'text_documents', 'd', $orphanedStepsQb->expr()->eq('st.document_id', 'd.id'))
 				->where($orphanedStepsQb->expr()->isNull('s.id'))
-				->andWhere($orphanedStepsQb->expr()->lt('st.timestamp', $orphanedStepsQb->createNamedParameter($safetyBufferTime)))
+				->andWhere($orphanedStepsQb->expr()->lt('st.timestamp', $orphanedStepsQb->createNamedParameter($ageThreshold)))
 				->andWhere(
 					$orphanedStepsQb->expr()->orX(
 						$orphanedStepsQb->expr()->isNull('d.id'),

tests/unit/Db/SessionMapperTest.php

@@ -142,7 +142,7 @@ public function testDeleteOrphanedSteps() {
 		$this->sessionMapper->clearAll();
 		$this->stepMapper->clearAll();
 
-		$oldTimestamp = time() - 86401;
+		$eightDaysAgo = time() - (8 * 24 * 60 * 60);
 
 		// Create document
 		$document = $this->documentMapper->insert(Document::fromParams([
@@ -166,7 +166,7 @@ public function testDeleteOrphanedSteps() {
 			'sessionId' => 99999,
 			'documentId' => $document->getId(),
 			'data' => 'ORPHANED_OLD_VERSION',
-			'timestamp' => $oldTimestamp,
+			'timestamp' => $eightDaysAgo,
 			'version' => 1
 		]));
 
@@ -185,16 +185,17 @@ public function testDeleteOrphanedSteps() {
 			'sessionId' => 99999,
 			'documentId' => $document->getId(),
 			'data' => 'ORPHANED_NEW_VERSION',
-			'timestamp' => $oldTimestamp,
+			'timestamp' => $eightDaysAgo,
 			'version' => 3
 		]));
 
 		// Verify steps for document 1 and 99999
 		self::assertCount(3, $this->stepMapper->find(1, 0));
 		self::assertCount(1, $this->stepMapper->find(99999, 0));
 
-		// Verify orphan delete
-		$deletedCount = $this->sessionMapper->deleteOrphanedSteps();
+		// Delete orphaned steps older than 7 days
+		$sevenDays = 7 * 24 * 60 * 60;
+		$deletedCount = $this->sessionMapper->deleteOrphanedSteps($sevenDays);
 		self::assertEquals(2, $deletedCount);
 	}
 }