From 1131f7f2fea286aaef5aaf9072ac7c41aadf3d1e Mon Sep 17 00:00:00 2001
From: Ivo Oskamp <ivooskamp@oskamp.info>
Date: Thu, 8 Jan 2026 11:15:47 +0100
Subject: [PATCH] Auto-commit local changes before build (2026-01-08 11:15:47)

---
 .last-branch                                  |  2 +-
 .../src/backend/app/mail_importer.py          | 30 +++++++++++++++++++
 docs/changelog.md                             |  6 ++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/.last-branch b/.last-branch
index 2a4419b..5bac2fe 100644
--- a/.last-branch
+++ b/.last-branch
@@ -1 +1 @@
-v20260108-26-changelog-0.1.18-update
+v20260108-26-mail-move-only-after-successful-import
diff --git a/containers/backupchecks/src/backend/app/mail_importer.py b/containers/backupchecks/src/backend/app/mail_importer.py
index 20ef471..7d6f397 100644
--- a/containers/backupchecks/src/backend/app/mail_importer.py
+++ b/containers/backupchecks/src/backend/app/mail_importer.py
@@ -436,6 +436,21 @@ def run_auto_import(settings: SystemSettings):
         new_messages = 0
         auto_approved = 0
         auto_approved_runs = []
+        # Never move messages when the import failed (prevents "moved but not stored" situations).
+        processed_folder_id = None
+
+    # Ensure imported messages are committed before moving them to another folder.
+    # If commit fails, do not move anything.
+    if processed_folder_id and new_messages >= 0:
+        try:
+            db.session.commit()
+        except Exception as exc:
+            db.session.rollback()
+            errors.append(f"Failed to commit imported messages: {exc}")
+            new_messages = 0
+            auto_approved = 0
+            auto_approved_runs = []
+            processed_folder_id = None
 
     # Move messages to the processed folder if configured
     if processed_folder_id:
@@ -613,6 +628,21 @@ def run_manual_import(settings: SystemSettings, batch_size: int):
         errors.append(str(exc))
         new_messages = 0
         auto_approved_runs = []
+        # Never move messages when the import failed (prevents "moved but not stored" situations).
+        processed_folder_id = None
+
+    # Ensure imported messages are committed before moving them to another folder.
+    # If commit fails, do not move anything.
+    if processed_folder_id and new_messages >= 0:
+        try:
+            db.session.commit()
+        except Exception as exc:
+            db.session.rollback()
+            errors.append(f"Failed to commit imported messages: {exc}")
+            new_messages = 0
+            auto_approved = 0
+            auto_approved_runs = []
+            processed_folder_id = None
 
     # Move messages to the processed folder if configured
     if processed_folder_id:
diff --git a/docs/changelog.md b/docs/changelog.md
index 30ec66c..f884e22 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,3 +1,9 @@
+## v20260108-26-mail-move-only-after-successful-import
+
+- Changed mail import flow so messages are only moved to the processed folder after a successful database store and commit.
+- Prevented Graph mails from being moved when parsing, storing, or committing to the database fails.
+- Added explicit commit and rollback handling to ensure database integrity before mail state changes.
+- Improved logging around import and commit failures to better trace skipped or retried mails.