fix(GAT-8119): update notifications (#1548)

Author: dnhdruk

app/Http/Controllers/Api/V1/TeamNotificationController.php

@@ -180,7 +180,6 @@ public function store(CreateTeamNotification $request, int $teamId)
 
             // team has notifications
             $teamNotifications = TeamHasNotification::where('team_id', $teamId)->pluck('notification_id')->all();
-
             if ($teamNotifications) {
                 $this->deleteTeamNotifications($teamId, $teamNotifications);
                 $this->createTeamNotifications($input, $teamId);

app/Http/Controllers/Api/V1/UserController.php

@@ -199,7 +199,6 @@ public function show(GetUser $request, int $id): mixed
     {
         $input = $request->all();
         $jwtUser = array_key_exists('jwt_user', $input) ? $input['jwt_user'] : [];
-
         try {
             $users = User::where([
                 'id' => $id,
@@ -209,9 +208,10 @@ public function show(GetUser $request, int $id): mixed
                 $userTeam = User::where('id', $id)->with(
                     'roles',
                     'roles.permissions',
-                    'teams',
-                    'notifications'
-                )->get()->toArray();
+                    'teams.notifications',
+                    'notifications',
+                    'teamUsers.notifications'
+                )->first();
 
                 Auditor::log([
                     'user_id' => (int)$jwtUser['id'],
@@ -222,7 +222,7 @@ public function show(GetUser $request, int $id): mixed
 
                 return response()->json([
                     'message' => 'success',
-                    'data' => $this->getUsers($userTeam),
+                    'data' => $userTeam,
                 ], 200);
             }
 

app/Http/Traits/UserTransformation.php

@@ -45,6 +45,7 @@ public function getUsers(array $users): array
                 'terms' => $user['terms'],
                 'roles' => $user['roles'],
                 'hubspot_id' => $user['hubspot_id'],
+                'team_users' => $user['team_users'],
             ];
 
             $tmpTeam = [];
@@ -63,6 +64,7 @@ public function getUsers(array $users): array
                     'application_form_updated_by' => $team['application_form_updated_by'],
                     'application_form_updated_on' => $team['application_form_updated_on'],
                     'is_question_bank' => $team['is_question_bank'],
+                    'notifications' => $team['notifications'],
                 ];
 
                 $teamHasUserId = (int)$team['pivot']['id'];
@@ -90,6 +92,7 @@ public function getUsers(array $users): array
             }
             $tmpUser['notifications'] = $tmpNotification;
 
+
             // Added in to stop a singular /users/:id call returning an array for
             // the users part of the payload
             if (count($users) === 1) {