Merge pull request #25 from fredbradley/master

Fix issue when an app that uses this package hasn't got the cacheDuration config set
cranleighschool · Oct 15, 2021 · ddba3d9 · ddba3d9
2 parents 7efce45 + 48119a8
commit ddba3d9
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 17 deletions.
diff --git a/src/Controllers/AdmissionApplicantController.php b/src/Controllers/AdmissionApplicantController.php
@@ -52,7 +52,7 @@ public function index(): Collection
             throw new \Exception($items->count() . ' items were returned instead of ' . $totalCount . ' as specified on page 1.');
         }
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($items) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($items) {
             return $items;
         });
     }

diff --git a/src/Controllers/AdmissionStatusController.php b/src/Controllers/AdmissionStatusController.php
@@ -33,7 +33,7 @@ public function index(): Collection
 
         $response = $this->guzzle->request('GET', $this->endpoint, ['headers' => $this->getHeaders()]);
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($response) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($response) {
             return $this->wrapJson($response->getBody()->getContents(), 'items', AdmissionStatus::class);
         });
     }

diff --git a/src/Controllers/CountryController.php b/src/Controllers/CountryController.php
@@ -33,7 +33,7 @@ public function index(): Collection
 
         $response = $this->guzzle->request('GET', $this->endpoint, ['headers' => $this->getHeaders()]);
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($response) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($response) {
             return $this->wrapJson($response->getBody()->getContents(), 'items', Country::class);
         });
     }

diff --git a/src/Controllers/CountyController.php b/src/Controllers/CountyController.php
@@ -33,7 +33,7 @@ public function index(): Collection
 
         $response = $this->guzzle->request('GET', $this->endpoint, ['headers' => $this->getHeaders()]);
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($response) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($response) {
             return $this->wrapJson($response->getBody()->getContents(), 'items', County::class);
         });
     }

diff --git a/src/Controllers/CurrentPupilController.php b/src/Controllers/CurrentPupilController.php
@@ -52,7 +52,7 @@ public function index(): Collection
             throw new \Exception($items->count() . ' items were returned instead of ' . $totalCount . ' as specified on page 1.');
         }
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($items) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($items) {
             return $items;
         });
     }

diff --git a/src/Controllers/EstateBuildingController.php b/src/Controllers/EstateBuildingController.php
@@ -33,7 +33,7 @@ public function index(): Collection
 
         $response = $this->guzzle->request('GET', $this->endpoint, ['headers' => $this->getHeaders()]);
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($response) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($response) {
             return $this->wrapJson($response->getBody()->getContents(), 'buildings', EstateBuilding::class);
         });
     }

diff --git a/src/Controllers/EstateRoomController.php b/src/Controllers/EstateRoomController.php
@@ -32,7 +32,7 @@ public function index(): Collection
 
         $response = $this->guzzle->request('GET', $this->endpoint, ['headers' => $this->getHeaders()]);
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($response) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($response) {
             return $this->wrapJson($response->getBody()->getContents(), 'rooms', EstateRoom::class);
         });
     }

diff --git a/src/Controllers/HumanResourcesEmployeeController.php b/src/Controllers/HumanResourcesEmployeeController.php
@@ -60,7 +60,7 @@ public function index(): Collection
 
         $items = $this->sortBySurname($items);
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($items) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($items) {
             return $items;
         });
     }

diff --git a/src/Controllers/LanguageController.php b/src/Controllers/LanguageController.php
@@ -33,7 +33,7 @@ public function index(): Collection
 
         $response = $this->guzzle->request('GET', $this->endpoint, ['headers' => $this->getHeaders()]);
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($response) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($response) {
             return $this->wrapJson($response->getBody()->getContents(), 'items', Language::class);
         });
     }

diff --git a/src/Controllers/NationalityController.php b/src/Controllers/NationalityController.php
@@ -33,7 +33,7 @@ public function index(): Collection
 
         $response = $this->guzzle->request('GET', $this->endpoint, ['headers' => $this->getHeaders()]);
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($response) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($response) {
             return $this->wrapJson($response->getBody()->getContents(), 'items', Nationality::class);
         });
     }

diff --git a/src/Controllers/OtherSchoolController.php b/src/Controllers/OtherSchoolController.php
@@ -52,7 +52,7 @@ public function index(): Collection
             throw new \Exception($items->count() . ' items were returned instead of ' . $totalCount . ' as specified on page 1.');
         }
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($items) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($items) {
             return $items;
         });
     }

diff --git a/src/Controllers/PupilBoardingStatusController.php b/src/Controllers/PupilBoardingStatusController.php
@@ -33,7 +33,7 @@ public function index(): Collection
 
         $response = $this->guzzle->request('GET', $this->endpoint, ['headers' => $this->getHeaders()]);
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($response) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($response) {
             return $this->wrapJson($response->getBody()->getContents(), 'items', PupilBoardingStatus::class);
         });
     }

diff --git a/src/Controllers/SchoolDepartmentController.php b/src/Controllers/SchoolDepartmentController.php
@@ -46,7 +46,7 @@ public function index(string $departmentType)
 
         $response = $this->guzzle->request('GET', $this->endpoint . '/' . $departmentType, ['headers' => $this->getHeaders()]);
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($response) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($response) {
             return $this->wrapJson($response->getBody()->getContents(), 'departments', SchoolDepartment::class);
         });
     }

diff --git a/src/Controllers/SchoolHouseController.php b/src/Controllers/SchoolHouseController.php
@@ -32,7 +32,7 @@ public function index(): Collection
 
         $response = $this->guzzle->request('GET', $this->endpoint, ['headers' => $this->getHeaders()]);
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($response) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($response) {
             return $this->wrapJson($response->getBody()->getContents(), 'houses', House::class);
         });
     }

diff --git a/src/Controllers/SchoolYearGroupController.php b/src/Controllers/SchoolYearGroupController.php
@@ -32,7 +32,7 @@ public function index(): Collection
 
         $response = $this->guzzle->request('GET', $this->endpoint, ['headers' => $this->getHeaders()]);
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($response) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($response) {
             return $this->wrapJson($response->getBody()->getContents(), 'yearGroups', YearGroup::class);
         });
     }

diff --git a/src/Controllers/TeachingSubjectController.php b/src/Controllers/TeachingSubjectController.php
@@ -32,7 +32,7 @@ public function index(): Collection
 
         $response = $this->guzzle->request('GET', $this->endpoint, ['headers' => $this->getHeaders()]);
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($response) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($response) {
             return $this->wrapJson($response->getBody()->getContents(), 'subjects', TeachingSubject::class);
         });
     }

diff --git a/src/Controllers/TitleController.php b/src/Controllers/TitleController.php
@@ -33,7 +33,7 @@ public function index(): Collection
 
         $response = $this->guzzle->request('GET', $this->endpoint, ['headers' => $this->getHeaders()]);
 
-        return Cache::remember($key, config('isams.cacheDuration'), function () use ($response) {
+        return Cache::remember($key, $this->getCacheDuration(), function () use ($response) {
             return $this->wrapJson($response->getBody()->getContents(), 'items', Title::class);
         });
     }

diff --git a/src/Endpoint.php b/src/Endpoint.php
@@ -191,4 +191,12 @@ protected function response(int $expectedStatusCode, $response, $data, array $er
 
         return response()->json($json, $response->getStatusCode());
     }
+
+    /**
+     * @return \Carbon\Carbon
+     */
+    protected function getCacheDuration()
+    {
+        return config('isams.cacheDuration', now()->addHours(12));
+    }
 }
diff --git a/src/Facade.php b/src/Facade.php
@@ -64,8 +64,10 @@ private function getController(string $controllerClassName): string
             return self::CONTROLLER_NAMESPACE . $controllerClassName;
         }
 
+
         throw new ControllerNotFound('Could not find Controller: ' . $controllerClassName,
             500);
+
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
                 return self::CONTROLLER_NAMESPACE . $controllerClassName;
             }
             throw new ControllerNotFound('Could not find Controller: ' . $controllerClassName,
 );
         }
         /**
@@ Expand Down @@