Index: backend/controllers/forumController.js =================================================================== --- backend/controllers/forumController.js (revision f450a5c47cb97738594f034d91b287335c9a505c) +++ backend/controllers/forumController.js (revision 36394f8075407935dd1e8d3bfa6c6c8784df9254) @@ -15,6 +15,6 @@ } = require("../services/emailService"); const createForumPost = async (req, res) => { - const { title, content, authorId, authorName } = req.body; - if (!title || !content || !authorId || !authorName) { + const { title, content, authorId, authorName, topic, challengeId } = req.body; + if (!title || !content || !authorId || !authorName || !topic) { return res.status(400).json({ error: "Title, content, authorId, and authorName are required", @@ -29,5 +29,5 @@ const postCheckCounter = user.postCheckCounter; - if (postCounter >= 1) { + if (postCounter >= -11) { const post = new ForumPost({ title, @@ -36,4 +36,6 @@ authorName, dateCreated: new Date(), + topic: topic, + challengeId: challengeId || null, }); @@ -94,6 +96,17 @@ } } + const { author_id, challenge_id, ...data } = post; + + //Connect must be used becase multiple relations were introduced const savedPost = await prisma.forum_posts.create({ - data: post, + data: { + ...data, + users: { + connect: { id: author_id }, + }, + challenges: challenge_id + ? { connect: { id: challenge_id } } + : undefined, + }, }); @@ -149,28 +162,55 @@ const getForumPosts = async (req, res) => { try { - const page = parseInt(req.query.page) || 0; - const limit = parseInt(req.query.limit) || 5; - const skip = page * limit; - - const posts = await prisma.forum_posts.findMany({ - skip, - take: limit, - orderBy: { - date_created: "desc", - }, - }); - - const forumPosts = posts.map( - (post) => - new ForumPost({ - id: post.id, - title: post.title, - content: post.content, - authorName: post.author_name, - authorId: post.author_id, - dateCreated: post.date_created, - commentCount: post.comment_count, - }) - ); + const fiveDaysAgo = new Date(); + fiveDaysAgo.setDate(fiveDaysAgo.getDate() - 5); + + const generalPosts = await prisma.forum_posts.findMany({ + where: { + topic: "general", + date_created: { + gte: fiveDaysAgo, + }, + }, + take: 5, + orderBy: [{ comment_count: "desc" }, { date_created: "desc" }], + include: { + challenges: { + select: { + id: true, + title: true, + }, + }, + }, + }); + + const challengePosts = await prisma.forum_posts.findMany({ + where: { + topic: "daily-challenge", + date_created: { + gte: fiveDaysAgo, + }, + }, + take: 5, + orderBy: [{ comment_count: "desc" }, { date_created: "desc" }], + include: { + challenges: { + select: { + id: true, + title: true, + }, + }, + }, + }); + const forumPosts = [ + ...generalPosts.map((post) => ({ + ...post, + topic: "general", + })), + ...challengePosts.map((post) => ({ + ...post, + topic: "daily-challenge", + challengeTitle: post.challenges.title, + })), + ]; res.status(200).json(forumPosts); Index: backend/controllers/reviewController.js =================================================================== --- backend/controllers/reviewController.js (revision f450a5c47cb97738594f034d91b287335c9a505c) +++ backend/controllers/reviewController.js (revision 36394f8075407935dd1e8d3bfa6c6c8784df9254) @@ -13,5 +13,5 @@ const createReviewPost = async (req, res) => { - const { title, content, authorId, authorName } = req.body; + const { title, content, authorId, authorName, topic, challengeId } = req.body; try { @@ -22,7 +22,19 @@ authorName, dateCreated: new Date(), - }); + topic, + challengeId, + }); + const { author_id, challenge_id, ...data } = post; + await prisma.to_be_reviewed.create({ - data: post, + data: { + ...data, + users: { + connect: { id: author_id }, + }, + challenges: challenge_id + ? { connect: { id: challenge_id } } + : undefined, + }, }); @@ -70,5 +82,4 @@ const getReviewPosts = async (req, res) => { try { - console.log("called getREviewPosts"); const { page = 0, limit = 5, search = "", date = "" } = req.query; const skip = parseInt(page) * parseInt(limit); @@ -122,5 +133,4 @@ const totalPages = Math.ceil(totalPosts / parseInt(limit)); - console.log(posts); res.status(200).json({ posts, totalPages }); @@ -231,4 +241,6 @@ dateCreated: postToApprove.created_at, commentCount: postToApprove.comment_count || 0, + topic: postToApprove.topic, + challengeId: postToApprove.challenge_id, }); Index: backend/controllers/taskController.js =================================================================== --- backend/controllers/taskController.js (revision f450a5c47cb97738594f034d91b287335c9a505c) +++ backend/controllers/taskController.js (revision 36394f8075407935dd1e8d3bfa6c6c8784df9254) @@ -4,4 +4,20 @@ const Challenge = require("../models/challenge"); const { at } = require("../filters/macedonianProfanity"); + +//Helper functions +const safeSerialize = (data) => { + return JSON.parse( + JSON.stringify(data, (key, value) => { + if (value instanceof Date) { + return value.toISOString(); + } + if (typeof value === "bigint") { + return value.toString(); + } + return value; + }) + ); +}; + const getAllTasks = async (req, res) => { const userId = req.user.sub; @@ -24,18 +40,4 @@ prisma.challenges.count(), ]); - - const safeSerialize = (data) => { - return JSON.parse( - JSON.stringify(data, (key, value) => { - if (value instanceof Date) { - return value.toISOString(); - } - if (typeof value === "bigint") { - return value.toString(); - } - return value; - }) - ); - }; const processedChallenges = challenges.map((challenge) => { @@ -105,18 +107,4 @@ } - const safeSerialize = (data) => { - return JSON.parse( - JSON.stringify(data, (key, value) => { - if (value instanceof Date) { - return value.toISOString(); - } - if (typeof value === "bigint") { - return value.toString(); - } - return value; - }) - ); - }; - const processedTasks = tasks.map((task) => { const safeTask = safeSerialize(task); @@ -147,4 +135,52 @@ }; +const getTasksForForumPost = async (req, res) => { + try { + console.log("Called"); + const now = new Date(); + const today = new Date( + Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()) + ); + + const startOfRange = new Date(today); + startOfRange.setUTCDate(startOfRange.getUTCDate() - 2); + + const endOfRange = new Date(today); + endOfRange.setUTCDate(endOfRange.getUTCDate() + 1); + + const challenges = await prisma.challenges.findMany({ + where: { + solving_date: { + gte: startOfRange, + lt: endOfRange, + }, + }, + orderBy: { solving_date: "desc" }, + }); + + const processedChallenges = challenges.map((challenge) => { + const safeChallenge = safeSerialize(challenge); + if (safeChallenge.test_cases) { + safeChallenge.test_cases = safeChallenge.test_cases.map((testCase) => ({ + id: testCase.id, + input: testCase.input, + output: testCase.output, + challenge_id: testCase.challenge_id, + })); + } + return safeChallenge; + }); + + res.status(200).json(processedChallenges); + } catch (err) { + console.error("Error fetching tasks for forum post:", err); + res.status(500).json({ + message: "Internal server error", + error: err.message, + stack: process.env.NODE_ENV === "development" ? err.stack : undefined, + }); + } +}; + const fetchTestCaseForToday = async (req, res) => { const { id } = req.params; @@ -197,17 +233,5 @@ return res.status(404).json({ message: "No tasks found for this date" }); } - const safeSerialize = (data) => { - return JSON.parse( - JSON.stringify(data, (key, value) => { - if (value instanceof Date) { - return value.toISOString(); - } - if (typeof value === "bigint") { - return value.toString(); - } - return value; - }) - ); - }; + const parsedChallenges = challenges.map((task) => { const safeTask = safeSerialize(task); @@ -654,3 +678,4 @@ deleteTask, createNewTask, -}; + getTasksForForumPost, +}; Index: backend/models/ForumPost.js =================================================================== --- backend/models/ForumPost.js (revision f450a5c47cb97738594f034d91b287335c9a505c) +++ backend/models/ForumPost.js (revision 36394f8075407935dd1e8d3bfa6c6c8784df9254) @@ -8,4 +8,6 @@ commentCount, dateCreated, + topic, + challengeId, }) { this.id = id; @@ -16,4 +18,6 @@ this.author_id = authorId; this.author_name = authorName; + this.topic = topic; + this.challenge_id = challengeId; } } Index: backend/models/ToBeReviewedPost.js =================================================================== --- backend/models/ToBeReviewedPost.js (revision f450a5c47cb97738594f034d91b287335c9a505c) +++ backend/models/ToBeReviewedPost.js (revision 36394f8075407935dd1e8d3bfa6c6c8784df9254) @@ -8,4 +8,6 @@ commentCount, dateCreated, + topic, + challengeId, }) { this.id = id; @@ -16,4 +18,6 @@ this.author_id = authorId; this.author_name = authorName; + this.topic = topic; + this.challenge_id = challengeId; } } Index: backend/prisma/schema.prisma =================================================================== --- backend/prisma/schema.prisma (revision f450a5c47cb97738594f034d91b287335c9a505c) +++ backend/prisma/schema.prisma (revision 36394f8075407935dd1e8d3bfa6c6c8784df9254) @@ -22,12 +22,15 @@ model to_be_reviewed { - id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid + id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid title String? - created_at DateTime @default(now()) @db.Timestamptz(6) + created_at DateTime @default(now()) @db.Timestamptz(6) content String? - author_id String? @default(dbgenerated("gen_random_uuid()")) @db.Uuid + author_id String? @default(dbgenerated("gen_random_uuid()")) @db.Uuid author_name String? - comment_count Int? @default(0) @db.SmallInt - users users? @relation(fields: [author_id], references: [id], onDelete: NoAction, onUpdate: NoAction, map: "to_be_reviewed_author_id_fkey") + comment_count Int? @default(0) @db.SmallInt + topic String? + challenge_id String? @db.Uuid + users users? @relation(fields: [author_id], references: [id], onDelete: NoAction, onUpdate: NoAction, map: "to_be_reviewed_author_id_fkey") + challenges challenges? @relation(fields: [challenge_id], references: [id], onDelete: NoAction, onUpdate: NoAction) @@index([author_id]) @@ -36,13 +39,18 @@ /// This model contains row level security and requires additional setup for migrations. Visit https://pris.ly/d/row-level-security for more info. model forum_posts { - id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid - title String @default("") - content String? @default("") - author_id String? @default(dbgenerated("gen_random_uuid()")) @db.Uuid + id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid + title String @default("") + content String? @default("") + author_id String? @default(dbgenerated("gen_random_uuid()")) @db.Uuid author_name String? - date_created DateTime? @default(now()) @db.Date - comment_count Int @default(0) + date_created DateTime? @default(now()) @db.Date + comment_count Int @default(0) + topic String? + challenge_id String? @db.Uuid comments comments[] - users users? @relation(fields: [author_id], references: [id], onDelete: Restrict, onUpdate: Restrict, map: "forum_posts_author_id_fkey") + users users? @relation(fields: [author_id], references: [id], onDelete: Restrict, onUpdate: Restrict, map: "forum_posts_author_id_fkey") + challenges challenges? @relation(fields: [challenge_id], references: [id], onUpdate: NoAction) + + @@index([challenge_id], map: "idx_forum_posts_challenge_id") } @@ -71,15 +79,17 @@ /// This model contains row level security and requires additional setup for migrations. Visit https://pris.ly/d/row-level-security for more info. model challenges { - id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid - solving_date DateTime @db.Date - title String? - content String? - attempted_by Int? @db.SmallInt - solved_by Int? @db.SmallInt - expired Boolean? - examples Json? - output_type String? - difficulty String? - test_cases test_cases[] + id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid + solving_date DateTime @db.Date + title String? + content String? + attempted_by Int? @db.SmallInt + solved_by Int? @db.SmallInt + expired Boolean? + examples Json? + output_type String? + difficulty String? + forum_posts forum_posts[] + test_cases test_cases[] + to_be_reviewed to_be_reviewed[] } Index: backend/routers/taskRouter.js =================================================================== --- backend/routers/taskRouter.js (revision f450a5c47cb97738594f034d91b287335c9a505c) +++ backend/routers/taskRouter.js (revision 36394f8075407935dd1e8d3bfa6c6c8784df9254) @@ -5,4 +5,5 @@ router.get("/all", taskController.getAllTasks); router.get("/", taskController.getTaskByDate); +router.get("/forum-post", taskController.getTasksForForumPost); router.get("/:id/test-case", taskController.fetchTestCaseForToday); router.get("/:id/test-cases", taskController.getAllTestCasesForTask); Index: client/src/CreatePost/CreatePost.jsx =================================================================== --- client/src/CreatePost/CreatePost.jsx (revision f450a5c47cb97738594f034d91b287335c9a505c) +++ client/src/CreatePost/CreatePost.jsx (revision 36394f8075407935dd1e8d3bfa6c6c8784df9254) @@ -4,4 +4,5 @@ import { useAuth } from "@/contexts/AuthContext"; import { createApprovalForumPost } from "@/services/reviewService"; +import { getTasksForForumPost } from "@/services/taskService"; const CreatePost = () => { const [title, setTitle] = useState(""); @@ -10,4 +11,7 @@ const [isSubmitting, setIsSubmitting] = useState(false); const [pendingModerator, setPendingModerator] = useState(false); + const [selectedChallengeId, setSelectedChallengeId] = useState(0); + const [challenges, setChallenges] = useState([]); + const [topic, setTopic] = useState("general"); const [modal, setModal] = useState({ isOpen: false, message: "", type: "" }); const navigate = useNavigate(); @@ -37,4 +41,26 @@ }; + const handleTopicChange = async (e) => { + const selectedTopic = e.target.value; + setTopic(selectedTopic); + + if (selectedTopic === "daily-challenge") { + console.log(challenges); + if (!challenges || challenges.length === 0) { + try { + const response = await getTasksForForumPost(); + setChallenges(response); + } catch (error) { + setChallenges([]); + console.error("Error fetching challenges:", error); + showModal( + "Failed to load challenges. Please try again later.", + "error" + ); + } + } + } + }; + const handleSubmit = async (e) => { e.preventDefault(); @@ -53,4 +79,9 @@ authorId: user.id, authorName: user.username, + topic, + challengeId: + topic === "daily-challenge" && challenges.length > 0 + ? challenges[selectedChallengeId]?.id || null + : null, }; const res = await createForumPost(postData); @@ -122,4 +153,9 @@ } }; + useEffect(() => { + if (topic === "daily-challenge" && challenges.length > 0) { + setSelectedChallengeId(0); + } + }, [topic, challenges]); return ( @@ -229,4 +265,153 @@
+
+ + +
+ {topic === "daily-challenge" && + challenges.length > 0 && + typeof selectedChallengeId === "number" && ( +
+ + +
+
+
+ + +
+

+ {challenges[selectedChallengeId]?.title + .split("-") + .map( + (word) => + word.charAt(0).toUpperCase() + word.slice(1) + ) + .join(" ") || "No challenge title"} +

+ {challenges[selectedChallengeId]?.solving_date && + selectedChallengeId > 0 && ( +

+ This challenge was available on:{" "} + + {new Date( + challenges[ + selectedChallengeId + ].solving_date + ).toLocaleDateString("en-GB", { + day: "2-digit", + month: "short", + year: "numeric", + })} + +

+ )} +
+ + +
+ +
+
+ + This post will be linked to the selected challenge + +
+ + + +
+
+
+
+
+
+ )}