various fixes

src/Commands/PostUpgrade/V0_2/PostUpgradeCommand.php

@@ -69,12 +69,17 @@ class PostUpgradeCommand extends Command
 
             $this->logger->info('Populate Subdomain table from openassos.sys_domain');
             $sql = "INSERT INTO opentalent.Subdomain (parameters_id, subdomain)
-                    SELECT o.parameters_id, SUBSTRING_INDEX(d.domainName,'.',1)
+                    SELECT o.parameters_id, REGEXP_REPLACE(d.domainName, '^(.+)\\\\.opentalent\\\\.fr$', '\\\\1')
                     FROM openassos.sys_domain d
                     inner join opentalent.Organization o on o.cmsId = d.pid
                     where d.domainName like '%.opentalent.fr';";
             $cnn->query($sql);
 
+            $sql = "update opentalent.Subdomain
+                    set subdomain = REGEXP_REPLACE(subdomain, '\\\\.', '-')
+                    where subdomain REGEXP '^(.*)\\\\.(.*)$';";
+            $cnn->query($sql);
+
             $this->logger->info('Complete with subdomains from Parameters table');
             $sql = "insert into opentalent.Subdomain (parameters_id, subdomain)
                     select p.id, p.subDomain

src/Entity/Organization/Parameters.php

@@ -347,6 +347,9 @@ class Parameters
     public function setCustomDomain(?string $customDomain): void
     {
         $this->customDomain = $customDomain;
+
+        // En attendant la fin de la migration vers le nouveau système de gestion des sous-domaines
+        $this->otherWebsite = $customDomain;
     }
 
     public function getDesactivateOpentalentSiteWeb(): bool
@@ -651,18 +654,6 @@ class Parameters
         return $this;
     }
 
-    public function getActiveSubdomain(): ?Subdomain
-    {
-        return $this->activeSubdomain;
-    }
-
-    public function setActiveSubdomain(?Subdomain $activeSubdomain): self
-    {
-        $this->activeSubdomain = $activeSubdomain;
-
-        return $this;
-    }
-
     public function getSubdomains(): Collection
     {
         return $this->subdomains;

src/Entity/Organization/Subdomain.php

@@ -98,5 +98,8 @@ class Subdomain
     public function setActive(bool $active): void
     {
         $this->active = $active;
+
+        // En attendant la fin de la migration vers le nouveau système de gestion des sous-domaines
+        $this->getParameters()->setSubDomain($this->subdomain);
     }
 }