Refactored code

src/app/Console/Commands/Lists/Anime/GenerateCommand.php

@@ -40,7 +40,7 @@ public function handle(AnimeService $animeService, UserRepositoryInterface $user
         }
 
         $animeList = $animeService->all([
-            new ColumnFilter(['id', 'title', 'status', 'rating', 'episodes']),
+            new ColumnFilter(['id', 'title', 'type', 'status', 'rating', 'episodes', 'year']),
             new RelationFilter([
                 'urls:anime_id,url',
                 'synonyms:anime_id,name',

src/app/Http/Controllers/Telegram/TelegramController.php

@@ -10,6 +10,8 @@
 use App\Services\TelegramUserService;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+use Throwable;
 
 class TelegramController extends Controller
 {
@@ -29,7 +31,16 @@ public function assign(AssignRequest $request): RedirectResponse
             $request->get('username'),
         );
 
-        $this->telegramUserService->createAndAttach($dto, $request->user());
+        try {
+            $this->telegramUserService->createAndAttach($request->user(), $dto);
+        } catch (Throwable $e) {
+            Log::error('Failed to assign telegram user', [
+                'exception_trace'   => $e->getTraceAsString(),
+                'exception_message' => $e->getMessage(),
+            ]);
+
+            return back()->withErrors(['message' => $e->getMessage()]);
+        }
 
         return back();
     }
@@ -40,7 +51,7 @@ public function assign(AssignRequest $request): RedirectResponse
      */
     public function detach(Request $request): RedirectResponse
     {
-        if (!$request->user()?->telegramUser()?->update(['user_id' => null])) {
+        if (!$request->user()?->telegramUser()?->delete()) {
             return back()->withErrors(['message' => 'Could not revoke Telegram account']);
         }
 

src/app/Http/Middleware/Telegram/RedirectIfHasAssignedUserMiddleware.php

@@ -20,7 +20,7 @@ class RedirectIfHasAssignedUserMiddleware
     public function handle(Request $request, Closure $next): Response
     {
         if ($request->user()->telegramUser) {
-            return back();
+            return back()->withErrors(['message' => 'You already have assigned Telegram account']);
         }
 
         return $next($request);

src/app/Models/Anime.php

@@ -18,16 +18,18 @@
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
-#[ObservedBy(AnimeObserver::class)]
 /**
  * @mixin IdeHelperAnime
  */
+#[ObservedBy(AnimeObserver::class)]
 class Anime extends Model
 {
     use HasUuids;
     use HasFactory;
     use Filterable;
+    use SoftDeletes;
 
     protected $fillable = [
         'title',

src/app/Models/AnimeSynonym.php

@@ -4,6 +4,7 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -13,6 +14,7 @@
  */
 class AnimeSynonym extends Model
 {
+    use HasUuids;
     use HasFactory;
 
     protected $fillable = ['anime_id', 'name'];

src/app/Models/AnimeUrl.php

@@ -5,6 +5,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -14,6 +15,7 @@
  */
 class AnimeUrl extends Model
 {
+    use HasUuids;
     use HasFactory;
 
     protected $fillable = ['anime_id', 'url'];

src/app/Models/Genre.php

@@ -10,6 +10,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * @mixin IdeHelperGenre
@@ -19,6 +20,7 @@ class Genre extends Model
     use HasUuids;
     use HasFactory;
     use Filterable;
+    use SoftDeletes;
 
     protected $fillable = ['name'];
 

src/app/Models/TelegramUser.php

@@ -8,18 +8,20 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * @mixin IdeHelperTelegramUser
  */
 class TelegramUser extends Model
 {
-    use HasFactory;
     use HasUuids;
+    use HasFactory;
+    use SoftDeletes;
 
     protected $fillable = [
-        'telegram_id',
         'user_id',
+        'telegram_id',
         'first_name',
         'last_name',
         'username',

src/app/Models/User.php

@@ -47,9 +47,6 @@ protected function casts(): array
         ];
     }
 
-    /**
-     * @return HasOne
-     */
     public function telegramUser(): HasOne
     {
         return $this->hasOne(TelegramUser::class);

src/app/Models/VoiceActing.php

@@ -9,6 +9,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * @mixin IdeHelperVoiceActing
@@ -18,6 +19,7 @@ class VoiceActing extends Model
     use HasUuids;
     use HasFactory;
     use Filterable;
+    use SoftDeletes;
 
     protected $table = 'voice_acting';
 

src/app/Providers/AppServiceProvider.php

@@ -22,6 +22,7 @@
 use App\Repositories\VoiceActing\VoiceActingRepositoryInterface;
 use Elastic\Elasticsearch\Client;
 use Elastic\Elasticsearch\ClientBuilder;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Arr;
 use Illuminate\Support\ServiceProvider;
@@ -54,6 +55,7 @@ public function register(): void
     public function boot(): void
     {
         $this->enforceMorphAliases();
+        Model::shouldBeStrict(!$this->app->isProduction());
     }
 
     private function setUpElasticsearchClient(): void

src/app/Repositories/TelegramUser/TelegramUserRepository.php

@@ -24,19 +24,11 @@ public function upsert(array $data): TelegramUser
         return $this->query->updateOrCreate(['telegram_id' => $data['telegram_id']], $data);
     }
 
-    /**
-     * @param int $telegramId
-     * @return TelegramUser|null
-     */
     public function findByTelegramId(int $telegramId): ?TelegramUser
     {
         return $this->query->where('telegram_id', $telegramId)->first();
     }
 
-    /**
-     * @param string $username
-     * @return TelegramUser|null
-     */
     public function findByUsername(string $username): ?TelegramUser
     {
         return $this->query->where('username', $username)->first();

src/app/Repositories/TelegramUser/TelegramUserRepositoryInterface.php

@@ -8,21 +8,9 @@
 
 interface TelegramUserRepositoryInterface
 {
-    /**
-     * @param array $data
-     * @return TelegramUser
-     */
     public function upsert(array $data): TelegramUser;
 
-    /**
-     * @param int $telegramId
-     * @return TelegramUser|null
-     */
     public function findByTelegramId(int $telegramId): ?TelegramUser;
 
-    /**
-     * @param string $username
-     * @return TelegramUser|null
-     */
     public function findByUsername(string $username): ?TelegramUser;
 }

src/app/Services/TelegramUserService.php

@@ -25,10 +25,18 @@ public function upsert(CreateUserDTO $dto): TelegramUser
     /**
      * @throws Throwable
      */
-    public function createAndAttach(CreateUserDTO $dto, User $user): TelegramUser
+    public function createAndAttach(User $user, CreateUserDTO $dto): TelegramUser
     {
-        return DB::transaction(function () use ($dto, $user) {
-            $telegramUser = $this->upsert($dto);
+        return DB::transaction(function () use ($dto, $user): TelegramUser {
+            /** @var TelegramUser $telegramUser */
+            $telegramUser = TelegramUser::withTrashed()->updateOrCreate(
+                ['telegram_id' => $dto->telegramId],
+                $dto->toArray()
+            );
+
+            if ($telegramUser->trashed()) {
+                $telegramUser->restore();
+            }
 
             $telegramUser->user()->associate($user)->save();
 

src/database/migrations/2021_12_04_123816_create_telegram_users_table.php

@@ -9,24 +9,22 @@
 return new class extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
     public function up(): void
     {
         Schema::create('telegram_users', function (Blueprint $table) {
             $table->uuid('id')->primary();
             $table->bigInteger('telegram_id')->unique();
-            $table->string('nickname');
-            $table->string('username');
+            $table->string('first_name')->nullable();
+            $table->string('last_name')->nullable();
+            $table->string('username')->nullable();
             $table->timestamps();
+            $table->softDeletes();
         });
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
     public function down(): void
     {

src/database/migrations/2021_12_04_124746_create_voice_acting_table.php

@@ -9,22 +9,19 @@
 return new class extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
     public function up(): void
     {
         Schema::create('voice_acting', function (Blueprint $table) {
             $table->uuid('id')->primary();
             $table->string('name')->unique();
             $table->timestamps();
+            $table->softDeletes();
         });
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
     public function down(): void
     {

src/database/migrations/2021_12_04_124796_create_animes_table.php

@@ -9,28 +9,20 @@
 return new class extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
     public function up(): void
     {
         Schema::create('animes', function (Blueprint $table) {
             $table->uuid('id')->primary();
-            $table->string('title');
+            $table->string('title')->unique();
             $table->string('url');
-            $table->foreignUuid('favourite_voice_acting')
-                  ->nullable()
-                  ->constrained('voice_acting')
-                  ->nullOnDelete();
             $table->timestamps();
             $table->softDeletes();
         });
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
     public function down(): void
     {