Changeset df6e9ec

Timestamp:

10/24/21 23:35:45 (3 years ago)

Author:

beratkjufliju <kufliju@…>

Branches:

develop, master

Children:

495dd28

Parents:

94f05dc

Message:

edited folder seeder

Files:

• app/Http/Controllers/Dashboard/DepartmentsController.php (modified) (2 diffs)
• app/Http/Controllers/Dashboard/FoldersController.php (modified) (1 diff)
• database/factories/FolderFactory.php (modified) (2 diffs)
• database/seeders/FoldersTableSeeder.php (modified) (1 diff)
• storage/Departments/10/Elwin/Elwin-6175cc1e46c6e.xlsx (deleted)
• storage/Departments/10/Elwin/Elwin-6175cc1e4bcde.xlsx (deleted)
• storage/Departments/10/Elwin/Elwin-6175cc1e4e2f9.xlsx (deleted)
• storage/Departments/10/Elwin/Elwin-6175cc1e506d4.xlsx (deleted)
• storage/Departments/19/Selmer/Selmer-6175c5ccd945f.xlsx (deleted)

app/Http/Controllers/Dashboard/DepartmentsController.php

@@ -119 +119 @@
     public function downloadAll()
     {
-        $zip_file=Storage::disk('uploads')->path('Departments.zip');
-        $zip = new \ZipArchive();
-        $zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
-        $path = Storage::disk('uploads')->path('Departments');
+        try {
+            $zip_file=Storage::disk('uploads')->path('Departments.zip');
+            $zip = new \ZipArchive();
+            $zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
+            $path = Storage::disk('uploads')->path('Departments');
 
-        try {
             $files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path));
             foreach ($files as $file) {
@@ -149 +149 @@
     public function downloadDepartment($id)
     {
-        $department = Department::find($id);
+        try {
+            $department = Department::find($id);
+            $zip_file=Storage::disk('uploads')->path('Department.zip');
+            $zip = new \ZipArchive();
+            $zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
+            $path = Storage::disk('uploads')->path($department->location);
 
-        $zip_file=Storage::disk('uploads')->path('Department.zip');
-        $zip = new \ZipArchive();
-        $zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
-        $path = Storage::disk('uploads')->path($department->location);
-
-        try {
             $files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path));
             foreach ($files as $file) {

app/Http/Controllers/Dashboard/FoldersController.php

@@ -276 +276 @@
     public function downloadfolder(Request $request, $id)
     {
-        $folder = Folder::find($id);
-
-        $FileSystem = new Filesystem();
-        $zip_file = Storage::disk('uploads')->path('Folder.zip');
-        $zip = new \ZipArchive();
-        $zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
-        $path = Storage::disk('uploads')->path($folder->department->location . DIRECTORY_SEPARATOR . $folder->name);
-
         try {
+            $folder = Folder::find($id);
+            $FileSystem = new Filesystem();
+            $zip_file = Storage::disk('uploads')->path('Folder.zip');
+            $zip = new \ZipArchive();
+            $zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
+
+            $path = Storage::disk('uploads')->path($folder->department->location . DIRECTORY_SEPARATOR . $folder->name);
+
             $files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path));
 

database/factories/FolderFactory.php

@@ -27 +27 @@
     public function definition()
     {
+        $inputArray = [5, 15, 25, 35, 45, 55, 65, 75];
+        $deptId = Arr::random($inputArray);
 
-        $deptCode = Department::find(1)->code;
+        $deptCode = Department::find($deptId)->code;
 
         $name = $this->faker->unique()->firstName();
@@ -41 +43 @@
             'location' => $location,
             'user_id' => 1,
-            'department_id' => 1,
+            'department_id' => $deptId,
             'is_important' => $this->faker->boolean,
             'created_at' => now()

database/seeders/FoldersTableSeeder.php

@@ -17 +17 @@
     public function run()
     {
-        Folder::factory()->count(5)->create();
+        Folder::factory()->count(900)->create();
         $folders = Folder::all();