Описание изменений

This commit is contained in:
2025-02-21 19:08:03 +03:00
parent 2ddd4a9ff0
commit 1f08f07ca5
11 changed files with 248 additions and 20 deletions

View File

@@ -0,0 +1,21 @@
-- Создаем временную таблицу для уникальных адресов
CREATE TEMP TABLE unique_users AS
SELECT DISTINCT ON (LOWER(address))
id,
LOWER(address) as address,
created_at
FROM users
ORDER BY LOWER(address), created_at ASC;
-- Удаляем все записи из users
TRUNCATE users CASCADE;
-- Восстанавливаем уникальные записи
INSERT INTO users (id, address, created_at)
SELECT id, address, created_at FROM unique_users;
-- Обновляем последовательность id
SELECT setval('users_id_seq', (SELECT MAX(id) FROM users));
-- Удаляем временную таблицу
DROP TABLE unique_users;

View File

@@ -29,4 +29,12 @@ CREATE TABLE IF NOT EXISTS chat_history (
-- Даем права пользователю
GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO postgres;
GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO postgres;
GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO postgres;
-- Обновляем существующие адреса
UPDATE users SET address = LOWER(address);
-- Удаляем дубликаты
DELETE FROM users a USING users b
WHERE a.id > b.id
AND LOWER(a.address) = LOWER(b.address);

View File

@@ -130,7 +130,7 @@ router.post('/chat', requireAuth, async (req, res) => {
// Получаем или создаем пользователя
let user = await pool.query(
'INSERT INTO users (address) VALUES ($1) ON CONFLICT (address) DO UPDATE SET address = EXCLUDED.address RETURNING id',
'INSERT INTO users (address) VALUES (LOWER($1)) ON CONFLICT (address) DO UPDATE SET address = LOWER($1) RETURNING id',
[userAddress]
);
const userId = user.rows[0].id;
@@ -166,34 +166,36 @@ router.post('/chat', requireAuth, async (req, res) => {
router.get('/chat/history', requireAuth, async (req, res) => {
try {
const userAddress = req.session.siwe.address;
console.log('Запрос истории чата для:', userAddress);
// Получаем ID пользователя
const userResult = await pool.query(
'SELECT id FROM users WHERE address = $1',
'SELECT id FROM users WHERE LOWER(address) = LOWER($1) ORDER BY created_at ASC LIMIT 1',
[userAddress]
);
console.log('Найден пользователь:', userResult.rows);
if (userResult.rows.length === 0) {
return res.status(404).json({ error: 'User not found' });
}
const userId = userResult.rows[0].id;
// Получаем историю чата
const history = await pool.query(
`SELECT * FROM (
SELECT
message as content,
created_at,
'user' as role
FROM chat_history
WHERE user_id = $1
UNION ALL
SELECT
response as content,
created_at,
'assistant' as role
FROM chat_history
WHERE user_id = $1
) messages
ORDER BY created_at ASC`,
`SELECT
ch.id,
LOWER(u.address) as address,
ch.message,
ch.response,
ch.created_at
FROM chat_history ch
JOIN users u ON ch.user_id = u.id
WHERE ch.user_id = $1
ORDER BY created_at DESC`,
[userId]
);
console.log('История чата:', history.rows);
res.json({
history: history.rows
@@ -204,4 +206,19 @@ router.get('/chat/history', requireAuth, async (req, res) => {
}
});
// Получение списка пользователей
router.get('/users', requireAuth, async (req, res) => {
try {
console.log('Запрос списка пользователей');
const users = await pool.query(
'SELECT id, LOWER(address) as address, created_at FROM users ORDER BY created_at DESC'
);
console.log('Найдено пользователей:', users.rows);
res.json({ users: users.rows });
} catch (error) {
console.error('Ошибка получения пользователей:', error);
res.status(500).json({ error: 'Ошибка сервера' });
}
});
module.exports = router;

View File

@@ -1 +1 @@
{"cookie":{"originalMaxAge":2591999999,"expires":"2025-03-23T14:05:28.613Z","secure":false,"httpOnly":true,"domain":"127.0.0.1","path":"/","sameSite":"lax"},"nonce":null,"__lastAccess":1740146728614,"siwe":{"domain":"127.0.0.1:5173","address":"0xF45aa4917b3775bA37f48Aeb3dc1a943561e9e0B","statement":"Sign in with Ethereum to access DApp features and AI Assistant","uri":"http://127.0.0.1:5173","version":"1","nonce":"KF6YuwJBLPv8vFKCK","issuedAt":"2025-02-21T14:05:01.684Z","chainId":11155111,"resources":["http://127.0.0.1:5173/api/chat","http://127.0.0.1:5173/api/contract"]},"authenticated":true}
{"cookie":{"originalMaxAge":2591999999,"expires":"2025-03-23T16:06:19.831Z","secure":false,"httpOnly":true,"domain":"127.0.0.1","path":"/","sameSite":"lax"},"nonce":null,"__lastAccess":1740153979832,"siwe":{"domain":"127.0.0.1:5173","address":"0xF45aa4917b3775bA37f48Aeb3dc1a943561e9e0B","statement":"Sign in with Ethereum to access DApp features and AI Assistant","uri":"http://127.0.0.1:5173","version":"1","nonce":"u7P3wT2kyPmGb4Z0I","issuedAt":"2025-02-21T16:05:49.561Z","chainId":11155111,"resources":["http://127.0.0.1:5173/api/chat","http://127.0.0.1:5173/api/contract"]},"authenticated":true}

View File

@@ -0,0 +1 @@
{"cookie":{"originalMaxAge":2592000000,"expires":"2025-03-23T14:54:20.531Z","secure":false,"httpOnly":true,"domain":"127.0.0.1","path":"/","sameSite":"lax"},"__lastAccess":1740149660531}

View File

@@ -0,0 +1 @@
{"cookie":{"originalMaxAge":2592000000,"expires":"2025-03-23T14:53:08.151Z","secure":false,"httpOnly":true,"domain":"127.0.0.1","path":"/","sameSite":"lax"},"__lastAccess":1740149588151}

View File

@@ -0,0 +1 @@
{"cookie":{"originalMaxAge":2592000000,"expires":"2025-03-23T14:36:28.622Z","secure":false,"httpOnly":true,"domain":"127.0.0.1","path":"/","sameSite":"lax"},"__lastAccess":1740148588623}

View File

@@ -0,0 +1 @@
{"cookie":{"originalMaxAge":2592000000,"expires":"2025-03-23T14:49:54.299Z","secure":false,"httpOnly":true,"domain":"127.0.0.1","path":"/","sameSite":"lax"},"__lastAccess":1740149394299}