feat(wallet): add pagination and filtration for history and admin views #13
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,144 @@ | ||
| import { TransactionType } from "../data/constants.js"; | ||
|
|
||
| export const validateIdempotency = (req, res, next) => { | ||
| const idempotencyKey = req.headers['idempotency-key']; | ||
| if (!idempotencyKey) { | ||
| return res.status(400).json({ | ||
| success: false, | ||
| error: "Transaction cannot be processed without a unique request ID." | ||
| }); | ||
| } | ||
| next(); | ||
| }; | ||
|
|
||
| export const validateWalletFilters = (req, res, next) => { | ||
| const minB = req.query.minBalance; | ||
| const maxB = req.query.maxBalance; | ||
| const skip = req.query.skip; | ||
| const take = req.query.take; | ||
|
|
||
|
|
||
|
|
||
| if (skip !== undefined) { | ||
| const skipInt = parseInt(skip); | ||
| if (isNaN(skipInt) || skipInt < 0) { | ||
| return res.status(400).json({ | ||
| success: false, | ||
| error: "Invalid skip value. Pagination starting index cannot be negative." | ||
| }); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| // 2. Validate take | ||
| if (take) { | ||
| const takeInt = parseInt(take); | ||
| if (isNaN(takeInt) || takeInt < 0 || takeInt > 100) { | ||
| return res.status(400).json({ | ||
| success: false, | ||
| error: "Invalid take value. Must be between 0 and 100." | ||
| }); | ||
| } | ||
| req.query.take = takeInt; | ||
| } | ||
|
|
||
| // Validate minBalance | ||
| if (minB !== undefined && minB !== '' && (isNaN(parseFloat(minB)) || parseFloat(minB) < 0)) { | ||
| return res.status(400).json({ | ||
| success: false, | ||
| error: "Invalid minBalance value. Must be a non-negative number." | ||
| }); | ||
| } | ||
| // Validate maxBalance | ||
| if (maxB !== undefined && maxB !== '' && (isNaN(parseFloat(maxB)) || parseFloat(maxB) < 0)) { | ||
| return res.status(400).json({ | ||
| success: false, | ||
| error: "Invalid maxBalance value. Must be a non-negative number." | ||
| }); | ||
| } | ||
| // Validate minBalance <= maxBalance | ||
| if ( | ||
| minB !== undefined && minB !== '' && | ||
| maxB !== undefined && maxB !== '' && | ||
| parseFloat(minB) > parseFloat(maxB) | ||
| ) { | ||
| return res.status(400).json({ | ||
| success: false, | ||
| error: "minBalance cannot be greater than maxBalance." | ||
| }); | ||
| } | ||
| next(); | ||
| }; | ||
|
|
||
|
|
||
| export const validateTransactionFilters = (req, res, next) => { | ||
| const { skip,take,startDate, endDate, type } = req.query; | ||
|
|
||
| if (skip !== undefined) { | ||
| const skipInt = parseInt(skip); | ||
| if (isNaN(skipInt) || skipInt < 0) { | ||
| return res.status(400).json({ | ||
| success: false, | ||
| error: "Invalid skip value. Pagination starting index cannot be negative." | ||
| }); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| // 2. Validate take | ||
| if (take) { | ||
|
Collaborator
There was a problem hiding this comment. Consider extracting pagination validation into its own middleware.Right now skip and take are validated in both validateWalletFilters and validateTransactionFilters with the same logic. This could be a good opportunity to keep the code DRY and maintain a single source of truth for pagination rules. A small refactor, like creating a validatePagination middleware, would let you reuse it across any route that needs pagination. |
||
| const takeInt = parseInt(take); | ||
| if (isNaN(takeInt) || takeInt < 0 || takeInt > 100) { | ||
| return res.status(400).json({ | ||
| success: false, | ||
| error: "Invalid take value. Must be between 0 and 100." | ||
| }); | ||
| } | ||
| req.query.take = takeInt; | ||
| } | ||
|
|
||
|
|
||
| if (startDate) { | ||
| const start = new Date(startDate); | ||
| if (isNaN(start.getTime())) { | ||
| return res.status(400).json({ | ||
| success: false, | ||
| error: "Invalid startDate format. Use YYYY-MM-DD format." | ||
| }); | ||
| } | ||
| } | ||
| if (endDate) { | ||
| const end = new Date(endDate); | ||
| if (isNaN(end.getTime())) { | ||
| return res.status(400).json({ | ||
| success: false, | ||
| error: "Invalid endDate format. Use YYYY-MM-DD format." | ||
| }); | ||
| } | ||
| } | ||
| // Validate date range | ||
| if (startDate && endDate) { | ||
| const start = new Date(startDate); | ||
| const end = new Date(endDate); | ||
| if (start > end) { | ||
| return res.status(400).json({ | ||
| success: false, | ||
| error: "startDate must be before endDate." | ||
| }); | ||
| } | ||
| } | ||
| // Validate transaction type if provided | ||
| if (type) { | ||
| const formattedType = type.charAt(0).toUpperCase() + type.slice(1).toLowerCase(); | ||
| const validTypes = Object.values(TransactionType); | ||
|
|
||
| if (!validTypes.includes(formattedType)) { | ||
| return res.status(400).json({ | ||
| success: false, | ||
| error: `Invalid transaction type. Allowed values: ${validTypes.join(', ')}` | ||
| }); | ||
| } | ||
| req.query.type = formattedType; | ||
| } | ||
| next(); | ||
| }; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
var !== ''check is added for minB & maxB and not for skip & takewhile all are supposed to be numerical values.