feat: add comment replies and liking functionality
- Introduced support for nested comment replies in both frontend and backend. - Added comment liking and unliking features, including like count and "isLiked" state tracking. - Updated database schema with `parentId` and new `comment_likes` table. - Enhanced UI for threaded comments and implemented display of like counts and reply actions. - Refactored APIs and repositories to support replies, likes, and enriched comment data.
This commit is contained in:
@@ -8,18 +8,45 @@ import {
|
||||
Req,
|
||||
UseGuards,
|
||||
} from "@nestjs/common";
|
||||
import { ConfigService } from "@nestjs/config";
|
||||
import { getIronSession } from "iron-session";
|
||||
import { AuthGuard } from "../auth/guards/auth.guard";
|
||||
import { getSessionOptions } from "../auth/session.config";
|
||||
import type { AuthenticatedRequest } from "../common/interfaces/request.interface";
|
||||
import { JwtService } from "../crypto/services/jwt.service";
|
||||
import { CommentsService } from "./comments.service";
|
||||
import { CreateCommentDto } from "./dto/create-comment.dto";
|
||||
|
||||
@Controller()
|
||||
export class CommentsController {
|
||||
constructor(private readonly commentsService: CommentsService) {}
|
||||
constructor(
|
||||
private readonly commentsService: CommentsService,
|
||||
private readonly jwtService: JwtService,
|
||||
private readonly configService: ConfigService,
|
||||
) {}
|
||||
|
||||
@Get("contents/:contentId/comments")
|
||||
findAllByContentId(@Param("contentId") contentId: string) {
|
||||
return this.commentsService.findAllByContentId(contentId);
|
||||
async findAllByContentId(
|
||||
@Param("contentId") contentId: string,
|
||||
@Req() req: any,
|
||||
) {
|
||||
// Tentative de récupération de l'utilisateur pour isLiked (optionnel)
|
||||
let userId: string | undefined;
|
||||
try {
|
||||
const session = await getIronSession<any>(
|
||||
req,
|
||||
req.res,
|
||||
getSessionOptions(this.configService.get("SESSION_PASSWORD") as string),
|
||||
);
|
||||
if (session.accessToken) {
|
||||
const payload = await this.jwtService.verifyJwt(session.accessToken);
|
||||
userId = payload.sub;
|
||||
}
|
||||
} catch (_e) {
|
||||
// Ignorer les erreurs de session
|
||||
}
|
||||
|
||||
return this.commentsService.findAllByContentId(contentId, userId);
|
||||
}
|
||||
|
||||
@Post("contents/:contentId/comments")
|
||||
@@ -38,4 +65,16 @@ export class CommentsController {
|
||||
const isAdmin = req.user.role === "admin" || req.user.role === "moderator";
|
||||
return this.commentsService.remove(req.user.sub, id, isAdmin);
|
||||
}
|
||||
|
||||
@Post("comments/:id/like")
|
||||
@UseGuards(AuthGuard)
|
||||
like(@Req() req: AuthenticatedRequest, @Param("id") id: string) {
|
||||
return this.commentsService.like(req.user.sub, id);
|
||||
}
|
||||
|
||||
@Delete("comments/:id/like")
|
||||
@UseGuards(AuthGuard)
|
||||
unlike(@Req() req: AuthenticatedRequest, @Param("id") id: string) {
|
||||
return this.commentsService.unlike(req.user.sub, id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
import { Module } from "@nestjs/common";
|
||||
import { AuthModule } from "../auth/auth.module";
|
||||
import { S3Module } from "../s3/s3.module";
|
||||
import { CommentsController } from "./comments.controller";
|
||||
import { CommentsService } from "./comments.service";
|
||||
import { CommentLikesRepository } from "./repositories/comment-likes.repository";
|
||||
import { CommentsRepository } from "./repositories/comments.repository";
|
||||
|
||||
@Module({
|
||||
imports: [AuthModule],
|
||||
imports: [AuthModule, S3Module],
|
||||
controllers: [CommentsController],
|
||||
providers: [CommentsService, CommentsRepository],
|
||||
providers: [CommentsService, CommentsRepository, CommentLikesRepository],
|
||||
exports: [CommentsService],
|
||||
})
|
||||
export class CommentsModule {}
|
||||
|
||||
@@ -3,23 +3,60 @@ import {
|
||||
Injectable,
|
||||
NotFoundException,
|
||||
} from "@nestjs/common";
|
||||
import { S3Service } from "../s3/s3.service";
|
||||
import type { CreateCommentDto } from "./dto/create-comment.dto";
|
||||
import { CommentLikesRepository } from "./repositories/comment-likes.repository";
|
||||
import { CommentsRepository } from "./repositories/comments.repository";
|
||||
|
||||
@Injectable()
|
||||
export class CommentsService {
|
||||
constructor(private readonly commentsRepository: CommentsRepository) {}
|
||||
constructor(
|
||||
private readonly commentsRepository: CommentsRepository,
|
||||
private readonly commentLikesRepository: CommentLikesRepository,
|
||||
private readonly s3Service: S3Service,
|
||||
) {}
|
||||
|
||||
async create(userId: string, contentId: string, dto: CreateCommentDto) {
|
||||
return this.commentsRepository.create({
|
||||
const comment = await this.commentsRepository.create({
|
||||
userId,
|
||||
contentId,
|
||||
text: dto.text,
|
||||
parentId: dto.parentId,
|
||||
});
|
||||
|
||||
// Enrichir le commentaire créé (pour le retour API)
|
||||
return {
|
||||
...comment,
|
||||
likesCount: 0,
|
||||
isLiked: false,
|
||||
};
|
||||
}
|
||||
|
||||
async findAllByContentId(contentId: string) {
|
||||
return this.commentsRepository.findAllByContentId(contentId);
|
||||
async findAllByContentId(contentId: string, userId?: string) {
|
||||
const comments = await this.commentsRepository.findAllByContentId(contentId);
|
||||
|
||||
return Promise.all(
|
||||
comments.map(async (comment) => {
|
||||
const [likesCount, isLiked] = await Promise.all([
|
||||
this.commentLikesRepository.countByCommentId(comment.id),
|
||||
userId
|
||||
? this.commentLikesRepository.isLikedByUser(comment.id, userId)
|
||||
: Promise.resolve(false),
|
||||
]);
|
||||
|
||||
return {
|
||||
...comment,
|
||||
likesCount,
|
||||
isLiked,
|
||||
user: {
|
||||
...comment.user,
|
||||
avatarUrl: comment.user.avatarUrl
|
||||
? this.s3Service.getPublicUrl(comment.user.avatarUrl)
|
||||
: null,
|
||||
},
|
||||
};
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
async remove(userId: string, commentId: string, isAdmin = false) {
|
||||
@@ -34,4 +71,20 @@ export class CommentsService {
|
||||
|
||||
await this.commentsRepository.delete(commentId);
|
||||
}
|
||||
|
||||
async like(userId: string, commentId: string) {
|
||||
const comment = await this.commentsRepository.findOne(commentId);
|
||||
if (!comment) {
|
||||
throw new NotFoundException("Comment not found");
|
||||
}
|
||||
await this.commentLikesRepository.addLike(commentId, userId);
|
||||
}
|
||||
|
||||
async unlike(userId: string, commentId: string) {
|
||||
const comment = await this.commentsRepository.findOne(commentId);
|
||||
if (!comment) {
|
||||
throw new NotFoundException("Comment not found");
|
||||
}
|
||||
await this.commentLikesRepository.removeLike(commentId, userId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,18 @@
|
||||
import { IsNotEmpty, IsString, MaxLength } from "class-validator";
|
||||
import {
|
||||
IsNotEmpty,
|
||||
IsOptional,
|
||||
IsString,
|
||||
IsUUID,
|
||||
MaxLength,
|
||||
} from "class-validator";
|
||||
|
||||
export class CreateCommentDto {
|
||||
@IsString()
|
||||
@IsNotEmpty()
|
||||
@MaxLength(1000)
|
||||
text!: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsUUID()
|
||||
parentId?: string;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
import { Injectable } from "@nestjs/common";
|
||||
import { and, eq, sql } from "drizzle-orm";
|
||||
import { DatabaseService } from "../../database/database.service";
|
||||
import { commentLikes } from "../../database/schemas/comment_likes";
|
||||
|
||||
@Injectable()
|
||||
export class CommentLikesRepository {
|
||||
constructor(private readonly databaseService: DatabaseService) {}
|
||||
|
||||
async addLike(commentId: string, userId: string) {
|
||||
await this.databaseService.db
|
||||
.insert(commentLikes)
|
||||
.values({ commentId, userId })
|
||||
.onConflictDoNothing();
|
||||
}
|
||||
|
||||
async removeLike(commentId: string, userId: string) {
|
||||
await this.databaseService.db
|
||||
.delete(commentLikes)
|
||||
.where(
|
||||
and(eq(commentLikes.commentId, commentId), eq(commentLikes.userId, userId)),
|
||||
);
|
||||
}
|
||||
|
||||
async countByCommentId(commentId: string) {
|
||||
const results = await this.databaseService.db
|
||||
.select({ count: sql<number>`count(*)` })
|
||||
.from(commentLikes)
|
||||
.where(eq(commentLikes.commentId, commentId));
|
||||
return Number(results[0]?.count || 0);
|
||||
}
|
||||
|
||||
async isLikedByUser(commentId: string, userId: string) {
|
||||
const results = await this.databaseService.db
|
||||
.select()
|
||||
.from(commentLikes)
|
||||
.where(
|
||||
and(eq(commentLikes.commentId, commentId), eq(commentLikes.userId, userId)),
|
||||
);
|
||||
return !!results[0];
|
||||
}
|
||||
}
|
||||
@@ -9,11 +9,11 @@ export class CommentsRepository {
|
||||
constructor(private readonly databaseService: DatabaseService) {}
|
||||
|
||||
async create(data: NewCommentInDb) {
|
||||
const [comment] = await this.databaseService.db
|
||||
const results = await this.databaseService.db
|
||||
.insert(comments)
|
||||
.values(data)
|
||||
.returning();
|
||||
return comment;
|
||||
return results[0];
|
||||
}
|
||||
|
||||
async findAllByContentId(contentId: string) {
|
||||
@@ -21,6 +21,7 @@ export class CommentsRepository {
|
||||
.select({
|
||||
id: comments.id,
|
||||
text: comments.text,
|
||||
parentId: comments.parentId,
|
||||
createdAt: comments.createdAt,
|
||||
updatedAt: comments.updatedAt,
|
||||
user: {
|
||||
@@ -37,11 +38,11 @@ export class CommentsRepository {
|
||||
}
|
||||
|
||||
async findOne(id: string) {
|
||||
const [comment] = await this.databaseService.db
|
||||
const results = await this.databaseService.db
|
||||
.select()
|
||||
.from(comments)
|
||||
.where(and(eq(comments.id, id), isNull(comments.deletedAt)));
|
||||
return comment;
|
||||
return results[0];
|
||||
}
|
||||
|
||||
async delete(id: string) {
|
||||
|
||||
21
backend/src/database/schemas/comment_likes.ts
Normal file
21
backend/src/database/schemas/comment_likes.ts
Normal file
@@ -0,0 +1,21 @@
|
||||
import { pgTable, primaryKey, timestamp, uuid } from "drizzle-orm/pg-core";
|
||||
import { comments } from "./comments";
|
||||
import { users } from "./users";
|
||||
|
||||
export const commentLikes = pgTable(
|
||||
"comment_likes",
|
||||
{
|
||||
commentId: uuid("comment_id")
|
||||
.notNull()
|
||||
.references(() => comments.id, { onDelete: "cascade" }),
|
||||
userId: uuid("user_id")
|
||||
.notNull()
|
||||
.references(() => users.uuid, { onDelete: "cascade" }),
|
||||
createdAt: timestamp("created_at", { withTimezone: true })
|
||||
.notNull()
|
||||
.defaultNow(),
|
||||
},
|
||||
(t) => ({
|
||||
pk: primaryKey({ columns: [t.commentId, t.userId] }),
|
||||
}),
|
||||
);
|
||||
@@ -12,6 +12,9 @@ export const comments = pgTable(
|
||||
userId: uuid("user_id")
|
||||
.notNull()
|
||||
.references(() => users.uuid, { onDelete: "cascade" }),
|
||||
parentId: uuid("parent_id").references(() => comments.id, {
|
||||
onDelete: "cascade",
|
||||
}),
|
||||
text: text("text").notNull(),
|
||||
createdAt: timestamp("created_at", { withTimezone: true })
|
||||
.notNull()
|
||||
@@ -24,6 +27,7 @@ export const comments = pgTable(
|
||||
(table) => ({
|
||||
contentIdIdx: index("comments_content_id_idx").on(table.contentId),
|
||||
userIdIdx: index("comments_user_id_idx").on(table.userId),
|
||||
parentIdIdx: index("comments_parent_id_idx").on(table.parentId),
|
||||
}),
|
||||
);
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
export * from "./api_keys";
|
||||
export * from "./audit_logs";
|
||||
export * from "./categories";
|
||||
export * from "./comment_likes";
|
||||
export * from "./comments";
|
||||
export * from "./content";
|
||||
export * from "./favorites";
|
||||
|
||||
Reference in New Issue
Block a user