Merge pull request #909 from parlemonde/ft/VIL-370

add totalComments endpoint and api call
parlemonde · Apr 25, 2024 · 10d3bc0 · 10d3bc0
2 parents e26f22c + bf09da1
commit 10d3bc0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/server/controllers/statistics.ts b/server/controllers/statistics.ts
@@ -1,4 +1,5 @@
 import { Activity } from '../entities/activity';
+import { Comment } from '../entities/comment';
 import { Student } from '../entities/student';
 import { UserType } from '../entities/user';
 import { AppDataSource } from '../utils/data-source';
@@ -7,6 +8,7 @@ import { Controller } from './controller';
 export const statisticsController = new Controller('/statistics');
 
 const activityRepository = AppDataSource.getRepository(Activity);
+const commentRepository = AppDataSource.getRepository(Comment);
 const studentRepository = AppDataSource.getRepository(Student);
 
 statisticsController.get({ path: '/contributions' }, async (_req, res) => {
@@ -22,8 +24,13 @@ statisticsController.get({ path: '/contributions' }, async (_req, res) => {
   );
 });
 
-statisticsController.get({ path: '/publications' }, async (_req, res) => {
-  res.sendJSON(await activityRepository.count({ where: { user: { type: UserType.TEACHER } } }));
+statisticsController.get({ path: '/classes-exchanges' }, async (_req, res) => {
+  const activitiesCount = await activityRepository.count({ where: { user: { type: UserType.TEACHER } } });
+  const commentsCount = await commentRepository.count({ where: { user: { type: UserType.TEACHER } } });
+  res.sendJSON({
+    totalActivities: activitiesCount,
+    totalComments: commentsCount,
+  })
 });
 
 statisticsController.get({ path: '/student-accounts' }, async (_req, res) => {

diff --git a/src/api/statistics/statistics.get.ts b/src/api/statistics/statistics.get.ts
@@ -17,18 +17,18 @@ export const useGetContributions = () => {
   return useQuery(['activities'], () => getContributions());
 };
 
-async function getPublications(): Promise<number> {
+async function getClassesExchanges(): Promise<number> {
   return (
     await axiosRequest({
       method: 'GET',
       baseURL: '/api',
-      url: '/statistics/publications',
+      url: '/statistics/classes-exchanges',
     })
   ).data;
 }
 
-export const useGetPublications = () => {
-  return useQuery(['activities'], () => getPublications());
+export const useGetClassesExchanges = () => {
+  return useQuery(['activities', 'comments'], () => getClassesExchanges());
 };
 
 async function getStudentAccounts(): Promise<StudentAccountsStats> {