Renamed GuzzleServiceProvider to HttpClientServiceProvider, fixed translation and import error

5 files changed, 9 insertions, 8 deletions

diff --git a/config/app.php b/config/app.php
index e1001900..8ede567e 100644
--- a/config/app.php
+++ b/config/app.php
@@ -31,7 +31,7 @@ return [
         // Additional services
         \Engelsystem\Helpers\VersionServiceProvider::class,
         \Engelsystem\Mail\MailerServiceProvider::class,
-        \Engelsystem\Http\GuzzleServiceProvider::class,
+        \Engelsystem\Http\HttpClientServiceProvider::class,
     ],
 
     // Application middleware
diff --git a/includes/pages/schedule/ImportSchedule.php b/includes/pages/schedule/ImportSchedule.php
index 8bc769d4..136f1816 100644
--- a/includes/pages/schedule/ImportSchedule.php
+++ b/includes/pages/schedule/ImportSchedule.php
@@ -451,13 +451,14 @@ class ImportSchedule extends BaseController
             $guid = $shift->guid;
             $shift = $this->loadShift($shift->shift_id);
             $event = $scheduleEvents[$guid];
+            $room = $rooms->where('name', $event->getRoom()->getName())->first();
 
             if (
                 $shift->title != $event->getTitle()
                 || $shift->shift_type_id != $shiftType
                 || Carbon::createFromTimestamp($shift->start) != $event->getDate()
                 || Carbon::createFromTimestamp($shift->end) != $event->getEndDate()
-                || $shift->room_id != $rooms->where('name', $event->getRoom()->getName())->first()->id
+                || $shift->room_id != ($room->id ?? '')
                 || $shift->url != $event->getUrl()
             ) {
                 $changeEvents[$guid] = $event;
diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po
index d5f30f22..7f017f13 100644
--- a/resources/lang/de_DE/default.po
+++ b/resources/lang/de_DE/default.po
@@ -2817,7 +2817,7 @@ msgid "schedule.import.title"
 msgstr "Programm importieren"
 
 msgid "schedule.import.text"
-msgstr "Dieser Import erstellt Räume and erstellt, aktualisiert und löscht Schichten anhand des schedule.xml exportes."
+msgstr "Dieser Import erstellt Räume und erstellt, aktualisiert und löscht Schichten anhand des schedule.xml exportes."
 
 msgid "schedule.import.load.title"
 msgstr "Programm importieren: Vorschau"
diff --git a/src/Http/GuzzleServiceProvider.php b/src/Http/HttpClientServiceProvider.php
index f81a91f5..113af713 100644
--- a/src/Http/GuzzleServiceProvider.php
+++ b/src/Http/HttpClientServiceProvider.php
@@ -5,7 +5,7 @@ namespace Engelsystem\Http;
 use Engelsystem\Container\ServiceProvider;
 use GuzzleHttp\Client as GuzzleClient;
 
-class GuzzleServiceProvider extends ServiceProvider
+class HttpClientServiceProvider extends ServiceProvider
 {
     public function register()
     {
diff --git a/tests/Unit/Http/GuzzleServiceProviderTest.php b/tests/Unit/Http/HttpClientServiceProviderTest.php
index 4d3c938b..7dfc0a3e 100644
--- a/tests/Unit/Http/GuzzleServiceProviderTest.php
+++ b/tests/Unit/Http/HttpClientServiceProviderTest.php
@@ -3,20 +3,20 @@
 namespace Engelsystem\Test\Unit\Http;
 
 use Engelsystem\Application;
-use Engelsystem\Http\GuzzleServiceProvider;
+use Engelsystem\Http\HttpClientServiceProvider;
 use Engelsystem\Test\Unit\ServiceProviderTest;
 use GuzzleHttp\Client as GuzzleClient;
 
-class GuzzleServiceProviderTest extends ServiceProviderTest
+class HttpClientServiceProviderTest extends ServiceProviderTest
 {
     /**
-     * @covers \Engelsystem\Http\GuzzleServiceProvider::register
+     * @covers \Engelsystem\Http\HttpClientServiceProvider::register
      */
     public function testRegister()
     {
         $app = new Application();
 
-        $serviceProvider = new GuzzleServiceProvider($app);
+        $serviceProvider = new HttpClientServiceProvider($app);
         $serviceProvider->register();
 
         /** @var GuzzleClient $guzzle */