@@ -56,7 +56,6 @@ async def index(request: Request):
5656
5757 new_short_url = session .pop ("new_short_url" , None )
5858 qr_enabled = session .pop ("qr_enabled" , False )
59- qr_type = session .pop ("qr_type" , "short" )
6059 original_url = session .pop ("original_url" , None )
6160 short_code = session .pop ("short_code" , None )
6261 info_message = session .pop ("info_message" , None )
@@ -66,7 +65,7 @@ async def index(request: Request):
6665 qr_data = None
6766
6867 if qr_enabled and new_short_url and short_code :
69- qr_data = new_short_url if qr_type == "short" else original_url
68+ qr_data = new_short_url
7069 qr_filename = f"{ short_code } .png"
7170 qr_dir = BASE_DIR / "static" / "qr"
7271 qr_dir .mkdir (parents = True , exist_ok = True )
@@ -231,44 +230,30 @@ def delete_recent_api(short_code: str):
231230 recent = get_recent_from_cache (MAX_RECENT_URLS ) or []
232231 removed_from_cache = False
233232
234- # Try removing from cache (memory only)
235233 for i , item in enumerate (recent ):
236234 code = item .get ("short_code" ) or item .get ("code" )
237235 if code == short_code :
238- recent .pop (i )
239236 removed_from_cache = True
240237 break
241238
242239 db_available = db .is_connected ()
243240 db_deleted = False
244241
245- # If DB available → rely ONLY on DB
246242 if db_available :
247243 db_deleted = db .delete_by_short_code (short_code )
248244
249- if not db_deleted :
250- raise HTTPException (
251- status_code = 404 , detail = f"short_code '{ short_code } ' not found"
252- )
253-
254- return {
255- "status" : "deleted" ,
256- "short_code" : short_code ,
257- "db_deleted" : True ,
258- "db_available" : True ,
259- }
260-
261- # If DB NOT available → rely on cache only
262- if not removed_from_cache :
245+ # ✅ If nothing was deleted anywhere → 404
246+ if not removed_from_cache and not db_deleted :
263247 raise HTTPException (
264248 status_code = 404 , detail = f"short_code '{ short_code } ' not found"
265249 )
266250
267251 return {
252+ "success" : True ,
268253 "status" : "deleted" ,
269254 "short_code" : short_code ,
270- "db_deleted" : False ,
271- "db_available" : False ,
255+ "db_deleted" : db_deleted ,
256+ "db_available" : db_available ,
272257 }
273258
274259
0 commit comments