From 019aa0f34e86f6430c2e52388068c2555d356972 Mon Sep 17 00:00:00 2001 From: morteza-mortezai Date: Tue, 16 Dec 2025 15:08:13 +0330 Subject: [PATCH] add scope to contact --- .../contact/controllers/contact.controller.ts | 30 +++++++++++++++++-- src/modules/contact/interface/interface.ts | 4 +-- .../contact/providers/contact.service.ts | 17 +++++++++-- .../repositories/contact.repository.ts | 8 +++-- 4 files changed, 51 insertions(+), 8 deletions(-) diff --git a/src/modules/contact/controllers/contact.controller.ts b/src/modules/contact/controllers/contact.controller.ts index 36a5d49..0e249a8 100644 --- a/src/modules/contact/controllers/contact.controller.ts +++ b/src/modules/contact/controllers/contact.controller.ts @@ -17,11 +17,12 @@ import { FindContactsDto } from '../dto/find-contacts.dto'; import { UpdateContactStatusDto } from '../dto/update-contact-status.dto'; import { ApiTags, ApiOperation, ApiBearerAuth, ApiParam, ApiQuery, ApiHeader } from '@nestjs/swagger'; import { AdminAuthGuard } from 'src/modules/auth/guards/adminAuth.guard'; +import { SuperAdminAuthGuard } from 'src/modules/auth/guards/superAdminAuth.guard'; @ApiTags('contact') @Controller() export class ContactController { - constructor(private readonly contactService: ContactService) {} + constructor(private readonly contactService: ContactService) { } @Post('public/contact') @ApiOperation({ summary: 'Create a new contact (public endpoint)' }) @@ -37,6 +38,8 @@ export class ContactController { return this.contactService.create(createContactDto); } + + @UseGuards(AdminAuthGuard) @ApiBearerAuth() @Get('admin/contact') @@ -48,7 +51,7 @@ export class ContactController { @ApiQuery({ name: 'order', required: false, enum: ['asc', 'desc'] }) @ApiQuery({ name: 'status', required: false, enum: ['new', 'seen'] }) async findAllPaginated(@Query() dto: FindContactsDto) { - return this.contactService.findAllPaginated(dto); + return this.contactService.findAllPaginatedAdmin(dto); } @UseGuards(AdminAuthGuard) @@ -78,4 +81,27 @@ export class ContactController { async remove(@Param('id') id: string) { await this.contactService.remove(id); } + + @UseGuards(SuperAdminAuthGuard) + @ApiBearerAuth() + @Get('super-admin/contact') + @ApiOperation({ summary: 'Get paginated list of contacts (admin only)' }) + @ApiQuery({ name: 'page', required: false, type: Number }) + @ApiQuery({ name: 'limit', required: false, type: Number }) + @ApiQuery({ name: 'search', required: false, type: String }) + @ApiQuery({ name: 'orderBy', required: false, type: String }) + @ApiQuery({ name: 'order', required: false, enum: ['asc', 'desc'] }) + @ApiQuery({ name: 'status', required: false, enum: ['new', 'seen'] }) + async findAllPaginatedForSuper(@Query() dto: FindContactsDto) { + return this.contactService.findAllPaginatedSuper(dto); + } + + @UseGuards(SuperAdminAuthGuard) + @ApiBearerAuth() + @Get('super-admin/contact/:id') + @ApiOperation({ summary: 'Get contact details by ID (admin only)' }) + @ApiParam({ name: 'id', description: 'Contact ID' }) + async findOneForSuper(@Param('id') id: string) { + return this.contactService.findOne(id); + } } diff --git a/src/modules/contact/interface/interface.ts b/src/modules/contact/interface/interface.ts index 5ea2f80..70cb107 100644 --- a/src/modules/contact/interface/interface.ts +++ b/src/modules/contact/interface/interface.ts @@ -4,6 +4,6 @@ export enum ContactStatusEnum { } export enum ContactScope { - New = 'application', - Seen = 'restaurant', + APPLICATION = 'application', + RESTAURANT = 'restaurant', } diff --git a/src/modules/contact/providers/contact.service.ts b/src/modules/contact/providers/contact.service.ts index 37e4b07..0758a5d 100644 --- a/src/modules/contact/providers/contact.service.ts +++ b/src/modules/contact/providers/contact.service.ts @@ -7,13 +7,14 @@ import { Contact } from '../entities/contact.entity'; import { PaginatedResult } from 'src/common/interfaces/pagination.interface'; import { ContactStatusEnum } from '../interface/interface'; import { EntityManager } from '@mikro-orm/postgresql'; +import { ContactScope } from '../interface/interface'; @Injectable() export class ContactService { constructor( private readonly contactRepository: ContactRepository, private readonly em: EntityManager, - ) {} + ) { } async create(createContactDto: CreateContactDto): Promise { const contact = this.contactRepository.create({ @@ -24,7 +25,7 @@ export class ContactService { return contact; } - async findAllPaginated(dto: FindContactsDto): Promise> { + async findAllPaginatedAdmin(dto: FindContactsDto): Promise> { return this.contactRepository.findAllPaginated({ page: dto.page, limit: dto.limit, @@ -32,6 +33,18 @@ export class ContactService { orderBy: dto.orderBy, order: dto.order, status: dto.status, + scope: ContactScope.RESTAURANT + }); + } + async findAllPaginatedSuper(dto: FindContactsDto): Promise> { + return this.contactRepository.findAllPaginated({ + page: dto.page, + limit: dto.limit, + search: dto.search, + orderBy: dto.orderBy, + order: dto.order, + status: dto.status, + scope: ContactScope.APPLICATION }); } diff --git a/src/modules/contact/repositories/contact.repository.ts b/src/modules/contact/repositories/contact.repository.ts index 10226d2..084d61c 100644 --- a/src/modules/contact/repositories/contact.repository.ts +++ b/src/modules/contact/repositories/contact.repository.ts @@ -3,7 +3,7 @@ import { EntityManager, EntityRepository } from '@mikro-orm/postgresql'; import { FilterQuery } from '@mikro-orm/core'; import { Contact } from '../entities/contact.entity'; import { PaginatedResult } from 'src/common/interfaces/pagination.interface'; -import { ContactStatusEnum } from '../interface/interface'; +import { ContactScope, ContactStatusEnum } from '../interface/interface'; type FindContactsOpts = { page?: number; @@ -12,6 +12,7 @@ type FindContactsOpts = { orderBy?: string; order?: 'asc' | 'desc'; status?: ContactStatusEnum; + scope?: ContactScope }; @Injectable() @@ -25,7 +26,7 @@ export class ContactRepository extends EntityRepository { * Supports: search (subject/content/phone), status, ordering. */ async findAllPaginated(opts: FindContactsOpts = {}): Promise> { - const { page = 1, limit = 10, search, orderBy = 'createdAt', order = 'desc', status } = opts; + const { page = 1, limit = 10, search, scope, orderBy = 'createdAt', order = 'desc', status } = opts; const offset = (page - 1) * limit; @@ -34,6 +35,9 @@ export class ContactRepository extends EntityRepository { if (status) { where.status = status; } + if (scope) { + where.scope = scope; + } if (search) { const pattern = `%${search}%`;