feat(OpenMessageSchedule): refactor message content update logic and enhance data isolation handling

Author: lihq1403

backend/magic-service/app/Infrastructure/Core/Traits/DataIsolationTrait.php

@@ -9,14 +9,12 @@
 
 use App\Domain\Contact\Entity\ValueObject\DataIsolation;
 use App\Interfaces\Authorization\Web\MagicUserAuthorization;
+use InvalidArgumentException;
 use Qbhy\HyperfAuth\Authenticatable;
 
 trait DataIsolationTrait
 {
-    /**
-     * @param MagicUserAuthorization $authorization
-     */
-    protected function createDataIsolation(Authenticatable $authorization): DataIsolation
+    protected function createDataIsolation(Authenticatable|MagicUserAuthorization $authorization): DataIsolation
     {
         $dataIsolation = new DataIsolation();
         /* @phpstan-ignore-next-line */
@@ -25,8 +23,11 @@ protected function createDataIsolation(Authenticatable $authorization): DataIsol
             $dataIsolation->setCurrentUserId(currentUserId: $userId);
             $dataIsolation->setCurrentMagicId(currentMagicId: $authorization->getMagicId());
             $dataIsolation->setUserType(userType: $authorization->getUserType());
+            $dataIsolation->setCurrentOrganizationCode(currentOrganizationCode: $authorization->getOrganizationCode());
+        } else {
+            throw new InvalidArgumentException(message: 'Unsupported authorization type for data isolation');
         }
-        $dataIsolation->setCurrentOrganizationCode(currentOrganizationCode: $authorization->getOrganizationCode());
+
         return $dataIsolation;
     }
 }

backend/super-magic-module/src/Application/SuperAgent/Service/OpenMessageScheduleAppService.php

@@ -7,14 +7,14 @@
 
 namespace Dtyq\SuperMagic\Application\SuperAgent\Service;
 
-use App\Infrastructure\Util\IdGenerator\IdGenerator;
 use App\Domain\Contact\Entity\ValueObject\DataIsolation;
 use App\Domain\File\Service\FileDomainService;
 use App\Domain\Provider\Entity\ValueObject\Status;
 use App\Domain\Provider\Service\ProviderModelDomainService;
 use App\ErrorCode\GenericErrorCode;
 use App\Infrastructure\Core\Exception\BusinessException;
 use App\Infrastructure\Core\Exception\ExceptionBuilder;
+use App\Infrastructure\Util\IdGenerator\IdGenerator;
 use Cron\CronExpression;
 use DateTime;
 use Dtyq\SuperMagic\Application\SuperAgent\Assembler\TaskConfigAssembler;
@@ -337,49 +337,6 @@ protected function buildModelFromProviderModelId(string $modelId, DataIsolation
         ];
     }
 
-    private function applyOpenMessageContentUpdates(
-        MessageScheduleEntity $messageSchedule,
-        OpenMessageScheduleEntity $entity,
-        DataIsolation $dataIsolation
-    ): void {
-        if (! $entity->hasMessageContentTextInput() && ! $entity->hasModelIdInput()) {
-            return;
-        }
-
-        $messageContent = $messageSchedule->getMessageContent();
-        $resolvedModelId = $entity->hasModelIdInput()
-            ? (string) $entity->getModelId()
-            : $this->extractModelIdFromMessageContent($messageContent);
-        $model = $this->buildModelFromProviderModelId($resolvedModelId, $dataIsolation);
-
-        if ($entity->hasMessageContentTextInput()) {
-            $messageSchedule->setMessageContent(
-                $this->buildFullMessageContent((string) ($entity->getMessageContentText() ?? ''), $model)
-            );
-
-            return;
-        }
-
-        if (! isset($messageContent['extra']) || ! is_array($messageContent['extra'])) {
-            $messageContent['extra'] = [];
-        }
-        if (! isset($messageContent['extra']['super_agent']) || ! is_array($messageContent['extra']['super_agent'])) {
-            $messageContent['extra']['super_agent'] = [];
-        }
-
-        $messageContent['extra']['super_agent']['model'] = $model;
-        $messageSchedule->setMessageContent($messageContent);
-    }
-
-    private function extractModelIdFromMessageContent(array $messageContent): string
-    {
-        return (string) (
-            $messageContent['extra']['super_agent']['model']['provider_model_id']
-            ?? $messageContent['extra']['super_agent']['model']['model_id']
-            ?? ''
-        );
-    }
-
     protected function createTimeConfigDTO(array $timeConfig): TimeConfigDTO
     {
         $timeConfigDTO = new TimeConfigDTO();
@@ -560,4 +517,47 @@ protected function shouldMarkAsCompleted(MessageScheduleEntity $messageSchedule)
 
         return false;
     }
+
+    private function applyOpenMessageContentUpdates(
+        MessageScheduleEntity $messageSchedule,
+        OpenMessageScheduleEntity $entity,
+        DataIsolation $dataIsolation
+    ): void {
+        if (! $entity->hasMessageContentTextInput() && ! $entity->hasModelIdInput()) {
+            return;
+        }
+
+        $messageContent = $messageSchedule->getMessageContent();
+        $resolvedModelId = $entity->hasModelIdInput()
+            ? (string) $entity->getModelId()
+            : $this->extractModelIdFromMessageContent($messageContent);
+        $model = $this->buildModelFromProviderModelId($resolvedModelId, $dataIsolation);
+
+        if ($entity->hasMessageContentTextInput()) {
+            $messageSchedule->setMessageContent(
+                $this->buildFullMessageContent((string) ($entity->getMessageContentText() ?? ''), $model)
+            );
+
+            return;
+        }
+
+        if (! isset($messageContent['extra']) || ! is_array($messageContent['extra'])) {
+            $messageContent['extra'] = [];
+        }
+        if (! isset($messageContent['extra']['super_agent']) || ! is_array($messageContent['extra']['super_agent'])) {
+            $messageContent['extra']['super_agent'] = [];
+        }
+
+        $messageContent['extra']['super_agent']['model'] = $model;
+        $messageSchedule->setMessageContent($messageContent);
+    }
+
+    private function extractModelIdFromMessageContent(array $messageContent): string
+    {
+        return (string) (
+            $messageContent['extra']['super_agent']['model']['provider_model_id']
+            ?? $messageContent['extra']['super_agent']['model']['model_id']
+            ?? ''
+        );
+    }
 }

backend/super-magic-module/src/Interfaces/SuperAgent/DTO/Request/CreateOpenMessageScheduleRequestDTO.php

@@ -67,5 +67,4 @@ public function getRemark(): string
     {
         return $this->remark;
     }
-
 }