Skip to content

merging dev to test #765

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 2 commits into from
Jun 17, 2026
+20 −10
Merged

merging dev to test #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8731e6f
fix(681): Fixed feedback csa calculations
1AhmedYasser Jun 16, 2026
155d71a
Merge pull request #763 from 1AhmedYasser/fix-feedback-csa-chat-distr…
ffrose Jun 17, 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
9 changes: 7 additions & 2 deletions DSL/Resql/analytics/POST/feedback-chats-distribution.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,13 @@ scale_ratings AS (
)
) s
),
valid_feedback_count AS (
SELECT COALESCE(SUM(rc.cnt), 0) AS cnt
FROM scale_ratings sr
JOIN rating_counts rc ON sr.rating = rc.rating
),
no_feedback_count AS (
SELECT (SELECT total_chats FROM all_ended_chats) - (SELECT COUNT(*) FROM chats_filtered) AS cnt
SELECT (SELECT total_chats FROM all_ended_chats) - (SELECT cnt FROM valid_feedback_count) AS cnt
),
distribution_with_no_feedback AS (
SELECT json_agg(elem ORDER BY ord, rating_nullable NULLS LAST) AS distribution
Expand All @@ -147,7 +152,7 @@ distribution_with_no_feedback AS (
)
SELECT json_build_object(
'distribution', (SELECT distribution FROM distribution_with_no_feedback),
'total_feedback', (SELECT COUNT(*) FROM chats_filtered),
'total_feedback', (SELECT cnt FROM valid_feedback_count),
'total_chats', (SELECT total_chats FROM all_ended_chats),
'is_five_scale', (SELECT COALESCE(is_five_rating_scale, 'false') = 'true' FROM rating_config)
) AS result;
12 changes: 6 additions & 6 deletions DSL/Resql/analytics/POST/feedback-csa-chats-feedback-nps.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ point_nps AS (
WHEN (SELECT COALESCE(is_five_rating_scale, 'false') = 'true' FROM rating_config) THEN
ROUND(
100.0 * SUM(CASE WHEN feedback_rating_dynamic IN (4, 5) THEN 1 ELSE 0 END)
/ NULLIF(COUNT(base_id), 0),
/ NULLIF(SUM(CASE WHEN feedback_rating_dynamic BETWEEN 1 AND 5 THEN 1 ELSE 0 END), 0),
2
)
ELSE
COALESCE(ROUND(
(
(SUM(CASE WHEN feedback_rating_dynamic BETWEEN 9 AND 10 THEN 1 ELSE 0 END) * 1.0 / NULLIF(COUNT(base_id), 0))
- (SUM(CASE WHEN feedback_rating_dynamic BETWEEN 0 AND 6 THEN 1 ELSE 0 END) * 1.0 / NULLIF(COUNT(base_id), 0))
(SUM(CASE WHEN feedback_rating_dynamic BETWEEN 9 AND 10 THEN 1 ELSE 0 END) * 1.0 / NULLIF(SUM(CASE WHEN feedback_rating_dynamic BETWEEN 0 AND 10 THEN 1 ELSE 0 END), 0))
- (SUM(CASE WHEN feedback_rating_dynamic BETWEEN 0 AND 6 THEN 1 ELSE 0 END) * 1.0 / NULLIF(SUM(CASE WHEN feedback_rating_dynamic BETWEEN 0 AND 10 THEN 1 ELSE 0 END), 0))
) * 100,
2
), 0)
Expand All @@ -76,14 +76,14 @@ period_nps AS (
WHEN (SELECT COALESCE(is_five_rating_scale, 'false') = 'true' FROM rating_config) THEN
ROUND(
100.0 * SUM(CASE WHEN feedback_rating_dynamic IN (4, 5) THEN 1 ELSE 0 END)
/ NULLIF(COUNT(base_id), 0),
/ NULLIF(SUM(CASE WHEN feedback_rating_dynamic BETWEEN 1 AND 5 THEN 1 ELSE 0 END), 0),
2
)
ELSE
COALESCE(ROUND(
(
(SUM(CASE WHEN feedback_rating_dynamic BETWEEN 9 AND 10 THEN 1 ELSE 0 END) * 1.0 / NULLIF(COUNT(base_id), 0))
- (SUM(CASE WHEN feedback_rating_dynamic BETWEEN 0 AND 6 THEN 1 ELSE 0 END) * 1.0 / NULLIF(COUNT(base_id), 0))
(SUM(CASE WHEN feedback_rating_dynamic BETWEEN 9 AND 10 THEN 1 ELSE 0 END) * 1.0 / NULLIF(SUM(CASE WHEN feedback_rating_dynamic BETWEEN 0 AND 10 THEN 1 ELSE 0 END), 0))
- (SUM(CASE WHEN feedback_rating_dynamic BETWEEN 0 AND 6 THEN 1 ELSE 0 END) * 1.0 / NULLIF(SUM(CASE WHEN feedback_rating_dynamic BETWEEN 0 AND 10 THEN 1 ELSE 0 END), 0))
) * 100,
2
), 0)
Expand Down
9 changes: 7 additions & 2 deletions DSL/Resql/analytics/POST/feedback-selected-csa-chats-distribution.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,13 @@ scale_ratings AS (
)
) s
),
valid_feedback_count AS (
SELECT COALESCE(SUM(rc.cnt), 0) AS cnt
FROM scale_ratings sr
JOIN rating_counts rc ON sr.rating = rc.rating
),
no_feedback_count AS (
SELECT (SELECT total_chats FROM all_ended_chats) - (SELECT COUNT(*) FROM chats_filtered) AS cnt
SELECT (SELECT total_chats FROM all_ended_chats) - (SELECT cnt FROM valid_feedback_count) AS cnt
),
distribution_with_no_feedback AS (
SELECT json_agg(elem ORDER BY ord, rating_nullable NULLS LAST) AS distribution
Expand All @@ -107,7 +112,7 @@ distribution_with_no_feedback AS (
)
SELECT json_build_object(
'distribution', (SELECT distribution FROM distribution_with_no_feedback),
'total_feedback', (SELECT COUNT(*) FROM chats_filtered),
'total_feedback', (SELECT cnt FROM valid_feedback_count),
'total_chats', (SELECT total_chats FROM all_ended_chats),
'is_five_scale', (SELECT COALESCE(is_five_rating_scale, 'false') = 'true' FROM rating_config)
) AS result;
Loading