[ADVAPP-358]

app-modules/alert/src/Observers/AlertObserver.php

@@ -55,8 +55,8 @@ public function created(Alert $alert): void
             resolve(SubscriptionCreate::class)->handle($user, $alert->getSubscribable(), false);
 
             Cache::tags([match ($alert->concern_type) {
-                app(Prospect::class)->getMorphClass() => "{user-{$user->getKey()}-prospect-alerts}",
-                app(Student::class)->getMorphClass() => "{user-{$user->getKey()}-student-alerts}",
+                app(Prospect::class)->getMorphClass() => "user-{$user->getKey()}-prospect-alerts",
+                app(Student::class)->getMorphClass() => "user-{$user->getKey()}-student-alerts",
             }])->flush();
         }
 
@@ -77,8 +77,8 @@ public function deleted(Alert $alert): void
 
         if ($user) {
             Cache::tags([match ($alert->concern_type) {
-                app(Prospect::class)->getMorphClass() => "{user-{$user->getKey()}-prospect-alerts}",
-                app(Student::class)->getMorphClass() => "{user-{$user->getKey()}-student-alerts}",
+                app(Prospect::class)->getMorphClass() => "user-{$user->getKey()}-prospect-alerts",
+                app(Student::class)->getMorphClass() => "user-{$user->getKey()}-student-alerts",
             }])->flush();
         }
     }

app-modules/application/src/Observers/ApplicationSubmissionObserver.php

@@ -61,7 +61,7 @@ public function created(ApplicationSubmission $submission): void
         if (! is_null($submission->author)) {
             Cache::tags('{application-submission-count}')
                 ->forget(
-                    "{application-submission-count-{$submission->author->getKey()}}"
+                    "application-submission-count-{$submission->author->getKey()}"
                 );
         }
     }

app-modules/form/src/Observers/FormSubmissionObserver.php

@@ -52,7 +52,7 @@ public function created(FormSubmission $submission): void
         if (! is_null($submission->author)) {
             Cache::tags('{form-submission-count}')
                 ->forget(
-                    "{form-submission-count-{$submission->author->getKey()}}"
+                    "form-submission-count-{$submission->author->getKey()}"
                 );
         }
     }

app-modules/notification/src/Observers/SubscriptionObserver.php

@@ -55,8 +55,8 @@ public function created(Subscription $subscription): void
 
         if ($user) {
             Cache::tags([match ($subscription->subscribable_type) {
-                app(Prospect::class)->getMorphClass() => "{user-{$user->getKey()}-prospect-subscriptions‘",
-                app(Student::class)->getMorphClass() => "{user-{$user->getKey()}-student-subscriptions‘",
+                app(Prospect::class)->getMorphClass() => "user-{$user->getKey()}-prospect-subscriptions",
+                app(Student::class)->getMorphClass() => "user-{$user->getKey()}-student-subscriptions",
             }])->flush();
         }
     }
@@ -70,8 +70,8 @@ public function deleted(Subscription $subscription): void
 
         if ($user) {
             Cache::tags([match ($subscription->subscribable_type) {
-                app(Prospect::class)->getMorphClass() => "{user-{$user->getKey()}-prospect-subscriptions‘",
-                app(Student::class)->getMorphClass() => "{user-{$user->getKey()}-student-subscriptions‘",
+                app(Prospect::class)->getMorphClass() => "user-{$user->getKey()}-prospect-subscriptions",
+                app(Student::class)->getMorphClass() => "user-{$user->getKey()}-student-subscriptions",
             }])->flush();
         }
     }

app-modules/prospect/src/Filament/Resources/ProspectResource/Pages/ManageProspectAlerts.php

@@ -81,7 +81,7 @@ public static function getNavigationItems(array $urlParameters = []): array
         /** @var Prospect $ownerRecord */
         $alertsCount = Cache::tags('{alert-count}')
             ->remember(
-                "{alert-count-{$ownerRecord->getKey()}}",
+                "alert-count-{$ownerRecord->getKey()}",
                 now()->addMinutes(5),
                 function () use ($ownerRecord): int {
                     return $ownerRecord->alerts()->status(AlertStatus::Active)->count();

app-modules/prospect/src/Filament/Resources/ProspectResource/Pages/ManageProspectApplicationSubmissions.php

@@ -135,7 +135,7 @@ public static function getNavigationItems(array $urlParameters = []): array
         /** @var Prospect $ownerRecord */
         $applicationSubmissionsCount = Cache::tags('{application-submission-count}')
             ->remember(
-                "{application-submission-count-{$ownerRecord->getKey()}}",
+                "application-submission-count-{$ownerRecord->getKey()}",
                 now()->addMinutes(5),
                 function () use ($ownerRecord): int {
                     return $ownerRecord->applicationSubmissions()->count();

app-modules/prospect/src/Filament/Resources/ProspectResource/Pages/ManageProspectFormSubmissions.php

@@ -117,7 +117,7 @@ public static function getNavigationItems(array $urlParameters = []): array
         /** @var Prospect $ownerRecord */
         $formSubmissionsCount = Cache::tags('{form-submission-count}')
             ->remember(
-                "{form-submission-count-{$ownerRecord->getKey()}}",
+                "form-submission-count-{$ownerRecord->getKey()}",
                 now()->addMinutes(5),
                 function () use ($ownerRecord): int {
                     return $ownerRecord->formSubmissions()->count();

app-modules/prospect/src/Filament/Widgets/ProspectStats.php

@@ -55,21 +55,21 @@ protected function getStats(): array
         return [
             Stat::make('Prospects', Number::abbreviate(
                 Cache::tags(['{prospects}'])
-                    ->remember('{prospects-count}', now()->addHour(), function (): int {
+                    ->remember('prospects-count', now()->addHour(), function (): int {
                         return Prospect::count();
                     }),
                 maxPrecision: 2,
             )),
-            Stat::make('Subscriptions', Cache::tags(['{prospects}', "{user-{$user->getKey()}-prospect-subscriptions}"])
-                ->remember("{user-{$user->getKey()}-prospect-subscriptions-count}", now()->addHour(), function () use ($user): int {
+            Stat::make('Subscriptions', Cache::tags(['{prospects}', "user-{$user->getKey()}-prospect-subscriptions"])
+                ->remember("user-{$user->getKey()}-prospect-subscriptions-count", now()->addHour(), function () use ($user): int {
                     return $user->prospectSubscriptions()->count();
                 })),
-            Stat::make('Alerts', Cache::tags(['{prospects}', "{user-{$user->getKey()}-prospect-alerts}"])
-                ->remember("{user-{$user->getKey()}-prospect-alerts-count}", now()->addHour(), function () use ($user): int {
+            Stat::make('Alerts', Cache::tags(['{prospects}', "user-{$user->getKey()}-prospect-alerts"])
+                ->remember("user-{$user->getKey()}-prospect-alerts-count", now()->addHour(), function () use ($user): int {
                     return $user->prospectAlerts()->status(AlertStatus::Active)->count();
                 })),
             Stat::make('Caseloads', Cache::tags(["{user-{$user->getKey()}-prospect-caseloads}"])
-                ->remember("{user-{$user->getKey()}-prospect-caseloads-count}", now()->addHour(), function () use ($user): int {
+                ->remember("user-{$user->getKey()}-prospect-caseloads-count", now()->addHour(), function () use ($user): int {
                     return $user->caseloads()->model(CaseloadModel::Prospect)->count();
                 })),
         ];

app-modules/student-data-model/src/Filament/Resources/StudentResource/Pages/ManageStudentAlerts.php

@@ -81,7 +81,7 @@ public static function getNavigationItems(array $urlParameters = []): array
         /** @var Student $ownerRecord */
         $alertsCount = Cache::tags('{alert-count}')
             ->remember(
-                "{alert-count-{$ownerRecord->getKey()}}",
+                "alert-count-{$ownerRecord->getKey()}",
                 now()->addMinutes(5),
                 function () use ($ownerRecord): int {
                     return $ownerRecord->alerts()->status(AlertStatus::Active)->count();

app-modules/student-data-model/src/Filament/Resources/StudentResource/Pages/ManageStudentApplicationSubmissions.php

@@ -135,7 +135,7 @@ public static function getNavigationItems(array $urlParameters = []): array
         /** @var Student $ownerRecord */
         $applicationSubmissionsCount = Cache::tags('{application-submission-count}')
             ->remember(
-                "{application-submission-count-{$ownerRecord->getKey()}}",
+                "application-submission-count-{$ownerRecord->getKey()}",
                 now()->addMinutes(5),
                 function () use ($ownerRecord): int {
                     return $ownerRecord->applicationSubmissions()->count();

app-modules/student-data-model/src/Filament/Resources/StudentResource/Pages/ManageStudentFormSubmissions.php

@@ -117,7 +117,7 @@ public static function getNavigationItems(array $urlParameters = []): array
         /** @var Prospect $ownerRecord */
         $formSubmissionsCount = Cache::tags('{form-submission-count}')
             ->remember(
-                "{form-submission-count-{$ownerRecord->getKey()}}",
+                "form-submission-count-{$ownerRecord->getKey()}",
                 now()->addMinutes(5),
                 function () use ($ownerRecord): int {
                     return $ownerRecord->formSubmissions()->count();

app-modules/student-data-model/src/Filament/Widgets/StudentStats.php

@@ -55,21 +55,21 @@ protected function getStats(): array
         return [
             Stat::make('Students', Number::abbreviate(
                 Cache::tags(['{students}'])
-                    ->remember('{students-count}', now()->addHour(), function (): int {
+                    ->remember('students-count', now()->addHour(), function (): int {
                         return Student::count();
                     }),
                 maxPrecision: 2,
             )),
-            Stat::make('Subscriptions', Cache::tags(['{students', "{user-{$user->getKey()}-student-subscriptions}"])
-                ->remember("{user-{$user->getKey()}-student-subscriptions-count}", now()->addHour(), function () use ($user): int {
+            Stat::make('Subscriptions', Cache::tags(['{students', "user-{$user->getKey()}-student-subscriptions"])
+                ->remember("user-{$user->getKey()}-student-subscriptions-count", now()->addHour(), function () use ($user): int {
                     return $user->studentSubscriptions()->count();
                 })),
-            Stat::make('Alerts', Cache::tags(['{students', "{user-{$user->getKey()}-student-alerts}"])
-                ->remember("{user-{$user->getKey()}-student-alerts-count}", now()->addHour(), function () use ($user): int {
+            Stat::make('Alerts', Cache::tags(['{students}', "user-{$user->getKey()}-student-alerts"])
+                ->remember("user-{$user->getKey()}-student-alerts-count", now()->addHour(), function () use ($user): int {
                     return $user->studentAlerts()->status(AlertStatus::Active)->count();
                 })),
             Stat::make('Caseloads', Cache::tags(["{user-{$user->getKey()}-student-caseloads}"])
-                ->remember("{user-{$user->getKey()}-student-caseloads-count}", now()->addHour(), function () use ($user): int {
+                ->remember("user-{$user->getKey()}-student-caseloads-count", now()->addHour(), function () use ($user): int {
                     return $user->caseloads()->model(CaseloadModel::Student)->count();
                 })),
         ];

app-modules/timeline/tests/Listeners/AddRecordToTimelineTest.php

@@ -64,7 +64,7 @@
 
     // The cache key for the educatable should be busted
     expect(Cache::has(
-        "{timeline.synced.{$initialResponse->sender->getMorphClass()}.{$initialResponse->sender->getKey()}}"
+        "timeline.synced.{$initialResponse->sender->getMorphClass()}.{$initialResponse->sender->getKey()}"
     ))->toBeFalse();
 });
 

app-modules/timeline/tests/Listeners/RemoveRecordFromTimelineTest.php

@@ -66,7 +66,7 @@
 
     // The cache key for the educatable should be busted
     expect(Cache::has(
-        "{timeline.synced.{$initialResponse->sender->getMorphClass()}.{$initialResponse->sender->getKey()}}"
+        "timeline.synced.{$initialResponse->sender->getMorphClass()}.{$initialResponse->sender->getKey()}"
     ))->toBeFalse();
 });
 

app/Filament/Widgets/ProspectGrowthChart.php

@@ -68,7 +68,7 @@ protected function getOptions(): array
     protected function getData(): array
     {
         $runningTotalPerMonth = Cache::tags(['{prospects}'])
-            ->remember('{prospect-growth-chart-data}', now()->addHour(), function (): array {
+            ->remember('prospect-growth-chart-data', now()->addHour(), function (): array {
                 $totalCreatedPerMonth = Prospect::query()
                     ->toBase()
                     ->selectRaw('date_trunc(\'month\', created_at) as month')

docker/s6-overlay/s6-rc.d/clear-cache/dependencies

@@ -0,0 +1 @@
+runas-user

docker/s6-overlay/s6-rc.d/clear-cache/type

@@ -0,0 +1 @@
+oneshot

docker/s6-overlay/s6-rc.d/clear-cache/up

@@ -0,0 +1 @@
+/etc/s6-overlay/scripts/clear-cache

docker/s6-overlay/scripts/clear-cache

@@ -0,0 +1,19 @@
+#!/command/with-contenv bash
+
+# Exit on error
+set -e
+
+# Check to see if an Artisan file exists and assume it means Laravel is configured.
+if [ -f $WEBUSER_HOME/artisan ] && [ ${CLEAR_CACHE:="false"} == "true" ]; then
+  echo "Clearing the cache..."
+
+  USERNAME=$(id -nu $PUID)
+
+  s6-setuidgid $USERNAME php $WEBUSER_HOME/artisan cache:clear
+
+  echo "Cache Cleared!"
+else
+    echo "Skipping clearing the cache because we could not detect a Laravel install or it was specifically not enabled..."
+fi
+
+exit 0