From f8f43e3e52bf1593c79aaf9fcd64a039e8c4114a Mon Sep 17 00:00:00 2001
From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com>
Date: Fri, 11 Apr 2025 13:50:07 +0200
Subject: [PATCH 1/2] 4260: Fixed issues with colibo feed

---
 CHANGELOG.md                             | 2 ++
 src/Feed/ColiboFeedType.php              | 6 ++++--
 src/Feed/SourceType/Colibo/ApiClient.php | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f22f31fa6..a4602bd36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- [#240](https://github.com/os2display/display-api-service/pull/240)
+  - Fixed issues with Colibo feed type.
 - [#226](https://github.com/os2display/display-api-service/pull/226)
   - Added Colibo feed type.
 
diff --git a/src/Feed/ColiboFeedType.php b/src/Feed/ColiboFeedType.php
index 65526ab69..496c5e514 100644
--- a/src/Feed/ColiboFeedType.php
+++ b/src/Feed/ColiboFeedType.php
@@ -8,6 +8,7 @@
 use App\Entity\Tenant\FeedSource;
 use App\Feed\OutputModel\ConfigOption;
 use App\Feed\SourceType\Colibo\ApiClient;
+use App\Feed\SourceType\Colibo\SecretsDTO;
 use App\Service\FeedService;
 use FeedIo\Feed\Item;
 use FeedIo\Feed\Node\Category;
@@ -65,14 +66,15 @@ public function getAdminFormOptions(FeedSource $feedSource): array
     public function getData(Feed $feed): array
     {
         $configuration = $feed->getConfiguration();
-        $secrets = $feed->getFeedSource()?->getSecrets() ?? [];
+
+        $secrets = new SecretsDTO($feed->getFeedSource());
 
         $result = [
             'title' => 'Intranet',
             'entries' => [],
         ];
 
-        $baseUri = $secrets['api_base_uri'];
+        $baseUri = $secrets->apiBaseUri;
         $recipients = $configuration['recipients'] ?? [];
         $publishers = $configuration['publishers'] ?? [];
         $pageSize = isset($configuration['page_size']) ? (int) $configuration['page_size'] : 10;
diff --git a/src/Feed/SourceType/Colibo/ApiClient.php b/src/Feed/SourceType/Colibo/ApiClient.php
index ae98dab19..9751efc4d 100644
--- a/src/Feed/SourceType/Colibo/ApiClient.php
+++ b/src/Feed/SourceType/Colibo/ApiClient.php
@@ -84,7 +84,7 @@ public function getFeedEntriesNews(FeedSource $feedSource, array $recipients = [
      *
      * @return array
      */
-    public function getSearchGroups(FeedSource $feedSource, string $type = 'WorkGroup'): array
+    public function getSearchGroups(FeedSource $feedSource, string $type = 'Department'): array
     {
         try {
             $responseData = $this->getSearchGroupsPage($feedSource, $type)->toArray();

From 18c02f25e345227a6de2a5c91808cd5e2374bf9c Mon Sep 17 00:00:00 2001
From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com>
Date: Fri, 11 Apr 2025 13:58:06 +0200
Subject: [PATCH 2/2] 4260: Fixed result

---
 src/Feed/ColiboFeedType.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Feed/ColiboFeedType.php b/src/Feed/ColiboFeedType.php
index 496c5e514..1fd76af60 100644
--- a/src/Feed/ColiboFeedType.php
+++ b/src/Feed/ColiboFeedType.php
@@ -65,15 +65,20 @@ public function getAdminFormOptions(FeedSource $feedSource): array
 
     public function getData(Feed $feed): array
     {
-        $configuration = $feed->getConfiguration();
-
-        $secrets = new SecretsDTO($feed->getFeedSource());
-
         $result = [
             'title' => 'Intranet',
             'entries' => [],
         ];
 
+        $configuration = $feed->getConfiguration();
+        $feedSource = $feed->getFeedSource();
+
+        if (null == $feedSource) {
+            return $result;
+        }
+
+        $secrets = new SecretsDTO($feedSource);
+
         $baseUri = $secrets->apiBaseUri;
         $recipients = $configuration['recipients'] ?? [];
         $publishers = $configuration['publishers'] ?? [];