Add organization setting employees_can_see_billable_rates

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

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Enums\Role;
 use App\Http\Requests\V1\Organization\OrganizationUpdateRequest;
 use App\Http\Resources\V1\Organization\OrganizationResource;
 use App\Models\Organization;
@@ -23,7 +24,9 @@ class OrganizationController extends Controller
     {
         $this->checkPermission($organization, 'organizations:view');
 
-        return new OrganizationResource($organization);
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
+
+        return new OrganizationResource($organization, $showBillableRate);
     }
 
     /**
@@ -39,6 +42,9 @@ class OrganizationController extends Controller
 
         $organization->name = $request->input('name');
         $oldBillableRate = $organization->billable_rate;
+        if ($request->has('employees_can_see_billable_rates')) {
+            $organization->employees_can_see_billable_rates = $request->validated('employees_can_see_billable_rates');
+        }
         $organization->billable_rate = $request->getBillableRate();
         $organization->save();
 
@@ -46,6 +52,6 @@ class OrganizationController extends Controller
             $billableRateService->updateTimeEntriesBillableRateForOrganization($organization);
         }
 
-        return new OrganizationResource($organization);
+        return new OrganizationResource($organization, true);
     }
 }

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

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Enums\Role;
 use App\Exceptions\Api\EntityStillInUseApiException;
 use App\Http\Requests\V1\Project\ProjectIndexRequest;
 use App\Http\Requests\V1\Project\ProjectStoreRequest;
@@ -60,7 +61,9 @@ class ProjectController extends Controller
 
         $projects = $projectsQuery->paginate(config('app.pagination_per_page_default'));
 
-        return new ProjectCollection($projects);
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
+
+        return new ProjectCollection($projects, $showBillableRate);
     }
 
     /**
@@ -74,9 +77,12 @@ class ProjectController extends Controller
     {
         $this->checkPermission($organization, 'projects:view', $project);
 
+        // Note: There is currently no need to check if a user is a member of the project,
+        // since this is only relevant for users with the role "employee" and they can not access this endpoint.
+
         $project->load('organization');
 
-        return new ProjectResource($project);
+        return new ProjectResource($project, true);
     }
 
     /**
@@ -101,7 +107,7 @@ class ProjectController extends Controller
         $project->organization()->associate($organization);
         $project->save();
 
-        return new ProjectResource($project);
+        return new ProjectResource($project, true);
     }
 
     /**
@@ -132,7 +138,7 @@ class ProjectController extends Controller
             $billableRateService->updateTimeEntriesBillableRateForProject($project);
         }
 
-        return new ProjectResource($project);
+        return new ProjectResource($project, true);
     }
 
     /**

app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php

@@ -31,6 +31,9 @@ class OrganizationUpdateRequest extends FormRequest
                 'integer',
                 'min:0',
             ],
+            'employees_can_see_billable_rates' => [
+                'boolean',
+            ],
         ];
     }
 

app/Http/Resources/V1/Organization/OrganizationResource.php

@@ -13,6 +13,20 @@ use Illuminate\Http\Request;
  */
 class OrganizationResource extends BaseResource
 {
+    private bool $showBillableRate;
+
+    /**
+     * Create a new resource instance.
+     *
+     * @return void
+     */
+    public function __construct(Organization $resource, bool $showBillableRate)
+    {
+        parent::__construct($resource);
+
+        $this->showBillableRate = $showBillableRate;
+    }
+
     /**
      * Transform the resource into an array.
      *
@@ -28,7 +42,9 @@ class OrganizationResource extends BaseResource
             /** @var bool $color Personal organizations automatically created after registration */
             'is_personal' => $this->resource->personal_team,
             /** @var int|null $billable_rate Billable rate in cents per hour */
-            'billable_rate' => $this->resource->billable_rate,
+            'billable_rate' => $this->showBillableRate ? $this->resource->billable_rate : null,
+            /** @var bool $employees_can_see_billable_rates Can members of the organization with role "employee" see the billable rates */
+            'employees_can_see_billable_rates' => $this->resource->employees_can_see_billable_rates,
         ];
     }
 }

app/Http/Resources/V1/Project/ProjectCollection.php

@@ -5,14 +5,39 @@ declare(strict_types=1);
 namespace App\Http\Resources\V1\Project;
 
 use App\Http\Resources\PaginatedResourceCollection;
+use App\Models\Project;
+use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
+use Illuminate\Pagination\LengthAwarePaginator;
 
 class ProjectCollection extends ResourceCollection implements PaginatedResourceCollection
 {
+    private bool $showBillableRates;
+
     /**
-     * The resource that this resource collects.
-     *
-     * @var string
+     * @param  LengthAwarePaginator<Project>  $resource
      */
-    public $collects = ProjectResource::class;
+    public function __construct($resource, bool $showBillableRates)
+    {
+        parent::__construct($resource);
+        $this->showBillableRates = $showBillableRates;
+    }
+
+    protected function collects(): ?string
+    {
+        return null;
+    }
+
+    /**
+     * Transform the resource collection into an array.
+     *
+     * @return array<array<string, string|bool|int|null>>
+     */
+    public function toArray(Request $request): array
+    {
+        return $this->collection->map(function (Project $project) use ($request): array {
+            return (new ProjectResource($project, $this->showBillableRates))
+                ->toArray($request);
+        })->all();
+    }
 }

app/Http/Resources/V1/Project/ProjectResource.php

@@ -13,6 +13,15 @@ use Illuminate\Http\Request;
  */
 class ProjectResource extends BaseResource
 {
+    private bool $showBillableRate;
+
+    public function __construct(Project $resource, bool $showBillableRate)
+    {
+        parent::__construct($resource);
+
+        $this->showBillableRate = $showBillableRate;
+    }
+
     /**
      * Transform the resource into an array.
      *
@@ -32,7 +41,7 @@ class ProjectResource extends BaseResource
             /** @var bool $is_archived Whether the client is archived */
             'is_archived' => $this->resource->is_archived,
             /** @var int|null $billable_rate Billable rate in cents per hour */
-            'billable_rate' => $this->resource->billable_rate,
+            'billable_rate' => $this->showBillableRate ? $this->resource->billable_rate : null,
             /** @var bool $is_billable Project time entries billable default */
             'is_billable' => $this->resource->is_billable,
             /** @var int|null $estimated_time Estimated time in seconds */