diff --git a/package.json b/package.json index 2d1b474..37bba8e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "russcult_server", - "version": "1.0.7", + "version": "1.0.8", "main": "index.js", "scripts": { "build": "tsc", diff --git a/src/routes/announcements/controllers/announcements.ts b/src/routes/announcements/controllers/announcements.ts index 5330358..60ed202 100644 --- a/src/routes/announcements/controllers/announcements.ts +++ b/src/routes/announcements/controllers/announcements.ts @@ -1,7 +1,7 @@ import { Request, Response } from 'express'; import { prisma } from '../../../lib/prisma'; -export async function getActiveAnnouncement(req: Request, res: Response) { +export async function getActiveAnnouncement(req: Request, res: Response): Promise { try { const announcement = await prisma.announcement.findFirst({ where: { isActive: true }, @@ -13,7 +13,8 @@ export async function getActiveAnnouncement(req: Request, res: Response) { }); if (!announcement) { - return res.status(204).send(); + res.status(204).send(); + return } res.json(announcement); @@ -22,12 +23,13 @@ export async function getActiveAnnouncement(req: Request, res: Response) { } } -export async function createAnnouncement(req: Request, res: Response) { +export async function createAnnouncement(req: Request, res: Response): Promise { try { const { message } = req.body; if (!message || typeof message !== 'string' || message.trim().length === 0) { - return res.status(400).json({ error: 'Message is required' }); + res.status(400).json({ error: 'Message is required' }); + return } const announcement = await prisma.announcement.create({ @@ -42,7 +44,7 @@ export async function createAnnouncement(req: Request, res: Response) { } } -export async function updateAnnouncement(req: Request, res: Response) { +export async function updateAnnouncement(req: Request, res: Response): Promise { try { const { id } = req.params; const { message, isActive } = req.body; @@ -61,7 +63,7 @@ export async function updateAnnouncement(req: Request, res: Response) { } } -export async function deleteAnnouncement(req: Request, res: Response) { +export async function deleteAnnouncement(req: Request, res: Response): Promise { try { const { id } = req.params; @@ -75,7 +77,7 @@ export async function deleteAnnouncement(req: Request, res: Response) { } } -export async function getAllAnnouncements(req: Request, res: Response) { +export async function getAllAnnouncements(req: Request, res: Response): Promise { try { const announcements = await prisma.announcement.findMany({ orderBy: { createdAt: 'desc' }