fix: handle imports bug

ousid · ousid · commit aec23ccecadc · 2022-09-17T14:48:20.000+01:00
diff --git a/resources/views/livewire/tailwindcss/handle-imports.blade.php b/resources/views/livewire/tailwindcss/handle-imports.blade.php
@@ -3,7 +3,11 @@
     @foreach ($this->imports as $import)
         <div class="p-6">
             <div>
-                <h2 class="font-medium">Importing {{ $import->file_name }}</h2>
+                <h2 class="font-medium">
+                    {{ __('Importing :file_name', [
+                        'file_name' => $import->file_name,
+                    ]) }}
+                </h2>
                 <span class="text-gray-700 text-sm">Imported {{ $import->processed_rows }}/{{ $import->total_rows }} rows</span>
                 <div class="w-full bg-indigo-100 rounded">
                     <div class="mt-2 w-full bg-indigo-500 rounded h-2" style="width: {{ $import->percentageComplete() }}%"></div>
diff --git a/src/Http/Livewire/HandleImports.php b/src/Http/Livewire/HandleImports.php
@@ -28,9 +28,9 @@ public function getImportsProperty()
 
         return Import::query()
                     ->forModel($this->model)
-                    ->forUser($user)
+                    ->forUser($user->id)
                     ->oldest()
-                    ->notCompleted()
+                    ->unCompleted()
                     ->get();
     }
 
diff --git a/src/Scopes/ImportScope.php b/src/Scopes/ImportScope.php
@@ -22,11 +22,16 @@ public function scopeCompleted(Builder $builder): Builder
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeNotCompleted(Builder $builder): Builder
+    public function scopeUnCompleted(Builder $builder): Builder
     {
         return $builder->whereNull('completed_at');
     }
 
+    public function percentageComplete()
+    {
+        return floor(($this->processed_rows / $this->total_rows) * 100);
+    }
+
     /**
      * Fetch imports based on the given model
      *
@@ -41,10 +46,10 @@ public function scopeForModel(Builder $builder, string $model): Builder
     /**
      * Fetch imports on the user id
      *
-     * @param  \Illuminate\Foundation\Auth\User  $user
+     * @param  int  $user
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeForUser(Builder $builder, User $user): Builder
+    public function scopeForUser(Builder $builder, int $user): Builder
     {
         return $builder->where('user_id', $user);
     }

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,16 @@ public function scopeCompleted(Builder $builder): Builder`
`22`	`22`	`*`
`23`	`23`	`* @return \Illuminate\Database\Eloquent\Builder`
`24`	`24`	`*/`
`25`		`- public function scopeNotCompleted(Builder $builder): Builder`
	`25`	`+ public function scopeUnCompleted(Builder $builder): Builder`
`26`	`26`	`{`
`27`	`27`	`return $builder->whereNull('completed_at');`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ public function percentageComplete()`
	`31`	`+ {`
	`32`	`+ return floor(($this->processed_rows / $this->total_rows) * 100);`
	`33`	`+ }`
	`34`	`+`
`30`	`35`	`/**`
`31`	`36`	`* Fetch imports based on the given model`
`32`	`37`	`*`
`@@ -41,10 +46,10 @@ public function scopeForModel(Builder $builder, string $model): Builder`
`41`	`46`	`/**`
`42`	`47`	`* Fetch imports on the user id`
`43`	`48`	`*`
`44`		`- * @param \Illuminate\Foundation\Auth\User $user`
	`49`	`+ * @param int $user`
`45`	`50`	`* @return \Illuminate\Database\Eloquent\Builder`
`46`	`51`	`*/`
`47`		`- public function scopeForUser(Builder $builder, User $user): Builder`
	`52`	`+ public function scopeForUser(Builder $builder, int $user): Builder`
`48`	`53`	`{`
`49`	`54`	`return $builder->where('user_id', $user);`
`50`	`55`	`}`