Update geographical unit filter for period's location

The geographical unit filter in the accompanying course filters now takes the period's location on the address into account. This enhancement was achieved by modifying the GeographicalUnitStatFilter class. As a result, the "filter accompanying period by geographical unit" option provides more accurate data.

.changes/unreleased/Feature-20240426-134831.yaml

@@ -0,0 +1,6 @@
+kind: Feature
+body: Make the script which subscribe to microsoft calendars changes more tolerant
+  to errors or missing configuration on the microsoft side
+time: 2024-04-26T13:48:31.476415017+02:00
+custom:
+  Issue: "197"

.changes/unreleased/Fixed-20240416-161817.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix broken link in homepage when a evaluation from a closed acc period was present
+  in the homepage widget
+time: 2024-04-16T16:18:17.888645172+02:00
+custom:
+  Issue: "270"

.changes/unreleased/Fixed-20240429-113804.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Allow the filter "filter accompanying period by geographical unit" to take period's
+  location on address into account
+time: 2024-04-29T11:38:04.966027861+02:00
+custom:
+  Issue: "275"

.changes/v2.18.2.md

@@ -0,0 +1,3 @@
+## v2.18.2 - 2024-04-12
+### Fixed
+* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record 

CHANGELOG.md

@@ -6,6 +6,10 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v2.18.2 - 2024-04-12
+### Fixed
+* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record 
+
 ## v2.18.1 - 2024-03-26
 ### Fixed
 * Fix layout issue in document generation for admin (minor) 

docs/source/installation/load-addresses.rst

@@ -8,6 +8,16 @@ Chill can store a list of geolocated address references, which are used to sugge
 
 Those addresses may be load from a dedicated source.
 
+Countries
+=========
+
+In order to load addresses into the chill application we first have to make sure that a list of countries is present.
+To import the countries run the following command.
+
+.. code-block:: bash
+
+    bin/console chill:main:countries:populate
+
 In France
 =========
 

src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php

@@ -49,8 +49,6 @@ final class MapAndSubscribeUserCalendarCommand extends Command
 
         $limit = 50;
         $offset = 0;
-        /** @var \DateInterval $interval the interval before the end of the expiration */
-        $interval = new \DateInterval('P1D');
         $expiration = (new \DateTimeImmutable('now'))->add(new \DateInterval($input->getOption('subscription-duration')));
         $users = $this->userRepository->findAllAsArray('fr');
         $created = 0;
@@ -93,7 +91,6 @@ final class MapAndSubscribeUserCalendarCommand extends Command
             } catch (UserAbsenceSyncException $e) {
                 $this->logger->error('could not sync user absence', ['userId' => $user->getId(), 'email' => $user->getEmail(), 'exception' => $e->getTraceAsString(), 'message' => $e->getMessage()]);
                 $output->writeln(sprintf('Could not sync user absence: id: %s and email: %s', $user->getId(), $user->getEmail()));
-                throw $e;
             }
 
             // we first try to renew an existing subscription, if any.

src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php

@@ -23,7 +23,7 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
  */
 class PostalCodeFRFromOpenData
 {
-    private const CSV = 'https://datanova.laposte.fr/data-fair/api/v1/datasets/laposte-hexasmal/data-files/019HexaSmal.csv';
+    private const CSV = 'https://datanova.laposte.fr/data-fair/api/v1/datasets/laposte-hexasmal/metadata-attachments/base-officielle-codes-postaux.csv';
 
     public function __construct(private readonly PostalCodeBaseImporter $baseImporter, private readonly HttpClientInterface $client, private readonly LoggerInterface $logger)
     {
@@ -50,7 +50,7 @@ class PostalCodeFRFromOpenData
         fseek($tmpfile, 0);
 
         $csv = Reader::createFromStream($tmpfile);
-        $csv->setDelimiter(';');
+        $csv->setDelimiter(',');
         $csv->setHeaderOffset(0);
 
         foreach ($csv as $offset => $record) {
@@ -65,23 +65,23 @@ class PostalCodeFRFromOpenData
 
     private function handleRecord(array $record): void
     {
-        if ('' !== trim($record['coordonnees_geographiques'] ?? $record['coordonnees_gps'])) {
-            [$lat, $lon] = array_map(static fn ($el) => (float) trim($el), explode(',', $record['coordonnees_geographiques'] ?? $record['coordonnees_gps']));
+        if ('' !== trim((string) $record['_geopoint'])) {
+            [$lat, $lon] = array_map(static fn ($el) => (float) trim($el), explode(',', (string) $record['_geopoint']));
         } else {
             $lat = $lon = 0.0;
         }
 
-        $ref = trim((string) $record['Code_commune_INSEE']);
+        $ref = trim((string) $record['code_commune_insee']);
 
         if (str_starts_with($ref, '987')) {
             // some differences in French Polynesia
-            $ref .= '.'.trim((string) $record['Libellé_d_acheminement']);
+            $ref .= '.'.trim((string) $record['libelle_d_acheminement']);
         }
 
         $this->baseImporter->importCode(
             'FR',
-            trim((string) $record['Libellé_d_acheminement']),
-            trim((string) $record['Code_postal']),
+            trim((string) $record['libelle_d_acheminement']),
+            trim((string) $record['code_postal']),
             $ref,
             'INSEE',
             $lat,

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php

@@ -33,8 +33,12 @@ use Symfony\Component\Form\FormBuilderInterface;
  */
 class GeographicalUnitStatFilter implements FilterInterface
 {
-    public function __construct(private readonly GeographicalUnitRepositoryInterface $geographicalUnitRepository, private readonly GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly RollingDateConverterInterface $rollingDateConverter)
-    {
+    public function __construct(
+        private readonly GeographicalUnitRepositoryInterface $geographicalUnitRepository,
+        private readonly GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly RollingDateConverterInterface $rollingDateConverter
+    ) {
     }
 
     public function addRole(): ?string
@@ -50,6 +54,10 @@ class GeographicalUnitStatFilter implements FilterInterface
             FROM '.AccompanyingPeriod\AccompanyingPeriodLocationHistory::class.' acp_geog_filter_location_history
             LEFT JOIN '.PersonHouseholdAddress::class.' acp_geog_filter_address_person_location
                 WITH IDENTITY(acp_geog_filter_location_history.personLocation) = IDENTITY(acp_geog_filter_address_person_location.person)
+                AND
+                (acp_geog_filter_address_person_location.validFrom < :acp_geog_filter_date AND (
+                    acp_geog_filter_address_person_location.validTo IS NULL OR acp_geog_filter_address_person_location.validTo > :acp_geog_filter_date
+                ))
             LEFT JOIN '.Address::class.' acp_geog_filter_address
                 WITH COALESCE(IDENTITY(acp_geog_filter_address_person_location.address), IDENTITY(acp_geog_filter_location_history.addressLocation)) = acp_geog_filter_address.id
             LEFT JOIN acp_geog_filter_address.geographicalUnits acp_geog_filter_units
@@ -57,10 +65,6 @@ class GeographicalUnitStatFilter implements FilterInterface
                 (acp_geog_filter_location_history.startDate <= :acp_geog_filter_date AND (
                     acp_geog_filter_location_history.endDate IS NULL OR acp_geog_filter_location_history.endDate > :acp_geog_filter_date
                 ))
-                AND
-                (acp_geog_filter_address_person_location.validFrom < :acp_geog_filter_date AND (
-                    acp_geog_filter_address_person_location.validTo IS NULL OR acp_geog_filter_address_person_location.validTo > :acp_geog_filter_date
-                ))
                 AND acp_geog_filter_units IN (:acp_geog_filter_units)
                 AND acp_geog_filter_location_history.period = acp.id
             ';

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Doctrine\ORM\EntityManagerInterface;
@@ -88,6 +89,7 @@ class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
             ->where(
                 $qb->expr()->andX(
                     $qb->expr()->isNull('e.endDate'),
+                    $qb->expr()->neq('period.step', ':closed'),
                     $qb->expr()->gte(':now', $qb->expr()->diff('e.maxDate', 'e.warningInterval')),
                     $qb->expr()->orX(
                         $qb->expr()->eq('period.user', ':user'),
@@ -100,6 +102,7 @@ class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
             ->setParameters([
                 'user' => $user,
                 'now' => new \DateTimeImmutable('now'),
+                'closed' => AccompanyingPeriod::STEP_CLOSED,
             ]);
 
         return $qb;