Андрей Ларионов / rekamore.su

Browse Code »

Commit 97498a6911934a6ba358afea335dacb152410b56

Authored by Fedor 2024-10-31 15:18:10 +0300

1 parent bae7fd15b6

Exists in master

task-132985 minor fixes

Showing 5 changed files with 8 additions and 11 deletions Inline Diff

app/Console/Commands/DeleteExpiredAutoliftOptions.php
app/Console/Commands/DispatchResumeLiftJobCommand.php
app/Jobs/LiftResumeJob.php
app/Jobs/LiftVacancyJob.php
app/Jobs/SendVacancyToTelegramJob.php

app/Console/Commands/DeleteExpiredAutoliftOptions.php

Diff comments View file @ 97498a6

 <?php
 namespace App\Console\Commands;
 use App\Models\EmployerAutoliftOption;
 use App\Models\WorkerAutoliftOption;
 use Illuminate\Console\Command;
 class DeleteExpiredAutoliftOptions extends Command
 {
     protected $signature = 'vacancy:delete_expired';
     protected $description = 'Command description';
     public function handle()
     {
         EmployerAutoliftOption::query()
             ->whereRaw('`updated_at` < DATE_SUB(NOW(), INTERVAL `days_repeat` DAY)')
-            ->update([
+            ->delete();
-                'is_enabled' => false
-            ]);
         WorkerAutoliftOption::query()
             ->whereRaw('`updated_at` < DATE_SUB(NOW(), INTERVAL `days_repeat` DAY)')
-            ->update([
+            ->delete();
-                'is_enabled' => false
-            ]);
         return Command::SUCCESS;
     }
 }

app/Console/Commands/DispatchResumeLiftJobCommand.php

Diff comments View file @ 97498a6

 <?php
 namespace App\Console\Commands;
 use App\Jobs\LiftResumeJob;
-use App\Jobs\LiftVacancyJob;
-use App\Jobs\SendVacancyToTelegramJob;
-use App\Models\EmployerAutoliftOption;
 use App\Models\WorkerAutoliftOption;
 use Illuminate\Console\Command;
 class DispatchResumeLiftJobCommand extends Command
 {
     protected $signature ='resume:dispatch';
     public function handle()
     {
         $now = now()->timezone('Europe/Moscow')->format('H:i');
         $workers = WorkerAutoliftOption::query()
             ->where(function ($query) use ($now) {
                 $query->where('times_per_day', 1)
                     ->where('time_send_first', $now);
             })
             ->orWhere(function ($query) use ($now) {
                 $query->where('times_per_day', 2)
                     ->where(function ($query) use ($now) {
                         $query->where('time_send_first', $now)
                             ->orWhere('time_send_second', $now);
                     });
             })
             ->orWhere(function ($query) use ($now) {
                 $query->where('times_per_day', 3)
                     ->where(function ($query) use ($now) {
                         $query->where('time_send_first', $now)
                             ->orWhere('time_send_second', $now)
                             ->orWhere('time_send_third', $now);
                     });
             })
             ->get();
         LiftResumeJob::dispatch($workers->pluck('worker_id')->toArray());
         return Command::SUCCESS;
     }
 }

app/Jobs/LiftResumeJob.php

Diff comments View file @ 97498a6

 <?php
 namespace App\Jobs;
-use App\Models\Ad_employer;
 use App\Models\Worker;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 class LiftResumeJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
     private array $workerIds;
     public function __construct(array $workerIds)
     {
         $this->workerIds = $workerIds;
     }
     public function handle()
     {
         Worker::query()
             ->whereIn('id', $this->workerIds)
             ->update([
                 'updated_at' => now()
             ]);
     }
 }

app/Jobs/LiftVacancyJob.php

Diff comments View file @ 97498a6

 <?php
 namespace App\Jobs;
 use App\Models\Ad_employer;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 class LiftVacancyJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
     private array $employerIds;
     public function __construct(array $employerIds)
     {
         $this->employerIds = $employerIds;
     }
     public function handle()
     {
         Ad_employer::query()
             ->whereIn('employer_id', $this->employerIds)
+            ->where('autolift_site', 1)
+            ->where('active_is', 1)
+            ->where('is_remove', 0)
             ->update([
                 'updated_at' => now()
             ]);
     }
 }

app/Jobs/SendVacancyToTelegramJob.php

Diff comments View file @ 97498a6

 <?php
 namespace App\Jobs;
 use App\Components\Integrations\Telegram\VacancyChannel;
 use App\Models\Ad_employer;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Telegram\Bot\Exceptions\TelegramSDKException;
 class SendVacancyToTelegramJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
     private array $employerIds;
     private VacancyChannel $telegramSenderHelper;
     public function __construct(array $employerIds)
     {
         $this->employerIds = $employerIds;
         $this->telegramSenderHelper = new VacancyChannel();
     }
     /**
      * @throws TelegramSDKException
      */
     public function handle(): void
     {
         $vacancies = Ad_employer::query()
             ->whereIn('employer_id', $this->employerIds)
+            ->where('autosend_tg', 1)
+            ->where('active_is', 1)
+            ->where('is_remove', 0)
             ->get();
         foreach ($vacancies as $vacancy) {
             $this->telegramSenderHelper->sendVacancy($vacancy);
         }
     }
 }