Merge branch 'develop' of https://github.com/owlchester/kanka into ch…

…aracter-private-families
owlchester · Jul 15, 2024 · b14299a · b14299a
2 parents 9fbc648 + b6b2c6f
commit b14299a
Show file tree

Hide file tree

Showing 205 changed files with 1,426 additions and 781 deletions.
diff --git a/app/Console/Commands/Cleanup/CleanupTrashed.php b/app/Console/Commands/Cleanup/CleanupTrashed.php
@@ -4,7 +4,8 @@
 
 use App\Models\Entity;
 use App\Models\Post;
-use App\Services\RecoveryService;
+use App\Services\Entity\PurgeService;
+use App\Services\Posts\PurgeService as PostPurgeService;
 use App\Traits\HasJobLog;
 use Carbon\Carbon;
 use Exception;
@@ -33,17 +34,19 @@ class CleanupTrashed extends Command
      * The recovery service
      *
      */
-    protected RecoveryService $service;
+    protected PurgeService $service;
+    protected PostPurgeService $postService;
 
     /**
      * Create a new command instance.
      *
      * @return void
      */
-    public function __construct(RecoveryService $service)
+    public function __construct(PurgeService $service, PostPurgeService $postService)
     {
         parent::__construct();
         $this->service = $service;
+        $this->postService = $postService;
     }
 
     /**
@@ -54,14 +57,13 @@ public function handle()
     {
         $delay = Carbon::now()->subDays(config('entities.hard_delete'))->toDateString();
         $log = '';
+        $this->info('Looking to purge entities and posts deleted since ' . $delay);
 
         DB::beginTransaction();
         try {
             Entity::onlyTrashed()
                 ->where('deleted_at', '<=', $delay)
                 ->allCampaigns()
-                // chunkById allows us to safely delete elements in a chunk
-                // see https://stackoverflow.com/questions/32700537/eloquent-chunk-missing-half-the-results
                 ->chunkById(1000, function ($entities): void {
                     $this->info('Chunk deleting ' . count($entities) . ' entities.');
                     foreach ($entities as $entity) {
@@ -73,8 +75,9 @@ public function handle()
                 ->where('deleted_at', '<=', $delay)
                 ->chunkById(1000, function ($posts): void {
                     $this->info('Chunk deleting ' . count($posts) . ' posts.');
+                    /** @var Post $post */
                     foreach ($posts as $post) {
-                        $this->service->trash($post);
+                        $this->postService->trash($post);
                     }
                 });
             DB::commit();
@@ -88,8 +91,8 @@ public function handle()
         $this->info('Deleted ' . $this->service->count() . ' trashed entities.');
         $log .= '<br />' . 'Deleted ' . $this->service->count() . ' trashed entities.';
 
-        $this->info('Deleted ' . $this->service->countPosts() . ' trashed posts.');
-        $log .= '<br />' . 'Deleted ' . $this->service->countPosts() . ' trashed posts.';
+        $this->info('Deleted ' . $this->postService->count() . ' trashed posts.');
+        $log .= '<br />' . 'Deleted ' . $this->postService->count() . ' trashed posts.';
         $this->log($log);
 
         return 0;

diff --git a/app/Console/Commands/Cleanup/CleanupTrashedCampaigns.php b/app/Console/Commands/Cleanup/CleanupTrashedCampaigns.php
@@ -51,9 +51,10 @@ public function handle()
     {
         Campaign::observe(CampaignObserver::class);
 
-        $this->service->purgeDeleted();
-        $this->info('');
-        $this->info('Deleted ' . $this->service->count() . ' trashed campaigns.');
+        $count = $this->service->purgeDeleted();
+        $log = 'Deleted ' . $count . ' trashed campaigns.';
+        $this->info($log);
+        $this->log($log);
 
         return 0;
     }

diff --git a/app/Console/Commands/Migrations/MigrateTutorials.php b/app/Console/Commands/Migrations/MigrateTutorials.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Console\Commands\Migrations;
+
+use App\Models\Users\Tutorial;
+use App\User;
+use Illuminate\Console\Command;
+
+class MigrateTutorials extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'users:migrate-tutorials';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Migrate user tutorial settings';
+
+    private $count = 0;
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        User::whereNotNull('settings')
+            ->chunk(5000, function ($users): void {
+                /** @var User $user */
+                foreach ($users as $user) {
+                    $this->count++;
+                    $settings = $user->settings;
+
+                    foreach ($settings as $key => $setting) {
+                        if (str_starts_with($key, 'tutorial_')) {
+                            $tutorial = new Tutorial();
+                            $tutorial->user_id = $user->id;
+                            $tutorial->code = mb_substr($key, 9);
+                            $tutorial->save();
+                            unset($settings[$key]);
+                        }
+                    }
+                    $user->updateQuietly(['settings' => $settings]);
+                }
+            });
+
+        $this->info('Migrated ' . $this->count . ' user tutorials.');
+        return Command::SUCCESS;
+    }
+}
diff --git a/app/Console/Commands/Migrations/NewsletterSubCommand.php b/app/Console/Commands/Migrations/NewsletterSubCommand.php
@@ -33,20 +33,25 @@ public function handle()
     {
         $this->service = app()->make(NewsletterService::class);
         User::whereNotNull('pledge')
+            ->where('pledge', '<>', '')
             ->where('settings', 'like', '%mail_release%')
-            ->chunk(500, function ($users) {
+            ->chunk(100, function ($users) {
                 foreach ($users as $user) {
                     if (!$user->mail_release) {
                         continue;
                     }
                     $options = [
                         'releases' => (bool) $user->mail_release
                     ];
-                    $this->service->user($user)->update($options);
-                    $this->count++;
+                    if ($this->service->user($user)->update($options)) {
+                        $this->count++;
+                        continue;
+                    }
+                    $this->error($this->service->error()->getMessage());
                 }
+                sleep(60);
             });
 
-        $this->info('Processes ' . $this->count . ' users.');
+        $this->info('Processed ' . $this->count . ' users.');
     }
 }
diff --git a/app/Console/Commands/Subscriptions/MigrateSubscriptions.php b/app/Console/Commands/Subscriptions/MigrateSubscriptions.php
@@ -3,6 +3,7 @@
 namespace App\Console\Commands\Subscriptions;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Str;
 use Laravel\Cashier\Subscription;
 
 class MigrateSubscriptions extends Command
@@ -34,6 +35,7 @@ public function handle()
         Subscription::with(['user', 'user.subscriptions', 'user.subscriptions.owner'])
             ->where('stripe_status', 'active')
             ->whereIn('stripe_price', $old)
+            ->whereNotIn('user_id', [177165, 200759])
             ->has('user')
             ->chunkById(200, function ($subs) {
                 if ($this->count > $this->limit) {
@@ -43,6 +45,10 @@ public function handle()
                     if ($this->count > $this->limit) {
                         return false;
                     }
+                    // Don't touch sofort people
+                    if (Str::startsWith($s->stripe_id, 'sofort_')) {
+                        continue;
+                    }
                     $this->info('User #' . $s->user->id . ' ' . $s->user->email . ' https://dashboard.stripe.com/customers/' . $s->user->stripe_id);
                     try {
                         $old = $s->stripe_price;

diff --git a/app/Facades/Images.php b/app/Facades/Images.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Facades;
+
+use App\Services\ImagesService;
+use Illuminate\Support\Facades\Facade;
+
+/**
+ * Class Img
+ * @package App\Facades
+ *
+ * @see ImagesService
+ * @mixin ImagesService
+ */
+class Images extends Facade
+{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        return 'images';
+    }
+}
diff --git a/app/Http/Controllers/Api/v1/EntityImageApiController.php b/app/Http/Controllers/Api/v1/EntityImageApiController.php
@@ -7,7 +7,7 @@
 use App\Http\Requests\API\UploadEntityImage;
 use App\Models\Campaign;
 use App\Models\Entity;
-use App\Services\ImageService;
+use App\Facades\Images;
 
 class EntityImageApiController extends Controller
 {
@@ -17,7 +17,7 @@ public function put(UploadEntityImage $request, Campaign $campaign, Entity $enti
         $this->authorize('update', $entity->child);
 
         // Let the service handle everything
-        ImageService::handle($entity);
+        Images::handle($entity);
         $entity->update();
 
         return response()->json([
@@ -38,7 +38,7 @@ public function destroy(Campaign $campaign, Entity $entity)
         $this->authorize('update', $entity->child);
 
         // Let the service handle everything
-        ImageService::cleanup($entity);
+        Images::cleanup($entity);
 
         $entity->update(['image_path' => '']);
 

diff --git a/app/Http/Controllers/Api/v1/EntityRecoveryApiController.php b/app/Http/Controllers/Api/v1/EntityRecoveryApiController.php
@@ -5,7 +5,7 @@
 use App\Models\Campaign;
 use App\Http\Resources\EntityResource as Resource;
 use App\Http\Requests\RecoverEntity as Request;
-use App\Services\RecoveryService;
+use App\Services\Entity\RecoveryService;
 
 class EntityRecoveryApiController extends ApiController
 {
@@ -42,6 +42,6 @@ public function recover(Request $request, Campaign $campaign)
         }
         $this->service->recover($request->entities);
 
-        return response()->json(['success' => 'Succesfully recovered deleted entities']);
+        return response()->json(['success' => 'Successfully recovered deleted entities']);
     }
 }
diff --git a/app/Http/Controllers/Api/v1/PostRecoveryApiController.php b/app/Http/Controllers/Api/v1/PostRecoveryApiController.php
@@ -5,7 +5,7 @@
 use App\Models\Campaign;
 use App\Http\Resources\PostResource as Resource;
 use App\Http\Requests\RecoverPost as Request;
-use App\Services\RecoveryService;
+use App\Services\Posts\RecoveryService;
 
 class PostRecoveryApiController extends ApiController
 {
@@ -40,8 +40,8 @@ public function recover(Request $request, Campaign $campaign)
         if (!$campaign->boosted()) {
             return response()->json(null, 204);
         }
-        $this->service->recoverPosts($request->posts);
+        $this->service->recover($request->posts);
 
-        return response()->json(['success' => 'Succesfully recovered deleted posts']);
+        return response()->json(['success' => 'Successfully recovered deleted posts']);
     }
 }
diff --git a/app/Http/Controllers/Campaign/MemberController.php b/app/Http/Controllers/Campaign/MemberController.php
@@ -63,12 +63,14 @@ public function back(Campaign $campaign)
     }
 
     /**
-     * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function updateRoles(Campaign $campaign, CampaignUser $campaignUser, CampaignRole $campaignRole)
     {
         $this->authorize('update', $campaignUser);
+        if (request()->ajax()) {
+            return response()->json();
+        }
 
         try {
             $added = $this->service->update($campaignUser, $campaignRole);

diff --git a/app/Http/Controllers/Campaign/PostRecoveryController.php b/app/Http/Controllers/Campaign/PostRecoveryController.php
@@ -5,7 +5,7 @@
 use App\Facades\Datagrid;
 use App\Http\Controllers\Controller;
 use App\Models\Campaign;
-use App\Services\RecoveryService;
+use App\Services\Posts\RecoveryService;
 use Carbon\Carbon;
 use Exception;
 use Illuminate\Http\Request;
@@ -64,7 +64,7 @@ public function recover(Request $request, Campaign $campaign)
         }
 
         try {
-            $count = $this->service->recoverPosts($request->get('model', []));
+            $count = $this->service->recover($request->get('model', []));
             return redirect()
                 ->route('recovery.posts', $campaign)
                 ->with('success', trans_choice('campaigns/recovery.posts.success', $count, ['count' => $count]));

diff --git a/app/Http/Controllers/Campaign/RecoveryController.php b/app/Http/Controllers/Campaign/RecoveryController.php
@@ -6,7 +6,7 @@
 use App\Http\Controllers\Controller;
 use App\Models\Campaign;
 use App\Models\Entity;
-use App\Services\RecoveryService;
+use App\Services\Entity\RecoveryService;
 use Carbon\Carbon;
 use Exception;
 use Illuminate\Http\Request;

diff --git a/app/Http/Controllers/Crud/CampaignController.php b/app/Http/Controllers/Crud/CampaignController.php
@@ -165,6 +165,9 @@ public function update(UpdateCampaign $request, Campaign $campaign)
     public function destroy(DeleteCampaign $request, Campaign $campaign)
     {
         $this->authorize('delete', $campaign);
+        if ($request->ajax()) {
+            return response()->json();
+        }
 
         $this->deletionService
             ->campaign($campaign)

diff --git a/app/Http/Controllers/Entity/AssetController.php b/app/Http/Controllers/Entity/AssetController.php
@@ -102,7 +102,7 @@ protected function storeFile(StoreEntityAsset $request, Campaign $campaign, Enti
             $file = $service
                 ->entity($entity)
                 ->campaign($campaign)
-                ->upload($request);
+                ->upload($request, 'file', 'w/' . $campaign->id . '/entity-assets');
 
             return redirect()
                 ->route('entities.entity_assets.index', [$campaign, $entity])

diff --git a/app/Http/Controllers/Entity/AttributeController.php b/app/Http/Controllers/Entity/AttributeController.php
@@ -124,7 +124,7 @@ public function save(Campaign $campaign, Entity $entity)
         $this->authorize('attribute', [$entity->child, 'edit']);
         $this->authorize('attributes', $entity);
 
-        $attributes = request()->get('attribute');
+        $attributes = request()->get('attribute', []);
 
         $this->service
             ->entity($entity)

diff --git a/app/Http/Controllers/Entity/ImageController.php b/app/Http/Controllers/Entity/ImageController.php
@@ -7,7 +7,7 @@
 use App\Http\Requests\UpdateEntityImage;
 use App\Models\Campaign;
 use App\Models\Entity;
-use App\Services\ImageService;
+use App\Facades\Images;
 
 class ImageController extends Controller
 {
@@ -77,7 +77,7 @@ public function update(UpdateEntityImage $request, Campaign $campaign, Entity $e
         } else {
             $entity->image_uuid = null;
         }
-        ImageService::entity($entity, 'w/' . $entity->campaign_id, 'image');
+        Images::entity($entity, 'w/' . $entity->campaign_id, 'image');
         // New image requires a focus reset
         if ($entity->isDirty(['image_uuid', 'image_path'])) {
             $entity->focus_x = null;