From acfef013596a4c218a3927fca06be9787bbfc59e Mon Sep 17 00:00:00 2001 From: Melanie Coslett Date: Wed, 26 Feb 2025 14:54:15 +0000 Subject: [PATCH] feat(cb2-16540): formatting dates in query --- src/app/queries/antsQuery.ts | 4 ++-- src/infrastructure/api/index.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/queries/antsQuery.ts b/src/app/queries/antsQuery.ts index 8f3cc20..7449b8c 100644 --- a/src/app/queries/antsQuery.ts +++ b/src/app/queries/antsQuery.ts @@ -4,11 +4,11 @@ SELECT make, model, wheelplan, - test_date, + DATE_FORMAT(test_date,'%d/%m/%Y') test_date, weight_before_test, weight_after_test, DOE_reference, - tech_record_date + DATE_FORMAT(tech_record_date,'%d/%m/%Y') tech_record_date FROM vw_dvla_ants WHERE test_date >= STR_TO_DATE(?, '%d/%m/%Y %T') ORDER BY test_date ASC;`; diff --git a/src/infrastructure/api/index.ts b/src/infrastructure/api/index.ts index c706deb..221d802 100644 --- a/src/infrastructure/api/index.ts +++ b/src/infrastructure/api/index.ts @@ -229,7 +229,7 @@ router.get('/ants', (_req, res) => { const processedResult = result.map((entry) => processAntsFeedData(entry)); const antsFeedProcessedData: string = processedResult .map( - (entry) => `${entry.vrm_trm},${entry.make},${entry.model}, ${entry.wheelplan},${moment(entry.test_date).format('DD-MM-YYYY')},${entry.weight_before_test},${entry.weight_after_test},${entry.DOE_reference},${moment(entry.tech_record_date).format('DD-MM-YYYY')}`, + (entry) => `${entry.vrm_trm},${entry.make},${entry.model}, ${entry.wheelplan},${entry.test_date},${entry.weight_before_test},${entry.weight_after_test},${entry.DOE_reference},${entry.tech_record_date}`, ) .join('\n'); logger.debug(`\nData captured for file generation: ${antsFeedProcessedData} \n\n`);