add scope to contact

This commit is contained in:
2025-12-16 15:08:13 +03:30
parent 8b4f67a70b
commit 019aa0f34e
4 changed files with 51 additions and 8 deletions
@@ -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);
}
}
+2 -2
View File
@@ -4,6 +4,6 @@ export enum ContactStatusEnum {
}
export enum ContactScope {
New = 'application',
Seen = 'restaurant',
APPLICATION = 'application',
RESTAURANT = 'restaurant',
}
@@ -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<Contact> {
const contact = this.contactRepository.create({
@@ -24,7 +25,7 @@ export class ContactService {
return contact;
}
async findAllPaginated(dto: FindContactsDto): Promise<PaginatedResult<Contact>> {
async findAllPaginatedAdmin(dto: FindContactsDto): Promise<PaginatedResult<Contact>> {
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<PaginatedResult<Contact>> {
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
});
}
@@ -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<Contact> {
* Supports: search (subject/content/phone), status, ordering.
*/
async findAllPaginated(opts: FindContactsOpts = {}): Promise<PaginatedResult<Contact>> {
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<Contact> {
if (status) {
where.status = status;
}
if (scope) {
where.scope = scope;
}
if (search) {
const pattern = `%${search}%`;