Skip to content

Commit 48b6f05

Browse files
committed
fix(FON-128): archivable uses official report outcome
1 parent 809d3ea commit 48b6f05

2 files changed

Lines changed: 19 additions & 12 deletions

File tree

apps/api/prisma/sql/countUnreportedNominationFiles.sql

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ WHERE
1212
OR NOT EXISTS (
1313
SELECT 1
1414
FROM docs.official_report_nomination_file AS orf
15-
WHERE orf.nomination_file_id = ddn.id
15+
WHERE (
16+
orf.nomination_file_id = ddn.id
17+
AND orf.outcome IS NOT NULL
18+
AND orf.outcome = ANY('{VALIDATED,NON_VALIDATED,WITHDRAWN}'::docs.agenda_file_outcome_enum[])
19+
)
1620
)
1721
OR NOT EXISTS (
1822
SELECT 1

apps/api/prisma/sql/findReportedSessionIds.sql

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,21 @@ WHERE
88
AND s.archived_at IS NULL
99
AND s.is_validated = TRUE
1010

11-
AND NOT EXISTS (
12-
SELECT 1
13-
FROM nominations_context.dossier_de_nomination
14-
WHERE session_id = s.id AND (
15-
outcome IS NULL
16-
OR outcome != ALL('{VALIDATED,NON_VALIDATED,WITHDRAWN,REMOVED}'::nominations_context.nomination_file_outcome_enum[])
17-
)
18-
)
19-
2011
AND NOT EXISTS (
2112
SELECT 1
2213
FROM nominations_context.dossier_de_nomination ddn
23-
LEFT JOIN docs.official_report_nomination_file ornf ON ornf.nomination_file_id = ddn.id
24-
WHERE ddn.session_id = s.id AND ornf.nomination_file_id IS NULL
14+
WHERE
15+
ddn.session_id = s.id
16+
AND (
17+
outcome IS NULL
18+
OR outcome != ALL('{VALIDATED,NON_VALIDATED,WITHDRAWN,REMOVED}'::nominations_context.nomination_file_outcome_enum[])
19+
OR NOT EXISTS (
20+
SELECT 1
21+
FROM docs.official_report_nomination_file ornf
22+
WHERE (
23+
ornf.nomination_file_id = ddn.id
24+
AND ornf.outcome = ANY('{VALIDATED,NON_VALIDATED,WITHDRAWN}'::docs.agenda_file_outcome_enum[])
25+
)
26+
)
27+
)
2528
);

0 commit comments

Comments
 (0)