fix : merge conflicts (#2356)

* 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]>

controllers/requests.ts

@@ -30,6 +30,8 @@ export const createRequestController = async (
       return await createTaskRequestController(req as TaskRequestRequest, res as CustomResponse);
     case REQUEST_TYPE.ONBOARDING:
       return await createOnboardingExtensionRequestController(req as OnboardingExtensionCreateRequest, res as OnboardingExtensionResponse);
+    case REQUEST_TYPE.ONBOARDING:
+      return await createOnboardingExtensionRequestController(req as OnboardingExtensionCreateRequest, res as OnboardingExtensionResponse);
     default:
       return res.boom.badRequest("Invalid request type");
   }