Skip to content

Commit cdef66f

Browse files
committed
Refactor message retrieval in public-request routes to use filtered messages for CSV and PDF exports
1 parent 2ec83bf commit cdef66f

1 file changed

Lines changed: 6 additions & 10 deletions

File tree

routes/public-request.js

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,11 @@ router.get('/:requestid/messages.csv', async function(req, res) {
9393
try {
9494
let messages = await Message.find({"recipient": requestid}).sort({createdAt: 'asc'}).lean().exec();
9595

96-
if (!messages) {
97-
return res.status(404).send({success: false, msg: 'Object not found.'});
98-
}
96+
let filteredMessages = await filterMessages(messages);
9997

100-
let tz = await transcriptTz.resolveTranscriptTimezone(req, firstMessageProjectId(messages));
98+
let tz = await transcriptTz.resolveTranscriptTimezone(req, firstMessageProjectId(filteredMessages));
10199

102-
let rows = messages.map(function(m) {
100+
let rows = filteredMessages.map(function(m) {
103101
return {
104102
createdAt: transcriptTz.formatTranscriptInstant(m.createdAt, tz),
105103
senderFullname: m.senderFullname != null ? String(m.senderFullname) : '',
@@ -163,12 +161,10 @@ router.get('/:requestid/messages.pdf', async function(req, res) {
163161
try {
164162
let messages = await Message.find({"recipient": requestid}).sort({createdAt: 'asc'}).exec();
165163

166-
if (!messages) {
167-
return res.status(404).send({success: false, msg: 'Object not found.'});
168-
}
164+
let filteredMessages = await filterMessages(messages);
169165

170-
let tz = await transcriptTz.resolveTranscriptTimezone(req, firstMessageProjectId(messages));
171-
let docDefinition = buildTranscriptPdfDocDefinition(messages, tz);
166+
let tz = await transcriptTz.resolveTranscriptTimezone(req, firstMessageProjectId(filteredMessages));
167+
let docDefinition = buildTranscriptPdfDocDefinition(filteredMessages, tz);
172168
let pdfDoc = printer.createPdfKitDocument(docDefinition);
173169

174170
res.setHeader('Content-Type', 'application/pdf');

0 commit comments

Comments
 (0)