adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-15 03:32:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrated endpoints from user to member; Renamed membership to member

Browse Source
This commit is contained in:
Constantin Graf
2024-05-13 19:50:50 +02:00
parent ba335b4f05
commit b2365e2778
64 changed files with 853 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Resources/V1/Member/MemberPivotResource.php
View File

@@ -5,7 +5,7 @@ declare(strict_types=1);
namespace App\Http\Resources\V1\Member;
use App\Http\Resources\V1\BaseResource;
use App\Models\Membership;
use App\Models\Member;
use App\Models\User;
use Illuminate\Http\Request;
@@ -21,12 +21,12 @@ class MemberPivotResource extends BaseResource
*/
public function toArray(Request $request): array
{
/** @var Membership $membership */
$membership = $this->resource->getRelationValue('membership');
/** @var Member $member */
$member = $this->resource->getRelationValue('membership');
return [
/** @var string $id ID of membership */
'id' => $membership->id,
'id' => $member->id,
/** @var string $id ID of user */
'user_id' => $this->resource->id,
/** @var string $name Name */
@@ -34,11 +34,11 @@ class MemberPivotResource extends BaseResource
/** @var string $email Email */
'email' => $this->resource->email,
/** @var string $role Role */
'role' => $membership->role,
'role' => $member->role,
/** @var bool $is_placeholder Placeholder user for imports, user might not really exist and does not know about this placeholder membership */
'is_placeholder' => $this->resource->is_placeholder,
/** @var int|null $billable_rate Billable rate in cents per hour */
'billable_rate' => $membership->billable_rate,
'billable_rate' => $member->billable_rate,
];
}
}

4
app/Http/Resources/V1/Member/MemberResource.php
View File

@@ -5,12 +5,12 @@ declare(strict_types=1);
namespace App\Http\Resources\V1\Member;
use App\Http\Resources\V1\BaseResource;
use App\Models\Membership;
use App\Models\Member;
use App\Models\User;
use Illuminate\Http\Request;
/**
* @property Membership $resource
* @property Member $resource
*/
class MemberResource extends BaseResource
{

4
app/Http/Resources/V1/ProjectMember/ProjectMemberResource.php
View File

@@ -25,8 +25,8 @@ class ProjectMemberResource extends BaseResource
'id' => $this->resource->id,
/** @var int|null $billable_rate Billable rate in cents per hour */
'billable_rate' => $this->resource->billable_rate,
/** @var string $user_id ID of the user */
'user_id' => $this->resource->user_id,
/** @var string $member_id ID of the organization member */
'member_id' => $this->resource->member_id,
/** @var string $project_id ID of the project */
'project_id' => $this->resource->project_id,
];