show flags on front

back/db/api.ts

@@ -52,7 +52,7 @@ export async function getRooms(mailboxId) {
     return await execQueryAsync(query, values);
 }
 
-export async function getMessages(roomId) {
+export async function getMessages(roomId: number) {
     // todo attachements name
     const query = `
         SELECT 
@@ -62,7 +62,8 @@ export async function getMessages(roomId) {
             GROUP_CONCAT(ccT.address_id) AS ccA,
             subjectT.value AS subject,
             content.text AS content,
-            message.idate AS date
+            message.idate AS date,
+            GROUP_CONCAT(flagT.flag_name) AS flags
         FROM app_room_message msg
 
         ${queryFromId} fromT ON msg.message_id = fromT.message_id
@@ -88,6 +89,9 @@ export async function getMessages(roomId) {
                 bodypart.bodypart_id = header_field.bodypart_id
         ) content ON msg.message_id = content.message_id
 
+        LEFT JOIN flag ON flag.message_id = msg.message_id
+        LEFT JOIN flag_name flagT ON flagT.flag_id = flag.flag_id
+
         INNER JOIN message ON message.message_id = msg.message_id
 
         WHERE msg.room_id = ?

back/db/structureV2.sql

@@ -164,7 +164,7 @@ CREATE TABLE app_room_member (
 
 -- 15
 create table flag_name (
-  flag_id          INT NOT NULL,
+  flag_id          INT AUTO_INCREMENT,
   flag_name        VARCHAR(255) NOT NULL,
   PRIMARY KEY (flag_id),
   UNIQUE KEY (flag_name)

back/db/utils/addressQueries.ts

@@ -2,9 +2,8 @@ const queryAddress = (type: string): string => `
     LEFT JOIN (
         SELECT address_field.address_id, address_field.message_id
         FROM address_field 
-        INNER JOIN field_name 
+        INNER JOIN field_name ON field_name.field_id = address_field.field_id
         WHERE 
-            field_name.field_id = address_field.field_id AND
             field_name.field_name = '${type}'
     )
 `;

back/server.ts

@@ -14,6 +14,7 @@ app.use(cors());
 app.listen(process.env.PORT || 5500);
 
 import mailRouter from "./routes/mail";
+import logger from "./system/Logger";
 app.use("/api/mail", mailRouter);
 
 const imapSync = new ImapSync();
@@ -33,4 +34,4 @@ if (shouldReset) {
             // execQuery("DROP TABLE " + table.table_name);
         });
     });
-}
+}