-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Added userChallenge pagination #33
Merged
Merged
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
5d8d8d5
Added userChallenge pagination
vmkhitaryanscn ac77cbf
Lint fixes
vmkhitaryanscn 37523b1
Refactor pagination , generic pagination types and functions introduced
vmkhitaryanscn 836f1e4
Fix eslint
vmkhitaryanscn 3867dd1
Fixed TS error
moiskillnadne b6d7857
Zod validation was added for safe work with query params
moiskillnadne 1205096
Update swagger docs
moiskillnadne a9fe21c
Update migration
moiskillnadne 8104332
Fix: error handling
moiskillnadne 8f9868a
Fix: Lint errors
moiskillnadne File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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 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 +1,2 @@ | ||
export * from './response'; | ||
export * from './pagination'; |
This file contains 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 |
---|---|---|
@@ -0,0 +1,12 @@ | ||
export interface PaginationResponse { | ||
totalRecords: number; | ||
totalPages: number; | ||
currentPage: number; | ||
nextPage: number | null; | ||
prevPage: number | null; | ||
} | ||
|
||
export interface PaginationRequest { | ||
page: number; | ||
limit: number; | ||
} |
This file contains 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 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 |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import { PaginationResponse } from '~/core/interfaces'; | ||
|
||
export const getPaginationMeta = ( | ||
page: number, | ||
limit: number, | ||
totalRecords: number, | ||
): PaginationResponse => { | ||
const totalPages = Math.ceil(totalRecords / limit); | ||
|
||
const paginationMeta: PaginationResponse = { | ||
totalRecords, | ||
totalPages, | ||
currentPage: page, | ||
nextPage: page < totalPages ? page + 1 : null, | ||
prevPage: page > 1 ? page - 1 : null, | ||
}; | ||
|
||
return paginationMeta; | ||
}; |
17 changes: 17 additions & 0 deletions
17
src/database/migrations/20241203121943-add-status-to-userChallenge.js
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should to mark each challenge according our new statuses and the startAtDate property. If startAtDate === currentMonth -> ACTIVE |
This file contains 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 |
---|---|---|
@@ -0,0 +1,17 @@ | ||
'use strict'; | ||
|
||
/** @type {import('sequelize-cli').Migration} */ | ||
module.exports = { | ||
async up(queryInterface, Sequelize) { | ||
await queryInterface.addColumn('userChallenge', 'status', { | ||
type: Sequelize.TEXT, | ||
allowNull: true, | ||
unique: false, | ||
defaultValue: 'ACTIVE', | ||
}); | ||
}, | ||
|
||
async down(queryInterface, Sequelize) { | ||
await queryInterface.removeColumn('userChallenge', 'status'); | ||
}, | ||
}; |
This file contains 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 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,3 +1,4 @@ | ||
import { ChallengeType } from './types'; | ||
import { ChallengeStatus, ChallengeType } from './types'; | ||
|
||
export const ChallengeTypeValues = Object.values(ChallengeType); | ||
export const ChallengeStatusValues = Object.values(ChallengeStatus); |
This file contains 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
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.
I have added the validation lorgic here.
We always should work with safe/parsed values because we don`t know what we can get