fix : resolve merge conflicts #2357
Merged
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]>
This reverts commit 5bc49c6.
* fix: Add support to fetch onboarding extension by requestedBy field - Add requestedBy field in the fetch query - Add tests to verify the chanes * fix: Add changes under dev flag and fix failing tests * chore: fix typo
…oupOnboarding31d+ role (#2330) * feat: added tests to handle edges cases * fix: added fix to skip onboarding users having valid approved extension request * fix: added integration test to handle edge case * feat: optimize user filtering by skipping those with valid onboarding extensions - Replaced sequential user processing with Promise.all to improve performance. - Enhanced error logging to include user IDs for better traceability. - Introduced a single timestamp variable to ensure consistent time comparisons.
…atedAt (#2344) * fix: negligent tagging instead of proposedStartDate, now we are using createdAt in the startedOn field * fix: added validation logic that we should not get undefined for createdAt * fix: failing tests
…rejection state (#2324) - Add constant and types for update request state - Add controller to update onboarding status - Add dev query in request and implemented feature flag - Change request body when reason is undefined - Add onboarding type in schema for request body validation - Fix actual message in assert statement - Add tests to validate the controller - Remove destructure body - Fix string type spelling - Add jsDoc for controller to maintain good practise - Add tests to handle more edge case and fix test name - Fix lint issue - Refactor type name for better readability and fix field name - Add message field in request schema, refactor controller and test to handle message field - Refactor function name to define its purpose - Import addLog from service file - Fix jsDoc documentation - Fix lint issue - Send 404 response when request does not exist - Remove createdAt field because log stores timestamp by default
* node version update to v22.x * yml node version update * node version update
* chore: fix date query to fetch logs * chore: remove id for logs * chore: fix logs order query * chore: add test for logs modal * chore: fix failing test * chore: fix failing test by reverting it * chore: remove nanoseconds precision
* 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]>
Achintya-Chatterjee
approved these changes
Jan 18, 2025
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.
Changes