Feat/vil 579 2 modification des requetes

.vscode/settings.json

@@ -11,5 +11,6 @@
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
-  }
+  },
+  "sqltools.connections": []
 }

package.json

@@ -196,6 +196,7 @@
     "react-player": "^2.10.1",
     "react-query": "^3.39.2",
     "react-simple-maps": "^3.0.0",
+    "recharts": "^2.13.3",
     "resize-observer-polyfill": "^1.5.1",
     "safe-buffer": "^5.2.1",
     "sass": "^1.53.0",

server/controllers/analytic.ts

@@ -275,6 +275,7 @@ analyticController.router.post(
         });
       }
 
+      // Retrieve current user session or save the new one.
       // Retrieve current user session or save the new one.
       // eslint-disable-next-line prefer-const
       let [sessionCount, userPhase] = await Promise.all([
@@ -296,8 +297,26 @@ analyticController.router.post(
         session.width = data.width || 0;
         session.duration = null;
         session.initialPage = data.location;
-        session.userId = data.userId ?? null;
-        // TODO debug phase
+        session.userId = data.userId ?? 1;
+        session.phase = userPhase ? userPhase.firstlogin : 0;
+
+        await AppDataSource.getRepository(AnalyticSession).save(session);
+        sessionCount = 1;
+      }
+
+      if (sessionCount === 0 && data.event === 'pageview' && data.params?.isInitial) {
+        const session = new AnalyticSession();
+        session.id = data.sessionId;
+        session.uniqueId = uniqueSessionId;
+        session.date = new Date();
+        session.browserName = req.useragent?.browser ?? '';
+        session.browserVersion = req.useragent?.version ?? '';
+        session.os = req.useragent?.os ?? '';
+        session.type = req.useragent?.isDesktop ? 'desktop' : req.useragent?.isTablet ? 'tablet' : req.useragent?.isMobile ? 'mobile' : 'other';
+        session.width = data.width || 0;
+        session.duration = null;
+        session.initialPage = data.location;
+        session.userId = data.userId ?? 1;
         session.phase = userPhase ? userPhase.firstlogin : 0;
 
         await AppDataSource.getRepository(AnalyticSession).save(session);

server/controllers/classroom.ts

@@ -18,24 +18,21 @@ export const classroomController = new Controller('/classrooms');
  * @param {object} res Express response object
  * @return {object} Route API JSON response
  */
-
-classroomController.get({ path: '', userType: UserType.ADMIN }, async (_req: Request, res: Response) => {
-  const villageId = _req.query.villageId as string;
+classroomController.get({ path: '/', userType: UserType.TEACHER }, async (req: Request, res: Response, next: NextFunction) => {
   try {
-    const classroomRepository = AppDataSource.getRepository(Classroom);
-    let classrooms;
-    if (villageId) {
-      const query = classroomRepository.createQueryBuilder('classroom').leftJoinAndSelect('classroom.user', 'user');
-      query.where('classroom.villageId = :villageId', { villageId });
-
-      classrooms = await query.getMany();
-    } else {
-      classrooms = await classroomRepository.find();
+    const classrooms = await AppDataSource.getRepository(Classroom).find({
+      relations: {
+        user: true,
+      },
+    });
+
+    if (!classrooms) {
+      return res.status(404).json({ message: 'No classrooms found' });
     }
-    res.sendJSON(classrooms);
-  } catch (e) {
-    console.error(e);
-    res.status(500).sendJSON({ message: 'An error occurred while fetching classrooms' });
+
+    res.json(classrooms);
+  } catch (error) {
+    next(error);
   }
 });