From d6b1216021c3e4baeda76baf355de3553455e617 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 21 Nov 2023 15:10:14 +0100
Subject: [PATCH 01/27] rename methods for more clarity

---
 .../ChillMainBundle/Controller/NewsItemHistoryController.php  | 4 ++--
 src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php b/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
index 8c645828b..ff7adf818 100644
--- a/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
@@ -34,8 +34,8 @@ class NewsItemHistoryController extends AbstractController
     public function listAction(Request $request): Response
     {
         $filter = $this->buildFilterOrder(false);
-        $total = $this->newsItemRepository->countAllFilteredByUser($filter->getQueryString());
-        $newsItems = $this->newsItemRepository->findAllFilteredByUser($filter->getQueryString());
+        $total = $this->newsItemRepository->countAllFilteredBySearchTerm($filter->getQueryString());
+        $newsItems = $this->newsItemRepository->findAllFilteredBySearchTerm($filter->getQueryString());
 
         $pagination = $this->paginatorFactory->create($total);
 
diff --git a/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php b/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
index 88b597647..44e1f2d39 100644
--- a/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
@@ -71,7 +71,7 @@ class NewsItemRepository implements ObjectRepository
         return $qb;
     }
 
-    public function findAllFilteredByUser(string $pattern = null)
+    public function findAllFilteredBySearchTerm(string $pattern = null)
     {
         $qb = $this->buildBaseQuery($pattern);
         $qb->addOrderBy('n.startDate', 'DESC')
@@ -97,7 +97,7 @@ class NewsItemRepository implements ObjectRepository
             ->getResult();
     }
 
-    public function countAllFilteredByUser(string $pattern = null)
+    public function countAllFilteredBySearchTerm(string $pattern = null)
     {
         $qb = $this->buildBaseQuery($pattern);
 

From 4a58d7f30080631373323ba64742cfdbd37e9b41 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 21 Nov 2023 20:34:28 +0100
Subject: [PATCH 02/27] attempt to write tests

---
 .../Dashboard/NewsItemControllerTest.php      | 36 +++++++++++++
 .../Dashboard/NewsItemRepositoryTest.php      | 50 +++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemControllerTest.php
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemRepositoryTest.php

diff --git a/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemControllerTest.php
new file mode 100644
index 000000000..8809138a2
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemControllerTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Dashboard;
+
+use Chill\MainBundle\Test\PrepareClientTrait;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class NewsItemControllerTest extends WebTestCase
+{
+    use PrepareClientTrait;
+
+    /**
+     * Test to ensure that the news item admin index page works.
+     */
+    public function newsItemAdminSmokeTest(): void
+    {
+        $client = $this->getClientAuthenticated('admin', 'admin');
+
+        $crawler = $client->request('GET', '/fr/admin/news_item');
+        self::assertResponseIsSuccessful('Testing /fr/admin/news_item');
+
+        $btnEdit = $crawler->filter('.btn-edit')?->first();
+
+        self::assertNotNull($btnEdit, 'check that there is at least one btn-edit on news item page');
+
+        $client->click($btnEdit->link());
+
+        self::assertResponseIsSuccessful();
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemRepositoryTest.php b/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemRepositoryTest.php
new file mode 100644
index 000000000..f0491b75a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemRepositoryTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Dashboard;
+
+use Chill\MainBundle\Entity\NewsItem;
+use Chill\MainBundle\Repository\NewsItemRepository;
+use Chill\MainBundle\Test\PrepareClientTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Clock\MockClock;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class NewsItemRepositoryTest extends KernelTestCase
+{
+    private NewsItemRepository $newsItemRepository;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+        self::bootKernel();
+        $this->newsItemRepository = self::$container->get(NewsItemRepository::class);
+    }
+
+    public function testFindWithDateFilter(): void
+    {
+        $clock = new MockClock('2023-11-20');
+
+        $newsItemA = new NewsItem();
+        $newsItemA->setTitle('With end date article');
+        $newsItemA->setContent('blabla');
+        $newsItemA->setStartDate(new \DateTime('2023-11-01'));
+        $newsItemA->setEndDate(new \DateTime('2023-11-15'));
+
+        $newsItemB = new NewsItem();
+        $newsItemB->setTitle('No end date article');
+        $newsItemB->setContent('with blopblop');
+        $newsItemB->setStartDate(new \DateTime('2023-11-02'));
+
+        $newsItemC = new NewsItem();
+        $newsItemC->setTitle('Null as end date article');
+        $newsItemC->setContent('tralala');
+        $newsItemC->setStartDate(new \DateTime('2023-11-03'));
+        $newsItemC->setEndDate(null);
+
+    }
+
+}

From f1df2d5165a4efc5f2bc51c040440c94fc03af8e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 29 Nov 2023 11:12:21 +0100
Subject: [PATCH 03/27] Update wrong translation key

---
 .../ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
index 88007a074..ab73932b5 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
@@ -59,7 +59,7 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
                 ]);
         }
 
-        $menu->addChild($this->translator->trans('news_history.menu'), [
+        $menu->addChild($this->translator->trans('news.menu'), [
             'route' => 'chill_main_news_items_history',
         ])
             ->setExtras([

From df16ca9a60cfaa97bc46037e4e389bacd0b2738d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Nov 2023 13:20:14 +0100
Subject: [PATCH 04/27] force bootstrap to be restricted to version 5.2

---
 package.json                                         | 12 ++++++------
 .../Resources/public/module/bootstrap/_shared.scss   |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 8ef78d1c7..26c93e045 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,8 @@
     "@ckeditor/ckeditor5-vue": "^4.0.1",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node14": "^1.0.1",
+    "@types/dompurify": "^3.0.5",
     "bindings": "^1.5.0",
-    "bootstrap": "^5.3.0",
     "chokidar": "^3.5.1",
     "fork-awesome": "^1.1.7",
     "jquery": "^3.6.0",
@@ -31,10 +31,10 @@
     "typescript": "^4.7.2",
     "vue-loader": "^17.0.0",
     "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1",
-    "@types/dompurify": "^3.0.5"
+    "webpack-cli": "^5.0.1"
   },
   "dependencies": {
+    "bootstrap": "~5.2.0",
     "@fullcalendar/core": "^6.1.4",
     "@fullcalendar/daygrid": "^6.1.4",
     "@fullcalendar/interaction": "^6.1.4",
@@ -43,9 +43,11 @@
     "@fullcalendar/vue3": "^6.1.4",
     "@popperjs/core": "^2.9.2",
     "@types/leaflet": "^1.9.3",
+    "dompurify": "^3.0.6",
     "dropzone": "^5.7.6",
     "es6-promise": "^4.2.8",
     "leaflet": "^1.7.1",
+    "marked": "^9.1.5",
     "masonry-layout": "^4.2.2",
     "mime": "^3.0.0",
     "swagger-ui": "^4.15.5",
@@ -54,9 +56,7 @@
     "vue-i18n": "^9.1.6",
     "vue-multiselect": "3.0.0-alpha.2",
     "vue-toast-notification": "^2.0",
-    "vuex": "^4.0.0",
-    "dompurify": "^3.0.6",
-    "marked": "^9.1.5"
+    "vuex": "^4.0.0"
   },
   "browserslist": [
     "Firefox ESR"
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_shared.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_shared.scss
index feca44382..96da20779 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_shared.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_shared.scss
@@ -11,7 +11,6 @@
 
 // 3. Include remainder of required Bootstrap stylesheets
 @import "bootstrap/scss/variables";
-@import "bootstrap/scss/variables-dark";
 
 // 4. Include any default map overrides here
 @import "custom/_maps";

From 8bbe094e708f597750cab19bcbc2cf21b3dde6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Nov 2023 13:20:35 +0100
Subject: [PATCH 05/27] fix error for props on AddressDetailsButton.vue

---
 .../AddressDetails/AddressDetailsButton.vue      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue
index f5e914d27..9a1550d7d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue
@@ -15,18 +15,20 @@ import AddressModal from "./AddressModal.vue";
 
 export interface AddressModalContentProps {
   address_id: number;
-  address_ref_status: AddressRefStatus | null;
+  address_ref_status: AddressRefStatus;
 }
 
-const data = reactive<{
-  loading: boolean,
-  working_address: Address | null,
-  working_ref_status: AddressRefStatus | null,
-}>({
+interface AddressModalData {
+    loading: boolean,
+    working_address: Address | null,
+    working_ref_status: AddressRefStatus | null,
+}
+
+const data: AddressModalData = reactive({
   loading: false,
   working_address: null,
   working_ref_status: null,
-});
+} as AddressModalData);
 
 const props = defineProps<AddressModalContentProps>();
 

From 53d18c7748f09a4e3b6033366a19c1e09989d784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Nov 2023 13:22:51 +0100
Subject: [PATCH 06/27] Give a more obvious url for new/current api endpoint

---
 .../ChillMainBundle/Controller/NewsItemApiController.php    | 6 +++---
 src/Bundle/ChillMainBundle/chill.api.specs.yaml             | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php b/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php
index 5224228a8..6df54c779 100644
--- a/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php
@@ -30,15 +30,15 @@ class NewsItemApiController
     /**
      * Get list of news items filtered on start and end date.
      *
-     * @Route("/api/1.0/main/news.json", methods={"get"})
+     * @Route("/api/1.0/main/news/current.json", methods={"get"})
      */
     public function listCurrentNewsItems(): JsonResponse
     {
         $total = $this->newsItemRepository->countWithDateFilter();
         $paginator = $this->paginatorFactory->create($total);
         $newsItems = $this->newsItemRepository->findWithDateFilter(
-            $limit = $paginator->getItemsPerPage(),
-            $offset = $paginator->getCurrentPage()->getFirstItemNumber()
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPage()->getFirstItemNumber()
         );
 
         return new JsonResponse($this->serializer->serialize(
diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
index 8edbd93f6..f37ee723d 100644
--- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
@@ -892,11 +892,11 @@ paths:
                 403:
                     description: "Unauthorized"
 
-    /1.0/main/news.json:
+    /1.0/main/news/current.json:
         get:
             tags:
                 - news items
-            summary: Returns a list of news items
+            summary: Returns a list of news items which are valid
             responses:
                 200:
                     description: "ok"

From 67876120710097fe0a9dc13893ba9d09560a91db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Nov 2023 13:28:50 +0100
Subject: [PATCH 07/27] Take into account case when there are no active news

---
 .../vuejs/HomepageWidget/DashboardWidgets/News.vue   | 12 +++++++-----
 .../public/vuejs/HomepageWidget/MyCustoms.vue        |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue
index a33bebf5c..6f85a5678 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div v-if="newsItems.length > 0">
         <h1>{{ $t('widget.news.title') }}</h1>
         <ul class="scrollable">
             <NewsItem v-for="item in newsItems" :item="item" :key="item.id" />
@@ -9,7 +9,7 @@
 
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
-import { makeFetch } from '../../../lib/api/apiMethods';
+import { fetchResults } from '../../../lib/api/apiMethods';
 import Modal from '../../_components/Modal.vue';
 import { NewsItemType } from '../../../types';
 import NewsItem from './NewsItem.vue';
@@ -17,10 +17,12 @@ import NewsItem from './NewsItem.vue';
 const newsItems = ref<NewsItemType[]>([])
 
 onMounted(() => {
-    makeFetch('GET', '/api/1.0/main/news.json')
-        .then((response: { results: NewsItemType[] }) => {
+    fetchResults<NewsItemType>('/api/1.0/main/news/current.json')
+        .then((news): Promise<void> => {
             // console.log('news articles', response.results)
-            newsItems.value = response.results
+            newsItems.value = news;
+
+            return Promise.resolve();
         })
         .catch((error: string) => {
             console.error('Error fetching news items', error);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
index 58120e5cf..cc50715f1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
@@ -40,9 +40,9 @@
       </div>
 
        <div class="mbloc col col-lg-12 col-lg-4" v-if="this.dashboardItems">
-           <div v-for="dashboardItem in this.dashboardItems">
+           <template v-for="dashboardItem in this.dashboardItems">
                <News v-if="dashboardItem.type === 'news'"/>
-           </div>
+           </template>
        </div>
 
    </div>

From 6da297d1d273d9b566de552ab316a884d4938be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Nov 2023 15:59:55 +0100
Subject: [PATCH 08/27] rename method newsWithDateFilter => currentNews

---
 .../Controller/NewsItemApiController.php            |  4 ++--
 .../Repository/NewsItemRepository.php               | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php b/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php
index 6df54c779..a44bcf989 100644
--- a/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php
@@ -34,9 +34,9 @@ class NewsItemApiController
      */
     public function listCurrentNewsItems(): JsonResponse
     {
-        $total = $this->newsItemRepository->countWithDateFilter();
+        $total = $this->newsItemRepository->countCurrentNews();
         $paginator = $this->paginatorFactory->create($total);
-        $newsItems = $this->newsItemRepository->findWithDateFilter(
+        $newsItems = $this->newsItemRepository->findCurrentNews(
             $paginator->getItemsPerPage(),
             $paginator->getCurrentPage()->getFirstItemNumber()
         );
diff --git a/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php b/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
index 44e1f2d39..3e918dfd1 100644
--- a/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
@@ -80,9 +80,12 @@ class NewsItemRepository implements ObjectRepository
         return $qb->getQuery()->getResult();
     }
 
-    public function findWithDateFilter($limit = null, $offset = null)
+    /**
+     * @return list<NewsItem>
+     */
+    public function findCurrentNews(int $limit = null, int $offset = null): array
     {
-        $qb = $this->buildQueryWithDateFilter();
+        $qb = $this->buildQueryCurrentNews();
 
         if ($limit) {
             $qb->setMaxResults($limit);
@@ -107,15 +110,15 @@ class NewsItemRepository implements ObjectRepository
             ->getSingleScalarResult();
     }
 
-    public function countWithDateFilter()
+    public function countCurrentNews()
     {
-        return $this->buildQueryWithDateFilter()
+        return $this->buildQueryCurrentNews()
             ->select('COUNT(n)')
             ->getQuery()
             ->getSingleScalarResult();
     }
 
-    public function buildQueryWithDateFilter(): QueryBuilder
+    private function buildQueryCurrentNews(): QueryBuilder
     {
         $now = $this->clock->now();
 

From ae2265df218c088f4b8a4e75dc15d563efc89bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Nov 2023 16:00:46 +0100
Subject: [PATCH 09/27] fix errors with data structure

---
 .../ChillMainBundle/Resources/public/types.ts |  4 +--
 .../DashboardWidgets/NewsItem.vue             | 27 +++++++++++--------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts
index 79dae2695..2e33b8248 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -165,6 +165,6 @@ export interface NewsItemType {
     id: number;
     title: string;
     content: string;
-    startdate: { date: DateTime };
-    enddate: { date: DateTime | null}
+    startDate: DateTime;
+    endDate: DateTime | null;
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue
index 345545fe9..f4a7cd0eb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue
@@ -15,7 +15,7 @@
             </template>
             <template #body>
                 <p class="news-date">
-                    {{ $t('widget.news.date') }}: <span>{{ formatDate(item.startdate.date) }}</span>
+                    <span>{{ $d(newsItemStartDate(), 'short') }}</span>
                 </p>
                 <div v-html="convertMarkdownToHtml(item.content)"></div>
             </template>
@@ -30,12 +30,17 @@ import DOMPurify from 'dompurify';
 import { DateTime, NewsItemType } from "../../../types";
 import type { PropType } from 'vue'
 import { defineProps, ref } from "vue";
-import {dateToISO} from "../../../chill/js/date";
+import {ISOToDatetime} from "../../../chill/js/date";
 
 const props = defineProps({
     item: {
         type: Object as PropType<NewsItemType>,
         required: true
+    },
+    maxLength: {
+        type: Number,
+        required: false,
+        default: 200,
     }
 })
 
@@ -52,13 +57,13 @@ const closeModal = () => {
     showModal.value = false;
 };
 
-const shouldTruncate = (content: string, maxLength = 100): boolean => {
-    return content.length > maxLength;
+const shouldTruncate = (content: string): boolean => {
+    return content.length > props.maxLength;
 };
 
-const truncateContent = (content: string, maxLength = 100): string => {
-    if (shouldTruncate(content, maxLength)) {
-        let truncatedContent = content.slice(0, maxLength);
+const truncateContent = (content: string): string => {
+    if (shouldTruncate(content)) {
+        let truncatedContent = content.slice(0, props.maxLength);
         let linkDepth = 0;
         let linkStartIndex = -1;
 
@@ -103,13 +108,13 @@ const convertMarkdownToHtml = (markdown: string): string => {
     return DOMPurify.sanitize(rawHtml)
 };
 
-const prepareContent = (content: string, maxLength = 200): string => {
+const prepareContent = (content: string): string => {
     const htmlContent = convertMarkdownToHtml(content);
-    return truncateContent(htmlContent, maxLength);
+    return truncateContent(htmlContent);
 };
 
-const formatDate = (datetime: DateTime): string|null => {
-    return dateToISO(new Date(datetime.toString()))
+const newsItemStartDate = (): null|Date => {
+    return ISOToDatetime(props.item?.startDate.datetime);
 }
 </script>
 

From 2af9ff7d001e9c26b695602a7cf47bfc79959700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Nov 2023 16:01:15 +0100
Subject: [PATCH 10/27] reload masonry when dom is updated

---
 .../public/vuejs/HomepageWidget/MyCustoms.vue      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
index cc50715f1..5f6439123 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
@@ -64,7 +64,8 @@ export default {
          counterClass: {
             counter: true   //hack to pass class 'counter' in i18n-t
          },
-         dashboardItems: []
+         dashboardItems: [],
+         masonry: null,
       }
    },
    computed: {
@@ -75,7 +76,7 @@ export default {
    },
    mounted() {
       const elem = document.querySelector('#dashboards');
-      const masonry = new Masonry(elem, {});
+      this.masonry = new Masonry(elem, {});
        //Fetch the dashboard items configured for user. Currently response is still hardcoded
        makeFetch('GET', '/api/1.0/main/dashboard-config-item.json')
            .then((response) => {
@@ -84,8 +85,13 @@ export default {
            })
            .catch((error) => {
                throw error
-           })
-   }
+           });
+
+
+   },
+    updated() {
+       this.masonry.layout();
+    }
 }
 </script>
 

From 684f1a30158b2b3c625108c428788d2101a05bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Nov 2023 16:15:40 +0100
Subject: [PATCH 11/27] Fix ci issues

---
 .../Controller/NewsItemApiController.php          |  6 +++---
 .../Repository/NewsItemRepository.php             |  2 +-
 .../Tests/Dashboard/NewsItemControllerTest.php    | 10 +++++++++-
 .../Tests/Dashboard/NewsItemRepositoryTest.php    | 15 ++++++++++++---
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php b/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php
index a44bcf989..c4476a041 100644
--- a/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php
@@ -22,9 +22,9 @@ use Symfony\Component\Serializer\SerializerInterface;
 class NewsItemApiController
 {
     public function __construct(
-        private NewsItemRepository $newsItemRepository,
-        private SerializerInterface $serializer,
-        private PaginatorFactory $paginatorFactory
+        private readonly NewsItemRepository $newsItemRepository,
+        private readonly SerializerInterface $serializer,
+        private readonly PaginatorFactory $paginatorFactory
     ) {}
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php b/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
index 3e918dfd1..6787e78bd 100644
--- a/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
@@ -22,7 +22,7 @@ class NewsItemRepository implements ObjectRepository
 {
     private readonly EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $entityManager, private ClockInterface $clock)
+    public function __construct(EntityManagerInterface $entityManager, private readonly ClockInterface $clock)
     {
         $this->repository = $entityManager->getRepository(NewsItem::class);
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemControllerTest.php
index 8809138a2..bbbd354e6 100644
--- a/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemControllerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Dashboard;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
@@ -32,5 +41,4 @@ class NewsItemControllerTest extends WebTestCase
 
         self::assertResponseIsSuccessful();
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemRepositoryTest.php b/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemRepositoryTest.php
index f0491b75a..e831e59ad 100644
--- a/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemRepositoryTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemRepositoryTest.php
@@ -1,10 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Dashboard;
 
 use Chill\MainBundle\Entity\NewsItem;
 use Chill\MainBundle\Repository\NewsItemRepository;
-use Chill\MainBundle\Test\PrepareClientTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Clock\MockClock;
 
@@ -24,6 +32,9 @@ class NewsItemRepositoryTest extends KernelTestCase
         $this->newsItemRepository = self::$container->get(NewsItemRepository::class);
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testFindWithDateFilter(): void
     {
         $clock = new MockClock('2023-11-20');
@@ -44,7 +55,5 @@ class NewsItemRepositoryTest extends KernelTestCase
         $newsItemC->setContent('tralala');
         $newsItemC->setStartDate(new \DateTime('2023-11-03'));
         $newsItemC->setEndDate(null);
-
     }
-
 }

From e2efb267f5f4d290471bdd2c042d79f401bcd81c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Nov 2023 20:52:12 +0100
Subject: [PATCH 12/27] Improve layout of the history page

---
 .../Controller/NewsItemHistoryController.php  | 21 +++---
 .../Repository/NewsItemRepository.php         |  8 ++-
 .../NewsItem/news_items_history.html.twig     | 66 +++++++------------
 .../Resources/views/NewsItem/show.html.twig   | 29 ++++----
 4 files changed, 58 insertions(+), 66 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php b/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
index ff7adf818..1b000665b 100644
--- a/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Controller;
 
+use Chill\MainBundle\Entity\NewsItem;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\NewsItemRepository;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
@@ -19,6 +20,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Twig\Environment;
 
 class NewsItemHistoryController extends AbstractController
 {
@@ -26,42 +28,41 @@ class NewsItemHistoryController extends AbstractController
         private readonly NewsItemRepository $newsItemRepository,
         private readonly PaginatorFactory $paginatorFactory,
         private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
+        private readonly Environment $environment,
     ) {}
 
     /**
      * @Route("/{_locale}/news-items/history", name="chill_main_news_items_history")
      */
-    public function listAction(Request $request): Response
+    public function list(): Response
     {
-        $filter = $this->buildFilterOrder(false);
+        $filter = $this->buildFilterOrder();
         $total = $this->newsItemRepository->countAllFilteredBySearchTerm($filter->getQueryString());
         $newsItems = $this->newsItemRepository->findAllFilteredBySearchTerm($filter->getQueryString());
 
         $pagination = $this->paginatorFactory->create($total);
 
-        return $this->render('@ChillMain/NewsItem/news_items_history.html.twig', [
+        return new Response($this->environment->render('@ChillMain/NewsItem/news_items_history.html.twig', [
             'entities' => $newsItems,
             'paginator' => $pagination,
             'filter_order' => $filter,
-        ]);
+        ]));
     }
 
     /**
      * @Route("/{_locale}/news-items/{id}", name="chill_main_single_news_item")
      */
-    public function showSingleItem(int $id, Request $request): Response
+    public function showSingleItem(NewsItem $newsItem, Request $request): Response
     {
-        $newsItem = $this->newsItemRepository->findOneBy(['id' => $id]);
-
-        return $this->render(
+        return new Response($this->environment->render(
             '@ChillMain/NewsItem/show.html.twig',
             [
                 'entity' => $newsItem,
             ]
-        );
+        ));
     }
 
-    private function buildFilterOrder($includeFilterByUser = true, $includeMissionType = false): FilterOrderHelper
+    private function buildFilterOrder(): FilterOrderHelper
     {
         $filterBuilder = $this->filterOrderHelperFactory
             ->create(self::class)
diff --git a/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php b/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
index 6787e78bd..f8a155c68 100644
--- a/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
@@ -57,11 +57,14 @@ class NewsItemRepository implements ObjectRepository
         return NewsItem::class;
     }
 
-    public function buildBaseQuery(
+    private function buildBaseQuery(
         string $pattern = null
     ): QueryBuilder {
         $qb = $this->createQueryBuilder('n');
 
+        $qb->where('n.startDate <= :now');
+        $qb->setParameter('now', $this->clock->now());
+
         if (null !== $pattern && '' !== $pattern) {
             $qb->andWhere($qb->expr()->like('LOWER(UNACCENT(n.title))', 'LOWER(UNACCENT(:pattern))'))
                 ->orWhere($qb->expr()->like('LOWER(UNACCENT(n.content))', 'LOWER(UNACCENT(:pattern))'))
@@ -74,7 +77,8 @@ class NewsItemRepository implements ObjectRepository
     public function findAllFilteredBySearchTerm(string $pattern = null)
     {
         $qb = $this->buildBaseQuery($pattern);
-        $qb->addOrderBy('n.startDate', 'DESC')
+        $qb
+            ->addOrderBy('n.startDate', 'DESC')
             ->addOrderBy('n.id', 'DESC');
 
         return $qb->getQuery()->getResult();
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig
index e462c3302..e6e5f862c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig
@@ -21,54 +21,38 @@
                 {% for entity in entities %}
 
                     <div class="item-bloc">
-                        <div class="item-row wrap-header">
-
-                            <div class="item-col">
-                                <h3>
-                                    {{ entity.title }}
-                                </h3>
-                                <div>
-                                    {% if entity.startDate %}
-                                        <span>{{ entity.startDate|format_date('long') }}</span>
-                                    {% endif %}
-                                    {% if entity.endDate %}
-                                        <span> - {{ entity.endDate|format_date('long') }}</span>
-                                    {% endif %}
-                                </div>
-                            </div>
-                            <div class="item-col" style="justify-content: flex-end;">
-                                <div class="box">
-                                    <div>
-{#                                        <blockquote class="chill-user-quote">#}
-                                            {{ entity.content|u.truncate(350, '…', false)|chill_markdown_to_html }}
-{#                                            {% if entity.content|length > 350 %}#}
-{#                                                <a href="{{ chill_path_add_return_path('chill_main_news_items_history', {'news_item_id': entity.id}) }}">{{ 'news.read_more'|trans }}</a>#}
-{#                                            {% endif %}#}
-{#                                        </blockquote>#}
-                                        <div class="action">
-                                            <ul class="record_actions">
-                                                <li>
-                                                    <a href="{{ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) }}" class="btn btn-show btn-mini"></a>
-                                                </li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div>
+                        <div class="item-row">
+                            <h3>
+                                {{ entity.title }}
+                            </h3>
+                        </div>
+                        <div class="item-row">
+                            <p>
+                                {% if entity.startDate %}
+                                    <span>{{ entity.startDate|format_date('long') }}</span>
+                                {% endif %}
+                                {% if entity.endDate %}
+                                    <span> - {{ entity.endDate|format_date('long') }}</span>
+                                {% endif %}
+                            </p>
+                        </div>
+                        <div class="item-row separator">
+                            <div>
+                                {{ entity.content|u.truncate(350, '… [' ~ ('news.read_more'|trans) ~ '](' ~ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) ~ ')', false)|chill_markdown_to_html }}
                             </div>
                         </div>
+                        <div class="item-row">
+                            <ul class="record_actions">
+                                <li>
+                                    <a href="{{ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) }}" class="btn btn-show btn-mini"></a>
+                                </li>
+                            </ul>
+                        </div>
                     </div>
                 {% endfor %}
             </div>
 
             {{ chill_pagination(paginator) }}
-
-            <ul class="record_actions sticky-form-buttons">
-                <li>
-                    <a href="{{ chill_path_add_return_path('chill_crud_aside_activity_new') }}" class="btn btn-create">
-                        {{ 'Create'|trans }}
-                    </a>
-                </li>
-            </ul>
         {% endif %}
     </div>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig
index b86408183..764a2cc6f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig
@@ -3,19 +3,22 @@
 {% block title 'news.show_details'|trans %}
 
 {% block content %}
-    <h1>{{ entity.title }}</h1>
+    <div class="col-md-10">
+        <h1>{{ entity.title }}</h1>
 
-    <div class="flex-table">
-            <div class="item-row">
-                <div>
-                    <span>{{ entity.startDate|format_date('long') }}</span>
-                    {% if entity.endDate is not null %}
-                        <span> - {{ entity.endDate|format_date('long') }}</span>
-                    {% endif %}
-                </div>
-            </div>
-            <div class="item-row separator">
-                {{ entity.content|chill_markdown_to_html }}
-            </div>
+        <div>
+            <span>{{ entity.startDate|format_date('long') }}</span>
+            {% if entity.endDate is not null %}
+                <span> - {{ entity.endDate|format_date('long') }}</span>
+            {% endif %}
+        </div>
+        <div>
+            {{ entity.content|chill_markdown_to_html }}
+        </div>
+        <ul class="record_actions sticky-form-buttons">
+            <li class="cancel">
+                <a href="{{ chill_return_path_or('chill_main_news_items_history') }}" class="btn btn-cancel">{{ 'Back to the list'|trans|chill_return_path_label }}</a>
+            </li>
+        </ul>
     </div>
 {% endblock %}

From 6e48f8f7ea1de968e9f3a5bac6a064e5ea224b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Nov 2023 21:03:03 +0100
Subject: [PATCH 13/27] do not use an integer in a condition

---
 src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php b/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
index f8a155c68..2e517970c 100644
--- a/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/NewsItemRepository.php
@@ -91,11 +91,11 @@ class NewsItemRepository implements ObjectRepository
     {
         $qb = $this->buildQueryCurrentNews();
 
-        if ($limit) {
+        if (null !== $limit) {
             $qb->setMaxResults($limit);
         }
 
-        if ($offset) {
+        if (null !== $offset) {
             $qb->setFirstResult($offset);
         }
 

From 6676e06fb52684918f491466ddb6a931008bc92c Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 4 Dec 2023 14:13:27 +0100
Subject: [PATCH 14/27] remove extend of abstractController

---
 .../ChillMainBundle/Controller/NewsItemHistoryController.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php b/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
index 1b000665b..ed84b6130 100644
--- a/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
@@ -22,7 +22,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Twig\Environment;
 
-class NewsItemHistoryController extends AbstractController
+final readonly class NewsItemHistoryController
 {
     public function __construct(
         private readonly NewsItemRepository $newsItemRepository,

From 229cef8942429624e40329ce7a2029713ae0d3c8 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 4 Dec 2023 14:13:44 +0100
Subject: [PATCH 15/27] Adjust translation of endDate

---
 src/Bundle/ChillMainBundle/translations/messages.fr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 5d500f48e..d64af4dbe 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -686,7 +686,7 @@ admin:
 news:
     noDate: Pas de date de fin
     startDate: Date de début
-    endDate: Date de fin
+    endDate: Date de fin de publication sur la page d'accueil
     title: Historique des actualités
     menu: Actualités
     no_data: Aucune actualité

From e876b75d417770f9b5aef092367f69928f8fdd1c Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 4 Dec 2023 15:13:12 +0100
Subject: [PATCH 16/27] Add delete functionality in admin for news item

---
 .../ChillMainExtension.php                    |  7 ++++
 .../Resources/views/NewsItem/delete.html.twig |  6 +++
 .../Resources/views/NewsItem/index.html.twig  |  3 ++
 .../Templating/Entity/NewsItemRender.php      | 39 +++++++++++++++++++
 .../config/services/templating.yaml           |  2 +
 .../translations/messages.fr.yml              |  3 ++
 6 files changed, 60 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/NewsItem/delete.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Templating/Entity/NewsItemRender.php

diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 1621471b8..8b61ae4f1 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -562,10 +562,17 @@ class ChillMainExtension extends Extension implements
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillMain/NewsItem/new.html.twig',
                         ],
+                        'view' => [
+                            'role' => '',
+                        ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillMain/NewsItem/edit.html.twig',
                         ],
+                        'delete' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/NewsItem/delete.html.twig',
+                        ]
                     ],
                 ],
             ],
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/delete.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/delete.html.twig
new file mode 100644
index 000000000..cf55ef2f7
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/delete.html.twig
@@ -0,0 +1,6 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/delete.html.twig' %}
+    {% endembed %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
index 4eb02945b..3e5d08cee 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
@@ -22,6 +22,9 @@
                             <li>
                                 <a href="{{ path('chill_crud_news_item_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                             </li>
+                            <li>
+                                <a href="{{ path('chill_crud_news_item_delete', { 'id': entity.id }) }}" class="btn btn-delete" title="{{ 'delete'|trans }}"></a>
+                            </li>
                         </ul>
                     </td>
                 </tr>
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/NewsItemRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/NewsItemRender.php
new file mode 100644
index 000000000..1faaf4213
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/NewsItemRender.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Templating\Entity;
+
+use Chill\MainBundle\Entity\NewsItem;
+use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+
+/**
+ * @implements ChillEntityRenderInterface<NewsItem>
+ */
+final readonly class NewsItemRender implements ChillEntityRenderInterface
+{
+    public function __construct(private TranslatableStringHelper $translatableStringHelper, private \Twig\Environment $engine) {}
+
+    public function renderBox($entity, array $options): string
+    {
+        return '';
+    }
+
+    public function renderString($entity, array $options): string
+    {
+        return $entity->getTitle();
+    }
+
+    public function supports($newsItem, array $options): bool
+    {
+        return $newsItem instanceof NewsItem;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/config/services/templating.yaml b/src/Bundle/ChillMainBundle/config/services/templating.yaml
index e69700732..0baa91b69 100644
--- a/src/Bundle/ChillMainBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/templating.yaml
@@ -47,6 +47,8 @@ services:
 
     Chill\MainBundle\Templating\Entity\AddressRender: ~
 
+    Chill\MainBundle\Templating\Entity\NewsItemRender: ~
+
     Chill\MainBundle\Templating\Entity\UserRender: ~
 
     Chill\MainBundle\Templating\Listing\:
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index d64af4dbe..40bf1081e 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -436,6 +436,9 @@ crud:
             add_new: Créer une nouvelle actualité
         title_new: Nouvelle actualité
         title_edit: Modifier une actualité
+        title_delete: Supprimer une actualité
+        button_delete: Supprimer
+        confirm_message_delete: Êtes-vous sûr de vouloir supprimer l'actualité, "%as_string%" ?
 
 No entities: Aucun élément
 

From e0fc87ef587e2d2c137a1691c6bdcc5ee943c94b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 4 Dec 2023 16:10:24 +0100
Subject: [PATCH 17/27] add view admin page + some styling

---
 .../ChillMainExtension.php                    |  3 +-
 .../Resources/views/NewsItem/_list.html.twig  | 30 +++++++++++++++
 .../Resources/views/NewsItem/_show.html.twig  | 13 +++++++
 .../Resources/views/NewsItem/index.html.twig  |  3 ++
 .../NewsItem/news_items_history.html.twig     | 37 ++++++++++---------
 .../Resources/views/NewsItem/show.html.twig   | 25 +++++--------
 .../views/NewsItem/view_admin.html.twig       | 29 +++++++++++++++
 7 files changed, 107 insertions(+), 33 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/NewsItem/_list.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/NewsItem/_show.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/NewsItem/view_admin.html.twig

diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 8b61ae4f1..aa025bdfe 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -563,7 +563,8 @@ class ChillMainExtension extends Extension implements
                             'template' => '@ChillMain/NewsItem/new.html.twig',
                         ],
                         'view' => [
-                            'role' => '',
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/NewsItem/view_admin.html.twig'
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/_list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/_list.html.twig
new file mode 100644
index 000000000..11ca95995
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/_list.html.twig
@@ -0,0 +1,30 @@
+<div class="item-bloc">
+    <div class="item-row">
+        <h3>
+            {{ entity.title }}
+        </h3>
+    </div>
+    <div class="item-row">
+        <p>
+            {% if entity.startDate %}
+                <span>{{ entity.startDate|format_date('long') }}</span>
+            {% endif %}
+            {% if entity.endDate %}
+                <span> - {{ entity.endDate|format_date('long') }}</span>
+            {% endif %}
+        </p>
+    </div>
+    <div class="item-row separator">
+        <div>
+            {{ entity.content|u.truncate(350, '… [' ~ ('news.read_more'|trans) ~ '](' ~ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) ~ ')', false)|chill_markdown_to_html }}
+        </div>
+    </div>
+    <div class="item-row">
+        <ul class="record_actions">
+            <li>
+                <a href="{{ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) }}" class="btn btn-show btn-mini"></a>
+            </li>
+        </ul>
+    </div>
+</div>
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/_show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/_show.html.twig
new file mode 100644
index 000000000..ed11908ec
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/_show.html.twig
@@ -0,0 +1,13 @@
+<div class="flex-table">
+    <div class="item-bloc">
+        <p class="date-label">
+            <span>{{ entity.startDate|format_date('long') }}</span>
+            {% if entity.endDate is not null %}
+                <span> - {{ entity.endDate|format_date('long') }}</span>
+            {% endif %}
+        </p>
+    </div>
+    <div class="item-bloc">
+        {{ entity.content|chill_markdown_to_html }}
+    </div>
+</div>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
index 3e5d08cee..4ac053e7f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
@@ -19,6 +19,9 @@
                     {% endif %}
                     <td>
                         <ul class="record_actions">
+                            <li>
+                                <a href="{{ path('chill_crud_news_item_view', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
+                            </li>
                             <li>
                                 <a href="{{ path('chill_crud_news_item_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                             </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig
index e6e5f862c..134135791 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig
@@ -22,25 +22,28 @@
 
                     <div class="item-bloc">
                         <div class="item-row">
-                            <h3>
-                                {{ entity.title }}
-                            </h3>
-                        </div>
-                        <div class="item-row">
-                            <p>
-                                {% if entity.startDate %}
-                                    <span>{{ entity.startDate|format_date('long') }}</span>
-                                {% endif %}
-                                {% if entity.endDate %}
-                                    <span> - {{ entity.endDate|format_date('long') }}</span>
-                                {% endif %}
-                            </p>
-                        </div>
-                        <div class="item-row separator">
-                            <div>
-                                {{ entity.content|u.truncate(350, '… [' ~ ('news.read_more'|trans) ~ '](' ~ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) ~ ')', false)|chill_markdown_to_html }}
+                            <div class="wrap-list">
+                                <div class="wl-row">
+                                    <div class="wl-col">
+                                        <h2>{{ entity.title }}</h2>
+                                    </div>
+                                    <div class="wl-col">
+                                        <p>
+                                            {% if entity.startDate %}
+                                                <span>{{ entity.startDate|format_date('long') }}</span>
+                                            {% endif %}
+                                            {% if entity.endDate %}
+                                                <span> - {{ entity.endDate|format_date('long') }}</span>
+                                            {% endif %}
+                                        </p>
+                                    </div>
+                                </div>
                             </div>
                         </div>
+
+                        <div class="item-row separator">
+                            {{ entity.content|u.truncate(350, '… [' ~ ('news.read_more'|trans) ~ '](' ~ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) ~ ')', false)|chill_markdown_to_html }}
+                        </div>
                         <div class="item-row">
                             <ul class="record_actions">
                                 <li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig
index 764a2cc6f..abd596918 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig
@@ -3,22 +3,17 @@
 {% block title 'news.show_details'|trans %}
 
 {% block content %}
-    <div class="col-md-10">
-        <h1>{{ entity.title }}</h1>
+    <div class="col-md-10 col-xxl">
+        <div class="news-item-show">
+            <h1>{{ entity.title }}</h1>
 
-        <div>
-            <span>{{ entity.startDate|format_date('long') }}</span>
-            {% if entity.endDate is not null %}
-                <span> - {{ entity.endDate|format_date('long') }}</span>
-            {% endif %}
+            {% include '@ChillMain/NewsItem/_show.html.twig' with { 'entity': entity } %}
+
+            <ul class="record_actions sticky-form-buttons">
+                <li class="cancel">
+                    <a href="{{ chill_return_path_or('chill_main_news_items_history') }}" class="btn btn-cancel">{{ 'Back to the list'|trans|chill_return_path_label }}</a>
+                </li>
+            </ul>
         </div>
-        <div>
-            {{ entity.content|chill_markdown_to_html }}
-        </div>
-        <ul class="record_actions sticky-form-buttons">
-            <li class="cancel">
-                <a href="{{ chill_return_path_or('chill_main_news_items_history') }}" class="btn btn-cancel">{{ 'Back to the list'|trans|chill_return_path_label }}</a>
-            </li>
-        </ul>
     </div>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/view_admin.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/view_admin.html.twig
new file mode 100644
index 000000000..b9cee97cf
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/view_admin.html.twig
@@ -0,0 +1,29 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_view_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+
+    <div class="col-md-10 col-xxl">
+        <div class="news-item-show">
+            <h1>{{ entity.title }}</h1>
+
+            {% include '@ChillMain/NewsItem/_show.html.twig' with { 'entity': entity } %}
+
+            <ul class="record_actions sticky-form-buttons">
+                <li class="cancel">
+                    <a href="{{ chill_return_path_or('chill_crud_news_item_index') }}" class="btn btn-cancel">{{ 'Back to the list'|trans|chill_return_path_label }}</a>
+                </li>
+                <li>
+                    <a href="{{ path('chill_crud_news_item_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                </li>
+                <li>
+                    <a href="{{ path('chill_crud_news_item_delete', { 'id': entity.id }) }}" class="btn btn-delete" title="{{ 'delete'|trans }}"></a>
+                </li>
+            </ul>
+        </div>
+    </div>
+
+{% endblock %}

From 807ffb845ab0ba895a4dee8823d7061fca2958a2 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 4 Dec 2023 16:15:05 +0100
Subject: [PATCH 18/27] correct date format in admin

---
 .../ChillMainBundle/Resources/views/NewsItem/index.html.twig  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
index 4ac053e7f..0a197353b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
@@ -11,9 +11,9 @@
             {% for entity in entities %}
                 <tr>
                     <td>{{ entity.title }}</td>
-                    <td>{{ entity.startDate|date }}</td>
+                    <td>{{ entity.startDate|format_date('long') }}</td>
                     {% if entity.endDate is not null %}
-                        <td>{{ entity.endDate|date }}</td>
+                        <td>{{ entity.endDate|format_date('long') }}</td>
                     {% else %}
                         <td>{{ 'news.noDate'|trans }}</td>
                     {% endif %}

From de9251942c6f0cc60475d5f265717e769551e4a5 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 4 Dec 2023 16:19:37 +0100
Subject: [PATCH 19/27] add missing translations

---
 .../ChillMainBundle/Resources/views/CRUD/_view_title.html.twig  | 2 +-
 src/Bundle/ChillMainBundle/translations/messages.fr.yml         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_title.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_title.html.twig
index 3473dd298..00688ecd9 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_title.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_title.html.twig
@@ -1 +1 @@
-{{ 'crud.%crud_name%.title_view'|trans({'%crud_name%' : crud_name }) }}
\ No newline at end of file
+{{ ('crud.' ~ crud_name ~ '.title_view')|trans({'%crud_name%' : crud_name }) }}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 40bf1081e..cca4e82d0 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -435,6 +435,7 @@ crud:
             title: Liste des actualités
             add_new: Créer une nouvelle actualité
         title_new: Nouvelle actualité
+        title_view: Voir l'actualité
         title_edit: Modifier une actualité
         title_delete: Supprimer une actualité
         button_delete: Supprimer
@@ -694,5 +695,6 @@ news:
     menu: Actualités
     no_data: Aucune actualité
     read_more: Lire la suite
+    show_details: Voir l'actualité
 
 

From a97a22d4642462b33c658c7b5a33647aa1a2ac93 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 4 Dec 2023 16:24:05 +0100
Subject: [PATCH 20/27] php cs fixer

---
 .../ChillMainBundle/Controller/NewsItemHistoryController.php  | 1 -
 .../DependencyInjection/ChillMainExtension.php                | 4 ++--
 .../ChillMainBundle/Templating/Entity/NewsItemRender.php      | 4 ----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php b/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
index ed84b6130..b79812464 100644
--- a/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\NewsItemRepository;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index aa025bdfe..c91f03516 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -564,7 +564,7 @@ class ChillMainExtension extends Extension implements
                         ],
                         'view' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/NewsItem/view_admin.html.twig'
+                            'template' => '@ChillMain/NewsItem/view_admin.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
@@ -573,7 +573,7 @@ class ChillMainExtension extends Extension implements
                         'delete' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillMain/NewsItem/delete.html.twig',
-                        ]
+                        ],
                     ],
                 ],
             ],
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/NewsItemRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/NewsItemRender.php
index 1faaf4213..fd2e2e211 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/NewsItemRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/NewsItemRender.php
@@ -12,16 +12,12 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Templating\Entity;
 
 use Chill\MainBundle\Entity\NewsItem;
-use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 
 /**
  * @implements ChillEntityRenderInterface<NewsItem>
  */
 final readonly class NewsItemRender implements ChillEntityRenderInterface
 {
-    public function __construct(private TranslatableStringHelper $translatableStringHelper, private \Twig\Environment $engine) {}
-
     public function renderBox($entity, array $options): string
     {
         return '';

From 2402050f5f1b760f0f2c564dc9e5a359aec4160b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 11 Dec 2023 17:32:21 +0100
Subject: [PATCH 21/27] work on tests

---
 .../Controller/NewsItemApiControllerTest.php  | 71 +++++++++++++++++++
 .../Controller/NewsItemControllerTest.php     | 68 ++++++++++++++++++
 .../NewsItemsHistoryControllerTest.php        | 58 +++++++++++++++
 .../Dashboard/NewsItemControllerTest.php      | 44 ------------
 .../Dashboard/NewsItemRepositoryTest.php      | 59 ---------------
 .../Repository/NewsItemRepositoryTest.php     | 71 +++++++++++++++++++
 6 files changed, 268 insertions(+), 103 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Controller/NewsItemControllerTest.php
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Controller/NewsItemsHistoryControllerTest.php
 delete mode 100644 src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemControllerTest.php
 delete mode 100644 src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemRepositoryTest.php
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Repository/NewsItemRepositoryTest.php

diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php
new file mode 100644
index 000000000..55c06d18a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Controller;
+
+use Chill\MainBundle\Controller\NewsItemApiController;
+use Chill\MainBundle\Entity\NewsItem;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Repository\NewsItemRepository;
+use Chill\MainBundle\Test\PrepareClientTrait;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Serializer\SerializerInterface;
+
+
+class NewsItemApiControllerTest extends TestCase
+{
+    use PrepareClientTrait;
+
+/*    public function testListCurrentNewsItems()
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request('GET', '/api/1.0/main/news/current.json');
+        $this->assertResponseIsSuccessful('Testing whether the GET request to the news item Api endpoint was successful');
+
+        $responseContent = json_decode($client->getResponse()->getContent(), true);
+        if (!empty($responseContent['data'][0])) {
+            $this->assertArrayHasKey('title', $responseContent['data'][0]);
+        }
+    }*/
+
+    public function testListCurrentNewsItems()
+    {
+        // Mock dependencies
+        $newsItemRepository = $this->createMock(NewsItemRepository::class);
+        $serializer = $this->createMock(SerializerInterface::class);
+        $paginatorFactory = $this->createMock(PaginatorFactory::class);
+
+        $mockNewsItem = $this->createMock(NewsItem::class);
+        $mockNewsItem->method('getTitle')->willReturn('Mock News Title');
+        $mockNewsItem->method('getContent')->willReturn('Mock News Content');
+
+        $newsItemRepository->expects($this->once())
+            ->method('countCurrentNews')
+            ->willReturn(1);
+
+        $newsItemRepository->expects($this->once())
+            ->method('findCurrentNews')
+            ->willReturn([$mockNewsItem]);
+
+        $serializer->expects($this->once())
+            ->method('serialize')
+            ->willReturn('{"data":[{"title":"Mock News Title"}]}');
+
+        $paginatorFactory->expects($this->once())
+            ->method('create')
+            ->willReturn(/* Your Paginator object here */);
+
+        $controller = new NewsItemApiController($newsItemRepository, $serializer, $paginatorFactory);
+
+        $response = $controller->listCurrentNewsItems();
+        $this->assertEquals(Response::HTTP_OK, $response->getStatusCode());
+
+        $responseContent = json_decode($response->getContent(), true);
+        if (!empty($responseContent['data'][0])) {
+            $this->assertEquals('Mock News Title', $responseContent['data'][0]['title']);
+        }
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemControllerTest.php
new file mode 100644
index 000000000..aa6aa821d
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemControllerTest.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Controller;
+
+use Chill\MainBundle\Entity\NewsItem;
+use Chill\MainBundle\Test\PrepareClientTrait;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+/**
+ * Tests the admin pages for news items
+ *
+ */
+class NewsItemControllerTest extends WebTestCase
+{
+    use PrepareClientTrait;
+
+    protected function tearDown(): void
+    {
+        self::ensureKernelShutdown();
+    }
+
+    public function generateNewsItemIds(): iterable
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $qb = $em->createQueryBuilder();
+        $newsItems = $qb->select('n')->from(NewsItem::class, 'n')
+            ->setMaxResults(2)
+            ->getQuery()
+            ->getResult();
+
+        foreach ($newsItems as $n) {
+            yield [$n->getId()];
+        }
+
+        self::ensureKernelShutdown();
+    }
+
+    public function testList()
+    {
+        $client = $this->getClientAuthenticated();
+        $client->request('GET', "/fr/admin/news_item");
+
+        self::assertResponseIsSuccessful('Test that news item admin page shows');
+    }
+
+    /**
+     * @dataProvider generateNewsItemIds
+     */
+    public function testShowSingleItem(int $newsItemId)
+    {
+        $client = $this->getClientAuthenticated();
+        $client->request('GET', "/fr/amdin/news_item/{$newsItemId}/view");
+
+        $this->assertResponseIsSuccessful('test that single news item admin page loads successfully');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemsHistoryControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemsHistoryControllerTest.php
new file mode 100644
index 000000000..77c471380
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemsHistoryControllerTest.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Controller;
+
+use Chill\MainBundle\Entity\NewsItem;
+use Chill\MainBundle\Test\PrepareClientTrait;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+class NewsItemsHistoryControllerTest extends WebTestCase
+{
+    use PrepareClientTrait;
+
+    protected function tearDown(): void
+    {
+        self::ensureKernelShutdown();
+    }
+
+    public function generateNewsItemIds(): iterable
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $qb = $em->createQueryBuilder();
+        $newsItems = $qb->select('n')->from(NewsItem::class, 'n')
+            ->setMaxResults(2)
+            ->getQuery()
+            ->getResult();
+
+        foreach ($newsItems as $n) {
+            yield [$n->getId()];
+        }
+
+        self::ensureKernelShutdown();
+    }
+
+    public function testList()
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request('GET', "/fr/news-items/history");
+
+        self::assertResponseIsSuccessful('Test that /fr/news-items history shows');
+    }
+
+    /**
+     * @dataProvider generateNewsItemIds
+     */
+    public function testShowSingleItem(int $newsItemId)
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request('GET', "/fr/news-items/{$newsItemId}");
+
+        $this->assertResponseIsSuccessful('test that single news item page loads successfully');
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemControllerTest.php
deleted file mode 100644
index bbbd354e6..000000000
--- a/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemControllerTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Dashboard;
-
-use Chill\MainBundle\Test\PrepareClientTrait;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class NewsItemControllerTest extends WebTestCase
-{
-    use PrepareClientTrait;
-
-    /**
-     * Test to ensure that the news item admin index page works.
-     */
-    public function newsItemAdminSmokeTest(): void
-    {
-        $client = $this->getClientAuthenticated('admin', 'admin');
-
-        $crawler = $client->request('GET', '/fr/admin/news_item');
-        self::assertResponseIsSuccessful('Testing /fr/admin/news_item');
-
-        $btnEdit = $crawler->filter('.btn-edit')?->first();
-
-        self::assertNotNull($btnEdit, 'check that there is at least one btn-edit on news item page');
-
-        $client->click($btnEdit->link());
-
-        self::assertResponseIsSuccessful();
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemRepositoryTest.php b/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemRepositoryTest.php
deleted file mode 100644
index e831e59ad..000000000
--- a/src/Bundle/ChillMainBundle/Tests/Dashboard/NewsItemRepositoryTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Dashboard;
-
-use Chill\MainBundle\Entity\NewsItem;
-use Chill\MainBundle\Repository\NewsItemRepository;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Clock\MockClock;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class NewsItemRepositoryTest extends KernelTestCase
-{
-    private NewsItemRepository $newsItemRepository;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-        self::bootKernel();
-        $this->newsItemRepository = self::$container->get(NewsItemRepository::class);
-    }
-
-    /**
-     * @doesNotPerformAssertions
-     */
-    public function testFindWithDateFilter(): void
-    {
-        $clock = new MockClock('2023-11-20');
-
-        $newsItemA = new NewsItem();
-        $newsItemA->setTitle('With end date article');
-        $newsItemA->setContent('blabla');
-        $newsItemA->setStartDate(new \DateTime('2023-11-01'));
-        $newsItemA->setEndDate(new \DateTime('2023-11-15'));
-
-        $newsItemB = new NewsItem();
-        $newsItemB->setTitle('No end date article');
-        $newsItemB->setContent('with blopblop');
-        $newsItemB->setStartDate(new \DateTime('2023-11-02'));
-
-        $newsItemC = new NewsItem();
-        $newsItemC->setTitle('Null as end date article');
-        $newsItemC->setContent('tralala');
-        $newsItemC->setStartDate(new \DateTime('2023-11-03'));
-        $newsItemC->setEndDate(null);
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/Tests/Repository/NewsItemRepositoryTest.php b/src/Bundle/ChillMainBundle/Tests/Repository/NewsItemRepositoryTest.php
new file mode 100644
index 000000000..f9aee89a9
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Repository/NewsItemRepositoryTest.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Repository;
+
+use PHPUnit\Framework\TestCase;
+use Chill\MainBundle\Entity\NewsItem;
+use Chill\MainBundle\Repository\NewsItemRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Clock\ClockInterface;
+
+class NewsItemRepositoryTest extends TestCase
+{
+    private $entityManager;
+    private $clock;
+    private $repository;
+
+    protected function setUp(): void
+    {
+        $this->entityManager = $this->createMock(EntityManagerInterface::class);
+        $this->clock = $this->createMock(ClockInterface::class);
+
+        $this->repository = new NewsItemRepository(
+            $this->entityManager,
+            $this->clock
+        );
+    }
+
+    public function testFindCurrentNews()
+    {
+        $this->clock->expects($this->once())->method('now')->willReturn(new \DateTime('2023-01-10'));
+
+        $newsItem1 = new NewsItem();
+        $newsItem1->setTitle('This is a mock news item');
+        $newsItem1->setContent('We are testing that the repository returns the correct news items');
+        $newsItem1->setStartDate(new \DateTimeImmutable('2023-01-01'));
+        $newsItem1->setEndDate(new \DateTimeImmutable('2023-01-05'));
+
+        $newsItem2 = new NewsItem();
+        $newsItem2->setTitle('This is a mock news item');
+        $newsItem2->setContent('We are testing that the repository returns the correct news items');
+        $newsItem2->setStartDate(new \DateTimeImmutable('2023-12-15'));
+        $newsItem2->setEndDate($this->clock->now());
+
+        $newsItem3 = new NewsItem();
+        $newsItem3->setTitle('This is a mock news item');
+        $newsItem3->setContent('We are testing that the repository returns the correct news items');
+        $newsItem3->setStartDate(new \DateTimeImmutable('2033-11-03'));
+        $newsItem3->setEndDate(null);
+
+        // Call the method to test
+        $result = $this->repository->findCurrentNews();
+
+        // Assertions
+        $this->assertCount(2, $result);
+        $this->assertInstanceOf(NewsItem::class, $result[0]);
+        $this->assertContains($newsItem2, $result);
+        $this->assertContains($newsItem3, $result);
+
+    }
+}

From 3a080ebebe130390c21c7f88c7ca025e5ca99e05 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 18 Dec 2023 14:28:57 +0100
Subject: [PATCH 22/27] Silence deprecation warning in tests, log them

---
 phpunit.xml.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index aa519e376..223c74b56 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -10,7 +10,7 @@
     <php>
         <ini name="error_reporting" value="-1" />
         <server name="APP_ENV" value="test" force="true" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0&amp;max[indirect]=999999" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="logFile=var/log/deprecations.log" />
         <server name="SHELL_VERBOSITY" value="-1" />
         <env name="KERNEL_CLASS" value="\App\Kernel" />
     </php>

From f03ae2cabc2c956b7fd56f0af103cd36f6c603e4 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 18 Dec 2023 14:29:17 +0100
Subject: [PATCH 23/27] Fix doctrine annotation for dashboard config item

---
 src/Bundle/ChillMainBundle/Entity/DashboardConfigItem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/DashboardConfigItem.php b/src/Bundle/ChillMainBundle/Entity/DashboardConfigItem.php
index 5ad1107c5..ed9cc07bf 100644
--- a/src/Bundle/ChillMainBundle/Entity/DashboardConfigItem.php
+++ b/src/Bundle/ChillMainBundle/Entity/DashboardConfigItem.php
@@ -57,7 +57,7 @@ class DashboardConfigItem
     private ?User $user = null;
 
     /**
-     * @ORM\Column(type="json" "jsonb"=true, options={"default": "[]"})
+     * @ORM\Column(type="json", options={"default": "[]", "jsonb": true})
      *
      * @Serializer\Groups({"dashboardConfigItem:read"})
      */

From 726f71c8f13865df8ca24c5f9bf386a45fd03f3a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 18 Dec 2023 15:34:43 +0100
Subject: [PATCH 24/27] Correct the NewsItemsApiController test : remove
 commented code and extend properly

---
 .../Controller/NewsItemApiControllerTest.php  | 44 ++-----------------
 1 file changed, 4 insertions(+), 40 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php
index 55c06d18a..5616cf311 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php
@@ -8,16 +8,17 @@ use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\NewsItemRepository;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Serializer\SerializerInterface;
 
 
-class NewsItemApiControllerTest extends TestCase
+class NewsItemApiControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
-/*    public function testListCurrentNewsItems()
+    public function testListCurrentNewsItems()
     {
         $client = $this->getClientAuthenticated();
 
@@ -25,47 +26,10 @@ class NewsItemApiControllerTest extends TestCase
         $this->assertResponseIsSuccessful('Testing whether the GET request to the news item Api endpoint was successful');
 
         $responseContent = json_decode($client->getResponse()->getContent(), true);
+
         if (!empty($responseContent['data'][0])) {
             $this->assertArrayHasKey('title', $responseContent['data'][0]);
         }
-    }*/
-
-    public function testListCurrentNewsItems()
-    {
-        // Mock dependencies
-        $newsItemRepository = $this->createMock(NewsItemRepository::class);
-        $serializer = $this->createMock(SerializerInterface::class);
-        $paginatorFactory = $this->createMock(PaginatorFactory::class);
-
-        $mockNewsItem = $this->createMock(NewsItem::class);
-        $mockNewsItem->method('getTitle')->willReturn('Mock News Title');
-        $mockNewsItem->method('getContent')->willReturn('Mock News Content');
-
-        $newsItemRepository->expects($this->once())
-            ->method('countCurrentNews')
-            ->willReturn(1);
-
-        $newsItemRepository->expects($this->once())
-            ->method('findCurrentNews')
-            ->willReturn([$mockNewsItem]);
-
-        $serializer->expects($this->once())
-            ->method('serialize')
-            ->willReturn('{"data":[{"title":"Mock News Title"}]}');
-
-        $paginatorFactory->expects($this->once())
-            ->method('create')
-            ->willReturn(/* Your Paginator object here */);
-
-        $controller = new NewsItemApiController($newsItemRepository, $serializer, $paginatorFactory);
-
-        $response = $controller->listCurrentNewsItems();
-        $this->assertEquals(Response::HTTP_OK, $response->getStatusCode());
-
-        $responseContent = json_decode($response->getContent(), true);
-        if (!empty($responseContent['data'][0])) {
-            $this->assertEquals('Mock News Title', $responseContent['data'][0]['title']);
-        }
     }
 
 }

From 49dbd091670fb23e6ab2d41930d31fa2eb5b2910 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 18 Dec 2023 15:36:01 +0100
Subject: [PATCH 25/27] Change test into an integration test rather than unit
 test : extend KernelTestCase and get real services from the container.

---
 .../Repository/NewsItemRepositoryTest.php     | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Tests/Repository/NewsItemRepositoryTest.php b/src/Bundle/ChillMainBundle/Tests/Repository/NewsItemRepositoryTest.php
index f9aee89a9..56f4cf499 100644
--- a/src/Bundle/ChillMainBundle/Tests/Repository/NewsItemRepositoryTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Repository/NewsItemRepositoryTest.php
@@ -11,34 +11,28 @@ declare(strict_types=1);
 
 namespace Repository;
 
-use PHPUnit\Framework\TestCase;
 use Chill\MainBundle\Entity\NewsItem;
 use Chill\MainBundle\Repository\NewsItemRepository;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\QueryBuilder;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Clock\ClockInterface;
 
-class NewsItemRepositoryTest extends TestCase
+class NewsItemRepositoryTest extends KernelTestCase
 {
-    private $entityManager;
-    private $clock;
-    private $repository;
-
-    protected function setUp(): void
+    private function getNewsItemsRepository(): NewsItemRepository
     {
-        $this->entityManager = $this->createMock(EntityManagerInterface::class);
-        $this->clock = $this->createMock(ClockInterface::class);
-
-        $this->repository = new NewsItemRepository(
-            $this->entityManager,
-            $this->clock
-        );
+        return self::$container->get(NewsItemRepository::class);
     }
 
     public function testFindCurrentNews()
     {
-        $this->clock->expects($this->once())->method('now')->willReturn(new \DateTime('2023-01-10'));
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+        $repository = $this->getNewsItemsRepository();
+
+        $mockClock = $this->createMock(ClockInterface::class);
+
+        $mockClock->expects($this->once())->method('now')->willReturn(new \DateTime('2023-01-10'));
 
         $newsItem1 = new NewsItem();
         $newsItem1->setTitle('This is a mock news item');
@@ -50,7 +44,7 @@ class NewsItemRepositoryTest extends TestCase
         $newsItem2->setTitle('This is a mock news item');
         $newsItem2->setContent('We are testing that the repository returns the correct news items');
         $newsItem2->setStartDate(new \DateTimeImmutable('2023-12-15'));
-        $newsItem2->setEndDate($this->clock->now());
+        $newsItem2->setEndDate($mockClock->now());
 
         $newsItem3 = new NewsItem();
         $newsItem3->setTitle('This is a mock news item');
@@ -58,14 +52,18 @@ class NewsItemRepositoryTest extends TestCase
         $newsItem3->setStartDate(new \DateTimeImmutable('2033-11-03'));
         $newsItem3->setEndDate(null);
 
+        $em->persist($newsItem1);
+        $em->persist($newsItem2);
+        $em->persist($newsItem3);
+        $em->flush();
+
         // Call the method to test
-        $result = $this->repository->findCurrentNews();
+        $result = $repository->findCurrentNews();
 
         // Assertions
         $this->assertCount(2, $result);
         $this->assertInstanceOf(NewsItem::class, $result[0]);
         $this->assertContains($newsItem2, $result);
         $this->assertContains($newsItem3, $result);
-
     }
 }

From f5879cf275fdeda7193e4e74ed7838ab4e3b9a2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 15 Jan 2024 20:57:51 +0100
Subject: [PATCH 26/27] Apply new CS rules on the news-on-homepage feature

---
 .../Controller/NewsItemApiController.php      |  3 ++-
 .../Controller/NewsItemHistoryController.php  |  3 ++-
 .../MenuBuilder/AdminNewsMenuBuilder.php      |  4 +++-
 .../Controller/NewsItemApiControllerTest.php  | 24 +++++++++++--------
 .../Controller/NewsItemControllerTest.php     |  7 ++++--
 .../NewsItemsHistoryControllerTest.php        | 17 +++++++++++--
 .../Repository/NewsItemRepositoryTest.php     |  5 ++++
 7 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php b/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php
index c4476a041..786a7e0f1 100644
--- a/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php
@@ -25,7 +25,8 @@ class NewsItemApiController
         private readonly NewsItemRepository $newsItemRepository,
         private readonly SerializerInterface $serializer,
         private readonly PaginatorFactory $paginatorFactory
-    ) {}
+    ) {
+    }
 
     /**
      * Get list of news items filtered on start and end date.
diff --git a/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php b/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
index b79812464..cf1f4922b 100644
--- a/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
@@ -28,7 +28,8 @@ final readonly class NewsItemHistoryController
         private readonly PaginatorFactory $paginatorFactory,
         private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
         private readonly Environment $environment,
-    ) {}
+    ) {
+    }
 
     /**
      * @Route("/{_locale}/news-items/history", name="chill_main_news_items_history")
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminNewsMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminNewsMenuBuilder.php
index 08e72884f..0ce6a9824 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminNewsMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminNewsMenuBuilder.php
@@ -17,7 +17,9 @@ use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
 class AdminNewsMenuBuilder implements LocalMenuBuilderInterface
 {
-    public function __construct(private readonly AuthorizationCheckerInterface $authorizationChecker) {}
+    public function __construct(private readonly AuthorizationCheckerInterface $authorizationChecker)
+    {
+    }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php
index 5616cf311..1a00e45de 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php
@@ -1,19 +1,24 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Controller;
 
-use Chill\MainBundle\Controller\NewsItemApiController;
-use Chill\MainBundle\Entity\NewsItem;
-use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\MainBundle\Repository\NewsItemRepository;
 use Chill\MainBundle\Test\PrepareClientTrait;
-use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Serializer\SerializerInterface;
-
 
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
 class NewsItemApiControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
@@ -31,5 +36,4 @@ class NewsItemApiControllerTest extends WebTestCase
             $this->assertArrayHasKey('title', $responseContent['data'][0]);
         }
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemControllerTest.php
index aa6aa821d..c77983454 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemControllerTest.php
@@ -17,8 +17,11 @@ use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
- * Tests the admin pages for news items
+ * Tests the admin pages for news items.
  *
+ * @internal
+ *
+ * @coversNothing
  */
 class NewsItemControllerTest extends WebTestCase
 {
@@ -50,7 +53,7 @@ class NewsItemControllerTest extends WebTestCase
     public function testList()
     {
         $client = $this->getClientAuthenticated();
-        $client->request('GET', "/fr/admin/news_item");
+        $client->request('GET', '/fr/admin/news_item');
 
         self::assertResponseIsSuccessful('Test that news item admin page shows');
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemsHistoryControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemsHistoryControllerTest.php
index 77c471380..329fd7bc0 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemsHistoryControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemsHistoryControllerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Controller;
 
 use Chill\MainBundle\Entity\NewsItem;
@@ -7,6 +16,11 @@ use Chill\MainBundle\Test\PrepareClientTrait;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
 class NewsItemsHistoryControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
@@ -38,7 +52,7 @@ class NewsItemsHistoryControllerTest extends WebTestCase
     {
         $client = $this->getClientAuthenticated();
 
-        $client->request('GET', "/fr/news-items/history");
+        $client->request('GET', '/fr/news-items/history');
 
         self::assertResponseIsSuccessful('Test that /fr/news-items history shows');
     }
@@ -54,5 +68,4 @@ class NewsItemsHistoryControllerTest extends WebTestCase
 
         $this->assertResponseIsSuccessful('test that single news item page loads successfully');
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Repository/NewsItemRepositoryTest.php b/src/Bundle/ChillMainBundle/Tests/Repository/NewsItemRepositoryTest.php
index 56f4cf499..478ca1bbb 100644
--- a/src/Bundle/ChillMainBundle/Tests/Repository/NewsItemRepositoryTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Repository/NewsItemRepositoryTest.php
@@ -17,6 +17,11 @@ use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Clock\ClockInterface;
 
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
 class NewsItemRepositoryTest extends KernelTestCase
 {
     private function getNewsItemsRepository(): NewsItemRepository

From b369d94bc3d0dffe40ac91a4766b2f73fb9fd0cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 15 Jan 2024 20:59:11 +0100
Subject: [PATCH 27/27] Append JSON_THROW_ON_ERROR on json_decode

---
 .../Tests/Controller/NewsItemApiControllerTest.php              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php
index 1a00e45de..f8f7aafea 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/NewsItemApiControllerTest.php
@@ -30,7 +30,7 @@ class NewsItemApiControllerTest extends WebTestCase
         $client->request('GET', '/api/1.0/main/news/current.json');
         $this->assertResponseIsSuccessful('Testing whether the GET request to the news item Api endpoint was successful');
 
-        $responseContent = json_decode($client->getResponse()->getContent(), true);
+        $responseContent = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
         if (!empty($responseContent['data'][0])) {
             $this->assertArrayHasKey('title', $responseContent['data'][0]);