Cleanup for qa

Author: thoresuenert

packages/http/src/Session/Config/RedisSessionConfig.php

@@ -16,7 +16,7 @@ final class RedisSessionConfig implements SessionConfig
      */
     public function __construct(
         private(set) Duration $expiration,
-        private(set) string $prefix = 'session',
+        private(set) string $prefix = 'session:',
     ) {}
 
     public function createManager(Container $container): RedisSessionManager

packages/http/src/Session/Managers/RedisSessionManager.php

@@ -120,12 +120,16 @@ private function persist(SessionId $id, ?array $data = null): Session
 
     private function getKey(SessionId $id): string
     {
-        return sprintf('%s_%s', $this->sessionConfig->prefix, $id);
+        return sprintf('%s%s', $this->sessionConfig->prefix, $id);
     }
 
     private function getSessionIdFromKey(string $key): SessionId
     {
-        return new SessionId(new ImmutableString($key)->afterFirst('_')->toString());
+        return new SessionId(
+            new ImmutableString($key)
+                ->afterFirst($this->sessionConfig->prefix)
+                ->toString(),
+        );
     }
 
     public function cleanup(): void
@@ -135,17 +139,16 @@ public function cleanup(): void
         do {
             $result = $this->redis->command('SCAN', $cursor, 'MATCH', $this->getKey(new SessionId('*')), 'COUNT', '100');
             $cursor = $result[0];
-
+            ld($result);
             foreach ($result[1] as $key) {
                 $sessionId = $this->getSessionIdFromKey($key);
 
                 if ($this->isValid($sessionId)) {
                     continue;
                 }
 
-               $this->destroy($sessionId);
+                $this->destroy($sessionId);
             }
-
-        } while( $cursor != '0');
+        } while ($cursor !== '0');
     }
 }

tests/Integration/Http/RedisSessionTest.php

@@ -31,7 +31,7 @@ protected function setUp(): void
         $this->container->config(new RedisSessionConfig(expiration: Duration::hours(2)));
         $this->container->singleton(
             SessionManager::class,
-            fn() => new RedisSessionManager(
+            fn () => new RedisSessionManager(
                 $this->container->get(Clock::class),
                 $this->container->get(Redis::class),
                 $this->container->get(SessionConfig::class),
@@ -242,7 +242,7 @@ private function assertSessionExistsInDatabase(SessionId $sessionId): void
     {
         $session = $this->getSessionFromDatabase($sessionId);
 
-        $this->assertNotNull($session, "Session {$sessionId} should not exist in database");
+        $this->assertNotNull($session, "Session {$sessionId} should exist in database");
     }
 
     private function assertSessionNotExistsInDatabase(SessionId $sessionId): void
@@ -252,17 +252,6 @@ private function assertSessionNotExistsInDatabase(SessionId $sessionId): void
         $this->assertNull($session, "Session {$sessionId} should not exist in database");
     }
 
-    private function assertSessionDataInDatabase(SessionId $sessionId, array $data): void
-    {
-        $session = $this->getSessionFromDatabase($sessionId);
-
-        $this->assertNotNull($session, "Session {$sessionId} should exist in database");
-
-        foreach ($data as $key => $value) {
-            $this->assertEquals($value, $session->data[$key], "Session data key '{$key}' should match expected value");
-        }
-    }
-
     private function getSessionLastActiveTimestamp(SessionId $sessionId): \Tempest\DateTime\DateTime
     {
         $session = $this->getSessionFromDatabase($sessionId);
@@ -272,16 +261,15 @@ private function getSessionLastActiveTimestamp(SessionId $sessionId): \Tempest\D
         return $session->lastActiveAt;
     }
 
-
     private function getSessionFromDatabase(SessionId $id): ?Session
     {
         $config = $this->container->get(SessionConfig::class);
         $redis = $this->container->get(Redis::class);
 
         try {
-            $content = $redis->get(sprintf('%s_%s', $config->prefix, $id));
+            $content = $redis->get(sprintf('%s%s', $config->prefix, $id));
             return unserialize($content, ['allowed_classes' => true]);
-        } catch (Throwable $e) {
+        } catch (Throwable) {
             return null;
         }
     }