Merge pull request #436 from abdielbytes/abdiel

fix: broken tests
hngprojects · Aug 8, 2024 · 1b77aa1 · 1b77aa1
2 parents 4b2f884 + 737f749
commit 1b77aa1
Show file tree

Hide file tree

Showing 24 changed files with 574 additions and 566 deletions.
diff --git a/.scribe/endpoints.cache/00.yaml b/.scribe/endpoints.cache/00.yaml
@@ -1591,7 +1591,7 @@ endpoints:
   -
     httpMethods:
       - POST
-    uri: 'api/v1/organizations/{org_id}/products'
+    uri: 'api/v1/organisations/{org_id}/products'
     metadata:
       groupName: Endpoints
       groupDescription: ''
@@ -1691,7 +1691,7 @@ endpoints:
   -
     httpMethods:
       - PATCH
-    uri: 'api/v1/organizations/{org_id}/products/{product_id}'
+    uri: 'api/v1/organisations/{org_id}/products/{product_id}'
     metadata:
       groupName: Endpoints
       groupDescription: ''
@@ -3110,7 +3110,7 @@ endpoints:
     responses:
       -
         status: 400
-        content: '{"message":"Invalid or expired invitation link","errors":["Invalid invitation link format","Expired invitation link","Organization not found"],"status_code":400}'
+        content: '{"message":"Invalid or expired invitation link","errors":["Invalid invitation link format","Expired invitation link","organisation not found"],"status_code":400}'
         headers:
           cache-control: 'no-cache, private'
           content-type: application/json
@@ -3983,7 +3983,7 @@ endpoints:
   -
     httpMethods:
       - POST
-    uri: api/v1/organizations
+    uri: api/v1/organisations
     metadata:
       groupName: Endpoints
       groupDescription: ''
@@ -4093,7 +4093,7 @@ endpoints:
   -
     httpMethods:
       - GET
-    uri: api/v1/organizations
+    uri: api/v1/organisations
     metadata:
       groupName: Endpoints
       groupDescription: ''
@@ -4132,7 +4132,7 @@ endpoints:
   -
     httpMethods:
       - PUT
-    uri: 'api/v1/organizations/{org_id}'
+    uri: 'api/v1/organisations/{org_id}'
     metadata:
       groupName: Endpoints
       groupDescription: ''
@@ -4251,7 +4251,7 @@ endpoints:
   -
     httpMethods:
       - DELETE
-    uri: 'api/v1/organizations/{org_id}'
+    uri: 'api/v1/organisations/{org_id}'
     metadata:
       groupName: Endpoints
       groupDescription: ''
@@ -4291,7 +4291,7 @@ endpoints:
   -
     httpMethods:
       - DELETE
-    uri: 'api/v1/organizations/{org_id}/users/{user_id}'
+    uri: 'api/v1/organisations/{org_id}/users/{user_id}'
     metadata:
       groupName: Endpoints
       groupDescription: ''
@@ -4341,7 +4341,7 @@ endpoints:
   -
     httpMethods:
       - GET
-    uri: 'api/v1/organizations/{organisation}/users'
+    uri: 'api/v1/organisations/{organisation}/users'
     metadata:
       groupName: Endpoints
       groupDescription: ''

diff --git a/.scribe/endpoints/00.yaml b/.scribe/endpoints/00.yaml
@@ -1589,7 +1589,7 @@ endpoints:
   -
     httpMethods:
       - POST
-    uri: 'api/v1/organizations/{org_id}/products'
+    uri: 'api/v1/organisations/{org_id}/products'
     metadata:
       groupName: Endpoints
       groupDescription: ''
@@ -1689,7 +1689,7 @@ endpoints:
   -
     httpMethods:
       - PATCH
-    uri: 'api/v1/organizations/{org_id}/products/{product_id}'
+    uri: 'api/v1/organisations/{org_id}/products/{product_id}'
     metadata:
       groupName: Endpoints
       groupDescription: ''
@@ -3108,7 +3108,7 @@ endpoints:
     responses:
       -
         status: 400
-        content: '{"message":"Invalid or expired invitation link","errors":["Invalid invitation link format","Expired invitation link","Organization not found"],"status_code":400}'
+        content: '{"message":"Invalid or expired invitation link","errors":["Invalid invitation link format","Expired invitation link","organisation not found"],"status_code":400}'
         headers:
           cache-control: 'no-cache, private'
           content-type: application/json
@@ -3981,7 +3981,7 @@ endpoints:
   -
     httpMethods:
       - POST
-    uri: api/v1/organizations
+    uri: api/v1/organisations
     metadata:
       groupName: Endpoints
       groupDescription: ''
@@ -4091,7 +4091,7 @@ endpoints:
   -
     httpMethods:
       - GET
-    uri: api/v1/organizations
+    uri: api/v1/organisations
     metadata:
       groupName: Endpoints
       groupDescription: ''
@@ -4130,7 +4130,7 @@ endpoints:
   -
     httpMethods:
       - PUT
-    uri: 'api/v1/organizations/{org_id}'
+    uri: 'api/v1/organisations/{org_id}'
     metadata:
       groupName: Endpoints
       groupDescription: ''
@@ -4249,7 +4249,7 @@ endpoints:
   -
     httpMethods:
       - DELETE
-    uri: 'api/v1/organizations/{org_id}'
+    uri: 'api/v1/organisations/{org_id}'
     metadata:
       groupName: Endpoints
       groupDescription: ''
@@ -4289,7 +4289,7 @@ endpoints:
   -
     httpMethods:
       - DELETE
-    uri: 'api/v1/organizations/{org_id}/users/{user_id}'
+    uri: 'api/v1/organisations/{org_id}/users/{user_id}'
     metadata:
       groupName: Endpoints
       groupDescription: ''
@@ -4339,7 +4339,7 @@ endpoints:
   -
     httpMethods:
       - GET
-    uri: 'api/v1/organizations/{organisation}/users'
+    uri: 'api/v1/organisations/{organisation}/users'
     metadata:
       groupName: Endpoints
       groupDescription: ''

diff --git a/app/Exports/UsersExport.php b/app/Exports/UsersExport.php
@@ -53,7 +53,7 @@ public function headings(): array
             'Profile Phone',
             'Profile Avatar URL',
             'Products',
-            'Organizations',
+            'organisations',
         ];
     }
 

diff --git a/app/Http/Controllers/Api/V1/Auth/AuthController.php b/app/Http/Controllers/Api/V1/Auth/AuthController.php
@@ -81,18 +81,18 @@ public function store(Request $request)
                 'last_name' => $request->last_name
             ]);
 
-            $organization = $user->owned_organisations()->create([
+            $organisation = $user->owned_organisations()->create([
                 'name' => $request->first_name."'s Organisation",
             ]);
 
-            $organization_user = OrganisationUser::create([
+            $organisation_user = OrganisationUser::create([
                 'user_id' => $user->id,
-                'org_id' => $organization->org_id
+                'org_id' => $organisation->org_id
             ]);
 
             $roles = $user->roles()->create([
                 'name' => $role,
-                'org_id' => $organization->org_id
+                'org_id' => $organisation->org_id
             ]);
             DB::table('users_roles')->insert([
                 'user_id' => $user->id,

diff --git a/app/Http/Controllers/Api/V1/Organisation/OrganisationController.php b/app/Http/Controllers/Api/V1/Organisation/OrganisationController.php
@@ -19,47 +19,72 @@ class OrganisationController extends Controller
     /**
      * Display a listing of the resource.
      */
-    public function index()
-    {
-        try {
-            $user = auth('api')->user();
-            if (!$user) {
-                return response()->json([
-                    'status' => 'error',
-                    'message' => 'Unauthorized',
-                    'status_code' => 401
-                ], 401);
-            }
+    public function index($user_id)
+{
+    try {
+        // Ensure that the authenticated user is accessing their own organisations
+        $authUser = auth('api')->user();
+        if (!$authUser) {
+            return response()->json([
+                'status' => 'error',
+                'message' => 'Unauthorized',
+                'status_code' => 401
+            ], 401);
+        }
 
-            $organisations = $user->organisations;
+        // Check if the authenticated user is trying to access their own data
+        if ($authUser->id !== (string) $user_id) {
+            Log::info('Authenticated User ID:', ['id' => $authUser->id]);
+            Log::info('Requested User ID:', ['requested_id' => $user_id]);
+            return response()->json([
+                'status' => 'error',
+                'message' => 'Forbidden',
+                'status_code' => 403
+            ], 403);
+        }
 
-            if ($organisations->isEmpty()) {
-                return response()->json([
-                    'status' => 'success',
-                    'message' => 'No organisations available',
-                    'data' => [
-                        'organisations' => []
-                    ]
-                ], 200);
-            }
+        // Find the user by ID, handling potential non-existence
+        $user = User::where('id', $user_id)->first();
+        if (!$user) {
+            return response()->json([
+                'status' => 'error',
+                'message' => 'User not found',
+                'status_code' => 404
+            ], 404);
+        }
+
+        // Retrieve the user's organisations
+        $organisations = $user->organisations;
 
+        if ($organisations->isEmpty()) {
             return response()->json([
                 'status' => 'success',
-                'message' => 'Organizations retrieved successfully',
+                'message' => 'No organisations available',
                 'status_code' => 200,
                 'data' => [
-                    'organisations' => OrganisationResource::collection($organisations)
+                    'organisations' => []
                 ]
-            ]);
-        } catch (\Exception $e) {
-            return response()->json([
-                'status' => 'error',
-                'message' => 'An error occurred',
-                'status_code' => 500,
-                'error' => $e->getMessage()
-            ], 500);
+            ], 200);
         }
+
+        return response()->json([
+            'status' => 'success',
+            'message' => 'Organisations retrieved successfully',
+            'status_code' => 200,
+            'data' => [
+                'organisations' => OrganisationResource::collection($organisations)
+            ]
+        ]);
+    } catch (\Exception $e) {
+        Log::error('An error occurred while retrieving organisations:', ['error' => $e->getMessage()]);
+        return response()->json([
+            'status' => 'error',
+            'message' => 'An error occurred',
+            'status_code' => 500,
+            'error' => $e->getMessage()
+        ], 500);
     }
+}
 
 
     /**
@@ -141,10 +166,10 @@ public function destroy($org_id)
 
     public function removeUser(Request $request, $org_id, $user_id)
     {
-        $organization = Organisation::findOrFail($org_id);
+        $organisation = Organisation::findOrFail($org_id);
 
         // Use $request->auth instead of Auth::user()
-        if (!$request->user()->can('removeUser', $organization)) {
+        if (!$request->user()->can('removeUser', $organisation)) {
             return response()->json([
                 'status' => 'Forbidden',
                 'message' => 'Only admin can remove users',
@@ -154,7 +179,7 @@ public function removeUser(Request $request, $org_id, $user_id)
 
         $user = User::find($user_id);
 
-        if (!$user || !$organization->users()->detach($user)) {
+        if (!$user || !$organisation->users()->detach($user)) {
             return response()->json([
                 'status' => 'forbidden',
                 'message' => 'user not found',