Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # app/Models/User.php
romo4ko · Oct 26, 2024 · 2842793 · 2842793
2 parents ead0f6d + 21e5a4f
commit 2842793
Show file tree

Hide file tree

Showing 18 changed files with 320 additions and 50 deletions.
diff --git a/app/Enums/ChallengeType.php b/app/Enums/ChallengeType.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Enums;
+
+enum ChallengeType: string
+{
+    case PERSONAL = 'personal';
+    case TEAM = 'team';
+
+    public static function values(): array
+    {
+        return array_map(fn (self $case) => $case->value, self::cases());
+    }
+}
diff --git a/app/Models/Achievement.php b/app/Models/Achievement.php
@@ -4,20 +4,34 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 
 class Achievement extends Model
 {
     use HasFactory;
 
+    public $timestamps = true;
+
     protected $fillable = ['name', 'description', 'image_id'];
 
-    public function challenges()
+    public function challenges(): BelongsToMany
+    {
+        return $this->belongsToMany(Challenge::class);
+    }
+
+    public function users(): belongsToMany
+    {
+        return $this->belongsToMany(User::class);
+    }
+
+    public function images(): hasOne
     {
-        return $this->hasMany(Challenge::class);
+        return $this->hasOne(Image::class);
     }
 
-    public function image()
+    public function teams(): belongsToMany
     {
-        return $this->belongsTo(Image::class);
+        return $this->belongsToMany(Team::class);
     }
 }
diff --git a/app/Models/Category.php b/app/Models/Category.php
diff --git a/app/Models/Challenge.php b/app/Models/Challenge.php
@@ -4,38 +4,43 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 
 class Challenge extends Model
 {
     use HasFactory;
 
+    public $timestamps = true;
+
     protected $fillable = [
         'name',
         'description',
-        'category_id',
         'start_date',
         'end_date',
+        'result',
         'achievement_id',
-        'image_id'
+        'image_id',
+        'type'
     ];
 
-    public function users()
+    public function users(): belongsToMany
     {
         return $this->belongsToMany(User::class, 'users_challenges');
     }
 
-    public function image()
+    public function images(): hasOne
     {
-        return $this->belongsTo(Image::class);
+        return $this->hasOne(Image::class);
     }
 
-    public function category()
+    public function achievements(): belongsToMany
     {
-        return $this->belongsTo(Category::class);
+        return $this->belongsToMany(Achievement::class);
     }
 
-    public function achievement()
+    public function teams(): belongsToMany
     {
-        return $this->belongsTo(Achievement::class);
+        return $this->belongsToMany(Team::class, 'teams_challenges');
     }
 }
diff --git a/app/Models/Image.php b/app/Models/Image.php
@@ -4,24 +4,26 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Image extends Model
 {
     use HasFactory;
 
+    public $timestamps = true;
     protected $fillable = ['image_path'];
 
-    public function users()
+    public function users(): hasMany
     {
         return $this->hasMany(User::class);
     }
 
-    public function challenges()
+    public function challenges(): hasMany
     {
         return $this->hasMany(Challenge::class);
     }
 
-    public function achievements()
+    public function achievements(): hasMany
     {
         return $this->hasMany(Achievement::class);
     }

diff --git a/app/Models/Team.php b/app/Models/Team.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+
+class Team extends Model
+{
+    use HasFactory;
+
+    public $timestamps = true;
+
+    protected $fillable = [
+        'name',
+        'description',
+        'code'
+    ];
+
+    public function users(): belongsToMany
+    {
+        return $this->belongsToMany(User::class, 'users_teams');
+    }
+
+    public function challenges(): belongsToMany
+    {
+        return $this->belongsToMany(Challenge::class, 'teams_challenges');
+    }
+
+    public function achievements(): belongsToMany
+    {
+        return $this->belongsToMany(Achievement::class, 'teams_achievements');
+    }
+}
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -1,11 +1,10 @@
 <?php
 
-declare(strict_types=1);
-
 namespace App\Models;
 
 // use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Sanctum\HasApiTokens;
@@ -22,6 +21,9 @@ class User extends Authenticatable
      *
      * @var array<int, string>
      */
+
+    public $timestamps = true;
+
     protected $fillable = [
         'name',
         'surname',
@@ -30,15 +32,27 @@ class User extends Authenticatable
         'about',
         'image_id',
         'is_admin',
+        'is_confirmed',
+        'is_admin',
         'patronymic',
     ];
 
-    public function challenges()
+    public function challenges(): BelongsToMany
     {
         return $this->belongsToMany(Challenge::class, 'users_challenges');
     }
 
-    public function image()
+    public function achievements(): BelongsToMany
+    {
+        return $this->belongsToMany(Achievement::class, 'users_achievements');
+    }
+
+    public function teams()
+    {
+        return $this->belongsToMany(Team::class, 'users_teams');
+    }
+
+    public function images()
     {
         return $this->belongsTo(Image::class);
     }

diff --git a/config/base.php b/config/base.php
@@ -0,0 +1,39 @@
+<?php
+
+return [
+    'achievements' => [
+        [
+            'name' => 'Достижение 1',
+            'description' => 'Достижение 2',
+            'image_id' => null
+        ],
+        [
+            'name' => 'Достижение 1',
+            'description' => 'Достижение 2',
+            'image_id' => null
+        ],
+        [
+            'name' => 'Достижение 1',
+            'description' => 'Достижение 2',
+            'image_id' => null
+        ],
+    ],
+
+    'challenges' => [
+        [
+            'name' => 'Задание 1',
+            'description' => 'Задание 2',
+            'image_id' => null
+        ],
+        [
+            'name' => 'Задание 1',
+            'description' => 'Задание 2',
+            'image_id' => null
+        ],
+        [
+            'name' => 'Задание 1',
+            'description' => 'Задание 2',
+            'image_id' => null
+        ],
+    ],
+];
diff --git a/database/factories/ChallengeFactory.php b/database/factories/ChallengeFactory.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use App\Enums\ChallengeType;
+use App\Models\Achievement;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class ChallengeFactory extends Factory
+{
+    public function definition(): array
+    {
+        $now = Carbon::now();
+
+        return [
+            'name' => fake()->text(20),
+            'description' => fake()->text(),
+            'start_date' => $now,
+            'end_date' => $now->addDays(fake()->numberBetween(1, 30)),
+            'achievement_id' => Achievement::query()->inRandomOrder()->first(),
+            'image_id' => null,
+            'type' => fake()->randomElement([
+                ChallengeType::PERSONAL,
+                ChallengeType::TEAM
+            ])
+        ];
+    }
+}
diff --git a/database/factories/TeamFactory.php b/database/factories/TeamFactory.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use App\Models\Team;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Team>
+ */
+class TeamFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    protected $model = Team::class;
+
+    public function definition(): array
+    {
+        return [
+            'name' => $this->faker->company,
+            'description' => $this->faker->sentence,
+            'code' => strtoupper($this->faker->unique()->lexify('??###')),
+        ];
+    }
+}
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
@@ -27,9 +27,12 @@ public function definition(): array
     {
         return [
             'name' => fake()->name(),
+            'surname' => fake()->lastName(),
+            'about' => fake()->text(),
+            'is_confirmed' => true,
             'email' => fake()->unique()->safeEmail(),
             'email_verified_at' => now(),
-            'password' => static::$password ??= Hash::make('password'),
+            'password' => Hash::make('password'),
             'remember_token' => Str::random(10),
         ];
     }

diff --git a/database/migrations/2024_10_25_213720_create_users_table.php b/database/migrations/2024_10_25_213720_create_users_table.php
@@ -15,7 +15,7 @@ public function up(): void
             $table->id();
             $table->string('name');
             $table->string('surname');
-            $table->string('patronymic');
+            $table->string('patronymic')->nullable();
             $table->string('email')->unique();
             $table->timestamp('email_verified_at')->nullable();
             $table->string('password');

diff --git a/database/seeders/AchievementsSeeder.php b/database/seeders/AchievementsSeeder.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Database\Seeders;
+
+use App\Models\Achievement;
+use Illuminate\Database\Seeder;
+
+class AchievementsSeeder extends Seeder
+{
+    public function run(): void
+    {
+        $achievements = config('base.achievements');
+
+        foreach ($achievements as $achievement) {
+            Achievement::query()->create($achievement);
+        }
+    }
+}