grimhilt/mail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

advancements in tests

Browse Source
This commit is contained in:
grimhilt
2023-04-04 18:00:27 +02:00
parent 5a71e104cd
commit 9fc31f8686
5 changed files with 132 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
back/db/saveMessage-db.ts
View File

@@ -1,3 +1,5 @@
import { RoomType } from "../mails/saveMessage";
import { hasSameElements } from "../utils/array";
import { transformEmojis } from "../utils/string";
import { execQueryAsync, execQueryAsyncWithId, execQuery } from "./db";
import { queryFromId, queryToId, queryCcId } from "./utils/addressQueries";
@@ -25,8 +27,8 @@ export async function createRoom(
roomName: string | null | undefined,
ownerId: number,
messageId: number,
roomType: number,
) {
roomType: RoomType,
): Promise<number> {
if (!roomName) roomName = "No room name";
roomName = transformEmojis(roomName);
const query = `INSERT IGNORE INTO app_room (room_name, owner_id, message_id, room_type) VALUES (?, ?, ?, ?)`;
@@ -97,7 +99,7 @@ export async function findRoomsFromMessage(messageID: string): Promise<{ room_id
return await execQueryAsync(query, values);
}
export async function hasSameMembersAsParent(messageId: number, messageID: string) {
export async function hasSameMembersAsParent(messageId: number, messageID: string): Promise<boolean> {
const query1 = `
SELECT
GROUP_CONCAT(fromT.address_id) AS fromA,
@@ -135,8 +137,5 @@ export async function hasSameMembersAsParent(messageId: number, messageID: strin
.concat(addressesMsg2[0]?.toA?.split(","))
.concat(addressesMsg2[0]?.ccA?.split(","));
return (
addressesMsg1.length == addressesMsg2.length &&
addressesMsg1.reduce((a, b) => a && addressesMsg2.includes(b), true)
);
return hasSameElements(addressesMsg1, addressesMsg2);
}