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

Enhanced imports with billable rates and project members; Fixed error handling and import structure

Browse Source
This commit is contained in:
Constantin Graf
2024-04-25 22:44:10 +02:00
committed by Constantin Graf
parent 7433648077
commit a8ce994f08
11 changed files with 128 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Service/Import/Importers/DefaultImporter.php
View File

@@ -4,9 +4,11 @@ declare(strict_types=1);
namespace App\Service\Import\Importers;
use App\Enums\Role;
use App\Models\Client;
use App\Models\Organization;
use App\Models\Project;
use App\Models\ProjectMember;
use App\Models\Tag;
use App\Models\Task;
use App\Models\User;
@@ -50,6 +52,11 @@ abstract class DefaultImporter implements ImporterContract
protected TimezoneService $timezoneService;
/**
* @var ImportDatabaseHelper<ProjectMember>
*/
protected ImportDatabaseHelper $projectMemberImportHelper;
public function init(Organization $organization): void
{
$this->organization = $organization;
@@ -58,7 +65,7 @@ abstract class DefaultImporter implements ImporterContract
return $builder->belongsToOrganization($this->organization);
}, function (User $user) {
$user->organizations()->attach($this->organization, [
'role' => 'placeholder',
'role' => Role::Placeholder->value,
]);
}, validate: [
'name' => [
@@ -71,12 +78,26 @@ abstract class DefaultImporter implements ImporterContract
],
]);
$this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true, function (Builder $builder) {
/** @var Builder<Project> $builder */
return $builder->where('organization_id', $this->organization->id);
}, validate: [
'name' => [
'required',
'max:255',
],
'billable_rate' => [
'nullable',
'integer',
],
]);
$this->projectMemberImportHelper = new ImportDatabaseHelper(ProjectMember::class, ['project_id', 'user_id'], true, function (Builder $builder) {
/** @var Builder<ProjectMember> $builder */
return $builder->whereBelongsToOrganization($this->organization);
}, validate: [
'billable_rate' => [
'nullable',
'integer',
],
]);
$this->tagImportHelper = new ImportDatabaseHelper(Tag::class, ['name', 'organization_id'], true, function (Builder $builder) {
return $builder->where('organization_id', $this->organization->id);