Move SMTP into integrations group (external mail relay; same shape as webhook)

Author: premtsd-code

src/Migration/Destinations/Appwrite.php

@@ -292,13 +292,13 @@ public static function getSupportedResources(): array
             Resource::TYPE_PLATFORM,
             Resource::TYPE_API_KEY,
             Resource::TYPE_WEBHOOK,
+            Resource::TYPE_SMTP,
 
             // Project
             Resource::TYPE_PROJECT_VARIABLE,
             Resource::TYPE_PROJECT_PROTOCOLS,
             Resource::TYPE_PROJECT_LABELS,
             Resource::TYPE_PROJECT_SERVICES,
-            Resource::TYPE_SMTP,
 
             // Backups
             Resource::TYPE_BACKUP_POLICY,
@@ -3115,6 +3115,10 @@ public function importIntegrationsResource(Resource $resource): Resource
                 /** @var Webhook $resource */
                 $this->createWebhook($resource);
                 break;
+            case Resource::TYPE_SMTP:
+                /** @var SMTP $resource */
+                $this->createSMTP($resource);
+                break;
         }
 
         if ($resource->getStatus() !== Resource::STATUS_SKIPPED) {
@@ -3143,10 +3147,6 @@ public function importProjectsResource(Resource $resource): Resource
                 /** @var ServicesResource $resource */
                 $this->createServices($resource);
                 break;
-            case Resource::TYPE_SMTP:
-                /** @var SMTP $resource */
-                $this->createSMTP($resource);
-                break;
         }
 
         if ($resource->getStatus() !== Resource::STATUS_SKIPPED) {

src/Migration/Resources/Settings/SMTP.php

@@ -79,7 +79,7 @@ public static function getName(): string
 
     public function getGroup(): string
     {
-        return Transfer::GROUP_PROJECTS;
+        return Transfer::GROUP_INTEGRATIONS;
     }
 
     public function getEnabled(): bool

src/Migration/Sources/Appwrite.php

@@ -227,6 +227,7 @@ public static function getSupportedResources(): array
             Resource::TYPE_PLATFORM,
             Resource::TYPE_API_KEY,
             Resource::TYPE_WEBHOOK,
+            Resource::TYPE_SMTP,
 
             // Backups
             Resource::TYPE_BACKUP_POLICY,
@@ -236,7 +237,6 @@ public static function getSupportedResources(): array
             Resource::TYPE_PROJECT_PROTOCOLS,
             Resource::TYPE_PROJECT_LABELS,
             Resource::TYPE_PROJECT_SERVICES,
-            Resource::TYPE_SMTP,
         ];
     }
 
@@ -1597,11 +1597,6 @@ private function reportProjects(array $resources, array &$report, array $resourc
             // Singleton — one services config per project.
             $report[Resource::TYPE_PROJECT_SERVICES] = 1;
         }
-
-        if (\in_array(Resource::TYPE_SMTP, $resources)) {
-            // Singleton — one SMTP config per project.
-            $report[Resource::TYPE_SMTP] = 1;
-        }
     }
 
     /**
@@ -1666,19 +1661,6 @@ protected function exportGroupProjects(int $batchSize, array $resources): void
             ));
         }
 
-        try {
-            if (\in_array(Resource::TYPE_SMTP, $resources)) {
-                $this->exportSMTP();
-            }
-        } catch (\Throwable $e) {
-            $this->addError(new Exception(
-                Resource::TYPE_SMTP,
-                Transfer::GROUP_PROJECTS,
-                message: $e->getMessage(),
-                code: (int) $e->getCode() ?: Exception::CODE_INTERNAL,
-                previous: $e
-            ));
-        }
     }
 
     private function exportServices(): void
@@ -2673,6 +2655,11 @@ private function reportIntegrations(array $resources, array &$report, array $res
                 $report[Resource::TYPE_WEBHOOK] = 0;
             }
         }
+
+        if (\in_array(Resource::TYPE_SMTP, $resources)) {
+            // Singleton — one SMTP config per project.
+            $report[Resource::TYPE_SMTP] = 1;
+        }
     }
 
     /**
@@ -2746,6 +2733,20 @@ protected function exportGroupIntegrations(int $batchSize, array $resources): vo
                 ));
             }
         }
+
+        try {
+            if (\in_array(Resource::TYPE_SMTP, $resources)) {
+                $this->exportSMTP();
+            }
+        } catch (\Throwable $e) {
+            $this->addError(new Exception(
+                Resource::TYPE_SMTP,
+                Transfer::GROUP_INTEGRATIONS,
+                message: $e->getMessage(),
+                code: (int) $e->getCode() ?: Exception::CODE_INTERNAL,
+                previous: $e
+            ));
+        }
     }
 
     /**

src/Migration/Transfer.php

@@ -68,6 +68,7 @@ class Transfer
         Resource::TYPE_PLATFORM,
         Resource::TYPE_API_KEY,
         Resource::TYPE_WEBHOOK,
+        Resource::TYPE_SMTP,
     ];
     public const GROUP_DOCUMENTSDB_RESOURCES = [
         Resource::TYPE_DATABASE_DOCUMENTSDB,
@@ -102,7 +103,6 @@ class Transfer
         Resource::TYPE_PROJECT_PROTOCOLS,
         Resource::TYPE_PROJECT_LABELS,
         Resource::TYPE_PROJECT_SERVICES,
-        Resource::TYPE_SMTP,
     ];
 
     public const GROUP_BACKUPS_RESOURCES = [
@@ -145,13 +145,13 @@ class Transfer
         Resource::TYPE_PLATFORM,
         Resource::TYPE_API_KEY,
         Resource::TYPE_WEBHOOK,
+        Resource::TYPE_SMTP,
 
         // Project
         Resource::TYPE_PROJECT_VARIABLE,
         Resource::TYPE_PROJECT_PROTOCOLS,
         Resource::TYPE_PROJECT_LABELS,
         Resource::TYPE_PROJECT_SERVICES,
-        Resource::TYPE_SMTP,
 
         // legacy
         Resource::TYPE_DOCUMENT,