From b774e629e4911cfc9008470ec0bd3311eb763674 Mon Sep 17 00:00:00 2001
From: Tvion <snakersu@gmail.com>
Date: Thu, 23 Oct 2025 15:05:49 +0500
Subject: [PATCH] refactor: Update database name handling in restore processes

---
 docker/granular/backups.py    | 2 +-
 docker/granular/granular.py   | 6 +++---
 docker/granular/pg_restore.py | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docker/granular/backups.py b/docker/granular/backups.py
index 35c55b2..eed77ce 100644
--- a/docker/granular/backups.py
+++ b/docker/granular/backups.py
@@ -534,7 +534,7 @@ def transform_restore_status_v1(raw: dict) -> dict:
         info = info or {}
         out["databases"].append({
             "previousDatabaseName": prev_name,
-            "databaseName":   info.get("databaseName") or info.get("restoredAs") or prev_name,
+            "databaseName":   info.get("newDatabaseName") or info.get("databaseName") or info.get("restoredAs") or prev_name,
             "status":         info.get("status"),
             "duration":       info.get("duration"),
             "path":           info.get("path"),
diff --git a/docker/granular/granular.py b/docker/granular/granular.py
index d1258e2..699adb2 100644
--- a/docker/granular/granular.py
+++ b/docker/granular/granular.py
@@ -1425,9 +1425,9 @@ def post(self, backup_id):
                 "created": created_iso,
                 "creationTime": created_iso,
                 "completionTime": None,
-                "databases": { prev: {"databaseName": (databases_mapping.get(prev) if isinstance(databases_mapping, dict) else prev) or prev,
-                                       "status": "notStarted",
-                                       "creationTime": created_iso} for prev in (requested or []) },
+                "databases": { prev: {"newDatabaseName": (databases_mapping.get(prev) if isinstance(databases_mapping, dict) else prev) or prev,
+                                      "status": "notStarted",
+                                      "creationTime": created_iso} for prev in (requested or []) },
                 "storageName": storage_name,
                 "blobPath": blob_path,
                 "externalBackupPath": external_backup_path or "",
diff --git a/docker/granular/pg_restore.py b/docker/granular/pg_restore.py
index ee65c61..dfa2a52 100644
--- a/docker/granular/pg_restore.py
+++ b/docker/granular/pg_restore.py
@@ -115,6 +115,8 @@ def update_status(self, key, value, database=None, flush=False):
             database_details = databases_section.get(database)
             if not database_details:
                 database_details = {}
+                if self.databases_mapping and self.databases_mapping[database]:
+                    database_details['newDatabaseName'] = self.databases_mapping[database]
                 databases_section[database] = database_details
 
             database_details[key] = value