Skip to content

merging dev to test #651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ffrose merged 3 commits into from
Feb 19, 2026
Merged

merging dev to test #651

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c635ee9
chore(1806): Showed both 5 and 10 rating scale
1AhmedYasser Feb 19, 2026
661e89e
fix(1806): Reverted domain urls
1AhmedYasser Feb 19, 2026
4c6ff98
Merge pull request #650 from 1AhmedYasser/Feedback-in-historical-chat…
ffrose Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 12 additions & 26 deletions DSL/Resql/analytics/POST/get-cs-all-ended-chats.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ MaxChats AS (
OR c.test = FALSE
)
AND c.ended::timestamptz BETWEEN :start::timestamptz AND :end::timestamptz
AND CASE
WHEN (SELECT COALESCE(is_five_rating_scale, 'false') = 'true' FROM rating_config)
THEN c.feedback_rating_five IS NOT NULL AND c.feedback_rating_five <= 3
ELSE c.feedback_rating IS NOT NULL AND c.feedback_rating <= 5
END
AND (
(c.feedback_rating_five IS NOT NULL AND c.feedback_rating_five <= 3)
OR
(c.feedback_rating IS NOT NULL AND c.feedback_rating <= 5)
)
GROUP BY base_id
),
EndedChatMessages AS (
Expand Down Expand Up @@ -218,12 +218,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,
nps,
CSAFullNames.all_csa_names AS all_csa,
CEIL(COUNT(*) OVER() / :page_size::DECIMAL) AS total_pages
Expand All @@ -238,7 +238,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, '') = ''
Expand Down Expand Up @@ -293,20 +292,8 @@ ORDER BY
CASE WHEN :sorting = 'status desc' THEN
CASE WHEN m.event IS NULL OR m.event = '' THEN NULL 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, ', '), ''),
CASE WHEN c.customer_support_id = 'chatbot' THEN 'Bürokratt' END)
Expand All @@ -318,4 +305,3 @@ ORDER BY
CASE WHEN :sorting = 'id asc' THEN c.base_id END ASC,
CASE WHEN :sorting = 'id desc' THEN c.base_id END DESC
OFFSET ((GREATEST(:page, 1) - 1) * :page_size) LIMIT :page_size;

Loading