Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

added route for resolving extension complaint

Yevhenii Kulisidi971043f74213
diff --git a/src/marketplace/comments/dtos/bodies/create-comment.dto.ts b/src/marketplace/comments/dtos/bodies/create-comment.dto.ts
index 90754d382..db7f699c3 100644
--- a/src/marketplace/comments/dtos/bodies/create-comment.dto.ts
+++ b/src/marketplace/comments/dtos/bodies/create-comment.dto.ts
@@ -1,5 +1,5 @@
import { ApiProperty } from '@nestjs/swagger'
-import { IsNumber, IsOptional, IsString, Max, Min } from 'class-validator'
+import { IsNumber, IsString, Max, Min } from 'class-validator'
export class CreateCommentBodyDto {
@ApiProperty()
@@ -8,13 +8,11 @@ export class CreateCommentBodyDto {
@ApiProperty()
@IsString()
- @IsOptional()
text: string | null
@ApiProperty()
@IsNumber()
@Min(0)
@Max(5)
- @IsOptional()
rating: number | null
}
diff --git a/src/marketplace/complaints/complaints.controller.ts b/src/marketplace/complaints/complaints.controller.ts
index 7f510cc0e..418a40d77 100644
--- a/src/marketplace/complaints/complaints.controller.ts
+++ b/src/marketplace/complaints/complaints.controller.ts
@@ -12,7 +12,9 @@ import { UserService } from '../../user/user.service'
import { ExtensionsService } from '../extensions/extensions.service'
import { ComplaintsService } from './complaints.service'
import { CreateComplaintBodyDto } from './dtos/bodies/create-complaint.dto'
+import { ResolveComplaintBodyDto } from './dtos/bodies/resolve-complaint.dto'
import { GetComplaintParamDto } from './dtos/params/get-complaint.dto'
+import { ResolveComplaintParamDto } from './dtos/params/resolve-complaint.dto'
import { CreateComplaintQueryDto } from './dtos/queries/create-complaint.dto'
import { GetComplaintsQueryDto } from './dtos/queries/get-complaints.dto'
import { Complaint } from './entities/complaint.entity'
@@ -91,4 +93,30 @@ export class ComplaintsController {
extensionId: Number(body.extensionId),
})
}
+
+ // In the future, it will be added to use only for admin.
+ @Post(':complaintId/resolve')
+ @ApiParam({ name: 'complaintId', required: true, type: String })
+ async resolveComplaint(
+ @Param() params: ResolveComplaintParamDto,
+ @Body() body: ResolveComplaintBodyDto,
+ ) {
+ const complaint = await this.complaintsService.findOne({
+ where: { id: params.complaintId },
+ })
+
+ if (!complaint) {
+ throw new NotFoundException('Complaint not found.')
+ }
+
+ if (complaint.isResolved) {
+ throw new NotFoundException('Complaint is already resolved.')
+ }
+
+ await this.complaintsService.update(Number(params.complaintId), {
+ extensionId: Number(params.complaintId),
+ ...body,
+ isResolved: true,
+ })
+ }
}
diff --git a/src/marketplace/complaints/complaints.service.ts b/src/marketplace/complaints/complaints.service.ts
index ec1971447..5fb9fe1b9 100644
--- a/src/marketplace/complaints/complaints.service.ts
+++ b/src/marketplace/complaints/complaints.service.ts
@@ -20,12 +20,11 @@ export class ComplaintsService {
return await this.complaintsRepository.findOne({ ...options })
}
- async save(
- complaint: Omit<
- Complaint,
- 'id' | 'status' | 'sendedAt' | 'extension' | 'user'
- >,
- ): Promise<Complaint> {
+ async save(complaint: Partial<Complaint>): Promise<Complaint> {
return await this.complaintsRepository.save(complaint)
}
+
+ async update(id: number, complaint: Partial<Complaint>): Promise<void> {
+ await this.complaintsRepository.update({ id }, complaint)
+ }
}
diff --git a/src/marketplace/complaints/dtos/bodies/resolve-complaint.dto.ts b/src/marketplace/complaints/dtos/bodies/resolve-complaint.dto.ts
new file mode 100644
index 000000000..f8e6d86b6
--- /dev/null
+++ b/src/marketplace/complaints/dtos/bodies/resolve-complaint.dto.ts
@@ -0,0 +1,15 @@
+import { ApiProperty } from '@nestjs/swagger'
+import { IsEnum, IsString } from 'class-validator'
+import { ComplaintStatus } from '../../enums/complaint-status.enum'
+
+export class ResolveComplaintBodyDto {
+ @ApiProperty()
+ @IsString()
+ reply: string | null
+
+ @ApiProperty({
+ enum: ComplaintStatus,
+ })
+ @IsEnum(ComplaintStatus)
+ status: ComplaintStatus
+}
diff --git a/src/marketplace/complaints/dtos/params/resolve-complaint.dto.ts b/src/marketplace/complaints/dtos/params/resolve-complaint.dto.ts
new file mode 100644
index 000000000..45c9aea90
--- /dev/null
+++ b/src/marketplace/complaints/dtos/params/resolve-complaint.dto.ts
@@ -0,0 +1,6 @@
+import { IsNumberString } from 'class-validator'
+
+export class ResolveComplaintParamDto {
+ @IsNumberString()
+ complaintId: string
+}
diff --git a/src/marketplace/complaints/entities/complaint.entity.ts b/src/marketplace/complaints/entities/complaint.entity.ts
index ffdb474e9..c1a7a0528 100644
--- a/src/marketplace/complaints/entities/complaint.entity.ts
+++ b/src/marketplace/complaints/entities/complaint.entity.ts
@@ -24,9 +24,15 @@ export class Complaint {
@Column('text')
description: string
+ @Column('text', { nullable: true, default: null })
+ reply: string | null
+
@Column('enum', { enum: ComplaintStatus, default: ComplaintStatus.PENDING })
status: ComplaintStatus
+ @Column('boolean', { default: false })
+ isResolved: boolean
+
@CreateDateColumn()
sendedAt: Date