fixes

Devvyky · Aug 5, 2022 · b2ac998 · b2ac998
1 parent 393ac14
commit b2ac998
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/src/fixtures/controllers/fixturesController.ts b/src/fixtures/controllers/fixturesController.ts
@@ -55,6 +55,7 @@ export const findFixtures = catchAsync(
     res.status(200).json({
       message: 'Fixtures fetched successfully',
       status: 'success',
+      results: data.length,
       data,
     });
   }

diff --git a/src/fixtures/services/fixturesService.ts b/src/fixtures/services/fixturesService.ts
@@ -98,7 +98,7 @@ export const remove = async (
     )}`
   );
 
-  const team = await FixtureModel.findOne({ id, isDeleted: false });
+  const team = await FixtureModel.findOne({ _id: id, isDeleted: false });
 
   if (!team) {
     throw new AppError('No fixture found with that ID or already deleted', 404);

diff --git a/src/routes/fixtureRouter.ts b/src/routes/fixtureRouter.ts
@@ -3,6 +3,7 @@ import {
   createFixtures,
   findFixtureById,
   findFixtures,
+  removeFixture,
   updateFixture,
 } from '../fixtures/controllers/fixturesController';
 import { protect, restrictTo } from '../middlewares';
@@ -18,6 +19,7 @@ router
 router
   .route('/:id')
   .get(restrictTo('admin', 'user'), findFixtureById)
-  .patch(restrictTo('admin'), updateFixture);
+  .patch(restrictTo('admin'), updateFixture)
+  .delete(restrictTo('admin'), removeFixture);
 
 export default router;
diff --git a/src/routes/teamRouter.ts b/src/routes/teamRouter.ts
@@ -3,7 +3,7 @@ import { cleanCache, protect, restrictTo } from '../middlewares';
 
 import {
   createTeam,
-  findTeamAllTeams,
+  findAllTeams,
   findTeamById,
   removeTeam,
   updateTeam,
@@ -16,7 +16,7 @@ router.use(protect);
 router
   .route('/')
   .post(restrictTo('admin'), cleanCache, createTeam)
-  .get(restrictTo('admin', 'user'), findTeamAllTeams);
+  .get(restrictTo('admin', 'user'), findAllTeams);
 router
   .route('/:id')
   .get(restrictTo('admin', 'user'), findTeamById)

diff --git a/src/team/controllers/teamController.ts b/src/team/controllers/teamController.ts
@@ -29,13 +29,14 @@ export const createTeam = catchAsync(
   }
 );
 
-export const findTeamAllTeams = catchAsync(
+export const findAllTeams = catchAsync(
   async (req: Request, res: Response, next: NextFunction): Promise<void> => {
     const data = await find();
 
     res.status(200).json({
       message: 'Teams fetched successfully',
       status: 'success',
+      results: data.length,
       data,
     });
   }