admin permission

src/modules/admin/controllers/admin.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Post, Body, HttpCode, HttpStatus, Get, UseGuards, Patch, Param, Delete } from '@nestjs/common';
+import { Controller, Post, Body, Get, UseGuards, Patch, Param, Delete } from '@nestjs/common';
 import { AdminService } from '../providers/admin.service';
 import { CreateAdminDto } from '../dto/create-admin.dto';
 import { UpdateAdminDto } from '../dto/update-admin.dto';
@@ -10,26 +10,22 @@ import { Permission } from 'src/common/enums/permission.enum';
 import { Permissions } from 'src/common/decorators/permissions.decorator';
 
 // TODO : if admin deleted then recreated it must be doable
-@ApiBearerAuth()
-@ApiTags('admin')
 @Controller()
+@ApiTags('admin')
+@UseGuards(AdminAuthGuard)
+@ApiBearerAuth()
+@Permissions(Permission.MANAGE_ADMINS)
 export class AdminController {
   constructor(private readonly adminService: AdminService) { }
 
   @Post('admin/admin')
-  @UseGuards(AdminAuthGuard)
-  @Permissions(Permission.MANAGE_ADMINS)
-  @HttpCode(HttpStatus.CREATED)
   @ApiOperation({ summary: 'Create a new admin' })
-  @ApiBody({ type: CreateAdminDto })
   async create(@Body() dto: CreateAdminDto,) {
     const admin = await this.adminService.create(dto);
     return admin;
   }
 
   @Get('admin/admins')
-  @UseGuards(AdminAuthGuard)
-  @Permissions(Permission.MANAGE_ADMINS)
   @ApiOperation({ summary: 'admin' })
   async getAll() {
     const admin = await this.adminService.findAll();
@@ -37,8 +33,6 @@ export class AdminController {
   }
 
   @Get('admin/admins/me')
-  @UseGuards(AdminAuthGuard)
-  @Permissions(Permission.MANAGE_ADMINS)
   @ApiOperation({ summary: 'admin' })
   async getMe(@AdminId() adminId: string,) {
     const admin = await this.adminService.findById(adminId,);
@@ -47,8 +41,6 @@ export class AdminController {
 
 
   @Patch('admin/admins/:adminId')
-  @UseGuards(AdminAuthGuard)
-  @Permissions(Permission.MANAGE_ADMINS)
   @ApiOperation({ summary: 'Update an admin' })
   @ApiParam({ name: 'adminId', description: 'Admin ID' })
   @ApiBody({ type: UpdateAdminDto })
@@ -57,8 +49,6 @@ export class AdminController {
   }
 
   @Get('admin/admins/:adminId')
-  @UseGuards(AdminAuthGuard)
-  @Permissions(Permission.MANAGE_ADMINS)
   @ApiOperation({ summary: 'Get an admin by ID' })
   @ApiParam({ name: 'id', description: 'Admin ID' })
   getById(@Param('adminId') adminId: string,): Promise<Admin | null> {
@@ -66,8 +56,6 @@ export class AdminController {
   }
 
   @Delete('admin/admins/:adminId')
-  @UseGuards(AdminAuthGuard)
-  @Permissions(Permission.MANAGE_ADMINS)
   @ApiOperation({ summary: 'Delete an admin by ID' })
   @ApiParam({ name: 'id', description: 'Admin ID' })
   deleteById(@Param('adminId') adminId: string,): Promise<void> {

src/modules/order/controllers/order.controller.ts

@@ -144,7 +144,7 @@ export class OrderController {
   @Post('admin/orders/:orderId/invoice')
   @UseGuards(AdminAuthGuard)
   @ApiOperation({ summary: 'Create Order invoice ' })
-  createInvoice(@Param('orderId') orderId: string, @Body() dto: UpdateOrderAsAdminDto) {
+  createInvoice(@Param('orderId') orderId: string) {
     return this.orderService.createInvoice(orderId);
   }
 
@@ -166,6 +166,7 @@ export class OrderController {
     return this.orderService.addOrderItemAsAdmin(orderId, body);
   }
 
+
   @Patch('admin/orders/:id/item/:itemId')
   @UseGuards(AdminAuthGuard)
   @ApiOperation({ summary: 'Update order item' })

src/modules/order/providers/order.service.ts

@@ -10,9 +10,7 @@ import {
 } from '../dto/create-order.dto';
 import { UserService } from 'src/modules/user/providers/user.service';
 import {
-  CreateOrderItem,
-  CreateOrder, OrderStatusEnum,
-  // UpdateOrderItem, 
+  OrderStatusEnum,
   CreateOrderWithItems,
   CreateOrderItemPopulated,
   UpdateOrder,
@@ -28,7 +26,6 @@ import { Order } from '../entities/order.entity';
 import { PaymentRepository } from 'src/modules/payment/repositories/payment.repository';
 import { UpdateOrderItemDtoAsAdmin, UpdateOrderItemDtoAsUser } from '../dto/update-order-item.dto';
 import { Admin } from 'src/modules/admin/entities/admin.entity';
-import { Product } from 'src/modules/product/entities/product.entity';
 import { AdminService } from 'src/modules/admin/providers/admin.service';
 import { OrderItem } from '../entities/order-item.entity';
 import { UpdateOrderAsAdminDto } from '../dto/update-order.dto';
@@ -65,7 +62,7 @@ export class OrderService {
 
   async createOrderAsUser(userId: string, dto: CreateOrderAsUSerDto) {
     const order = await this.createOrder({ ...dto, userId, status: OrderStatusEnum.CREATED })
-    this.logger.log("Order created as admin")
+    this.logger.log("Order created as user")
     return order
 
   }