feat: add ability to sort questions by update / edit date

.all-contributorsrc

@@ -117,14 +117,14 @@
       "login": "AdiPol1359",
       "name": "Adrian Polak",
       "avatar_url": "https://avatars.githubusercontent.com/u/27779154?v=4",
-      "profile": "https://projectcode.pl/",
+      "profile": "https://github.com/AdiPol1359",
       "contributions": [
         "code"
       ]
     },
     {
       "login": "xStrixU",
-      "name": "xStrixU",
+      "name": "Kacper Polak",
       "avatar_url": "https://avatars.githubusercontent.com/u/41890821?v=4",
       "profile": "https://github.com/xStrixU",
       "contributions": [

.vscode/settings.json

@@ -10,5 +10,9 @@
 		"titleBar.inactiveBackground": "#401886",
 		"titleBar.activeForeground": "#ffffff",
 		"titleBar.inactiveForeground": "#ffffff"
-	}
+	},
+	"[prisma]": {
+		"editor.defaultFormatter": "Prisma.prisma"
+	},
+	"prettier.configPath": "prettier.config.js"
 }

apps/api/modules/answers/answers.mapper.ts

@@ -6,13 +6,17 @@ export const dbAnswerToDto = ({
 	content,
 	sources,
 	createdAt,
+	QuestionAnswerVote,
 	CreatedBy: { socialLogin, ...createdBy },
-}: Prisma.QuestionAnswerGetPayload<{ select: typeof answerSelect }>) => {
+	_count,
+}: Prisma.QuestionAnswerGetPayload<{ select: ReturnType<typeof answerSelect> }>) => {
 	return {
 		id,
 		content,
 		sources,
 		createdAt: createdAt.toISOString(),
+		votesCount: _count.QuestionAnswerVote,
+		currentUserVotedOn: QuestionAnswerVote.length > 0,
 		createdBy: {
 			socialLogin: socialLogin as Record<string, string | number>,
 			...createdBy,

apps/api/modules/answers/answers.routes.ts

@@ -9,17 +9,30 @@ import {
 	createAnswerSchema,
 	deleteAnswerSchema,
 	updateAnswerSchema,
+	upvoteAnswerSchema,
 } from "./answers.schemas.js";
 
-export const answerSelect = {
-	id: true,
-	content: true,
-	sources: true,
-	createdAt: true,
-	CreatedBy: {
-		select: { id: true, firstName: true, lastName: true, socialLogin: true },
-	},
-} satisfies Prisma.QuestionAnswerSelect;
+export const answerSelect = (userId: number) => {
+	return {
+		id: true,
+		content: true,
+		sources: true,
+		createdAt: true,
+		CreatedBy: {
+			select: { id: true, firstName: true, lastName: true, socialLogin: true },
+		},
+		_count: {
+			select: {
+				QuestionAnswerVote: true,
+			},
+		},
+		QuestionAnswerVote: {
+			where: {
+				userId: userId,
+			},
+		},
+	} satisfies Prisma.QuestionAnswerSelect;
+};
 
 const answersPlugin: FastifyPluginAsync = async (fastify) => {
 	const checkAnswerUserHook: preHandlerAsyncHookHandler = async (request) => {
@@ -53,15 +66,16 @@ const answersPlugin: FastifyPluginAsync = async (fastify) => {
 		async handler(request) {
 			const {
 				params: { id },
+				session: { data: sessionData },
 			} = request;
 
 			const answers = await fastify.db.questionAnswer.findMany({
 				where: { questionId: id },
-				select: answerSelect,
+				select: answerSelect(request.session.data?._user.id || 0),
 			});
 
 			return {
-				data: answers.map(dbAnswerToDto),
+				data: answers.map((answer) => dbAnswerToDto(answer)),
 			};
 		},
 	});
@@ -84,7 +98,7 @@ const answersPlugin: FastifyPluginAsync = async (fastify) => {
 			try {
 				const answer = await fastify.db.questionAnswer.create({
 					data: { questionId: id, createdById: sessionData._user.id, content, sources },
-					select: answerSelect,
+					select: answerSelect(request.session.data?._user.id || 0),
 				});
 
 				return { data: dbAnswerToDto(answer) };
@@ -109,12 +123,13 @@ const answersPlugin: FastifyPluginAsync = async (fastify) => {
 			const {
 				params: { id },
 				body: { content, sources },
+				session: { data: sessionData },
 			} = request;
 
 			const answer = await fastify.db.questionAnswer.update({
 				where: { id },
 				data: { content, sources },
-				select: answerSelect,
+				select: answerSelect(request.session.data?._user.id || 0),
 			});
 
 			return { data: dbAnswerToDto(answer) };
@@ -138,6 +153,89 @@ const answersPlugin: FastifyPluginAsync = async (fastify) => {
 			return reply.status(204).send();
 		},
 	});
+
+	fastify.withTypeProvider<TypeBoxTypeProvider>().route({
+		url: "/answers/:id/votes",
+		method: "POST",
+		schema: upvoteAnswerSchema,
+		async handler(request, reply) {
+			const {
+				params: { id },
+				session: { data: sessionData },
+			} = request;
+
+			if (!sessionData) {
+				throw fastify.httpErrors.unauthorized();
+			}
+
+			try {
+				const questionAnswerVote = await fastify.db.questionAnswerVote.upsert({
+					where: {
+						userId_questionAnswerId: {
+							userId: sessionData._user.id,
+							questionAnswerId: id,
+						},
+					},
+					create: {
+						userId: sessionData._user.id,
+						questionAnswerId: id,
+					},
+					update: {
+						userId: sessionData._user.id,
+						questionAnswerId: id,
+					},
+				});
+
+				return {
+					data: {
+						userId: sessionData._user.id,
+						answerId: id,
+					},
+				};
+			} catch (err) {
+				if (isPrismaError(err) && PrismaErrorCode.ForeignKeyViolation) {
+					throw fastify.httpErrors.notFound(`Answer vote with id: ${id} not found!`);
+				}
+
+				throw err;
+			}
+		},
+	});
+
+	fastify.withTypeProvider<TypeBoxTypeProvider>().route({
+		url: "/answers/:id/votes",
+		method: "DELETE",
+		schema: deleteAnswerSchema,
+		async handler(request, reply) {
+			const {
+				params: { id },
+				session: { data: sessionData },
+			} = request;
+
+			if (!sessionData) {
+				throw fastify.httpErrors.unauthorized();
+			}
+
+			const questionAnswer = await fastify.db.questionAnswer.findFirst({
+				where: {
+					id,
+				},
+			});
+
+			if (!questionAnswer) {
+				throw fastify.httpErrors.notFound(`Answer vote with id: ${id} not found!`);
+			}
+
+			await fastify.db.questionAnswerVote.deleteMany({
+				where: {
+					userId: sessionData._user.id,
+					questionAnswerId: id,
+				},
+			});
+
+			return reply.status(204).send();
+		},
+	});
 };
 
 export default answersPlugin;

apps/api/modules/answers/answers.schemas.ts

@@ -5,6 +5,8 @@ const answerSchema = Type.Object({
 	content: Type.String(),
 	sources: Type.Array(Type.String()),
 	createdAt: Type.String({ format: "date-time" }),
+	votesCount: Type.Integer(),
+	currentUserVotedOn: Type.Boolean(),
 	createdBy: Type.Object({
 		id: Type.Integer(),
 		firstName: Type.Union([Type.String(), Type.Null()]),
@@ -64,3 +66,26 @@ export const deleteAnswerSchema = {
 		204: Type.Never(),
 	},
 };
+
+export const upvoteAnswerSchema = {
+	params: Type.Object({
+		id: Type.Integer(),
+	}),
+	response: {
+		200: Type.Object({
+			data: Type.Object({
+				userId: Type.Integer(),
+				answerId: Type.Integer(),
+			}),
+		}),
+	},
+};
+
+export const downvoteAnswerSchema = {
+	params: Type.Object({
+		id: Type.Integer(),
+	}),
+	response: {
+		204: Type.Never(),
+	},
+};

apps/api/modules/questions/questions.params.ts

@@ -3,7 +3,16 @@ import { kv } from "../../utils.js";
 import { GetQuestionsQuery } from "./questions.schemas.js";
 
 export const getQuestionsPrismaParams = (
-	{ category, level, status = "accepted", limit, offset, order, orderBy }: GetQuestionsQuery,
+	{
+		category,
+		level,
+		status = "accepted",
+		limit,
+		offset,
+		order,
+		orderBy,
+		userId,
+	}: GetQuestionsQuery,
 	userRole: string | undefined,
 ) => {
 	const levels = level?.split(",");
@@ -13,6 +22,7 @@ export const getQuestionsPrismaParams = (
 			...(category && { categoryId: category }),
 			...(levels && { levelId: { in: levels } }),
 			...(status && userRole === "admin" ? { statusId: status } : { statusId: "accepted" }),
+			...(userId && { createdById: userId }),
 		},
 		take: limit,
 		skip: offset,

apps/api/modules/questions/questions.routes.ts

@@ -49,6 +49,7 @@ const questionsPlugin: FastifyPluginAsync = async (fastify) => {
 						levelId: true,
 						statusId: true,
 						acceptedAt: true,
+						updatedAt: true,
 						_count: {
 							select: {
 								QuestionVote: true,
@@ -66,6 +67,7 @@ const questionsPlugin: FastifyPluginAsync = async (fastify) => {
 					_levelId: q.levelId,
 					_statusId: q.statusId,
 					acceptedAt: q.acceptedAt?.toISOString(),
+					updatedAt: q.updatedAt?.toISOString(),
 					votesCount: q._count.QuestionVote,
 				};
 			});

apps/api/modules/questions/questions.schemas.ts

@@ -26,8 +26,10 @@ const generateGetQuestionsQuerySchema = <
 				Type.Literal("acceptedAt"),
 				Type.Literal("level"),
 				Type.Literal("votesCount"),
+				Type.Literal("updatedAt"),
 			]),
 			order: Type.Union([Type.Literal("asc"), Type.Literal("desc")]),
+			userId: Type.Integer(),
 		}),
 	);
 export type GetQuestionsQuery = Static<ReturnType<typeof generateGetQuestionsQuerySchema>>;
@@ -50,6 +52,7 @@ const generateQuestionShape = <
 		_levelId: Type.Union(args.levels.map((val) => Type.Literal(val))),
 		_statusId: Type.Union(args.statuses.map((val) => Type.Literal(val))),
 		acceptedAt: Type.Optional(Type.String({ format: "date-time" })),
+		updatedAt: Type.Optional(Type.String({ format: "date-time" })),
 	} as const;
 };
 

apps/api/prisma/migrations/20230106153310_add_question_answers_votes/migration.sql

@@ -0,0 +1,14 @@
+-- CreateTable
+CREATE TABLE "QuestionAnswerVote" (
+    "_userId" INTEGER NOT NULL,
+    "_questionAnswerId" INTEGER NOT NULL,
+    "createdAt" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "QuestionAnswerVote_pkey" PRIMARY KEY ("_userId","_questionAnswerId")
+);
+
+-- AddForeignKey
+ALTER TABLE "QuestionAnswerVote" ADD CONSTRAINT "QuestionAnswerVote__questionAnswerId_fkey" FOREIGN KEY ("_questionAnswerId") REFERENCES "QuestionAnswer"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "QuestionAnswerVote" ADD CONSTRAINT "QuestionAnswerVote__userId_fkey" FOREIGN KEY ("_userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;