Changeset 4b7e2d3 for database

Timestamp:

10/23/21 04:03:46 (3 years ago)

Author:

beratkjufliju <kufliju@…>

Branches:

develop, master

Children:

b39afb5

Parents:

c6b84df

Message:

bug fixes, edited export, added fileSeeder for DB testing

Location:

database

Files:

• factories/DepartmentFactory.php (modified) (2 diffs)
• factories/FileFactory.php (added)
• factories/FolderFactory.php (modified) (3 diffs)
• factories/UserFactory.php (modified) (2 diffs)
• migrations/2021_09_29_121244_create_departments_table.php (modified) (1 diff)
• migrations/2021_10_06_103305_create_folders_table.php (modified) (1 diff)
• migrations/2021_10_21_144552_create_file_types_table.php (modified) (1 diff)
• seeders/DatabaseSeeder.php (modified) (1 diff)
• seeders/DepartmentsTableSeeder.php (modified) (1 diff)
• seeders/FileTypesTableSeeder.php (moved) (moved from database/seeders/FileTypeSeeder.php ) (2 diffs)
• seeders/FilesTableSeeder.php (added)
• seeders/FoldersTableSeeder.php (modified) (2 diffs)
• seeders/UsersTableSeeder.php (modified) (1 diff)

database/factories/DepartmentFactory.php

@@ -4 +4 @@
 
 use App\Models\Department;
+use App\Models\Folder;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Facades\Storage;
+use function Sodium\increment;
 
 class DepartmentFactory extends Factory
@@ -24 +26 @@
     public function definition()
     {
-        $location = $this->faker->unique()->numberBetween(1, 15);
+        $location = $this->faker->unique()->numberBetween(10, 25);
         Storage::disk('uploads')->makeDirectory('Departments/' . $location);
         return [
-            'name' => "Department" . $this->faker->unique()->firstName(),
+            'name' => "Department" . ' ' . $this->faker->unique()->firstName(),
             'code' => $location,
             'location' => 'Departments' . DIRECTORY_SEPARATOR . $location,
-            'user_id' => $this->faker->numberBetween('1', '2'),
-            'created_at' => Carbon::now()
+            'no_of_folders' => 0,
+            'user_id' => "1",
+            'created_at' => $this->faker->dateTime()
         ];
     }

database/factories/FolderFactory.php

@@ -6 +6 @@
 use App\Models\Folder;
 use Carbon\Carbon;
+use Faker\Provider\DateTime;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Facades\Storage;
@@ -27 +28 @@
 
         $deptId = $this->faker->numberBetween('1', '15');
+
         $deptCode = Department::find($deptId)->code;
         $name = $this->faker->unique()->firstName();
@@ -33 +35 @@
         Storage::disk('uploads')->makeDirectory($location);
 
-
         return [
             'arch_id' => $deptCode . "/" . $this->faker->unique()->randomNumber(),
             'name' => $name,
-            'note' => $this->faker->realText(),
+            'note' => "This a note field",
             'location' => $location,
             'user_id' => $this->faker->numberBetween('1', '2'),

database/factories/UserFactory.php

@@ -26 +26 @@
             'name' => $this->faker->firstName(),
             'surname' => $this->faker->lastName(),
-            'username' => $this->faker->userName(),
+            'username' => $this->faker->unique()->userName(),
             'password' => $this->faker->password(),
-            'email' => $this->faker->email(),
+            'email' => $this->faker->unique()->email(),
             'phone_number' => $this->faker->phoneNumber(),
             'role_id' => $this->faker->numberBetween(1, 2),
@@ -35 +35 @@
             'is_forgot_password' => $this->faker->boolean,
             'created_by' => "1",
-            'created_at' => Carbon::now()
+            'created_at' => now()
         ];
     }

database/migrations/2021_09_29_121244_create_departments_table.php

@@ -16 +16 @@
         Schema::create('departments', function (Blueprint $table) {
             $table->increments('id');
-            $table->integer("user_id")->unsigned();
             $table->string("name");
             $table->string("code");
+            $table->integer("user_id")->unsigned();
             $table->string("location");
+            $table->integer("no_of_folders")->default(0);
             $table->timestamps();
 

database/migrations/2021_10_06_103305_create_folders_table.php

@@ -20 +20 @@
             $table->text("note")->nullable();
             $table->string("location");
+            $table->integer("no_of_files")->default(0);
             $table->integer("user_id")->unsigned();
             $table->integer("department_id")->unsigned();

database/migrations/2021_10_21_144552_create_file_types_table.php

@@ -16 +16 @@
         Schema::create('file_types', function (Blueprint $table) {
             $table->increments('id');
-            $table->string("mimes")->default('mimes:');
+            $table->string("mimes")->default('jpg,jpeg,png,pdf,docx,xls,xlsx,txt,ppt,pptx');
             $table->integer("max_size");
             $table->integer("user_id")->unsigned();

database/seeders/DatabaseSeeder.php

@@ -19 +19 @@
         $this->call(UsersTableSeeder::class);
         $this->call(DepartmentsTableSeeder::class);
-        $this->call(FileTypeSeeder::class);
+        $this->call(FileTypesTableSeeder::class);
         $this->call(FoldersTableSeeder::class);
+        $this->call(FilesTableSeeder::class);
     }
 }

database/seeders/DepartmentsTableSeeder.php

@@ -4 +4 @@
 
 use App\Models\Department;
+use App\Models\Folder;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Database\Seeder;

database/seeders/FileTypesTableSeeder.php

@@ -6 +6 @@
 use Illuminate\Database\Seeder;
 
-class FileTypeSeeder extends Seeder
+class FileTypesTableSeeder extends Seeder
 {
     /**
@@ -16 +16 @@
     {
         \DB::table("file_types")->insert([
-            "mimes" => "mimes:jpg,jpeg,png,pdf,docx,xls,xlsx,txt,ppt,pptx",
+            "mimes" => "jpg,jpeg,png,pdf,docx,xls,xlsx,txt,ppt,pptx",
             "max_size" => "5000",
             "user_id" => "1",

database/seeders/FoldersTableSeeder.php

@@ -3 +3 @@
 namespace Database\Seeders;
 
+use App\Models\Department;
 use App\Models\Folder;
 use Carbon\Carbon;
@@ -16 +17 @@
     public function run()
     {
-        Folder::factory()->count(300)->create();
+        Folder::factory()->count(500)->create();
+        $folders = Folder::all();
+
+        foreach ($folders as $folder) {
+            $folder->department()->increment('no_of_folders');
+        }
     }
 }

database/seeders/UsersTableSeeder.php

@@ -27 +27 @@
             "is_confirmed" => true,
             "created_by" => "1",
-            "created_at" => Carbon::now()
+            "created_at" => now()
         ]);
 
-        User::factory()->count(20)->create();
+        User::factory()->count(50)->create();
 
     }