${body}
`); - } catch (e) { - console.error('Ошибка отправки email:', e); - } - } - return res.json({ success: true, message }); - } catch (error) { - console.error('Ошибка создания сообщения:', error); - return res.status(500).json({ error: 'Ошибка создания сообщения' }); - } + try { + const { clerkUserId, title, body, type = 'system', fromAdminId } = req.body; + if (!clerkUserId || !title || !body) { + return res + .status(400) + .json({ error: 'clerkUserId, title и body обязательны' }); + } + // Создаём сообщение в базе + const message = await prisma.message.create({ + data: { clerkUserId, title, body, type, fromAdminId }, + }); + // Получаем email пользователя + const user = await prisma.user.findUnique({ where: { clerkUserId } }); + if (user && user.email) { + // Отправляем email через nodemailer + try { + await sendEmail(user.email, title, `${body}
`); + } catch (e) { + console.error('Ошибка отправки email:', e); + } + } + return res.json({ success: true, message }); + } catch (error) { + console.error('Ошибка создания сообщения:', error); + return res.status(500).json({ error: 'Ошибка создания сообщения' }); + } }; // Получить все сообщения пользователя (по clerkUserId) export const getUserMessages = async (req, res) => { - try { - const { clerkUserId } = req.query; - if (!clerkUserId) return res.status(400).json({ error: 'clerkUserId обязателен' }); - const messages = await prisma.message.findMany({ - where: { clerkUserId }, - orderBy: { createdAt: 'desc' }, - }); - return res.json({ messages }); - } catch (error) { - console.error('Ошибка получения сообщений:', error); - return res.status(500).json({ error: 'Ошибка получения сообщений' }); - } + try { + const { clerkUserId } = req.query; + if (!clerkUserId) + return res.status(400).json({ error: 'clerkUserId обязателен' }); + const messages = await prisma.message.findMany({ + where: { clerkUserId }, + orderBy: { createdAt: 'desc' }, + }); + return res.json({ messages }); + } catch (error) { + console.error('Ошибка получения сообщений:', error); + return res.status(500).json({ error: 'Ошибка получения сообщений' }); + } }; // Отметить сообщение как прочитанное export const markMessageRead = async (req, res) => { - try { - const { id } = req.params; - const message = await prisma.message.update({ - where: { id }, - data: { isRead: true }, - }); - return res.json({ success: true, message }); - } catch (error) { - console.error('Ошибка отметки сообщения как прочитанного:', error); - return res.status(500).json({ error: 'Ошибка отметки сообщения' }); - } + try { + const { id } = req.params; + const message = await prisma.message.update({ + where: { id }, + data: { isRead: true }, + }); + return res.json({ success: true, message }); + } catch (error) { + console.error('Ошибка отметки сообщения как прочитанного:', error); + return res.status(500).json({ error: 'Ошибка отметки сообщения' }); + } }; // Массовая рассылка сообщений и email export const broadcastMessage = async (req, res) => { - try { - const { title, body, clerkUserIds } = req.body; - if (!title || !body) { - return res.status(400).json({ error: 'title и body обязательны' }); - } - - let users; - if (Array.isArray(clerkUserIds) && clerkUserIds.length > 0) { - users = await prisma.user.findMany({ where: { clerkUserId: { in: clerkUserIds } } }); - } else { - users = await prisma.user.findMany(); - } - let sent = 0; - for (const user of users) { - await prisma.message.create({ - data: { - clerkUserId: user.clerkUserId, - title, - body, - type: 'admin', - } - }); - if (user.email) { - try { - await sendEmail(user.email, title, body); - } catch (e) { - console.error('Ошибка отправки email:', e); - } - } - sent++; - } - return res.json({ success: true, count: sent }); - } catch (error) { - console.error('Ошибка рассылки:', error); - return res.status(500).json({ error: 'Ошибка рассылки' }); - } + try { + const { title, body, clerkUserIds } = req.body; + if (!title || !body) { + return res.status(400).json({ error: 'title и body обязательны' }); + } + + let users; + if (Array.isArray(clerkUserIds) && clerkUserIds.length > 0) { + users = await prisma.user.findMany({ + where: { clerkUserId: { in: clerkUserIds } }, + }); + } else { + users = await prisma.user.findMany(); + } + let sent = 0; + for (const user of users) { + await prisma.message.create({ + data: { + clerkUserId: user.clerkUserId, + title, + body, + type: 'admin', + }, + }); + if (user.email) { + try { + await sendEmail(user.email, title, body); + } catch (e) { + console.error('Ошибка отправки email:', e); + } + } + sent++; + } + return res.json({ success: true, count: sent }); + } catch (error) { + console.error('Ошибка рассылки:', error); + return res.status(500).json({ error: 'Ошибка рассылки' }); + } }; // Удалить сообщение export const deleteMessage = async (req, res) => { - try { - const { id } = req.params; - console.log('Attempting to delete message with ID:', id); - - if (!id) { - console.log('No message ID provided'); - return res.status(400).json({ error: 'Message ID is required' }); - } - - // Проверяем, существует ли сообщение - const message = await prisma.message.findUnique({ - where: { id } - }); - - console.log('Message found:', message ? 'Yes' : 'No'); - - if (!message) { - console.log('Message not found for ID:', id); - return res.status(404).json({ error: 'Сообщение не найдено' }); - } - - // Удаляем сообщение - const deletedMessage = await prisma.message.delete({ - where: { id } - }); - - console.log('Message deleted successfully:', deletedMessage.id); - - return res.json({ success: true, message: 'Сообщение удалено' }); - } catch (error) { - console.error('Error in deleteMessage:', error); - - // Handle specific Prisma errors - if (error.code === 'P2025') { - return res.status(404).json({ error: 'Сообщение не найдено' }); - } - - if (error.code === 'P2002') { - return res.status(400).json({ error: 'Invalid message ID format' }); - } - - return res.status(500).json({ error: 'Ошибка удаления сообщения' }); - } + try { + const { id } = req.params; + console.log('Attempting to delete message with ID:', id); + + if (!id) { + console.log('No message ID provided'); + return res.status(400).json({ error: 'Message ID is required' }); + } + + // Проверяем, существует ли сообщение + const message = await prisma.message.findUnique({ + where: { id }, + }); + + console.log('Message found:', message ? 'Yes' : 'No'); + + if (!message) { + console.log('Message not found for ID:', id); + return res.status(404).json({ error: 'Сообщение не найдено' }); + } + + // Удаляем сообщение + const deletedMessage = await prisma.message.delete({ + where: { id }, + }); + + console.log('Message deleted successfully:', deletedMessage.id); + + return res.json({ success: true, message: 'Сообщение удалено' }); + } catch (error) { + console.error('Error in deleteMessage:', error); + + // Handle specific Prisma errors + if (error.code === 'P2025') { + return res.status(404).json({ error: 'Сообщение не найдено' }); + } + + if (error.code === 'P2002') { + return res.status(400).json({ error: 'Invalid message ID format' }); + } + + return res.status(500).json({ error: 'Ошибка удаления сообщения' }); + } }; // Заготовка для отправки email (реализовать через nodemailer) // async function sendEmail(to, subject, text) { // // ... -// } \ No newline at end of file +// } diff --git a/apps/api/controllers/newsletterController.js b/apps/api/controllers/newsletterController.js index 39ef222..b7c112f 100644 --- a/apps/api/controllers/newsletterController.js +++ b/apps/api/controllers/newsletterController.js @@ -1,6 +1,10 @@ import { PrismaClient } from '@prisma/client'; import { sendInitialCandidatesToNewSubscriber } from '../services/candidateNotificationService.js'; -import { sendVerificationCode, storeVerificationCode, verifyCode } from '../services/snsService.js'; +import { + sendVerificationCode, + storeVerificationCode, + verifyCode, +} from '../services/snsService.js'; const prisma = new PrismaClient(); @@ -8,502 +12,504 @@ const prisma = new PrismaClient(); * Subscribe a user to the newsletter */ export async function subscribeToNewsletter(req, res) { - try { - const { - email, - firstName, - lastName, - language = 'ru', - preferences = {}, - // Filter preferences - preferredCities = [], - preferredCategories = [], - preferredEmployment = [], - preferredLanguages = [], - preferredGender = null, - preferredDocumentTypes = [], - onlyDemanded = false - } = req.body; - - // Validate email - if (!email || !email.trim()) { - return res.status(400).json({ - success: false, - message: 'Email is required' - }); - } - - // Basic email validation - const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; - if (!emailRegex.test(email)) { - return res.status(400).json({ - success: false, - message: 'Invalid email format' - }); - } - - // Check if already subscribed - const existingSubscriber = await prisma.newsletterSubscriber.findUnique({ - where: { email: email.trim().toLowerCase() } - }); - - if (existingSubscriber) { - return res.status(409).json({ - success: false, - message: 'This email is already subscribed to the newsletter' - }); - } - - // Create new subscriber with filter preferences - const subscriber = await prisma.newsletterSubscriber.create({ - data: { - email: email.trim().toLowerCase(), - firstName: firstName?.trim() || null, - lastName: lastName?.trim() || null, - language, - preferences, - isActive: true, - // Filter preferences - preferredCities, - preferredCategories, - preferredEmployment, - preferredLanguages, - preferredGender, - preferredDocumentTypes, - onlyDemanded - } - }); - - console.log('✅ New newsletter subscriber:', subscriber.email); - - // Send candidates to new subscriber - try { - await sendInitialCandidatesToNewSubscriber(subscriber); - } catch (emailError) { - console.error('❌ Failed to send candidates email:', emailError); - // Don't fail the subscription if email fails - } - - res.status(201).json({ - success: true, - message: 'Successfully subscribed to newsletter', - subscriber: { - id: subscriber.id, - email: subscriber.email, - firstName: subscriber.firstName, - lastName: subscriber.lastName, - preferredCities: subscriber.preferredCities, - preferredCategories: subscriber.preferredCategories, - preferredEmployment: subscriber.preferredEmployment, - preferredLanguages: subscriber.preferredLanguages, - preferredGender: subscriber.preferredGender, - preferredDocumentTypes: subscriber.preferredDocumentTypes, - onlyDemanded: subscriber.onlyDemanded - } - }); - - } catch (error) { - console.error('❌ Newsletter subscription error:', error); - res.status(500).json({ - success: false, - message: 'Failed to subscribe to newsletter' - }); - } + try { + const { + email, + firstName, + lastName, + language = 'ru', + preferences = {}, + // Filter preferences + preferredCities = [], + preferredCategories = [], + preferredEmployment = [], + preferredLanguages = [], + preferredGender = null, + preferredDocumentTypes = [], + onlyDemanded = false, + } = req.body; + + // Validate email + if (!email || !email.trim()) { + return res.status(400).json({ + success: false, + message: 'Email is required', + }); + } + + // Basic email validation + const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; + if (!emailRegex.test(email)) { + return res.status(400).json({ + success: false, + message: 'Invalid email format', + }); + } + + // Check if already subscribed + const existingSubscriber = await prisma.newsletterSubscriber.findUnique({ + where: { email: email.trim().toLowerCase() }, + }); + + if (existingSubscriber) { + return res.status(409).json({ + success: false, + message: 'This email is already subscribed to the newsletter', + }); + } + + // Create new subscriber with filter preferences + const subscriber = await prisma.newsletterSubscriber.create({ + data: { + email: email.trim().toLowerCase(), + firstName: firstName?.trim() || null, + lastName: lastName?.trim() || null, + language, + preferences, + isActive: true, + // Filter preferences + preferredCities, + preferredCategories, + preferredEmployment, + preferredLanguages, + preferredGender, + preferredDocumentTypes, + onlyDemanded, + }, + }); + + console.log('✅ New newsletter subscriber:', subscriber.email); + + // Send candidates to new subscriber + try { + await sendInitialCandidatesToNewSubscriber(subscriber); + } catch (emailError) { + console.error('❌ Failed to send candidates email:', emailError); + // Don't fail the subscription if email fails + } + + res.status(201).json({ + success: true, + message: 'Successfully subscribed to newsletter', + subscriber: { + id: subscriber.id, + email: subscriber.email, + firstName: subscriber.firstName, + lastName: subscriber.lastName, + preferredCities: subscriber.preferredCities, + preferredCategories: subscriber.preferredCategories, + preferredEmployment: subscriber.preferredEmployment, + preferredLanguages: subscriber.preferredLanguages, + preferredGender: subscriber.preferredGender, + preferredDocumentTypes: subscriber.preferredDocumentTypes, + onlyDemanded: subscriber.onlyDemanded, + }, + }); + } catch (error) { + console.error('❌ Newsletter subscription error:', error); + res.status(500).json({ + success: false, + message: 'Failed to subscribe to newsletter', + }); + } } /** * Unsubscribe from newsletter */ export async function unsubscribeFromNewsletter(req, res) { - try { - const { email } = req.body; - - if (!email) { - return res.status(400).json({ - success: false, - message: 'Email is required' - }); - } - - const subscriber = await prisma.newsletterSubscriber.findUnique({ - where: { email: email.trim().toLowerCase() } - }); - - if (!subscriber) { - return res.status(404).json({ - success: false, - message: 'Subscriber not found' - }); - } - - // Delete subscriber from database - await prisma.newsletterSubscriber.delete({ - where: { id: subscriber.id } - }); - - console.log('✅ Successfully deleted subscriber:', subscriber.email); - - res.json({ - success: true, - message: 'Successfully unsubscribed from newsletter' - }); - - } catch (error) { - console.error('❌ Newsletter unsubscribe error:', error); - res.status(500).json({ - success: false, - message: 'Failed to unsubscribe from newsletter' - }); - } + try { + const { email } = req.body; + + if (!email) { + return res.status(400).json({ + success: false, + message: 'Email is required', + }); + } + + const subscriber = await prisma.newsletterSubscriber.findUnique({ + where: { email: email.trim().toLowerCase() }, + }); + + if (!subscriber) { + return res.status(404).json({ + success: false, + message: 'Subscriber not found', + }); + } + + // Delete subscriber from database + await prisma.newsletterSubscriber.delete({ + where: { id: subscriber.id }, + }); + + console.log('✅ Successfully deleted subscriber:', subscriber.email); + + res.json({ + success: true, + message: 'Successfully unsubscribed from newsletter', + }); + } catch (error) { + console.error('❌ Newsletter unsubscribe error:', error); + res.status(500).json({ + success: false, + message: 'Failed to unsubscribe from newsletter', + }); + } } /** * Get all newsletter subscribers (admin only) */ export async function getNewsletterSubscribers(req, res) { - try { - const subscribers = await prisma.newsletterSubscriber.findMany({ - orderBy: { createdAt: 'desc' }, - select: { - id: true, - email: true, - firstName: true, - lastName: true, - language: true, - createdAt: true - } - }); - - res.json({ - success: true, - subscribers, - total: subscribers.length - }); - - } catch (error) { - console.error('❌ Error getting newsletter subscribers:', error); - res.status(500).json({ - success: false, - message: 'Failed to get newsletter subscribers' - }); - } + try { + const subscribers = await prisma.newsletterSubscriber.findMany({ + orderBy: { createdAt: 'desc' }, + select: { + id: true, + email: true, + firstName: true, + lastName: true, + language: true, + createdAt: true, + }, + }); + + res.json({ + success: true, + subscribers, + total: subscribers.length, + }); + } catch (error) { + console.error('❌ Error getting newsletter subscribers:', error); + res.status(500).json({ + success: false, + message: 'Failed to get newsletter subscribers', + }); + } } /** * Check if email is already subscribed to newsletter */ export async function checkSubscriptionStatus(req, res) { - try { - const { email } = req.query; - - if (!email) { - return res.status(400).json({ - success: false, - message: 'Email is required' - }); - } - - const subscriber = await prisma.newsletterSubscriber.findUnique({ - where: { email: email.trim().toLowerCase() }, - select: { - id: true, - email: true, - firstName: true, - lastName: true, - language: true, - createdAt: true, - // Filter preferences - preferredCities: true, - preferredCategories: true, - preferredEmployment: true, - preferredLanguages: true, - preferredGender: true, - preferredDocumentTypes: true, - onlyDemanded: true - } - }); - - if (subscriber) { - res.json({ - success: true, - isSubscribed: true, - subscriber - }); - } else { - res.json({ - success: true, - isSubscribed: false, - subscriber: null - }); - } - - } catch (error) { - console.error('❌ Error checking subscription status:', error); - res.status(500).json({ - success: false, - message: 'Failed to check subscription status' - }); - } + try { + const { email } = req.query; + + if (!email) { + return res.status(400).json({ + success: false, + message: 'Email is required', + }); + } + + const subscriber = await prisma.newsletterSubscriber.findUnique({ + where: { email: email.trim().toLowerCase() }, + select: { + id: true, + email: true, + firstName: true, + lastName: true, + language: true, + createdAt: true, + // Filter preferences + preferredCities: true, + preferredCategories: true, + preferredEmployment: true, + preferredLanguages: true, + preferredGender: true, + preferredDocumentTypes: true, + onlyDemanded: true, + }, + }); + + if (subscriber) { + res.json({ + success: true, + isSubscribed: true, + subscriber, + }); + } else { + res.json({ + success: true, + isSubscribed: false, + subscriber: null, + }); + } + } catch (error) { + console.error('❌ Error checking subscription status:', error); + res.status(500).json({ + success: false, + message: 'Failed to check subscription status', + }); + } } /** * Update newsletter subscription preferences */ export async function updateNewsletterPreferences(req, res) { - try { - const { email } = req.params; - const { - preferredCities = [], - preferredCategories = [], - preferredEmployment = [], - preferredLanguages = [], - preferredGender = null, - preferredDocumentTypes = [], - onlyDemanded = false - } = req.body; - - if (!email) { - return res.status(400).json({ - success: false, - message: 'Email is required' - }); - } - - const subscriber = await prisma.newsletterSubscriber.findUnique({ - where: { email: email.trim().toLowerCase() } - }); - - if (!subscriber) { - return res.status(404).json({ - success: false, - message: 'Subscriber not found' - }); - } - - // Update subscriber preferences - const updatedSubscriber = await prisma.newsletterSubscriber.update({ - where: { id: subscriber.id }, - data: { - preferredCities, - preferredCategories, - preferredEmployment, - preferredLanguages, - preferredGender, - preferredDocumentTypes, - onlyDemanded - } - }); - - console.log('✅ Updated newsletter preferences for:', updatedSubscriber.email); - - res.json({ - success: true, - message: 'Newsletter preferences updated successfully', - subscriber: { - id: updatedSubscriber.id, - email: updatedSubscriber.email, - firstName: updatedSubscriber.firstName, - lastName: updatedSubscriber.lastName, - preferredCities: updatedSubscriber.preferredCities, - preferredCategories: updatedSubscriber.preferredCategories, - preferredEmployment: updatedSubscriber.preferredEmployment, - preferredLanguages: updatedSubscriber.preferredLanguages, - preferredGender: updatedSubscriber.preferredGender, - preferredDocumentTypes: updatedSubscriber.preferredDocumentTypes, - onlyDemanded: updatedSubscriber.onlyDemanded - } - }); - - } catch (error) { - console.error('❌ Error updating newsletter preferences:', error); - res.status(500).json({ - success: false, - message: 'Failed to update newsletter preferences' - }); - } + try { + const { email } = req.params; + const { + preferredCities = [], + preferredCategories = [], + preferredEmployment = [], + preferredLanguages = [], + preferredGender = null, + preferredDocumentTypes = [], + onlyDemanded = false, + } = req.body; + + if (!email) { + return res.status(400).json({ + success: false, + message: 'Email is required', + }); + } + + const subscriber = await prisma.newsletterSubscriber.findUnique({ + where: { email: email.trim().toLowerCase() }, + }); + + if (!subscriber) { + return res.status(404).json({ + success: false, + message: 'Subscriber not found', + }); + } + + // Update subscriber preferences + const updatedSubscriber = await prisma.newsletterSubscriber.update({ + where: { id: subscriber.id }, + data: { + preferredCities, + preferredCategories, + preferredEmployment, + preferredLanguages, + preferredGender, + preferredDocumentTypes, + onlyDemanded, + }, + }); + + console.log( + '✅ Updated newsletter preferences for:', + updatedSubscriber.email, + ); + + res.json({ + success: true, + message: 'Newsletter preferences updated successfully', + subscriber: { + id: updatedSubscriber.id, + email: updatedSubscriber.email, + firstName: updatedSubscriber.firstName, + lastName: updatedSubscriber.lastName, + preferredCities: updatedSubscriber.preferredCities, + preferredCategories: updatedSubscriber.preferredCategories, + preferredEmployment: updatedSubscriber.preferredEmployment, + preferredLanguages: updatedSubscriber.preferredLanguages, + preferredGender: updatedSubscriber.preferredGender, + preferredDocumentTypes: updatedSubscriber.preferredDocumentTypes, + onlyDemanded: updatedSubscriber.onlyDemanded, + }, + }); + } catch (error) { + console.error('❌ Error updating newsletter preferences:', error); + res.status(500).json({ + success: false, + message: 'Failed to update newsletter preferences', + }); + } } /** * Send verification code for newsletter subscription */ export async function sendNewsletterVerificationCode(req, res) { - try { - const { - email, - firstName, - lastName, - language = 'ru', - preferences = {}, - preferredCities = [], - preferredCategories = [], - preferredEmployment = [], - preferredLanguages = [], - preferredGender = null, - preferredDocumentTypes = [], - onlyDemanded = false - } = req.body; - - // Validate email - if (!email || !email.trim()) { - return res.status(400).json({ - success: false, - message: 'Email is required' - }); - } - - // Basic email validation - const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; - if (!emailRegex.test(email)) { - return res.status(400).json({ - success: false, - message: 'Invalid email format' - }); - } - - // Check if already subscribed (only active subscribers) - const existingSubscriber = await prisma.newsletterSubscriber.findFirst({ - where: { - email: email.trim().toLowerCase(), - isActive: true - } - }); - - if (existingSubscriber) { - return res.status(409).json({ - success: false, - message: 'This email is already subscribed to the newsletter' - }); - } - - // Generate verification code - const verificationCode = Math.floor(100000 + Math.random() * 900000).toString(); - console.log('🔢 Generated verification code:', verificationCode); - - try { - // Store verification code - console.log('💾 Storing verification code...'); - await storeVerificationCode(email.trim().toLowerCase(), verificationCode); - console.log('✅ Verification code stored successfully'); - - // Send verification code via SNS - console.log('📧 Sending verification code...'); - await sendVerificationCode(email.trim().toLowerCase(), verificationCode); - console.log('✅ Verification code sent successfully'); - } catch (error) { - console.error('❌ Error in verification process:', error); - throw error; - } - - console.log('✅ Verification code sent to:', email); - - res.json({ - success: true, - message: 'Verification code sent to your email', - email: email.trim().toLowerCase(), - // Store subscription data temporarily for verification - subscriptionData: { - email: email.trim().toLowerCase(), - firstName: firstName?.trim() || null, - lastName: lastName?.trim() || null, - language, - preferences, - preferredCities, - preferredCategories, - preferredEmployment, - preferredLanguages, - preferredGender, - preferredDocumentTypes, - onlyDemanded - } - }); - - } catch (error) { - console.error('❌ Error sending verification code:', error); - res.status(500).json({ - success: false, - message: 'Failed to send verification code' - }); - } + try { + const { + email, + firstName, + lastName, + language = 'ru', + preferences = {}, + preferredCities = [], + preferredCategories = [], + preferredEmployment = [], + preferredLanguages = [], + preferredGender = null, + preferredDocumentTypes = [], + onlyDemanded = false, + } = req.body; + + // Validate email + if (!email || !email.trim()) { + return res.status(400).json({ + success: false, + message: 'Email is required', + }); + } + + // Basic email validation + const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; + if (!emailRegex.test(email)) { + return res.status(400).json({ + success: false, + message: 'Invalid email format', + }); + } + + // Check if already subscribed (only active subscribers) + const existingSubscriber = await prisma.newsletterSubscriber.findFirst({ + where: { + email: email.trim().toLowerCase(), + isActive: true, + }, + }); + + if (existingSubscriber) { + return res.status(409).json({ + success: false, + message: 'This email is already subscribed to the newsletter', + }); + } + + // Generate verification code + const verificationCode = Math.floor( + 100000 + Math.random() * 900000, + ).toString(); + console.log('🔢 Generated verification code:', verificationCode); + + try { + // Store verification code + console.log('💾 Storing verification code...'); + await storeVerificationCode(email.trim().toLowerCase(), verificationCode); + console.log('✅ Verification code stored successfully'); + + // Send verification code via SNS + console.log('📧 Sending verification code...'); + await sendVerificationCode(email.trim().toLowerCase(), verificationCode); + console.log('✅ Verification code sent successfully'); + } catch (error) { + console.error('❌ Error in verification process:', error); + throw error; + } + + console.log('✅ Verification code sent to:', email); + + res.json({ + success: true, + message: 'Verification code sent to your email', + email: email.trim().toLowerCase(), + // Store subscription data temporarily for verification + subscriptionData: { + email: email.trim().toLowerCase(), + firstName: firstName?.trim() || null, + lastName: lastName?.trim() || null, + language, + preferences, + preferredCities, + preferredCategories, + preferredEmployment, + preferredLanguages, + preferredGender, + preferredDocumentTypes, + onlyDemanded, + }, + }); + } catch (error) { + console.error('❌ Error sending verification code:', error); + res.status(500).json({ + success: false, + message: 'Failed to send verification code', + }); + } } /** * Verify code and complete newsletter subscription */ export async function verifyNewsletterCode(req, res) { - try { - const { email, code, subscriptionData } = req.body; - - if (!email || !code) { - return res.status(400).json({ - success: false, - message: 'Email and verification code are required' - }); - } - - // Verify the code - const verificationResult = await verifyCode(email.trim().toLowerCase(), code); - - if (!verificationResult.valid) { - return res.status(400).json({ - success: false, - message: verificationResult.message - }); - } - - // Create subscriber - const subscriber = await prisma.newsletterSubscriber.create({ - data: { - email: email.trim().toLowerCase(), - firstName: subscriptionData?.firstName || null, - lastName: subscriptionData?.lastName || null, - language: subscriptionData?.language || 'ru', - preferences: subscriptionData?.preferences || {}, - isActive: true, - preferredCities: subscriptionData?.preferredCities || [], - preferredCategories: subscriptionData?.preferredCategories || [], - preferredEmployment: subscriptionData?.preferredEmployment || [], - preferredLanguages: subscriptionData?.preferredLanguages || [], - preferredGender: subscriptionData?.preferredGender || null, - preferredDocumentTypes: subscriptionData?.preferredDocumentTypes || [], - onlyDemanded: subscriptionData?.onlyDemanded || false - } - }); - - console.log('✅ Newsletter subscription verified and completed:', subscriber.email); - - // Send candidates to new subscriber - try { - await sendInitialCandidatesToNewSubscriber(subscriber); - } catch (emailError) { - console.error('❌ Failed to send candidates email:', emailError); - // Don't fail the subscription if email fails - } - - res.json({ - success: true, - message: 'Successfully subscribed to newsletter', - subscriber: { - id: subscriber.id, - email: subscriber.email, - firstName: subscriber.firstName, - lastName: subscriber.lastName, - preferredCities: subscriber.preferredCities, - preferredCategories: subscriber.preferredCategories, - preferredEmployment: subscriber.preferredEmployment, - preferredLanguages: subscriber.preferredLanguages, - preferredGender: subscriber.preferredGender, - preferredDocumentTypes: subscriber.preferredDocumentTypes, - onlyDemanded: subscriber.onlyDemanded - } - }); - - } catch (error) { - console.error('❌ Error verifying newsletter code:', error); - res.status(500).json({ - success: false, - message: 'Failed to verify code and complete subscription' - }); - } + try { + const { email, code, subscriptionData } = req.body; + + if (!email || !code) { + return res.status(400).json({ + success: false, + message: 'Email and verification code are required', + }); + } + + // Verify the code + const verificationResult = await verifyCode( + email.trim().toLowerCase(), + code, + ); + + if (!verificationResult.valid) { + return res.status(400).json({ + success: false, + message: verificationResult.message, + }); + } + + // Create subscriber + const subscriber = await prisma.newsletterSubscriber.create({ + data: { + email: email.trim().toLowerCase(), + firstName: subscriptionData?.firstName || null, + lastName: subscriptionData?.lastName || null, + language: subscriptionData?.language || 'ru', + preferences: subscriptionData?.preferences || {}, + isActive: true, + preferredCities: subscriptionData?.preferredCities || [], + preferredCategories: subscriptionData?.preferredCategories || [], + preferredEmployment: subscriptionData?.preferredEmployment || [], + preferredLanguages: subscriptionData?.preferredLanguages || [], + preferredGender: subscriptionData?.preferredGender || null, + preferredDocumentTypes: subscriptionData?.preferredDocumentTypes || [], + onlyDemanded: subscriptionData?.onlyDemanded || false, + }, + }); + + console.log( + '✅ Newsletter subscription verified and completed:', + subscriber.email, + ); + + // Send candidates to new subscriber + try { + await sendInitialCandidatesToNewSubscriber(subscriber); + } catch (emailError) { + console.error('❌ Failed to send candidates email:', emailError); + // Don't fail the subscription if email fails + } + + res.json({ + success: true, + message: 'Successfully subscribed to newsletter', + subscriber: { + id: subscriber.id, + email: subscriber.email, + firstName: subscriber.firstName, + lastName: subscriber.lastName, + preferredCities: subscriber.preferredCities, + preferredCategories: subscriber.preferredCategories, + preferredEmployment: subscriber.preferredEmployment, + preferredLanguages: subscriber.preferredLanguages, + preferredGender: subscriber.preferredGender, + preferredDocumentTypes: subscriber.preferredDocumentTypes, + onlyDemanded: subscriber.onlyDemanded, + }, + }); + } catch (error) { + console.error('❌ Error verifying newsletter code:', error); + res.status(500).json({ + success: false, + message: 'Failed to verify code and complete subscription', + }); + } } - - \ No newline at end of file diff --git a/apps/api/controllers/payments.js b/apps/api/controllers/payments.js index ccda787..ef9c106 100755 --- a/apps/api/controllers/payments.js +++ b/apps/api/controllers/payments.js @@ -1,348 +1,389 @@ -import stripe from '../utils/stripe.js'; import { PrismaClient } from '@prisma/client'; -import { sendTelegramNotification } from '../utils/telegram.js'; -import { CLERK_SECRET_KEY } from '../config/clerkConfig.js'; -import { sendPremiumDeluxeWelcomeEmail, sendProWelcomeEmail } from '../services/premiumEmailService.js'; import fetch from 'node-fetch'; -const prisma = new PrismaClient(); +import { CLERK_SECRET_KEY } from '../config/clerkConfig.js'; +import { + sendPremiumDeluxeWelcomeEmail, + sendProWelcomeEmail, +} from '../services/premiumEmailService.js'; +import stripe from '../utils/stripe.js'; +import { sendTelegramNotification } from '../utils/telegram.js'; +const prisma = new PrismaClient(); export const createCheckoutSession = async (req, res) => { - const { clerkUserId, priceId } = req.body; - - if (!clerkUserId) { - return res.status(400).json({ error: 'clerkUserId is required' }); - } - - let user, finalPriceId; - - try { - // 🔹 Получаем пользователя из базы - user = await prisma.user.findUnique({ - where: { clerkUserId }, - }); - - if (!user || !user.email) { - return res.status(404).json({ error: 'Пользователь не найден или отсутствует email' }); - } - - // ✅ Формируем ссылки для продакшена - FORCE NEW DOMAIN - const successUrl = "https://worknow.co.il/success?session_id={CHECKOUT_SESSION_ID}"; - const cancelUrl = "https://worknow.co.il/cancel"; - - // 🔹 Выбираем нужный priceId - const defaultPriceId = 'price_1Qt5J0COLiDbHvw1IQNl90uU'; // Pro plan recurring subscription price ID - finalPriceId = priceId || defaultPriceId; - - // 🔹 Проверяем существование price ID в Stripe - try { - await stripe.prices.retrieve(finalPriceId); - } catch { - // Fallback to default price ID - finalPriceId = defaultPriceId; - } - - // 🔹 Создаем Stripe Checkout Session - const session = await stripe.checkout.sessions.create({ - payment_method_types: ['card'], - mode: 'subscription', - customer_email: user.email, - line_items: [ - { - price: finalPriceId, - quantity: 1, - }, - ], - success_url: successUrl, - cancel_url: cancelUrl, - metadata: { clerkUserId, priceId: finalPriceId }, - }); - - res.json({ url: session.url }); - } catch (error) { - console.error('❌ Ошибка при создании Checkout Session:', error); - - // Provide more specific error messages - if (error.type === 'StripeInvalidRequestError' && error.message.includes('price')) { - res.status(400).json({ error: `Неверный price ID: ${priceId}. Пожалуйста, обратитесь к администратору.` }); - } else { - res.status(500).json({ error: 'Ошибка при создании сессии' }); - } - } + const { clerkUserId, priceId } = req.body; + + if (!clerkUserId) { + return res.status(400).json({ error: 'clerkUserId is required' }); + } + + let user, finalPriceId; + + try { + // 🔹 Получаем пользователя из базы + user = await prisma.user.findUnique({ + where: { clerkUserId }, + }); + + if (!user || !user.email) { + return res + .status(404) + .json({ error: 'Пользователь не найден или отсутствует email' }); + } + + // ✅ Формируем ссылки для продакшена - FORCE NEW DOMAIN + const successUrl = + 'https://worknow.co.il/success?session_id={CHECKOUT_SESSION_ID}'; + const cancelUrl = 'https://worknow.co.il/cancel'; + + // 🔹 Выбираем нужный priceId + const defaultPriceId = 'price_1Qt5J0COLiDbHvw1IQNl90uU'; // Pro plan recurring subscription price ID + finalPriceId = priceId || defaultPriceId; + + // 🔹 Проверяем существование price ID в Stripe + try { + await stripe.prices.retrieve(finalPriceId); + } catch { + // Fallback to default price ID + finalPriceId = defaultPriceId; + } + + // 🔹 Создаем Stripe Checkout Session + const session = await stripe.checkout.sessions.create({ + payment_method_types: ['card'], + mode: 'subscription', + customer_email: user.email, + line_items: [ + { + price: finalPriceId, + quantity: 1, + }, + ], + success_url: successUrl, + cancel_url: cancelUrl, + metadata: { clerkUserId, priceId: finalPriceId }, + }); + + res.json({ url: session.url }); + } catch (error) { + console.error('❌ Ошибка при создании Checkout Session:', error); + + // Provide more specific error messages + if ( + error.type === 'StripeInvalidRequestError' && + error.message.includes('price') + ) { + res.status(400).json({ + error: `Неверный price ID: ${priceId}. Пожалуйста, обратитесь к администратору.`, + }); + } else { + res.status(500).json({ error: 'Ошибка при создании сессии' }); + } + } }; export const activatePremium = async (req, res) => { - const { sessionId } = req.body; - - console.log('🔍 activatePremium called with sessionId:', sessionId); - - try { - const session = await stripe.checkout.sessions.retrieve(sessionId); - const clerkUserId = session.metadata.clerkUserId; // Получаем ID пользователя - const subscriptionId = session.subscription; // ID подписки в Stripe - const priceId = session.metadata.priceId; - - console.log('🔍 Activating premium with session data:', { - sessionId, - clerkUserId, - subscriptionId, - priceId, - paymentStatus: session.payment_status - }); - - if (session.payment_status === 'paid') { - // Set premiumDeluxe flag for Deluxe subscriptions only (not Pro) - const premiumDeluxe = priceId === 'price_1RfHjiCOLiDbHvw1repgIbnK' || priceId === 'price_1Rfli2COLiDbHvw1xdMaguLf' || priceId === 'price_1RqXuoCOLiDbHvw1LLew4Mo8' || priceId === 'price_1RqXveCOLiDbHvw18RQxj2g6'; - - console.log('🔍 Updating user with premium data:', { - clerkUserId, - priceId, - premiumDeluxe, - willSetPremiumDeluxe: premiumDeluxe - }); - - const user = await prisma.user.update({ - where: { clerkUserId }, - data: { - isPremium: true, - premiumEndsAt: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000), // 30 дней подписки - isAutoRenewal: !!subscriptionId, - stripeSubscriptionId: subscriptionId || null, - premiumDeluxe: premiumDeluxe, - }, - include: { jobs: { include: { city: true } } }, // Подгружаем вакансии - }); - - // User updated successfully - - // 🔹 Отправляем уведомление в Telegram - await sendTelegramNotification(user, user.jobs); - - // Если deluxe — отправляем автоматическое сообщение и email - // Deluxe price IDs: price_1RfHjiCOLiDbHvw1repgIbnK, price_1Rfli2COLiDbHvw1xdMaguLf, price_1RqXuoCOLiDbHvw1LLew4Mo8, price_1RqXveCOLiDbHvw18RQxj2g6 - // Pro price ID: price_1Qt63NCOLiDbHvw13PRhpenX (excluded from deluxe condition) - if (priceId === 'price_1RfHjiCOLiDbHvw1repgIbnK' || priceId === 'price_1Rfli2COLiDbHvw1xdMaguLf' || priceId === 'price_1RqXuoCOLiDbHvw1LLew4Mo8' || priceId === 'price_1RqXveCOLiDbHvw18RQxj2g6') { - // Можно кастомизировать текст и контакты менеджера - await prisma.message.create({ - data: { - clerkUserId, - title: 'Добро пожаловать в Premium Deluxe!', - body: 'Для активации функции автопостинга напишите вашему персональному менеджеру: peterbaikov12@gmail.com', - type: 'system', - } - }); - - // Send Premium Deluxe welcome email - try { - const userName = user.firstName ? `${user.firstName} ${user.lastName || ''}`.trim() : ''; - await sendPremiumDeluxeWelcomeEmail(user.email, userName); - console.log('✅ Premium Deluxe welcome email sent successfully to:', user.email); - } catch (emailError) { - console.error('❌ Failed to send Premium Deluxe welcome email:', emailError); - // Don't fail the entire process if email fails - } - } else { - // Pro subscription — поздравительное письмо и сообщение - const title = 'Спасибо за покупку Pro подписки на WorkNow!'; - const body = `Здравствуйте!