Message: Fix to restore MESSAGE_STATUS_DELETED - refs BT#21887

Author: NicoDucou

assets/vue/components/message/constants.js

@@ -11,4 +11,4 @@ export const MESSAGE_TYPE_INVITATION = 6;
 export const MESSAGE_TYPE_CONVERSATION = 7;
 export const MESSAGE_TYPE_SENDER = 8;
 
-export const MESSAGE_STATUS_SENDER_DELETED = 3;
+export const MESSAGE_STATUS_DELETED = 3;

assets/vue/views/message/MessageList.vue

@@ -217,7 +217,7 @@ import DataTable from "primevue/datatable"
 import Column from "primevue/column"
 import { useConfirm } from "primevue/useconfirm"
 import { useQuery } from "@vue/apollo-composable"
-import { MESSAGE_STATUS_SENDER_DELETED, MESSAGE_TYPE_INBOX, MESSAGE_TYPE_SENDER } from "../../components/message/constants"
+import { MESSAGE_STATUS_DELETED, MESSAGE_TYPE_INBOX, MESSAGE_TYPE_SENDER } from "../../components/message/constants"
 import { GET_USER_MESSAGE_TAGS } from "../../graphql/queries/MessageTag"
 import { useNotification } from "../../composables/notification"
 import { useMessageRelUserStore } from "../../store/messageRelUserStore"

src/CoreBundle/DataProvider/Extension/MessageExtension.php

@@ -105,7 +105,7 @@ private function addWhere(QueryBuilder $qb, string $resourceClass): void
 
         $qb->setParameters([
             'current' => $user,
-            'deleted' => Message::MESSAGE_STATUS_SENDER_DELETED,
+            'deleted' => Message::MESSAGE_STATUS_DELETED,
             // 'currentList' => [$user->getId()],
             'inbox' => Message::MESSAGE_TYPE_INBOX,
             // 'outbox' => Message::MESSAGE_TYPE_OUTBOX,

src/CoreBundle/Entity/Message.php

@@ -98,7 +98,7 @@ class Message
     public const MESSAGE_TYPE_INVITATION = 6;
     public const MESSAGE_TYPE_CONVERSATION = 7;
     // status
-    public const MESSAGE_STATUS_SENDER_DELETED = 3;
+    public const MESSAGE_STATUS_DELETED = 3;
     public const MESSAGE_STATUS_DRAFT = 4;
     public const MESSAGE_STATUS_INVITATION_PENDING = 5;
     public const MESSAGE_STATUS_INVITATION_ACCEPTED = 6;

src/CoreBundle/Migrations/Schema/V200/Version20200821224244.php

@@ -66,7 +66,7 @@ public function up(Schema $schema): void
 
         $newTypeQueries[] = sprintf(
             'UPDATE message SET status = %d WHERE msg_type = %d',
-            Message::MESSAGE_STATUS_SENDER_DELETED,
+            Message::MESSAGE_STATUS_DELETED,
             self::OLD_MESSAGE_STATUS_DELETED
         );
         $newTypeQueries[] = sprintf(

src/CoreBundle/Repository/MessageRepository.php

@@ -79,7 +79,7 @@ public function findByGroupId(int $groupId)
         $qb->where('m.group = :groupId')
             ->andWhere('m.status NOT IN (:excludedStatuses)')
             ->setParameter('groupId', $groupId)
-            ->setParameter('excludedStatuses', [Message::MESSAGE_STATUS_DRAFT, Message::MESSAGE_STATUS_SENDER_DELETED])
+            ->setParameter('excludedStatuses', [Message::MESSAGE_STATUS_DRAFT, Message::MESSAGE_STATUS_DELETED])
             ->orderBy('m.id', 'ASC')
         ;
 
@@ -304,7 +304,7 @@ public function deleteTopicAndChildren(int $groupId, int $topicId): void
 
         /** @var Message $message */
         foreach ($messages as $message) {
-            $message->setMsgType(Message::MESSAGE_STATUS_SENDER_DELETED);
+            $message->setMsgType(Message::MESSAGE_STATUS_DELETED);
             $entityManager->persist($message);
         }
 

src/CoreBundle/State/MessageProcessor.php

@@ -118,7 +118,7 @@ private function checkAndUpdateMessageStatus($data): Message
         $remainingReceivers = $messageRelUserRepository->count(['message' => $message]);
 
         if ($remainingReceivers === 0) {
-            $message->setStatus(Message::MESSAGE_STATUS_SENDER_DELETED);
+            $message->setStatus(Message::MESSAGE_STATUS_DELETED);
             $this->entityManager->flush();
         }