From 5e7c667f2e9e6bdd3bbc674e7b2f8362c5221346 Mon Sep 17 00:00:00 2001
From: Tiavina <tiavina@ezway-technology.com>
Date: Tue, 21 Jan 2025 11:52:06 +0300
Subject: [PATCH] finish fix talk message and set default talk notifications
 sender to Johann, WIP talk notifications, ligne Groups

---
 gestion/lib/Constants/BddConstant.php |  1 +
 gestion/lib/Db/Bdd.php                | 12 ++++++++----
 gestion/lib/Db/TalkDb.php             |  6 +++---
 gestion/lib/Service/TalkService.php   |  8 ++++----
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/gestion/lib/Constants/BddConstant.php b/gestion/lib/Constants/BddConstant.php
index 78e4adf..e6d18cb 100644
--- a/gestion/lib/Constants/BddConstant.php
+++ b/gestion/lib/Constants/BddConstant.php
@@ -8,4 +8,5 @@ abstract class BddConstant
     const DEFAULT_TABLE_PREFIX = "*PREFIX*";
     const DEFAULT_CLIENT_GROUP_NAME = "Nom du groupe";
     const DEFAULT_ADMIN_ID_NEXTCLOUD = 'admin';
+    const DEFAULT_ADMIN_APP_ID_NEXTCLOUD = "Johann";
 }
\ No newline at end of file
diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php
index 84239c6..301d05b 100644
--- a/gestion/lib/Db/Bdd.php
+++ b/gestion/lib/Db/Bdd.php
@@ -3199,9 +3199,9 @@ class Bdd {
         if(empty($devisProducts)){
             return "";
         }
-        $productMessage = ". SOINS A FAIRE : ";
+        $productMessage = ". ACTE A FAIRE : ";
         foreach($devisProducts as $product){
-            $productMessage.= html_entity_decode($product->produit_reference)." ".html_entity_decode($product->produit_description). "(".$product->quantite."), ";
+            $productMessage.= html_entity_decode($product->produit_reference). "(".$product->quantite."), ";
         }
         $productMessage = trim( $productMessage );
         $productMessage = rtrim($productMessage,",");
@@ -3216,7 +3216,7 @@ class Bdd {
         }
         $devisDate = new Datetime($devis->date);
         $devisDate = $devisDate->format('d/m/Y');
-        $message = "NOUVEAUX SOINS: ";
+        $message = "NOUVEL INTERVENTION: ";
         $message .= html_entity_decode($devis->nom_defunt) . ' ';
         $message .= 'le '.$devisDate. ' ';
         $message .= 'à '.$devis->startTime. ' ';
@@ -3224,7 +3224,11 @@ class Bdd {
 
         $productMessage = $this->getDevisTalkRoomProductSectionMessage($devis->products);
         $message .= $productMessage;
-        $message .= ". COMMENTAIRES: ".html_entity_decode($devis->comment);
+        $comment = "aucun";
+        if(strtolower($devis->comment) != "commentaire" && $devis->comment != ""){
+            $comment = html_entity_decode($devis->comment);
+        }
+        $message .= ". COMMENTAIRES: ".$comment;
         return $message;
     }
 
diff --git a/gestion/lib/Db/TalkDb.php b/gestion/lib/Db/TalkDb.php
index 27f33a3..f7651eb 100644
--- a/gestion/lib/Db/TalkDb.php
+++ b/gestion/lib/Db/TalkDb.php
@@ -160,12 +160,12 @@ class TalkDb {
     }
 
     public function createDevisTalkRoomAndReturnDevisTalkRoom($idNextCloud,$token){
-        $roomName = '["'.$idNextCloud.'","'.BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD.'"]';
+        $roomName = '["'.$idNextCloud.'","'.BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD.'"]';
         $this->createDevisTalkRoom($roomName,$token);
         $room = $this->getDevisTalkRoomByName($roomName);
         $attendees = [
             $idNextCloud,
-            BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD
+            BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD
         ];
         $this->createDevisTalkRoomAttendeesByActors($attendees,$room['id']);
         return $room;
@@ -195,7 +195,7 @@ class TalkDb {
 
     public function createDevisTalkRoomMessageAndReturnMessage($roomId,$message){
         $this->createDevisTalkRoomMessage(
-            BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD,
+            BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD,
             $message,
             self::DEVIS_TALK_ROOM_VERB_COMMENT,
             $roomId,
diff --git a/gestion/lib/Service/TalkService.php b/gestion/lib/Service/TalkService.php
index bd219f2..5911c19 100644
--- a/gestion/lib/Service/TalkService.php
+++ b/gestion/lib/Service/TalkService.php
@@ -49,8 +49,8 @@ class TalkService {
 	}
 
     private function getUserDevisTalkRoomNames($idNextCloud){
-        $roomNamesCreatedByUser = '["'.$idNextCloud.'","'.BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD.'"]';
-        $roomNamesCreatedByAdmin = '["'.BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD.'","'.$idNextCloud.'"]';
+        $roomNamesCreatedByUser = '["'.$idNextCloud.'","'.BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD.'"]';
+        $roomNamesCreatedByAdmin = '["'.BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD.'","'.$idNextCloud.'"]';
         return [
             "createdByUser" => $roomNamesCreatedByUser,
             "createdByAdmin" => $roomNamesCreatedByAdmin
@@ -69,7 +69,7 @@ class TalkService {
     }
 
     public function sendDevisTalkNotifications(string $message,string $idNextcloud){
-        if($idNextcloud === BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD){
+        if($idNextcloud === BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD || $idNextcloud === BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD){
             return true;
         }
         $roomNames = $this->getUserDevisTalkRoomNames($idNextcloud);
@@ -80,7 +80,7 @@ class TalkService {
         }
         $devisMessage = $this->talkDb->createDevisTalkRoomMessageAndReturnMessage($room['id'],$message);
         $this->talkDb->updateRoomLastMessage($room['id'],$devisMessage['id']);
-        $this->talkDb->setAttendeeLastReadMessage($room['id'],$devisMessage['id'],BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD);
+        $this->talkDb->setAttendeeLastReadMessage($room['id'],$devisMessage['id'],BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
         return true;
     }