From b4372feddd0420c6693f60b59f7eb80d5c8ed91a Mon Sep 17 00:00:00 2001
From: Atmos4 <artrist.perrin@gmail.com>
Date: Mon, 25 Mar 2024 23:12:12 +0100
Subject: [PATCH] 183: add description and location to activitites

- add it to events as well
- rememberMe in index.php
---
 app/pages/index.php                           |  8 ++---
 database/migrations/Version20240324072035.php |  2 +-
 database/migrations/Version20240325220331.php | 33 +++++++++++++++++++
 database/models/activities.db.php             | 14 ++++++--
 database/models/events.db.php                 |  3 ++
 5 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 database/migrations/Version20240325220331.php

diff --git a/app/pages/index.php b/app/pages/index.php
index ac4ce3c3..7488f777 100644
--- a/app/pages/index.php
+++ b/app/pages/index.php
@@ -1,7 +1,5 @@
 <?php
-if (empty ($_SESSION['user_id'])) {
-    redirect("login");
-} else {
-    //redirect("accueil");
+if (AuthService::create()->isUserLoggedIn()) {
     redirect("evenements");
-}
\ No newline at end of file
+}
+redirect("login");
\ No newline at end of file
diff --git a/database/migrations/Version20240324072035.php b/database/migrations/Version20240324072035.php
index 63f896ce..f836d73a 100644
--- a/database/migrations/Version20240324072035.php
+++ b/database/migrations/Version20240324072035.php
@@ -14,7 +14,7 @@ final class Version20240324072035 extends AbstractMigration
 {
     public function getDescription(): string
     {
-        return '';
+        return 'activities';
     }
 
     public function up(Schema $schema): void
diff --git a/database/migrations/Version20240325220331.php b/database/migrations/Version20240325220331.php
new file mode 100644
index 00000000..2983a7f8
--- /dev/null
+++ b/database/migrations/Version20240325220331.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace intranose\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20240325220331 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'description and location to events and activities';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE orm_activities ADD location_url VARCHAR(255) NOT NULL, ADD description VARCHAR(255) NOT NULL, CHANGE place location_label VARCHAR(255) NOT NULL');
+        $this->addSql('ALTER TABLE orm_events ADD description VARCHAR(255) NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE orm_activities ADD place VARCHAR(255) NOT NULL, DROP location_label, DROP location_url, DROP description');
+        $this->addSql('ALTER TABLE orm_events DROP description');
+    }
+}
diff --git a/database/models/activities.db.php b/database/models/activities.db.php
index fd3c61bf..fbd400ad 100644
--- a/database/models/activities.db.php
+++ b/database/models/activities.db.php
@@ -59,7 +59,13 @@ class Activity
     public string $name;
 
     #[Column]
-    public string $place;
+    public string $location_label;
+
+    #[Column]
+    public string $location_url;
+
+    #[Column]
+    public string $description;
 
     #[ManyToOne]
     public Event|null $event = null;
@@ -77,11 +83,13 @@ function __construct()
         $this->categories = new ArrayCollection();
     }
 
-    function set(string $name, DateTime $date, string $place, Event $event)
+    function set(string $name, DateTime $date, Event $event, string $location_label = "", string $location_url = "", string $description = "")
     {
         $this->name = $name;
-        $this->place = $place;
         $this->date = $date;
         $this->event = $event;
+        $this->location_label = $location_label;
+        $this->location_url = $location_url;
+        $this->description = $description;
     }
 }
\ No newline at end of file
diff --git a/database/models/events.db.php b/database/models/events.db.php
index cebe4910..123ee408 100644
--- a/database/models/events.db.php
+++ b/database/models/events.db.php
@@ -87,6 +87,9 @@ class Event
     #[Column]
     public DateTime $deadline;
 
+    #[Column]
+    public string $description;
+
     #[Column]
     public bool $open = false;