Merge pull request #986 from parlemonde/ft/VIL-575

add Api call, clean statistics api call, change type type in teamComm…
parlemonde · Sep 10, 2024 · f3f484a · f3f484a
2 parents b21bcb3 + 36faf3b
commit f3f484a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 52 deletions.
diff --git a/server/controllers/analytic.ts b/server/controllers/analytic.ts
@@ -282,8 +282,6 @@ analyticController.router.post(
         AppDataSource.getRepository(User).createQueryBuilder('user').select('user.firstlogin').where({ id: data.userId }).getRawOne(),
       ]);
 
-      console.log('User Phase in analytics', userPhase);
-
       if (sessionCount === 0 && data.event === 'pageview' && data.params?.isInitial) {
         const session = new AnalyticSession();
         session.id = data.sessionId;

diff --git a/src/api/statistics/statistics.get.ts b/src/api/statistics/statistics.get.ts
@@ -1,52 +1,3 @@
-// import { useQuery } from 'react-query';
-
-// import { mockClassroomsStats, mockConnectionsStats } from 'src/components/admin/dashboard-statistics/mocks/mocks';
-// import { axiosRequest } from 'src/utils/axiosRequest';
-// import type { ClassroomsStats, ConnectionsStats } from 'types/statistics.type';
-
-// const isDevelopment = process.env.NODE_ENV === 'development';
-
-// async function getClassroomsStats(): Promise<ClassroomsStats[]> {
-//   if (isDevelopment) {
-//     // retourne mocks
-//     return new Promise((resolve) => {
-//       setTimeout(() => resolve(mockClassroomsStats), 500);
-//     });
-//   }
-
-//   return (
-//     await axiosRequest({
-//       method: 'GET',
-//       baseURL: '/api',
-//       url: '/statistics/classrooms',
-//     })
-//   ).data;
-// }
-
-// export const useGetClassroomsStats = () => {
-//   return useQuery(['classrooms-stats'], getClassroomsStats);
-// };
-
-// async function getConnectionsStats(): Promise<ConnectionsStats> {
-//   if (isDevelopment) {
-//     return new Promise((resolve) => {
-//       setTimeout(() => resolve(mockConnectionsStats), 500);
-//     });
-//   }
-
-//   return (
-//     await axiosRequest({
-//       method: 'GET',
-//       baseURL: '/api',
-//       url: '/statistics/connections',
-//     })
-//   ).data;
-// }
-
-// export const useGetConnectionsStats = () => {
-//   return useQuery(['connections-stats'], getConnectionsStats);
-// };
-
 import { useQuery } from 'react-query';
 
 import { axiosRequest } from 'src/utils/axiosRequest';

diff --git a/src/api/teamComment/teamComment.get.ts b/src/api/teamComment/teamComment.get.ts
@@ -0,0 +1,18 @@
+import { useQuery } from 'react-query';
+
+import { axiosRequest } from 'src/utils/axiosRequest';
+import type { TeamCommentInterface } from 'types/teamComment.type';
+
+async function getTeamComments(): Promise<TeamCommentInterface> {
+  return (
+    await axiosRequest({
+      method: 'GET',
+      baseURL: '/api',
+      url: '/statistics/team-comments',
+    })
+  ).data;
+}
+
+export const useGetSessionsStats = () => {
+  return useQuery(['team-comments'], () => getTeamComments());
+};
diff --git a/types/teamComment.type.ts b/types/teamComment.type.ts
@@ -1,6 +1,6 @@
 export interface TeamCommentInterface {
   id: number;
-  type: number;
+  type: TeamCommentType;
   createDate?: Date | string;
   updateDate?: Date | string;
   text: string;