implement

Signed-off-by: owenowenisme <mses010108@gmail.com>

Author: owenowenisme

backend/core/config.py

@@ -24,6 +24,15 @@ class Settings(BaseSettings):
     jwt_algorithm: str
     jwt_access_token_expire_minutes: str
     frontend_url: str
+    
+    # Redis settings (optional for graceful fallback)
+    redis_host: str = "localhost"
+    redis_port: int = 6379
+    redis_password: str = ""
+    redis_db: int = 0
+
+    class Config:
+        env_file = '.env'
 
 
 @lru_cache

backend/crud/bookmark.py

@@ -123,16 +123,15 @@ def get_bookmarks(self, db: Session, token: str, cache: CacheService = None) ->
                 bookmarks_data = []
                 for file in user.bookmarked_files:
                     bookmark_dict = {
-                        "id": str(file.id),
+                        "file_id": file.file_id,
                         "filename": file.filename,
                         "file_location": file.file_location,
                         "user_id": str(file.user_id),
-                        "file_id": file.file_id,
                         "course_id": str(file.course_id) if file.course_id else None,
                         "exam_type": file.exam_type,
                         "info": file.info,
                         "anonymous": file.anonymous,
-                        "upload_time": file.upload_time.isoformat() if file.upload_time else None
+                        "timestamp": file.timestamp.isoformat() if file.timestamp else None
                     }
                     bookmarks_data.append(bookmark_dict)
                 cache.set_user_bookmarks_cache(user_id, bookmarks_data)

backend/crud/file.py

@@ -128,16 +128,15 @@ def read_all_file(self, db: Session, user_id: str, cache: CacheService = None) -
                 files_data = []
                 for file in files:
                     file_dict = {
-                        "id": str(file.id),
+                        "file_id": file.file_id,
                         "filename": file.filename,
                         "file_location": file.file_location,
                         "user_id": str(file.user_id),
-                        "file_id": file.file_id,
                         "course_id": str(file.course_id) if file.course_id else None,
                         "exam_type": file.exam_type,
                         "info": file.info,
                         "anonymous": file.anonymous,
-                        "upload_time": file.upload_time.isoformat() if file.upload_time else None
+                        "timestamp": file.timestamp.isoformat() if file.timestamp else None
                     }
                     files_data.append(file_dict)
                 cache.set_user_files_cache(user_id, files_data)
@@ -173,16 +172,15 @@ def get_files_by_course(self, db: Session, course_id: str, cache: CacheService =
                 files_data = []
                 for file in files:
                     file_dict = {
-                        "id": str(file.id),
+                        "file_id": file.file_id,
                         "filename": file.filename,
                         "file_location": file.file_location,
                         "user_id": str(file.user_id),
-                        "file_id": file.file_id,
                         "course_id": str(file.course_id) if file.course_id else None,
                         "exam_type": file.exam_type,
                         "info": file.info,
                         "anonymous": file.anonymous,
-                        "upload_time": file.upload_time.isoformat() if file.upload_time else None
+                        "timestamp": file.timestamp.isoformat() if file.timestamp else None
                     }
                     files_data.append(file_dict)
                 cache.set_course_files_cache(course_id, files_data)
@@ -241,16 +239,15 @@ def get_file_by_id(self, db: Session, file_id: str, cache: CacheService = None)
             # Cache the result (without the presigned URL)
             if cache:
                 file_dict = {
-                    "id": str(file.id),
+                    "file_id": file.file_id,
                     "filename": file.filename,
                     "file_location": file.file_location,  # Store original path, not presigned URL
                     "user_id": str(file.user_id),
-                    "file_id": file.file_id,
                     "course_id": str(file.course_id) if file.course_id else None,
                     "exam_type": file.exam_type,
                     "info": file.info,
                     "anonymous": file.anonymous,
-                    "upload_time": file.upload_time.isoformat() if file.upload_time else None
+                    "timestamp": file.timestamp.isoformat() if file.timestamp else None
                 }
                 cache.set_file_cache(file_id, file_dict)
 

backend/services/cache.py

@@ -8,16 +8,33 @@
 
 class CacheService:
     def __init__(self):
-        self.redis_client = redis.Redis(
-            host=settings.redis_host,
-            port=settings.redis_port,
-            password=settings.redis_password,
-            db=settings.redis_db,
-            decode_responses=True
-        )
+        self.redis_client = None
+        self.redis_available = False
+        
+        try:
+            self.redis_client = redis.Redis(
+                host=settings.redis_host,
+                port=settings.redis_port,
+                password=settings.redis_password if settings.redis_password else None,
+                db=settings.redis_db,
+                decode_responses=True,
+                socket_connect_timeout=5,  # 5 second timeout
+                socket_timeout=5
+            )
+            # Test the connection
+            self.redis_client.ping()
+            self.redis_available = True
+            print("Redis connection established successfully")
+        except Exception as e:
+            print(f"Redis connection failed: {e}. Cache will be disabled.")
+            self.redis_available = False
+            self.redis_client = None
 
     def get(self, key: str) -> Optional[Any]:
         """Get value from cache"""
+        if not self.redis_available:
+            return None
+            
         try:
             value = self.redis_client.get(key)
             if value:
@@ -29,6 +46,9 @@ def get(self, key: str) -> Optional[Any]:
 
     def set(self, key: str, value: Any, expire: int = 3600) -> bool:
         """Set value in cache with expiration time in seconds"""
+        if not self.redis_available:
+            return False
+            
         try:
             serialized_value = json.dumps(value, default=str)
             return self.redis_client.setex(key, expire, serialized_value)
@@ -38,6 +58,9 @@ def set(self, key: str, value: Any, expire: int = 3600) -> bool:
 
     def delete(self, key: str) -> bool:
         """Delete key from cache"""
+        if not self.redis_available:
+            return False
+            
         try:
             return bool(self.redis_client.delete(key))
         except Exception as e:
@@ -46,6 +69,9 @@ def delete(self, key: str) -> bool:
 
     def delete_pattern(self, pattern: str) -> int:
         """Delete all keys matching pattern"""
+        if not self.redis_available:
+            return 0
+            
         try:
             keys = self.redis_client.keys(pattern)
             if keys:
@@ -57,6 +83,9 @@ def delete_pattern(self, pattern: str) -> int:
 
     def exists(self, key: str) -> bool:
         """Check if key exists in cache"""
+        if not self.redis_available:
+            return False
+            
         try:
             return bool(self.redis_client.exists(key))
         except Exception as e: