Skip to content

Commit 01e332f

Browse files
LoV432LoV432
committed
update nickname schema
1 parent d91f144 commit 01e332f

File tree

6 files changed

+23
-10
lines changed

6 files changed

+23
-10
lines changed

‎app/conversation-tracker/getConversations.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ export default async function getConversations(users: number[], page: number) {
99
const offset = Number(page) * itemsPerPage - itemsPerPage;
1010
const localLastId =
1111
Number((await cookies()).get('localLastId')?.value) || undefined;
12-
let messagesQuery = `SELECT messages.id as id, user_id, message_text, created_at, colors.color_name, nickname
12+
let messagesQuery = `SELECT messages.id as id, user_id, message_text, created_at, colors.color_name, nicknames.nickname_name as nickname
1313
FROM messages
14-
LEFT JOIN colors ON messages.color_id = colors.id
14+
LEFT JOIN colors ON messages.color_id = colors.id
15+
LEFT JOIN nicknames ON messages.nickname_id = nicknames.id
1516
WHERE user_id = ANY($1::int[]) AND messages.is_deleted = false`;
1617
let messagesParams: any[] = [users];
1718

‎app/users/[userId]/(dashboard)/dashboard-data.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ export async function getTotalMessages(userId: number) {
6161
export async function getRecentMessages(userId: number) {
6262
try {
6363
const query = `
64-
SELECT messages.id as id, created_at, message_text, user_id, color_name, nickname FROM messages
64+
SELECT messages.id as id, created_at, message_text, user_id, color_name, nicknames.nickname_name as nickname FROM messages
6565
LEFT JOIN colors ON messages.color_id = colors.id
66+
LEFT JOIN nicknames ON messages.nickname_id = nicknames.id
6667
WHERE user_id = $1 AND messages.is_deleted = false
6768
ORDER BY created_at DESC
6869
LIMIT 10

‎lib/all-messages.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ export async function getAllMessages(
2727
const offset = Number(page) * itemsPerPage - itemsPerPage;
2828
const localLastId =
2929
Number((await cookies()).get('localLastId')?.value) || undefined;
30-
let queryBuilder = `SELECT messages.id, message_text, created_at, colors.color_name, messages.user_id, nickname
30+
let queryBuilder = `SELECT messages.id, message_text, created_at, colors.color_name, messages.user_id, nicknames.nickname_name as nickname
3131
FROM messages
3232
LEFT JOIN colors ON messages.color_id = colors.id
33+
LEFT JOIN nicknames ON messages.nickname_id = nicknames.id
3334
WHERE messages.is_deleted = false`;
3435
let paramsList = [] as any[];
3536
if (localLastId) {

‎lib/message-context.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,18 @@ async function getFirstPage(anchorMessageCreatedAt: Date) {
5656
// I am now just anchoring to a specific date.
5757
const query = `
5858
(
59-
SELECT messages.id, created_at, user_id, message_text, color_name, nickname FROM messages
59+
SELECT messages.id, created_at, user_id, message_text, color_name, nicknames.nickname_name as nickname FROM messages
6060
LEFT JOIN colors ON messages.color_id = colors.id
61+
LEFT JOIN nicknames ON messages.nickname_id = nicknames.id
6162
WHERE created_at <= $1 AND messages.is_deleted = false
6263
ORDER BY created_at DESC
6364
LIMIT 20
6465
)
6566
UNION ALL
6667
(
67-
SELECT messages.id, created_at, user_id, message_text, color_name, nickname FROM messages
68+
SELECT messages.id, created_at, user_id, message_text, color_name, nicknames.nickname_name as nickname FROM messages
6869
LEFT JOIN colors ON messages.color_id = colors.id
70+
LEFT JOIN nicknames ON messages.nickname_id = nicknames.id
6971
WHERE created_at > $1 AND messages.is_deleted = false
7072
ORDER BY created_at ASC
7173
LIMIT 20
@@ -78,8 +80,9 @@ async function getFirstPage(anchorMessageCreatedAt: Date) {
7880

7981
async function getNegativePage(anchorMessageCreatedAt: Date, page: number) {
8082
const offset = Math.abs(page + 1) * 40 + 20;
81-
const query = `SELECT messages.id, created_at, user_id, message_text, color_name, nickname FROM messages
83+
const query = `SELECT messages.id, created_at, user_id, message_text, color_name, nicknames.nickname_name as nickname FROM messages
8284
LEFT JOIN colors ON messages.color_id = colors.id
85+
LEFT JOIN nicknames ON messages.nickname_id = nicknames.id
8386
WHERE created_at <= $1 AND messages.is_deleted = false
8487
ORDER BY created_at DESC
8588
OFFSET $2
@@ -90,8 +93,9 @@ async function getNegativePage(anchorMessageCreatedAt: Date, page: number) {
9093

9194
async function getPositivePage(anchorMessageCreatedAt: Date, page: number) {
9295
const offset = (page - 1) * 40 + 20;
93-
const query = `SELECT messages.id, created_at, user_id, message_text, color_name, nickname FROM messages
96+
const query = `SELECT messages.id, created_at, user_id, message_text, color_name, nicknames.nickname_name as nickname FROM messages
9497
LEFT JOIN colors ON messages.color_id = colors.id
98+
LEFT JOIN nicknames ON messages.nickname_id = nicknames.id
9599
WHERE created_at > $1 AND messages.is_deleted = false
96100
ORDER BY created_at ASC
97101
OFFSET $2

‎lib/search.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ export async function getSearch(
2525
Number((await cookies()).get('localLastId')?.value) || undefined;
2626
try {
2727
// Build get messages query
28-
let queryBuilder = `SELECT messages.id, message_text, created_at, colors.color_name, messages.user_id, nickname FROM messages LEFT JOIN colors ON messages.color_id = colors.id WHERE message_text ILIKE $1 AND messages.is_deleted = false`;
28+
let queryBuilder = `SELECT messages.id, message_text, created_at, colors.color_name, messages.user_id, nicknames.nickname_name as nickname FROM messages
29+
LEFT JOIN colors ON messages.color_id = colors.id
30+
LEFT JOIN nicknames ON messages.nickname_id = nicknames.id
31+
WHERE message_text ILIKE $1 AND messages.is_deleted = false`;
2932
let params: any[] = [`%${searchQuery}%`];
3033
if (dateStart || dateEnd) {
3134
queryBuilder = addDateRange({

‎lib/user-messages.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ export async function getUserMessages(
3030
error: 'User not found'
3131
};
3232
}
33-
let queryBuilder = `SELECT messages.id, message_text, created_at, colors.color_name, nickname FROM messages LEFT JOIN colors ON messages.color_id = colors.id WHERE user_id = $1 AND messages.is_deleted = false`;
33+
let queryBuilder = `SELECT messages.id, message_text, created_at, colors.color_name, nicknames.nickname_name as nickname FROM messages
34+
LEFT JOIN colors ON messages.color_id = colors.id
35+
LEFT JOIN nicknames ON messages.nickname_id = nicknames.id
36+
WHERE user_id = $1 AND messages.is_deleted = false`;
3437
let paramsList = [userId] as any[];
3538
if (localLastId) {
3639
queryBuilder = addLocalLastId({

0 commit comments

Comments
 (0)