resolve conflict

sql/schema-extensions/002-view_federation_structures.sql

@@ -12,13 +12,14 @@ AS
                AS practices,
            oar.articles, n1.parent_id as parentId, net1.name as parentName,
            CONCAT_WS(',', n1.parent_id, n2.parent_id, n3.parent_id, n4.parent_id, n5.parent_id) as parents
-    FROM Organization o
-             INNER JOIN Parameters p on o.parameters_id = p.id
-             LEFT JOIN OrganizationAddressPostal oa on oa.organization_id = o.id
-             LEFT JOIN AddressPostal a on oa.addressPostal_id = a.id
-             LEFT JOIN Country c ON (c.id = a.addressCountry_id)
-             LEFT JOIN organization_contactpoint ocp ON ocp.organization_id = o.id
-             INNER JOIN (SELECT * FROM ContactPoint WHERE `contactType`='PRINCIPAL') cp ON cp.id = ocp.contactPoint_id
+
+    FROM opentalent.Organization o
+             INNER JOIN opentalent.Parameters p on o.parameters_id = p.id
+             LEFT JOIN opentalent.OrganizationAddressPostal oa on oa.organization_id = o.id
+             LEFT JOIN opentalent.AddressPostal a on oa.addressPostal_id = a.id
+             LEFT JOIN opentalent.Country c ON (c.id = a.addressCountry_id)
+             LEFT JOIN opentalent.organization_contactpoint ocp ON ocp.organization_id = o.id
+             LEFT JOIN (SELECT * FROM opentalent.ContactPoint WHERE `contactType`='PRINCIPAL') cp ON cp.id = ocp.contactPoint_id
              LEFT JOIN (
                 SELECT oar_.organization_id, CONCAT('[', GROUP_CONCAT(COLUMN_JSON(COLUMN_CREATE('id', oar_.id, 'title', oar_.title, 'date', DATE_FORMAT(oar_.date, '%Y-%m-%dT%TZ'), 'link', oar_.link))), ']') as articles
                 FROM (SELECT * FROM OrganizationArticle WHERE link is not null and link != '' ORDER BY date DESC) as oar_

src/Service/Export/Encoder/DocXEncoder.php

@@ -4,9 +4,8 @@ declare(strict_types=1);
 
 namespace App\Service\Export\Encoder;
 
-use App\Enum\Export\ExportFormatEnum;
 use Phpdocx\Create\CreateDocx;
-use Twig\Environment;
+use App\Enum\Export\ExportFormatEnum;
 
 /**
  * Encode HTML to docx format