team members limitation frontend/backend

src/App/Users/Models/User.php

@@ -109,34 +109,6 @@ class User extends Authenticatable implements MustVerifyEmail
         ];
     }
 
-    // TODO: caching & refactoring
-    public function accountLimitations(): array
-    {
-        $members = \DB::table('team_folder_members')
-            ->where('user_id', $this->id)
-            ->pluck('parent_id');
-
-        $membersUse = \DB::table('team_folder_members')
-            ->where('user_id', '!=', $this->id)
-            ->whereIn('parent_id', $members)
-            ->pluck('user_id')
-            ->unique()
-            ->count();
-
-        return [
-            'max_storage_amount' => [
-                'use'        => Metric::bytes($this->usedCapacity)->format(),
-                'total'      => format_gigabytes($this->limitations->max_storage_amount),
-                'percentage' => (float)get_storage_fill_percentage($this->usedCapacity, $this->limitations->max_storage_amount),
-            ],
-            'max_team_members'   => [
-                'use'        => $membersUse,
-                'total'      => (int)$this->limitations->max_team_members,
-                'percentage' => ($membersUse / $this->limitations->max_team_members) * 100,
-            ],
-        ];
-    }
-
     /**
      * Get user used storage capacity in bytes
      */
@@ -209,6 +181,11 @@ class User extends Authenticatable implements MustVerifyEmail
         return $this->hasMany(File::class);
     }
 
+    public function folders(): HasMany
+    {
+        return $this->hasMany(Folder::class);
+    }
+
     /**
      * Send the password reset notification.
      */
@@ -227,7 +204,7 @@ class User extends Authenticatable implements MustVerifyEmail
             // Create default limitations
             $user->limitations()->create([
                 'max_storage_amount' => get_settings('default_storage_amount') ?? 1,
-                'max_team_members'   => 3,
+                'max_team_members'   => 5,
             ]);
 
             // Create user directory for his files

src/App/Users/Models/UserLimitation.php

@@ -1,10 +1,19 @@
 <?php
+
 namespace App\Users\Models;
 
+use ByteUnits\Metric;
+use DB;
 use Illuminate\Database\Eloquent\Model;
 use Database\Factories\UserLimitationFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 
+/**
+ * @property int max_storage_amount
+ * @property int max_team_members
+ * @property string user_id
+ */
 class UserLimitation extends Model
 {
     use HasFactory;
@@ -14,7 +23,7 @@ class UserLimitation extends Model
     protected $guarded = [];
 
     protected $hidden = [
-        'user_id',
+        'user_id', 'user'
     ];
 
     public $incrementing = false;
@@ -25,4 +34,74 @@ class UserLimitation extends Model
     {
         return UserLimitationFactory::new();
     }
+
+    public function user(): HasOne
+    {
+        return $this->hasOne(User::class, 'id', 'user_id');
+    }
+
+    /**
+     * Get summary of user limitations and their usage
+     */
+    public function summary(): array
+    {
+        return [
+            'max_storage_amount' => $this->getMaxStorageAmount(),
+            'max_team_members'   => $this->getMaxTeamMembers(),
+        ];
+    }
+
+    /**
+     * Get usage data of user storage
+     */
+    private function getMaxStorageAmount(): array
+    {
+        $userCapacity = $this->user->usedCapacity;
+
+        return [
+            'use'        => Metric::bytes($userCapacity)->format(),
+            'total'      => format_gigabytes($this->max_storage_amount),
+            'percentage' => get_storage_fill_percentage($userCapacity, $this->max_storage_amount),
+        ];
+    }
+
+    /**
+     * Get usage data of team members
+     */
+    private function getMaxTeamMembers(): array
+    {
+        $userTeamFolderIds = DB::table('team_folder_members')
+            ->where('user_id', $this->user_id)
+            ->pluck('parent_id');
+
+        $memberIds = DB::table('team_folder_members')
+            ->where('user_id', '!=', $this->user_id)
+            ->whereIn('parent_id', $userTeamFolderIds)
+            ->pluck('user_id')
+            ->unique();
+
+        // Get member emails
+        $memberEmails = User::whereIn('id', $memberIds)
+            ->pluck('email');
+
+        // Get active invitation emails
+        $InvitationEmails = DB::table('team_folder_invitations')
+            ->where('status', 'pending')
+            ->where('inviter_id', $this->user_id)
+            ->pluck('email')
+            ->unique();
+
+        // Get allowed emails in the limit
+        $totalUsedEmails = $memberEmails->merge($InvitationEmails)
+            ->unique();
+
+        return [
+            'use'        => $totalUsedEmails->count(),
+            'total'      => (int) $this->max_team_members,
+            'percentage' => ($totalUsedEmails->count() / $this->max_team_members) * 100,
+            'meta' => [
+                'allowed_emails' => $totalUsedEmails,
+            ],
+        ];
+    }
 }

src/App/Users/Resources/UserResource.php

@@ -45,7 +45,7 @@ class UserResource extends JsonResource
                     ]),
                 ],
                 'meta' => [
-                    'limitations' => $this->accountLimitations(),
+                    'limitations' => $this->limitations->summary(),
                 ],
             ],
         ];

src/Domain/Teams/Actions/CheckMaxTeamMembersLimitAction.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Domain\Teams\Actions;
+
+use App\Users\Models\User;
+
+class CheckMaxTeamMembersLimitAction
+{
+    public function __invoke(array $invitations, User $user)
+    {
+        // Get user limitation summary
+        $limits = $user->limitations->summary();
+
+        // Get currently used member emails
+        $allowedEmails = $limits['max_team_members']['meta']['allowed_emails'];
+
+        // Get new email invites from request
+        $invitationEmails = collect($invitations)
+            ->pluck('email');
+
+        // Count total unique members
+        $totalMembers = $allowedEmails
+            ->merge($invitationEmails)
+            ->unique()
+            ->count();
+
+        // Check if there is more unique members than total max team members are allowed
+        if ($totalMembers > $limits['max_team_members']['total']) {
+            abort(423, 'You exceed your members limit.');
+        }
+    }
+}

src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php

@@ -1,9 +1,10 @@
 <?php
 namespace Domain\Teams\Controllers;
 
+use Domain\Teams\Actions\CheckMaxTeamMembersLimitAction;
+use Domain\Teams\Models\TeamFolderMember;
 use Illuminate\Http\Response;
 use Domain\Folders\Models\Folder;
-use Illuminate\Support\Facades\DB;
 use App\Http\Controllers\Controller;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Domain\Teams\Requests\ConvertIntoTeamFolderRequest;
@@ -14,6 +15,7 @@ class ConvertFolderIntoTeamFolderController extends Controller
 {
     public function __construct(
         public InviteMembersIntoTeamFolderAction $inviteMembers,
+        public CheckMaxTeamMembersLimitAction $checkMaxTeamMembersLimit,
         public SetTeamFolderPropertyForAllChildrenAction $setTeamFolderPropertyForAllChildren,
     ) {
     }
@@ -22,21 +24,24 @@ class ConvertFolderIntoTeamFolderController extends Controller
         ConvertIntoTeamFolderRequest $request,
         Folder $folder
     ): ResponseFactory|Response {
+        // Check if user didn't exceed max team members limit
+        ($this->checkMaxTeamMembersLimit)($request->input('invitations'), $folder->owner);
+
         // Update root team folder
         $folder->update([
             'team_folder' => 1,
             'parent_id'   => null,
         ]);
 
+        // Mark all children folders as team folder
         ($this->setTeamFolderPropertyForAllChildren)($folder, true);
 
         // Attach owner into members
-        DB::table('team_folder_members')
-            ->insert([
-                'parent_id'  => $folder->id,
-                'user_id'    => $folder->user_id,
-                'permission' => 'owner',
-            ]);
+        TeamFolderMember::create([
+            'parent_id'  => $folder->id,
+            'user_id'    => $folder->user_id,
+            'permission' => 'owner',
+        ]);
 
         // Invite team members
         ($this->inviteMembers)($request->input('invitations'), $folder);

src/Domain/Teams/Controllers/TeamFoldersController.php

@@ -1,6 +1,8 @@
 <?php
 namespace Domain\Teams\Controllers;
 
+use Domain\Teams\Actions\CheckMaxTeamMembersLimitAction;
+use Domain\Teams\Models\TeamFolderMember;
 use Illuminate\Support\Str;
 use Domain\Files\Models\File;
 use Illuminate\Http\Response;
@@ -25,6 +27,7 @@ class TeamFoldersController extends Controller
     public function __construct(
         public InviteMembersIntoTeamFolderAction $inviteMembers,
         public SetTeamFolderPropertyForAllChildrenAction $setTeamFolderPropertyForAllChildren,
+        public CheckMaxTeamMembersLimitAction $checkMaxTeamMembersLimit,
     ) {
     }
 
@@ -58,6 +61,10 @@ class TeamFoldersController extends Controller
     ): ResponseFactory | Response {
         $data = CreateTeamFolderData::fromRequest($request);
 
+        // Check if user didn't exceed max team members limit
+        ($this->checkMaxTeamMembersLimit)($data->invitations, $request->user());
+
+        // Create folder
         $folder = Folder::create([
             'user_id'     => $request->user()->id,
             'name'        => $data->name,
@@ -65,12 +72,11 @@ class TeamFoldersController extends Controller
         ]);
 
         // Attach owner into members
-        DB::table('team_folder_members')
-            ->insert([
-                'parent_id'  => $folder->id,
-                'user_id'    => $request->user()->id,
-                'permission' => 'owner',
-            ]);
+        TeamFolderMember::create([
+            'parent_id'  => $folder->id,
+            'user_id'    => $request->user()->id,
+            'permission' => 'owner',
+        ]);
 
         // Invite team members
         $this->inviteMembers->onQueue()->execute($data->invitations, $folder);
@@ -86,6 +92,9 @@ class TeamFoldersController extends Controller
     ): ResponseFactory | Response {
         $this->authorize('owner', $folder);
 
+        // Check if user didn't exceed max team members limit
+        ($this->checkMaxTeamMembersLimit)($request->input('invitations'), $request->user());
+
         $updateInvitations(
             $folder,
             $request->input('invitations')

src/Domain/Teams/Models/TeamFolderMember.php

@@ -0,0 +1,31 @@
+<?php
+namespace Domain\Teams\Models;
+
+use Database\Factories\TeamFolderMemberFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+/**
+ * @method static create(array $array)
+ * @property string id
+ * @property string parent_id
+ * @property string email
+ * @property string status
+ * @property string created_at
+ * @property string updated_at
+ */
+class TeamFolderMember extends Model
+{
+    use HasFactory;
+
+    protected $guarded = [];
+
+    public $incrementing = false;
+
+    public $timestamps = false;
+
+    protected static function newFactory(): TeamFolderMemberFactory
+    {
+        return TeamFolderMemberFactory::new();
+    }
+}

src/Support/helpers.php

@@ -477,7 +477,7 @@ if (! function_exists('get_storage_fill_percentage')) {
         }
 
         // Return in 2 decimal
-        return number_format((float) $progress, 2, '.', '');
+        return (float) number_format((float) $progress, 2, '.', '');
     }
 }