Fixed import

solidtime-io · May 21, 2024 · 05e865e · 05e865e
1 parent 5a8dc60
commit 05e865e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/app/Service/Import/Importers/ClockifyTimeEntriesImporter.php b/app/Service/Import/Importers/ClockifyTimeEntriesImporter.php
@@ -4,6 +4,7 @@
 
 namespace App\Service\Import\Importers;
 
+use App\Enums\Role;
 use App\Models\TimeEntry;
 use Exception;
 use Illuminate\Support\Carbon;
@@ -59,6 +60,8 @@ public function importData(string $data): void
                 $memberId = $this->memberImportHelper->getKey([
                     'user_id' => $userId,
                     'organization_id' => $this->organization->getKey(),
+                ], [
+                    'role' => Role::Placeholder->value,
                 ]);
                 $clientId = null;
                 if ($record['Client'] !== '') {

diff --git a/app/Service/Import/Importers/DefaultImporter.php b/app/Service/Import/Importers/DefaultImporter.php
@@ -4,7 +4,6 @@
 
 namespace App\Service\Import\Importers;
 
-use App\Enums\Role;
 use App\Models\Client;
 use App\Models\Member;
 use App\Models\Organization;
@@ -69,11 +68,7 @@ public function init(Organization $organization): void
         $this->userImportHelper = new ImportDatabaseHelper(User::class, ['email'], true, function (Builder $builder) {
             /** @var Builder<User> $builder */
             return $builder->belongsToOrganization($this->organization);
-        }, function (User $user) {
-            $user->organizations()->attach($this->organization, [
-                'role' => Role::Placeholder->value,
-            ]);
-        }, validate: [
+        }, null, validate: [
             'name' => [
                 'required',
                 'max:255',
@@ -86,7 +81,13 @@ public function init(Organization $organization): void
         $this->memberImportHelper = new ImportDatabaseHelper(Member::class, ['user_id', 'organization_id'], true, function (Builder $builder) {
             /** @var Builder<Member> $builder */
             return $builder->whereBelongsTo($this->organization, 'organization');
-        });
+        }, null, validate: [
+            'role' => [
+                'required',
+                'string',
+                'in:placeholder',
+            ],
+        ]);
         $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);

diff --git a/app/Service/Import/Importers/TogglDataImporter.php b/app/Service/Import/Importers/TogglDataImporter.php
@@ -4,6 +4,7 @@
 
 namespace App\Service\Import\Importers;
 
+use App\Enums\Role;
 use Exception;
 use Spatie\TemporaryDirectory\TemporaryDirectory;
 use ValueError;
@@ -93,10 +94,12 @@ public function importData(string $data): void
                     'timezone' => $workspaceUser->timezone ?? 'UTC',
                     'is_placeholder' => true,
                 ], (string) $workspaceUser->uid);
-                $memberId = $this->memberImportHelper->getKey([
+                $this->memberImportHelper->getKey([
                     'user_id' => $userId,
                     'organization_id' => $this->organization->getKey(),
-                ], [], $userId);
+                ], [
+                    'role' => Role::Placeholder->value,
+                ], $userId);
             }
 
             foreach ($projects as $project) {

diff --git a/app/Service/Import/Importers/TogglTimeEntriesImporter.php b/app/Service/Import/Importers/TogglTimeEntriesImporter.php
@@ -4,6 +4,7 @@
 
 namespace App\Service\Import\Importers;
 
+use App\Enums\Role;
 use App\Models\TimeEntry;
 use Exception;
 use Illuminate\Support\Carbon;
@@ -59,6 +60,8 @@ public function importData(string $data): void
                 $memberId = $this->memberImportHelper->getKey([
                     'user_id' => $userId,
                     'organization_id' => $this->organization->getKey(),
+                ], [
+                    'role' => Role::Placeholder->value,
                 ]);
                 $clientId = null;
                 if ($record['Client'] !== '') {

diff --git a/tests/Unit/Service/Import/Importer/ImporterTestAbstract.php b/tests/Unit/Service/Import/Importer/ImporterTestAbstract.php
@@ -4,7 +4,9 @@
 
 namespace Tests\Unit\Service\Import\Importer;
 
+use App\Enums\Role;
 use App\Models\Client;
+use App\Models\Member;
 use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
@@ -28,6 +30,11 @@ protected function checkTestScenarioAfterImportExcludingTimeEntries(bool $detail
         $this->assertSame(null, $user1->password);
         $this->assertSame('Peter Tester', $user1->name);
         $this->assertSame('[email protected]', $user1->email);
+        $members = Member::all();
+        $this->assertCount(1, $members);
+        $member1 = $members->firstWhere('user_id', $user1->getKey());
+        $this->assertNotNull($member1);
+        $this->assertSame(Role::Placeholder->value, $member1->role);
         $clients = Client::all();
         $this->assertCount(1, $clients);
         $client1 = $clients->firstWhere('name', 'Big Company');