Making Changes to German Event Api - adding update event function

Siroumi · Siroumi · commit bf6ab339de32 · 2024-12-23T13:49:08.000Z
diff --git a/app/Console/Commands/Importers/Baden.php b/app/Console/Commands/Importers/Baden.php
@@ -44,7 +44,7 @@ public function handle(): void
 
         $techicalUser = ImporterHelper::getTechnicalUser('baden-technical');
 
-        $items = BadenRSSItem::whereNull('imported_at')->get();
+        $items = BadenRSSItem::all();
 
         foreach ($items as $item) {
 
diff --git a/app/Console/Commands/Importers/Bayern.php b/app/Console/Commands/Importers/Bayern.php
@@ -44,7 +44,7 @@ public function handle(): void
 
         $techicalUser = ImporterHelper::getTechnicalUser('bayern-technical');
 
-        $items = BayernRSSItem::whereNull('imported_at')->get();
+        $items = BayernRSSItem::all();
 
         foreach ($items as $item) {
 
diff --git a/app/Console/Commands/Importers/Berlin.php b/app/Console/Commands/Importers/Berlin.php
@@ -44,7 +44,7 @@ public function handle(): void
 
         $techicalUser = ImporterHelper::getTechnicalUser('berlin-technical');
 
-        $items = BerlinRSSItem::whereNull('imported_at')->get();
+        $items = BerlinRSSItem::all();
 
         foreach ($items as $item) {
 
diff --git a/app/Console/Commands/Importers/Bonn.php b/app/Console/Commands/Importers/Bonn.php
@@ -43,7 +43,7 @@ public function handle(): void
         Log::info('Loading Bonn API Items in Database');
 
         $techicalUser = ImporterHelper::getTechnicalUser('bonn-technical');
-        $items = BonnRSSItem::whereNull('imported_at')->get();
+        $items = BonnRSSItem::all();
 
         foreach ($items as $item) {
             $item->createEvent($techicalUser);
diff --git a/app/Console/Commands/Importers/Bremen.php b/app/Console/Commands/Importers/Bremen.php
@@ -43,7 +43,7 @@ public function handle(): void
         Log::info('Loading Bremen API Items in Database');
 
         $techicalUser = ImporterHelper::getTechnicalUser('bremen-technical');
-        $items = BremenRSSItem::whereNull('imported_at')->get();
+        $items = BremenRSSItem::all();
 
         foreach ($items as $item) {
             $item->createEvent($techicalUser);
diff --git a/app/Console/Commands/Importers/Dresden.php b/app/Console/Commands/Importers/Dresden.php
@@ -43,7 +43,7 @@ public function handle(): void
         Log::info('Loading Dresden API Items in Database');
 
         $techicalUser = ImporterHelper::getTechnicalUser('dresden-technical');
-        $items = DresdenRSSItem::whereNull('imported_at')->get();
+        $items = DresdenRSSItem::all();
 
         foreach ($items as $item) {
             $item->createEvent($techicalUser);
diff --git a/app/Console/Commands/Importers/Hamburg.php b/app/Console/Commands/Importers/Hamburg.php
@@ -43,7 +43,7 @@ public function handle(): void
         Log::info('Loading Hamburg API Items in Database');
 
         $techicalUser = ImporterHelper::getTechnicalUser('hamburg-technical');
-        $items = HamburgRSSItem::whereNull('imported_at')->get();
+        $items = HamburgRSSItem::all();
 
         foreach ($items as $item) {
             $item->createEvent($techicalUser);
diff --git a/app/Console/Commands/Importers/Leipzig.php b/app/Console/Commands/Importers/Leipzig.php
@@ -44,7 +44,7 @@ public function handle(): void
 
         $techicalUser = ImporterHelper::getTechnicalUser('leipzig-technical');
 
-        $items = LeipzigRSSItem::whereNull('imported_at')->get();
+        $items = LeipzigRSSItem::all();
 
         foreach ($items as $item) {
 
diff --git a/app/Console/Commands/Importers/Muensterland.php b/app/Console/Commands/Importers/Muensterland.php
@@ -44,7 +44,7 @@ public function handle(): void
 
         $techicalUser = ImporterHelper::getTechnicalUser('muensterland-technical');
 
-        $items = MuensterlandRSSItem::whereNull('imported_at')->get();
+        $items = MuensterlandRSSItem::all();
 
         foreach ($items as $item) {
 
diff --git a/app/Console/Commands/Importers/Niedersachsen.php b/app/Console/Commands/Importers/Niedersachsen.php
@@ -45,7 +45,7 @@ public function handle(): void
 
         $technicalUser = ImporterHelper::getTechnicalUser('niedersachsen-technical');
 
-        $items = NiedersachsenRSSItem::whereNull('imported_at')->get();
+        $items = NiedersachsenRSSItem::all();
 
         foreach ($items as $item) {
 
diff --git a/app/Console/Commands/Importers/Nordhessen.php b/app/Console/Commands/Importers/Nordhessen.php
@@ -44,7 +44,7 @@ public function handle(): void
 
         $techicalUser = ImporterHelper::getTechnicalUser('nordhessen-technical');
 
-        $items = NordhessenRSSItem::whereNull('imported_at')->get();
+        $items = NordhessenRSSItem::all();
 
         foreach ($items as $item) {
 
diff --git a/app/Console/Commands/Importers/Thueringen.php b/app/Console/Commands/Importers/Thueringen.php
@@ -44,7 +44,7 @@ public function handle(): void
 
         $techicalUser = ImporterHelper::getTechnicalUser('thueringen-technical');
 
-        $items = ThueringenRSSItem::whereNull('imported_at')->get();
+        $items = ThueringenRSSItem::all();
 
         foreach ($items as $item) {
 
diff --git a/app/Console/Commands/api/GermanTraits.php b/app/Console/Commands/api/GermanTraits.php
@@ -47,12 +47,12 @@ private function createRSSItem($json, $city): void
             $RSSitem->tags = trim(implode(';', Arr::pluck($item['tags'], 'title')));
             $RSSitem->themes = trim(implode(',', Arr::pluck($item['themes'], 'identifier')));
             $RSSitem->audience = trim(implode(',', Arr::pluck($item['audience'], 'identifier')));
-
+            $RSSitem->last_updated_at = $item['last_updated_at'];
+            
             try {
 
                 //Log::info($RSSitem);
-                $RSSitem->save();
-
+                $RSSitem->save();  
                 $new++;
 
             } catch (\PDOException $exception) {
@@ -71,72 +71,109 @@ private function createRSSItem($json, $city): void
     private function createGermanEvent($city): void
     {
         $user = User::where(['email' => $this->user_email])->first();
-
+    
         if ($user == null) {
-
-            //Create user
-            $user = User::create(
-                [
-                    'email' => $this->user_email,
-                    'firstname' => $this->organizer,
-                    'lastname' => '',
-                    'username' => $this->organizer,
-                    'password' => bcrypt(Str::random()),
-                ]);
-
+            // Create a new user
+            $user = User::create([
+                'email' => $this->user_email,
+                'firstname' => $this->organizer,
+                'lastname' => '',
+                'username' => $this->organizer,
+                'password' => bcrypt(Str::random()),
+            ]);
         }
+    
+        
+        // Check if an event with the same slug exists, slug is most unique.
+        $event = Event::where('slug', Str::slug($this->title))->first();
+        if ($event) {
+            // Update the existing event
+            $rssLastUpdated = $this->last_updated_at; 
+            $updatedAt = $event->updated_at;
+            $formattedUpdatedAt = $event->updated_at->format('Y-m-d H:i:s'); 
+            
+            if ($rssLastUpdated !== null && $rssLastUpdated > $updatedAt) {
+                $event->update([
+                    'status' => 'APPROVED',
+                    'title' => htmlspecialchars_decode($this->title),
+                    'slug' => Str::slug($this->title),
+                    'organizer' => $this->organizer,
+                    'description' => $this->description,
+                    'organizer_type' => $this->user_type,
+                    'activity_type' => $this->activity_type,
+                    'location' => $this->location,
+                    'event_url' => $this->user_website,
+                    'contact_person' => $this->user_publicEmail,
+                    'user_email' => $this->user_email,
+                    'creator_id' => $user->id,
+                    'country_iso' => 'DE',
+                    'picture' => $this->photo,
+                    'updated' => now(),
+                    'start_date' => $this->eventStartDate,
+                    'end_date' => $this->eventEndDate,
+                    'longitude' => $this->longitude,
+                    'latitude' => $this->latitude,
+                    'geoposition' => $this->latitude . ',' . $this->longitude,
+                ]);
+                
+                // dump("updated $this->title");
+            }
+        } else {
+            // Create a new event
+            $event = new Event([
+                'status' => 'APPROVED',
+                'title' => htmlspecialchars_decode($this->title),
+                'slug' => Str::slug($this->title),
+                'organizer' => $this->organizer,
+                'description' => $this->description,
+                'organizer_type' => $this->user_type,
+                'activity_type' => $this->activity_type,
+                'location' => $this->location,
+                'event_url' => $this->user_website,
+                'contact_person' => $this->user_publicEmail,
+                'user_email' => $this->user_email,
+                'creator_id' => $user->id,
+                'country_iso' => 'DE',
+                'picture' => $this->photo,
+                'pub_date' => now(),
+                'created' => now(),
+                'updated' => now(),
+                'codeweek_for_all_participation_code' => "cw-$city",
+                'mass_added_for' => 'API codeweek_de',
+                'start_date' => $this->eventStartDate,
+                'end_date' => $this->eventEndDate,
+                'longitude' => $this->longitude,
+                'latitude' => $this->latitude,
+                'geoposition' => $this->latitude . ',' . $this->longitude,
+                'language' => 'de',
+            ]);
+    
+            $event->save();
+
+           // dump("created $this->title");
+            
+            //Link Other as theme and audience
+            if ($this->audience) {
+                $event->audiences()->attach(explode(',', $this->audience));
+            }
+            if ($this->themes) {
+                $event->themes()->attach(explode(',', $this->themes));
+            }
 
-        $event = new Event([
-            'status' => 'APPROVED',
-            'title' => htmlspecialchars_decode($this->title),
-            'slug' => Str::slug($this->title),
-            'organizer' => $this->organizer,
-            'description' => $this->description,
-            'organizer_type' => $this->user_type,
-            'activity_type' => $this->activity_type,
-            'location' => $this->location,
-            'event_url' => $this->user_website,
-            'contact_person' => $this->user_publicEmail,
-            'user_email' => $this->user_email,
-            'creator_id' => $user->id,
-            'country_iso' => 'DE',
-            'picture' => $this->photo,
-            'pub_date' => now(),
-            'created' => now(),
-            'updated' => now(),
-            'codeweek_for_all_participation_code' => "cw-$city",
-            'mass_added_for' => 'API codeweek_de',
-            'start_date' => $this->eventStartDate,
-            'end_date' => $this->eventEndDate,
-            'longitude' => $this->longitude,
-            'latitude' => $this->latitude,
-            'geoposition' => $this->latitude.','.$this->longitude,
-            'language' => 'de',
-        ]);
-
-        $event->save();
-
-        //Link Other as theme and audience
-        if ($this->audience) {
-            $event->audiences()->attach(explode(',', $this->audience));
-        }
-        if ($this->themes) {
-            $event->themes()->attach(explode(',', $this->themes));
-        }
+            if ($this->tags) {
+                $tagsArray = [];
 
-        if ($this->tags) {
-            $tagsArray = [];
+                foreach (explode(';', $this->tags) as $item) {
+                    $tag = Tag::firstOrCreate([
+                        'name' => trim($item),
+                        'slug' => str_slug(trim($item)),
+                    ]);
+                    array_push($tagsArray, $tag->id);
+                }
 
-            foreach (explode(';', $this->tags) as $item) {
-                $tag = Tag::firstOrCreate([
-                    'name' => trim($item),
-                    'slug' => str_slug(trim($item)),
-                ]);
-                array_push($tagsArray, $tag->id);
+                $event->tags()->sync($tagsArray);
             }
-
-            $event->tags()->sync($tagsArray);
         }
-
     }
+    
 }
diff --git a/database/migrations/2024_12_23_120700_add_last_updated_at_to_baden_rss_items_table.php b/database/migrations/2024_12_23_120700_add_last_updated_at_to_baden_rss_items_table.php
@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddLastUpdatedAtToBadenRssItemsTable extends Migration
+{
+    public function up()
+    {
+        Schema::table('baden_r_s_s_items', function (Blueprint $table) {
+            $table->timestamp('last_updated_at')->nullable();
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('baden_r_s_s_items', function (Blueprint $table) {
+            $table->dropColumn('last_updated_at');
+        });
+    }
+}
diff --git a/database/migrations/2024_12_23_123653_add_last_updated_at_to_bayern_r_s_s_items_table.php b/database/migrations/2024_12_23_123653_add_last_updated_at_to_bayern_r_s_s_items_table.php
@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddLastUpdatedAtToBayernRssItemsTable extends Migration
+{
+    public function up()
+    {
+        Schema::table('bayern_r_s_s_items', function (Blueprint $table) {
+            $table->timestamp('last_updated_at')->nullable();
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('bayern_r_s_s_items', function (Blueprint $table) {
+            $table->dropColumn('last_updated_at');
+        });
+    }
+}
diff --git a/database/migrations/2024_12_23_123912_add_last_updated_at_to_berlin_r_s_s_items_table.php b/database/migrations/2024_12_23_123912_add_last_updated_at_to_berlin_r_s_s_items_table.php
@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddLastUpdatedAtToBerlinRssItemsTable extends Migration
+{
+    public function up()
+    {
+        Schema::table('berlin_r_s_s_items', function (Blueprint $table) {
+            $table->timestamp('last_updated_at')->nullable();
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('berlin_r_s_s_items', function (Blueprint $table) {
+            $table->dropColumn('last_updated_at');
+        });
+    }
+}
diff --git a/database/migrations/2024_12_23_123936_add_last_updated_at_to_bonn_r_s_s_items_table.php b/database/migrations/2024_12_23_123936_add_last_updated_at_to_bonn_r_s_s_items_table.php
@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddLastUpdatedAtToBonnRssItemsTable extends Migration
+{
+    public function up()
+    {
+        Schema::table('bonn_r_s_s_items', function (Blueprint $table) {
+            $table->timestamp('last_updated_at')->nullable();
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('bonn_r_s_s_items', function (Blueprint $table) {
+            $table->dropColumn('last_updated_at');
+        });
+    }
+}
diff --git a/database/migrations/2024_12_23_124000_add_last_updated_at_to_bremen_r_s_s_items_table.php b/database/migrations/2024_12_23_124000_add_last_updated_at_to_bremen_r_s_s_items_table.php
diff --git a/database/migrations/2024_12_23_124036_add_last_updated_at_to_dresden_r_s_s_items_table.php b/database/migrations/2024_12_23_124036_add_last_updated_at_to_dresden_r_s_s_items_table.php
diff --git a/database/migrations/2024_12_23_124056_add_last_updated_at_to_hamburg_r_s_s_items_table.php b/database/migrations/2024_12_23_124056_add_last_updated_at_to_hamburg_r_s_s_items_table.php
diff --git a/database/migrations/2024_12_23_131538_add_last_updated_at_to_leipzig_r_s_s_items_table.php b/database/migrations/2024_12_23_131538_add_last_updated_at_to_leipzig_r_s_s_items_table.php
diff --git a/database/migrations/2024_12_23_131607_add_last_updated_at_to_muensterland_r_s_s_items_table.php b/database/migrations/2024_12_23_131607_add_last_updated_at_to_muensterland_r_s_s_items_table.php
diff --git a/database/migrations/2024_12_23_131638_add_last_updated_at_to_niedersachsen_r_s_s_items_table.php b/database/migrations/2024_12_23_131638_add_last_updated_at_to_niedersachsen_r_s_s_items_table.php
diff --git a/database/migrations/2024_12_23_131748_add_last_updated_at_to_nordhessen_r_s_s_items_table.php b/database/migrations/2024_12_23_131748_add_last_updated_at_to_nordhessen_r_s_s_items_table.php
