Merge pull request #1397 from bakaphp/cronjob-caddielab

Cronjob caddielab

app/Console/Commands/Connectors/Notifications/MailCaddieLabCommand.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Console\Commands\Connectors\Notifications;
+
+use Illuminate\Console\Command;
+use Kanvas\Apps\Repositories\AppsRepository;
+use Kanvas\Connectors\Notifications\Jobs\MailCaddieLabJob;
+
+class MailCaddieLabCommand extends Command
+{
+    protected $signature = 'kanvas:internal-mail-caddie-lab {apps_id}';
+
+    public function handle()
+    {
+        $this->info('Sending internal mail to Caddie Lab');
+        MailCaddieLabJob::dispatch(AppsRepository::findFirstByKey($this->argument('apps_id')));
+    }
+}

app/Console/Kernel.php

@@ -13,15 +13,16 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
-     *
      * @return void
      */
     protected function schedule(Schedule $schedule)
     {
         $schedule->command(RunHealthChecksCommand::class)->everyMinute();
         $schedule->command(DispatchQueueCheckJobsCommand::class)->everyMinute();
         $schedule->command(ScheduleCheckHeartbeatCommand::class)->everyMinute();
+        /*         $schedule->command(MailCaddieLabCommand::class, [getenv('CADDIE_APP_KEY')])
+                        ->dailyAt('13:00')
+                        ->timezone('America/Santo_Domingo') ; */
     }
 
     /**

database/migrations/Guild/2024_05_28_030618_apps_id_people.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class () extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('peoples', function (Blueprint $table) {
+            //
+            $table->bigInteger('apps_id')->unsigned()->nullable()->after('companies_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('peoples', function (Blueprint $table) {
+            //
+            $table->dropColumn('apps_id');
+        });
+    }
+};

routes/console.php

@@ -2,6 +2,10 @@
 
 use Illuminate\Foundation\Inspiring;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Schedule;
+use Illuminate\Support\Facades\Schema;
+use Kanvas\Apps\Repositories\AppsRepository;
+use Kanvas\Connectors\Jobs\MailCaddieLabJob;
 
 /*
 |--------------------------------------------------------------------------

src/Domains/Connectors/Notifications/Jobs/MailCaddieLabJob.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Kanvas\Connectors\Notifications\Jobs;
+
+use Baka\Traits\KanvasJobsTrait;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Notification;
+use Kanvas\Apps\Models\Apps;
+use Kanvas\Guild\Customers\Repositories\PeoplesRepository;
+use Kanvas\Notifications\Templates\Blank;
+
+class MailCaddieLabJob implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use SerializesModels;
+    use KanvasJobsTrait;
+    use Queueable;
+
+    public function __construct(
+        public Apps $app
+    ) {
+    }
+
+    public function handle()
+    {
+        $peoples = PeoplesRepository::getByDaysCreated(7, $this->app);
+        $this->sendMails($peoples, 'join-caddie');
+
+        $peoples = PeoplesRepository::getByDaysCreated(28, $this->app);
+        $this->sendMails($peoples, 'join-caddie');
+    }
+
+    public function sendMails(Collection $peoples, string $template)
+    {
+        foreach ($peoples as $people) {
+            $email = $people->emails()->first();
+            $url = $this->app->get('billing_url') . '/' . '?email=' . $email->value . '&paid=false';
+            $notification = new Blank(
+                $template,
+                ['membershipUpgradeUrl' => $url, 'app' => $this->app],
+                ['mail'],
+                $people
+            );
+            $notification->setSubject('Join to Caddie Lab');
+            echo ' Sending email to ' . $email->value . "\n";
+            if (! $people->get('paid_subscription')) {
+                Notification::route('mail', $email->value)->notify($notification);
+            }
+        }
+    }
+}

src/Domains/Guild/Customers/Actions/CreatePeopleAction.php

@@ -28,6 +28,7 @@ public function execute(): People
         $company = $this->peopleData->branch->company()->firstOrFail();
 
         $attributes = [
+            'apps_id' => $this->peopleData->app->getId(),
             'users_id' => $this->peopleData->user->getId(),
             'firstname' => $this->peopleData->firstname,
             'middlename' => $this->peopleData->middlename,

src/Domains/Guild/Customers/Repositories/PeoplesRepository.php

@@ -7,8 +7,10 @@
 use Baka\Contracts\CompanyInterface;
 use Baka\Traits\SearchableTrait;
 use Baka\Users\Contracts\UserInterface;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Kanvas\Apps\Models\Apps;
 use Kanvas\Exceptions\ModelNotFoundException as ExceptionsModelNotFoundException;
 use Kanvas\Guild\Customers\Enums\ContactTypeEnum;
 use Kanvas\Guild\Customers\Models\Contact;
@@ -51,6 +53,13 @@ public static function getByEmail(string $email, CompanyInterface $company): ?Pe
             ->first();
     }
 
+    public static function getByDaysCreated(int $days, Apps $app): Collection
+    {
+        return People::whereRaw('DATEDIFF(NOW(), created_at) = ?', [$days])
+        ->where('apps_id', $app->getId())
+        ->get();
+    }
+
     public static function findByEmailOrCreate(string $email, UserInterface $user, CompanyInterface $company, ?string $name): People
     {
         $people = self::getByEmail($email, $company);

src/Kanvas/Users/Repositories/UsersRepository.php

@@ -9,6 +9,7 @@
 use Baka\Users\Contracts\UserInterface;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Support\Facades\DB;
 use Kanvas\Apps\Models\Apps;
 use Kanvas\Companies\Models\Companies;
 use Kanvas\Companies\Models\CompaniesBranches;
@@ -94,6 +95,17 @@ public static function getUserOfAppById(int $id, ?AppInterface $app = null): Use
             ->firstOrFail();
     }
 
+    public static function getUsersByDaysCreated(int $days, ?AppInterface $app = null): Collection
+    {
+        $app = $app ?? app(Apps::class);
+
+        return Users::join('users_associated_apps', 'users_associated_apps.users_id', '=', 'users.id')
+            ->whereRaw('DATEDIFF(CURDATE(), users_associated_apps.created_at) = ?', [$days])
+            ->select('users.*')
+            ->groupBy('users.id')
+            ->get();
+    }
+
     /**
      * getAll.
      * @psalm-suppress MixedReturnStatement
@@ -104,6 +116,7 @@ public static function getAll(int $companiesId): Collection
             ->join('users_associated_company', 'users_associated_company.users_id', 'users.id')
             ->where('users_associated_company.companies_id', $companiesId)
             ->whereNot('users.id', auth()->user()->id)
+            ->select('users.*')
             ->get();
     }