fix : merge conflicts #2356
Merged
fix : merge conflicts #2356
Conversation
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
Dev to Main Sync
Dev to Main Sync
* feat: Add api to create onboarding extension request from discord server (#2307) * fix:added onboarding type in request * feat: added types for onboarding extension request * feat: added validator and skip-authenticate middleware * fix: added missing field in user type * feat: added controller for handling the create onboarding extension request feature * fix: remove requestedBy field because validation for super-users is done before hitting this api * refactor: moved constant messages from controller * fix: remove super-users validation check as it is done before making this api call * fix: create newEndsOn from current date when deadline has missed * fix: wrap schema validation logic in try-catch block * chore: refactor varibale name for better readability * chore: refactor new deadline calculation logic in a separate utils file for reuse * chore: use utils function to calculate days to milliseconds * feat: added utils function to validate date * fix: return error response for invalid date * fix: return forbidden response for non-onboarding user * chore: added semicolon for consistent code practise * chore: added jsDoc for functions and refactor import statment * fix: import addLog from service file and fix lint issue * Add tests for create onboarding extension request api (#2306) * feat: added tests for middlewares * feat:added tests for controller * refactor: create middleware in beforeEach hook * refactor: remove requestBy field and super-users validation tests * fix: expectation message as test was failing * fix: change order of middleware creation as test was failing * fix: assert statement and mock value * feat: added tests for handling edges cases and fixed existing test * chore: correct test name * chore: fix lint issue * feat: Integrate userData into Progresses API to reduce redundant calls (#2311) * initial * fix typos * using batches to fetch userIds * refactor the function * added test for dev false case * added unit tests * fix response body containing email --------- Co-authored-by: Achintya Chatterjee <[email protected]> Co-authored-by: Prakash Choudhary <[email protected]> * fix: Changed status code to 409 for sending Conflict response (#2339) * chore(#2342) - upgraded dependency packages * Revert "chore(#2342) - upgraded dependency packages" (#2343) This reverts commit 5bc49c6. --------- Co-authored-by: Pankaj <[email protected]> Co-authored-by: Anuj Chhikara <[email protected]> Co-authored-by: Prakash Choudhary <[email protected]> Co-authored-by: Vikas Singh <[email protected]> Co-authored-by: Yash Raj <[email protected]>
Achintya-Chatterjee
changed the title
22.10.0 (#2354)
vikasosmium
approved these changes
Jan 18, 2025
shobhan-sundar-goutam
approved these changes
Jan 18, 2025
yesyash
approved these changes
Jan 18, 2025
yesyash
added a commit
that referenced
this pull request
Jan 18, 2025
* Dev to Main Sync (#2336) * feat: Add api to create onboarding extension request from discord server (#2307) * fix:added onboarding type in request * feat: added types for onboarding extension request * feat: added validator and skip-authenticate middleware * fix: added missing field in user type * feat: added controller for handling the create onboarding extension request feature * fix: remove requestedBy field because validation for super-users is done before hitting this api * refactor: moved constant messages from controller * fix: remove super-users validation check as it is done before making this api call * fix: create newEndsOn from current date when deadline has missed * fix: wrap schema validation logic in try-catch block * chore: refactor varibale name for better readability * chore: refactor new deadline calculation logic in a separate utils file for reuse * chore: use utils function to calculate days to milliseconds * feat: added utils function to validate date * fix: return error response for invalid date * fix: return forbidden response for non-onboarding user * chore: added semicolon for consistent code practise * chore: added jsDoc for functions and refactor import statment * fix: import addLog from service file and fix lint issue * Add tests for create onboarding extension request api (#2306) * feat: added tests for middlewares * feat:added tests for controller * refactor: create middleware in beforeEach hook * refactor: remove requestBy field and super-users validation tests * fix: expectation message as test was failing * fix: change order of middleware creation as test was failing * fix: assert statement and mock value * feat: added tests for handling edges cases and fixed existing test * chore: correct test name * chore: fix lint issue * feat: Integrate userData into Progresses API to reduce redundant calls (#2311) * initial * fix typos * using batches to fetch userIds * refactor the function * added test for dev false case * added unit tests * fix response body containing email --------- Co-authored-by: Achintya Chatterjee <[email protected]> Co-authored-by: Prakash Choudhary <[email protected]> * fix: Changed status code to 409 for sending Conflict response (#2339) * chore(#2342) - upgraded dependency packages * Revert "chore(#2342) - upgraded dependency packages" (#2343) This reverts commit 5bc49c6. --------- Co-authored-by: Pankaj <[email protected]> Co-authored-by: Anuj Chhikara <[email protected]> Co-authored-by: Prakash Choudhary <[email protected]> Co-authored-by: Vikas Singh <[email protected]> Co-authored-by: Yash Raj <[email protected]> * fix: merge conflicts --------- Co-authored-by: Amit Prakash <[email protected]> Co-authored-by: Pankaj <[email protected]> Co-authored-by: Anuj Chhikara <[email protected]> Co-authored-by: Prakash Choudhary <[email protected]> Co-authored-by: Vikas Singh <[email protected]> Co-authored-by: Yash Raj <[email protected]>
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Date:
19th January, 2025Developer Name: Achintya
Issue Ticket Number
Description
fix the merge conflicts which happened because of the main branch was not in sync with develop
Documentation Updated?
Under Feature Flag
Database Changes
Breaking Changes
Development Tested?
Screenshots
Screenshot 1
Test Coverage
Screenshot 1
Additional Notes