Modifiche

backend-node/controllers/bets.controller.js

@@ -5,6 +5,24 @@ class BetsController {
     this.betsService = betsService;
   }
 
+  async getUserBets(req, res, next) {
+    try {
+      const bets = await this.betsService.getUserBets(req.userId);
+      return ResponseHandler.success(res, bets, 'User bets retrieved successfully');
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  async getPublicBets(req, res, next) {
+    try {
+      const bets = await this.betsService.getPublicBetsExcludingUser(req.userId);
+      return ResponseHandler.success(res, bets, 'Public bets retrieved successfully');
+    } catch (error) {
+      next(error);
+    }
+  }
+
   async getAllBets(req, res, next) {
     try {
       const bets = await this.betsService.getAllBets();

backend-node/controllers/groups.controller.js

@@ -7,7 +7,7 @@ class GroupsController {
 
   async getAllGroups(req, res, next) {
     try {
-      const groups = await this.groupsService.getAllGroups();
+      const groups = await this.groupsService.getAllGroups(req.userId);
       return ResponseHandler.success(res, groups, 'Groups retrieved successfully');
     } catch (error) {
       next(error);
@@ -52,10 +52,7 @@ class GroupsController {
 
   async addMembers(req, res, next) {
     try {
-      const group = await this.groupsService.addMembersToGroup(
-        req.params.id,
-        req.body.userIds
-      );
+      const group = await this.groupsService.addMembersToGroup(req.params.id, req.body.userIds);
       return ResponseHandler.success(res, group, 'Members added successfully');
     } catch (error) {
       next(error);

backend-node/controllers/initialData.controller.js

@@ -1,38 +0,0 @@
-const ResponseHandler = require('../shared/response.handler');
-
-class InitialDataController {
-  constructor({ usersService, friendsService, groupsService, betsService }) {
-    this.usersService = usersService;
-    this.friendsService = friendsService;
-    this.groupsService = groupsService;
-    this.betsService = betsService;
-  }
-
-  async getInitialData(req, res, next) {
-    try {
-      const currentUser = await this.usersService.getUserById(req.userId);
-      const users = await this.usersService.getAllUsers();
-      const friends = await this.friendsService.getFriendsByUserId(req.userId);
-      const friendRequests = await this.friendsService.getPendingRequests(req.userId);
-      const groups = await this.groupsService.getAllGroups();
-      const userBets = await this.betsService.getUserBets(req.userId);
-      const publicBets = await this.betsService.getPublicBetsExcludingUser(req.userId);
-
-      const data = {
-        currentUser,
-        users,
-        friends,
-        friendRequests,
-        groups,
-        userBets,
-        publicBets,
-      };
-
-      return ResponseHandler.success(res, data, 'Initial data retrieved successfully');
-    } catch (error) {
-      next(error);
-    }
-  }
-}
-
-module.exports = InitialDataController;

backend-node/controllers/users.controller.js

@@ -5,6 +5,15 @@ class UsersController {
     this.usersService = usersService;
   }
 
+  async getCurrentUser(req, res, next) {
+    try {
+      const user = await this.usersService.getUserById(req.userId);
+      return ResponseHandler.success(res, user, 'User retrieved successfully');
+    } catch (error) {
+      next(error);
+    }
+  }
+
   async updateCurrentUser(req, res, next) {
     try {
       const user = await this.usersService.updateUserProfile(req.userId, req.body);