ISSUE #1625: Add deleted activities to WebhookEvent table

Author: robiningelbrecht

config/app/test/config-import.yaml

@@ -4,4 +4,7 @@ import:
   activity_visibilities_to_import: []
   skip_activities_recorded_before: null
   activitiesToSkipDuringImport: ['skip']
-  optInToSegmentDetailImport: true
+  optInToSegmentDetailImport: true
+  webhooks:
+    enabled: true
+    verifyToken: 'ffc26d52-d3ff-4797-a2b7-780a593a3547'

src/Console/DetectCorruptedActivitiesConsoleCommand.php

@@ -9,6 +9,10 @@
 use App\Domain\Activity\ActivityWithRawDataRepository;
 use App\Domain\Activity\Stream\ActivityStreamRepository;
 use App\Domain\Activity\Stream\CombinedStream\CombinedActivityStreamRepository;
+use App\Domain\Strava\Webhook\WebhookAspectType;
+use App\Domain\Strava\Webhook\WebhookConfig;
+use App\Domain\Strava\Webhook\WebhookEvent;
+use App\Domain\Strava\Webhook\WebhookEventRepository;
 use App\Infrastructure\Console\ProvideConsoleIntro;
 use App\Infrastructure\CQRS\Command\Bus\CommandBus;
 use App\Infrastructure\Daemon\Mutex\LockName;
@@ -34,8 +38,10 @@ public function __construct(
         private readonly ActivityWithRawDataRepository $activityWithRawDataRepository,
         private readonly ActivityStreamRepository $activityStreamRepository,
         private readonly CombinedActivityStreamRepository $combinedActivityStreamRepository,
+        private readonly WebhookEventRepository $webhookEventRepository,
         private readonly CommandBus $commandBus,
         private readonly UnitSystem $unitSystem,
+        private readonly WebhookConfig $webhookConfig,
         private readonly Mutex $mutex,
     ) {
         parent::__construct();
@@ -59,6 +65,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $activityIds = $this->activityRepository->findActivityIds();
         $activityIdsToDelete = ActivityIds::empty();
         foreach ($activityIds as $activityId) {
+            $progressIndicator->advance();
             try {
                 $this->activityWithRawDataRepository->find($activityId);
             } catch (\JsonException) {
@@ -83,7 +90,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $activityIdsToDelete->add($activityId);
                 continue;
             }
-            $progressIndicator->advance();
         }
 
         if ($activityIdsToDelete->isEmpty()) {
@@ -111,6 +117,20 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $this->activityWithRawDataRepository->markActivitiesForDeletion($activityIdsToDelete);
         $this->commandBus->dispatch(new DeleteActivitiesMarkedForDeletion($output));
 
+        if (!$this->webhookConfig->isEnabled()) {
+            return Command::SUCCESS;
+        }
+
+        foreach ($activityIdsToDelete as $activityId) {
+            // Add activities to the WebhookEvent table so they get imported through the webhook flow.
+            $this->webhookEventRepository->add(WebhookEvent::create(
+                objectId: $activityId->toUnprefixedString(),
+                objectType: 'activity',
+                aspectType: WebhookAspectType::CREATE,
+                payload: [],
+            ));
+        }
+
         return Command::SUCCESS;
     }
 }

tests/Console/DetectCorruptedActivitiesConsoleCommandTest.php

@@ -138,6 +138,10 @@ public function testExecuteWithoutDataButPositiveConfirmation(): void
         ]);
 
         $this->assertMatchesSnapshot($commandTester->getDisplay(), new ConsoleOutputSnapshotDriver());
+
+        $this->assertMatchesJsonSnapshot(
+            $this->getConnection()->executeQuery('SELECT * FROM WebhookEvent')->fetchAllAssociative()
+        );
     }
 
     #[\Override]

tests/Console/__snapshots__/DetectCorruptedActivitiesConsoleCommandTest__testExecuteWithoutDataButPositiveConfirmation__2.json

@@ -0,0 +1,20 @@
+[
+    {
+        "objectId": "test",
+        "objectType": "activity",
+        "aspectType": "create",
+        "payload": "[]"
+    },
+    {
+        "objectId": "test-3",
+        "objectType": "activity",
+        "aspectType": "create",
+        "payload": "[]"
+    },
+    {
+        "objectId": "test-2",
+        "objectType": "activity",
+        "aspectType": "create",
+        "payload": "[]"
+    }
+]