From c1378e6d4ce40a0228be0a0bfdb9190c2e0c1a07 Mon Sep 17 00:00:00 2001
From: 1AhmedYasser <26207361+1AhmedYasser@users.noreply.github.com>
Date: Thu, 19 Feb 2026 12:50:56 +0200
Subject: [PATCH] chore(1806): Showed both 5 and 10 rating scale

---
 .../users/POST/get-cs-all-ended-chats.sql     | 27 +++++--------------
 GUI/.env.development                          |  2 +-
 docker-compose.yml                            |  2 +-
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/DSL/Resql/users/POST/get-cs-all-ended-chats.sql b/DSL/Resql/users/POST/get-cs-all-ended-chats.sql
index b9d8ec410..b6d36720e 100644
--- a/DSL/Resql/users/POST/get-cs-all-ended-chats.sql
+++ b/DSL/Resql/users/POST/get-cs-all-ended-chats.sql
@@ -207,12 +207,12 @@ SELECT
     ContactsMessage.content AS contacts_message,
     m.updated AS last_message_timestamp,
     c.feedback_text,
+    COALESCE(c.feedback_rating_five, c.feedback_rating) AS feedback_rating,
     CASE 
-        WHEN (SELECT COALESCE(is_five_rating_scale, 'false') = 'true' FROM rating_config) 
-        THEN c.feedback_rating_five
-        ELSE c.feedback_rating
-    END AS feedback_rating,
-    is_five_rating_scale,
+        WHEN c.feedback_rating_five IS NOT NULL THEN 'true'
+        WHEN c.feedback_rating IS NOT NULL THEN 'false'
+        ELSE NULL
+    END AS is_five_rating_scale,
     c.test as isTest,
     nps,
     CSAFullNames.all_csa_names AS all_csa,
@@ -228,7 +228,6 @@ LEFT JOIN ContactsMessage ON ContactsMessage.chat_base_id = c.base_id
 LEFT JOIN CSAFullNames ON CSAFullNames.base_id = c.base_id
 CROSS JOIN TitleVisibility
 CROSS JOIN NPS
-CROSS JOIN rating_config rc
 WHERE (
     (
         COALESCE(:customerSupportIds, '') = ''
@@ -298,20 +297,8 @@ ORDER BY
                 ELSE m.event
             END
     END DESC NULLS LAST,
-    CASE WHEN :sorting = 'feedbackRating desc' THEN 
-        CASE 
-            WHEN rc.is_five_rating_scale = 'true' 
-            THEN c.feedback_rating_five 
-            ELSE c.feedback_rating 
-        END 
-    END DESC NULLS LAST,
-    CASE WHEN :sorting = 'feedbackRating asc' THEN 
-        CASE 
-            WHEN rc.is_five_rating_scale = 'true' 
-            THEN c.feedback_rating_five 
-            ELSE c.feedback_rating 
-        END 
-    END ASC NULLS LAST,
+    CASE WHEN :sorting = 'feedbackRating desc' THEN COALESCE(c.feedback_rating_five, c.feedback_rating) END DESC NULLS LAST,
+    CASE WHEN :sorting = 'feedbackRating asc' THEN COALESCE(c.feedback_rating_five, c.feedback_rating) END ASC NULLS LAST,
     CASE WHEN :sorting = 'customerSupportFullName asc' THEN
         COALESCE(
             NULLIF(array_to_string(CSAFullNames.all_csa_names, ', '), ''),
diff --git a/GUI/.env.development b/GUI/.env.development
index acc380bb5..3aea646dd 100644
--- a/GUI/.env.development
+++ b/GUI/.env.development
@@ -1,7 +1,7 @@
 REACT_APP_API_URL=http://localhost:8080/training
 REACT_APP_RUUTER_API_URL=http://localhost:8080/training
 REACT_APP_RUUTER_PRIVATE_API_URL=http://localhost:8080/training
-REACT_APP_RUUTER_PRIVATE_ENDED_API_URL=http://localhost:8088/training
+REACT_APP_RUUTER_PRIVATE_ENDED_API_URL=http://localhost:8080/training
 REACT_APP_RUUTER_V2_ANALYTICS_API_URL=http://localhost:3002/training/api
 REACT_APP_BUEROKRATT_CHATBOT_URL=http://buerokratt-chat:8080
 REACT_APP_OPENSEARCH_DASHBOARD_URL=https://opensearch.org/
diff --git a/docker-compose.yml b/docker-compose.yml
index b24d0b06e..243b5fa0a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -151,7 +151,7 @@ services:
       - REACT_APP_NOTIFICATION_NODE_URL=http://localhost:4040
       - REACT_APP_CSP=upgrade-insecure-requests; default-src 'self'; font-src 'self' data:; img-src 'self' data:; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; object-src 'none'; connect-src 'self' http://localhost:8080 http://localhost:8085 http://localhost:4040 https://admin.dev.buerokratt.ee/chat/menu.json;
       - REACT_APP_ENABLE_HIDDEN_FEATURES=TRUE
-      - REACT_APP_RUUTER_PRIVATE_ENDED_API_URL=http://localhost:8088/training
+      - REACT_APP_RUUTER_PRIVATE_ENDED_API_URL=http://localhost:8080/training
       - REACT_APP_VALIDATIONS_ENABLED=FALSE
       - REACT_APP_ENABLE_MULTI_DOMAIN=TRUE
       - REACT_APP_SHOW_TEST_MESSAGE=TRUE