sync develop to main #588
Merged
sync develop to main #588
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
* ignore unnecessary files in test coverage report * change ignored folders * add unit test for models/auction.js * add unit test for makeNewBid * fix auction unit test fix fetchAvailableAuctions rename changes * add edge cases for makeNewBid * change currencies fixture function to array
* add challenges unit test * minor changes move postChallenge to beforeEach block add time constant remove eslint disable line * add time utils and change challenges function add time utils add unit test for time utils rename start_date to start_at fix challengeData contains time in milliseconds * remove es-lint disable comment * remove challenge model fix * stub date.now for test case
* add unit test for models/wallets.js * change currencies to object * refactor currenciesData
* add authorizeRoles middleware and integration tests for it * update js docs and add unit tests * jsdocs update and add one additional test * refactor userHasPermission and add more edge case test for it * refactor remove validateRoles & userHasPermission add global constants VALID_ROLES * fix role validation
Create LICENSE
Co-authored-by: Ookla <[email protected]>
* add unit tests for githubService * rename axios to utils while importing
* Added feature of updating chaincode in user Object * Test for chaincode field in User object
* Fix UpdateUser Function * Suggested changes * Updated updateUser function
* Fixes getProfileDiff function User data was visible without encryption. In this PR, Email and Phone number are somwwhat encypted. Showing only first and last two characters of User's Phone number. For emails, only first two characters and last four characters are visible. Rest of the details of Email and Phone are hidden using Asterisk. Approve and Timestamp fields are not allowed. They are not returning in getProfileDiff function as a field in user data. * Removed the firestore config file * fixed conflicts * Removed un-necessary change * Removed un-necessary change
* updated getUsersById for email * Fixed Users tests to remove phone and email * Removed comments form Users tests file * updated getUsersById for email * Fixed Users tests to remove phone and email * Removed comments form Users tests file * Changes in per_page var GithubService * Fixes in getUserById (controller) * Updated getUserByID and githubService
ankushdharkar
approved these changes
Jul 13, 2022
ankushdharkar
added a commit
that referenced
this pull request
Aug 9, 2022
* Dev to Main Sync (#573) * new task status will be returned * passing test * api for overduetasks * enhancement/newTaskWorkflow * fix/task test * enhancement/handle default task status * response/overduetasks message added * using constants * used constants where ever possible * added missed constant * made some changes in overDueTasks * Made small enhancement * lint fixes * integration test for /tasks/overduetasks * changes in task tests * resolved errors * unit test for tasks * update unit test for tasks * resolve newTask-workflow unit test error * fix integration error * add validation to check year of experience (#537) * api name changes * refactor code * add PATCH /users/:userId endpoint and logging endpoint (#526) * merge profileDiffs to user data * add /:username endpoint Add fetchProfileDiffData & addOrUpdate of profile.js. Add add & addProfileLog of logs.js. * add integration test for /users/:username and renamed variables of /users/:username endpoint * change /users/:username data fetching method * resolve eslint error * add log fetch * fix linting error * renamed variables * refactor and change users/:userId changed username to userId remove addProfileLog from models/logs add error handling for controllers/updateUser add superUser authorization to logs fetch route refactored users.test.js * refactor users/:userId add profileDiffStatus constants renamed update to updateProfileDiff in controller * refactor users/:userId add logs and profileDiff contants change fetch to fetchLogs of models/logs change add to addLog of models/logs used constants super_user & profile_diff_approved * Added /profileDiffs (#525) * Fix Confilicts * Removed Parameter * lint fix * Restoring yarn.lock * Made suggested changes * Fixed * Made /users/verify (#554) * Made /users/verify * Made requested changes * Yarn.lock restored * return tasks according to startedOn field (#532) * return tasks according to endsOn field * made changes acc to failed tests * fixed error * returning all self tasks * sort based on startedOn * create indexes in firestore * use field and order as parameters * fix integration test Co-authored-by: akshay shinde <[email protected]> * Verified checks (#552) * eature(TDD): Add TDD setup and soft-enable 50% coverage markers #942 * Revert "Merge branch 'feature/tdd-setup-#492' of https://github.com/Real-Dev-Squad/website-backend into develop" This reverts commit 71a1334, reversing changes made to 2474758. * checks for verified status * return message updated * tests for verified status * resolved integration test Co-authored-by: ankushdharkar <[email protected]> * identity -> profile and username -> userId (#547) * Fixing conflicts * Renamed in verify function * Fixed Fixture * Fixing conflicts (#555) Co-authored-by: Ankush Dharkar <[email protected]> * Function to reject a ProfileDiff (#572) Co-authored-by: Ankush Dharkar <[email protected]> Co-authored-by: akshay shinde <[email protected]> Co-authored-by: pavangbhat <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Aryan-9211 <[email protected]> Co-authored-by: Akshay Shinde <[email protected]> Co-authored-by: ankushdharkar <[email protected]> Co-authored-by: Ankush Dharkar <[email protected]> * sync develop to main (#588) * add unit tests for models/auction.js (#543) * ignore unnecessary files in test coverage report * change ignored folders * add unit test for models/auction.js * add unit test for makeNewBid * fix auction unit test fix fetchAvailableAuctions rename changes * add edge cases for makeNewBid * change currencies fixture function to array * add unit tests for models/challenges and add time utils (#551) * add challenges unit test * minor changes move postChallenge to beforeEach block add time constant remove eslint disable line * add time utils and change challenges function add time utils add unit test for time utils rename start_date to start_at fix challengeData contains time in milliseconds * remove es-lint disable comment * remove challenge model fix * stub date.now for test case * add unit test for models/wallets.js (#549) * add unit test for models/wallets.js * change currencies to object * refactor currenciesData * fix auction test (#590) * Create LICENSE * add authorizeRoles middleware with tests (#581) * add authorizeRoles middleware and integration tests for it * update js docs and add unit tests * jsdocs update and add one additional test * refactor userHasPermission and add more edge case test for it * refactor remove validateRoles & userHasPermission add global constants VALID_ROLES * fix role validation * refactor roles name (#613) Co-authored-by: Ookla <[email protected]> * refactor currency fixture (#600) * add unit tests for services/githubService (#559) * add unit tests for githubService * rename axios to utils while importing * Chaincode in user (#597) * Added feature of updating chaincode in user Object * Test for chaincode field in User object * Fix UpdateUser Function (#584) * Fix UpdateUser Function * Suggested changes * Updated updateUser function * Fixes getProfileDiff function (#599) * Fixes getProfileDiff function User data was visible without encryption. In this PR, Email and Phone number are somwwhat encypted. Showing only first and last two characters of User's Phone number. For emails, only first two characters and last four characters are visible. Rest of the details of Email and Phone are hidden using Asterisk. Approve and Timestamp fields are not allowed. They are not returning in getProfileDiff function as a field in user data. * Removed the firestore config file * fixed conflicts * Removed un-necessary change * Removed un-necessary change * Updated getUsersById for email (#594) * updated getUsersById for email * Fixed Users tests to remove phone and email * Removed comments form Users tests file * updated getUsersById for email * Fixed Users tests to remove phone and email * Removed comments form Users tests file * Changes in per_page var GithubService * Fixes in getUserById (controller) * Updated getUserByID and githubService Co-authored-by: Rohan Singh <[email protected]> Co-authored-by: Shubham Yadav <[email protected]> Co-authored-by: Ookla <[email protected]> Co-authored-by: Rahul Goyal <[email protected]> Co-authored-by: Arunesh Choudhary <[email protected]> Co-authored-by: Jalpa Patel <[email protected]> Co-authored-by: Ankur Narkhede <[email protected]> Co-authored-by: akshay shinde <[email protected]> Co-authored-by: pavangbhat <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Aryan-9211 <[email protected]> Co-authored-by: Akshay Shinde <[email protected]> Co-authored-by: ankushdharkar <[email protected]> Co-authored-by: Ankush Dharkar <[email protected]> Co-authored-by: Rohan Singh <[email protected]> Co-authored-by: Shubham Yadav <[email protected]> Co-authored-by: Ookla <[email protected]> Co-authored-by: Rahul Goyal <[email protected]> Co-authored-by: Arunesh Choudhary <[email protected]> Co-authored-by: Jalpa Patel <[email protected]>
ankushdharkar
added a commit
that referenced
this pull request
Aug 19, 2022
* add unit tests for models/auction.js (#543) * ignore unnecessary files in test coverage report * change ignored folders * add unit test for models/auction.js * add unit test for makeNewBid * fix auction unit test fix fetchAvailableAuctions rename changes * add edge cases for makeNewBid * change currencies fixture function to array * add unit tests for models/challenges and add time utils (#551) * add challenges unit test * minor changes move postChallenge to beforeEach block add time constant remove eslint disable line * add time utils and change challenges function add time utils add unit test for time utils rename start_date to start_at fix challengeData contains time in milliseconds * remove es-lint disable comment * remove challenge model fix * stub date.now for test case * add unit test for models/wallets.js (#549) * add unit test for models/wallets.js * change currencies to object * refactor currenciesData * fix auction test (#590) * Create LICENSE * add authorizeRoles middleware with tests (#581) * add authorizeRoles middleware and integration tests for it * update js docs and add unit tests * jsdocs update and add one additional test * refactor userHasPermission and add more edge case test for it * refactor remove validateRoles & userHasPermission add global constants VALID_ROLES * fix role validation * refactor roles name (#613) Co-authored-by: Ookla <[email protected]> * refactor currency fixture (#600) * add unit tests for services/githubService (#559) * add unit tests for githubService * rename axios to utils while importing * Chaincode in user (#597) * Added feature of updating chaincode in user Object * Test for chaincode field in User object * Fix UpdateUser Function (#584) * Fix UpdateUser Function * Suggested changes * Updated updateUser function * Fixes getProfileDiff function (#599) * Fixes getProfileDiff function User data was visible without encryption. In this PR, Email and Phone number are somwwhat encypted. Showing only first and last two characters of User's Phone number. For emails, only first two characters and last four characters are visible. Rest of the details of Email and Phone are hidden using Asterisk. Approve and Timestamp fields are not allowed. They are not returning in getProfileDiff function as a field in user data. * Removed the firestore config file * fixed conflicts * Removed un-necessary change * Removed un-necessary change * Updated getUsersById for email (#594) * updated getUsersById for email * Fixed Users tests to remove phone and email * Removed comments form Users tests file * updated getUsersById for email * Fixed Users tests to remove phone and email * Removed comments form Users tests file * Changes in per_page var GithubService * Fixes in getUserById (controller) * Updated getUserByID and githubService * remove code related to feature-flag api (#606) * fix: remove api-docs and swagger package (#609) * Added Obfuscate util for obfuscating Phone and email (#621) * Added Obfuscate util * Fix obfuscate error (#664) * Obfuscate Error Fixed * Fixed ProfileDiff email and phone * Refactoring code Co-authored-by: Lakshay Manchanda <[email protected]> * Lint issues fixed (#666) * Fix/devtomain (#668) * Dev to Main Sync (#573) * new task status will be returned * passing test * api for overduetasks * enhancement/newTaskWorkflow * fix/task test * enhancement/handle default task status * response/overduetasks message added * using constants * used constants where ever possible * added missed constant * made some changes in overDueTasks * Made small enhancement * lint fixes * integration test for /tasks/overduetasks * changes in task tests * resolved errors * unit test for tasks * update unit test for tasks * resolve newTask-workflow unit test error * fix integration error * add validation to check year of experience (#537) * api name changes * refactor code * add PATCH /users/:userId endpoint and logging endpoint (#526) * merge profileDiffs to user data * add /:username endpoint Add fetchProfileDiffData & addOrUpdate of profile.js. Add add & addProfileLog of logs.js. * add integration test for /users/:username and renamed variables of /users/:username endpoint * change /users/:username data fetching method * resolve eslint error * add log fetch * fix linting error * renamed variables * refactor and change users/:userId changed username to userId remove addProfileLog from models/logs add error handling for controllers/updateUser add superUser authorization to logs fetch route refactored users.test.js * refactor users/:userId add profileDiffStatus constants renamed update to updateProfileDiff in controller * refactor users/:userId add logs and profileDiff contants change fetch to fetchLogs of models/logs change add to addLog of models/logs used constants super_user & profile_diff_approved * Added /profileDiffs (#525) * Fix Confilicts * Removed Parameter * lint fix * Restoring yarn.lock * Made suggested changes * Fixed * Made /users/verify (#554) * Made /users/verify * Made requested changes * Yarn.lock restored * return tasks according to startedOn field (#532) * return tasks according to endsOn field * made changes acc to failed tests * fixed error * returning all self tasks * sort based on startedOn * create indexes in firestore * use field and order as parameters * fix integration test Co-authored-by: akshay shinde <[email protected]> * Verified checks (#552) * eature(TDD): Add TDD setup and soft-enable 50% coverage markers #942 * Revert "Merge branch 'feature/tdd-setup-#492' of https://github.com/Real-Dev-Squad/website-backend into develop" This reverts commit 71a1334, reversing changes made to 2474758. * checks for verified status * return message updated * tests for verified status * resolved integration test Co-authored-by: ankushdharkar <[email protected]> * identity -> profile and username -> userId (#547) * Fixing conflicts * Renamed in verify function * Fixed Fixture * Fixing conflicts (#555) Co-authored-by: Ankush Dharkar <[email protected]> * Function to reject a ProfileDiff (#572) Co-authored-by: Ankush Dharkar <[email protected]> Co-authored-by: akshay shinde <[email protected]> Co-authored-by: pavangbhat <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Aryan-9211 <[email protected]> Co-authored-by: Akshay Shinde <[email protected]> Co-authored-by: ankushdharkar <[email protected]> Co-authored-by: Ankush Dharkar <[email protected]> * sync develop to main (#588) * add unit tests for models/auction.js (#543) * ignore unnecessary files in test coverage report * change ignored folders * add unit test for models/auction.js * add unit test for makeNewBid * fix auction unit test fix fetchAvailableAuctions rename changes * add edge cases for makeNewBid * change currencies fixture function to array * add unit tests for models/challenges and add time utils (#551) * add challenges unit test * minor changes move postChallenge to beforeEach block add time constant remove eslint disable line * add time utils and change challenges function add time utils add unit test for time utils rename start_date to start_at fix challengeData contains time in milliseconds * remove es-lint disable comment * remove challenge model fix * stub date.now for test case * add unit test for models/wallets.js (#549) * add unit test for models/wallets.js * change currencies to object * refactor currenciesData * fix auction test (#590) * Create LICENSE * add authorizeRoles middleware with tests (#581) * add authorizeRoles middleware and integration tests for it * update js docs and add unit tests * jsdocs update and add one additional test * refactor userHasPermission and add more edge case test for it * refactor remove validateRoles & userHasPermission add global constants VALID_ROLES * fix role validation * refactor roles name (#613) Co-authored-by: Ookla <[email protected]> * refactor currency fixture (#600) * add unit tests for services/githubService (#559) * add unit tests for githubService * rename axios to utils while importing * Chaincode in user (#597) * Added feature of updating chaincode in user Object * Test for chaincode field in User object * Fix UpdateUser Function (#584) * Fix UpdateUser Function * Suggested changes * Updated updateUser function * Fixes getProfileDiff function (#599) * Fixes getProfileDiff function User data was visible without encryption. In this PR, Email and Phone number are somwwhat encypted. Showing only first and last two characters of User's Phone number. For emails, only first two characters and last four characters are visible. Rest of the details of Email and Phone are hidden using Asterisk. Approve and Timestamp fields are not allowed. They are not returning in getProfileDiff function as a field in user data. * Removed the firestore config file * fixed conflicts * Removed un-necessary change * Removed un-necessary change * Updated getUsersById for email (#594) * updated getUsersById for email * Fixed Users tests to remove phone and email * Removed comments form Users tests file * updated getUsersById for email * Fixed Users tests to remove phone and email * Removed comments form Users tests file * Changes in per_page var GithubService * Fixes in getUserById (controller) * Updated getUserByID and githubService Co-authored-by: Rohan Singh <[email protected]> Co-authored-by: Shubham Yadav <[email protected]> Co-authored-by: Ookla <[email protected]> Co-authored-by: Rahul Goyal <[email protected]> Co-authored-by: Arunesh Choudhary <[email protected]> Co-authored-by: Jalpa Patel <[email protected]> Co-authored-by: Ankur Narkhede <[email protected]> Co-authored-by: akshay shinde <[email protected]> Co-authored-by: pavangbhat <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Aryan-9211 <[email protected]> Co-authored-by: Akshay Shinde <[email protected]> Co-authored-by: ankushdharkar <[email protected]> Co-authored-by: Ankush Dharkar <[email protected]> Co-authored-by: Rohan Singh <[email protected]> Co-authored-by: Shubham Yadav <[email protected]> Co-authored-by: Ookla <[email protected]> Co-authored-by: Rahul Goyal <[email protected]> Co-authored-by: Arunesh Choudhary <[email protected]> Co-authored-by: Jalpa Patel <[email protected]> * rfc: Removed duplicate ROLES constant (#644) (#646) * Removed ROLES constant from user.js * Changed import paths for the same in depending files fix: Passing superUser to authorizeUser instead of undefined in logs route Co-authored-by: Samarpan Harit <[email protected]> * Modifies /members to return only unarchived users (by default) (#649) * Updated getUsers method in members model * Added a new role archived in ROLES constant * Added a query param includeArchived(default value false) * By default only unarchived users are returned * Updated and added integration test for /members endpoint * Updated swagger documention for /members route * Added includeArchived query param in doc * Updated description and summary * Renamed query param includeArchived to show showArchived * Added validaton for /members endpoint * Added test for invalid showArchived query param value * rfc: Using new variable for boolean showArchived * Updated tests for GET /members endpoint * Updated addUser test util (#659) (#661) * Add user in firestore without roles * Update user roles after adding the user * Added a new endpoint to add default archived role (#651) (#654) * Added model,route,controller methods * Added integration test for this endpoint * Feat/contribution object task (#676) * added Id for the contribution object * Revert "added Id for the contribution object" This reverts commit f1dfdac. * removed yarn.lock changes * fix: 🔨 removed swagger comments from routes file (#658) * fix: 🔨 removed swagger comments from routes file * fix: removed unused variables * fix lint errors * add: added deleted code * replaced yarn file with original one * fix: resolved merge conflicts * rfc: Implemented correct semantics in the test setup for members integration tests (#680) (#681) * Adds default archived role for new users (#662) * Added default archived role for new users (#660) * Updated addOrUpdate model function * Added deleteRoles test util to delete all/specified roles * Fixed integration tests for /users/add-default-archived-role * Updated integration tests for /members * rfc: Added seperate methods for deleteRoles and deleteRolesObject * Updated deleteRoles and deleteRolesObject utils * Added param and description jsdoc comments * Added a log for error * Added necessary logs in deleteRoles and deleteRolesObject * API Sign Out Feature (#679) * configure signout route and clear the cookies * changed to post request * changed to post request * Storing cookie in a constant * reconfigured signout route and redirects * remove redirect * getting and deleting cookies from request * tests for signout * Modified Signout Tests * added a signout controller * Refactoring route to /auth/signout * removed signout controller and placed in auth controller * Removed response to return cookie name * lint fix * Improved test and corrected typo in auth controller * Adding domain to the clear cookie * Changed the variable name from cookie to cookieName * add cookie properties to clear cookie * fix: Added /users/add-default-archived-roles route (#685) Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Rohan Singh <[email protected]> Co-authored-by: Shubham Yadav <[email protected]> Co-authored-by: Ookla <[email protected]> Co-authored-by: Rahul Goyal <[email protected]> Co-authored-by: Arunesh Choudhary <[email protected]> Co-authored-by: Jalpa Patel <[email protected]> Co-authored-by: poonammohata <[email protected]> Co-authored-by: Ankur Narkhede <[email protected]> Co-authored-by: akshay shinde <[email protected]> Co-authored-by: pavangbhat <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Aryan-9211 <[email protected]> Co-authored-by: Akshay Shinde <[email protected]> Co-authored-by: ankushdharkar <[email protected]> Co-authored-by: Ankush Dharkar <[email protected]> Co-authored-by: Samarpan Harit <[email protected]> Co-authored-by: Samarpan Harit <[email protected]> Co-authored-by: vinayak-trivedi <[email protected]> Co-authored-by: Rajat Mehra <[email protected]> Co-authored-by: Ritik Jaiswal <[email protected]>
Merged
ankushdharkar
added a commit
that referenced
this pull request
Aug 21, 2022
* add unit tests for models/auction.js (#543) * ignore unnecessary files in test coverage report * change ignored folders * add unit test for models/auction.js * add unit test for makeNewBid * fix auction unit test fix fetchAvailableAuctions rename changes * add edge cases for makeNewBid * change currencies fixture function to array * add unit tests for models/challenges and add time utils (#551) * add challenges unit test * minor changes move postChallenge to beforeEach block add time constant remove eslint disable line * add time utils and change challenges function add time utils add unit test for time utils rename start_date to start_at fix challengeData contains time in milliseconds * remove es-lint disable comment * remove challenge model fix * stub date.now for test case * add unit test for models/wallets.js (#549) * add unit test for models/wallets.js * change currencies to object * refactor currenciesData * fix auction test (#590) * Create LICENSE * add authorizeRoles middleware with tests (#581) * add authorizeRoles middleware and integration tests for it * update js docs and add unit tests * jsdocs update and add one additional test * refactor userHasPermission and add more edge case test for it * refactor remove validateRoles & userHasPermission add global constants VALID_ROLES * fix role validation * refactor roles name (#613) Co-authored-by: Ookla <[email protected]> * refactor currency fixture (#600) * add unit tests for services/githubService (#559) * add unit tests for githubService * rename axios to utils while importing * Chaincode in user (#597) * Added feature of updating chaincode in user Object * Test for chaincode field in User object * Fix UpdateUser Function (#584) * Fix UpdateUser Function * Suggested changes * Updated updateUser function * Fixes getProfileDiff function (#599) * Fixes getProfileDiff function User data was visible without encryption. In this PR, Email and Phone number are somwwhat encypted. Showing only first and last two characters of User's Phone number. For emails, only first two characters and last four characters are visible. Rest of the details of Email and Phone are hidden using Asterisk. Approve and Timestamp fields are not allowed. They are not returning in getProfileDiff function as a field in user data. * Removed the firestore config file * fixed conflicts * Removed un-necessary change * Removed un-necessary change * Updated getUsersById for email (#594) * updated getUsersById for email * Fixed Users tests to remove phone and email * Removed comments form Users tests file * updated getUsersById for email * Fixed Users tests to remove phone and email * Removed comments form Users tests file * Changes in per_page var GithubService * Fixes in getUserById (controller) * Updated getUserByID and githubService * remove code related to feature-flag api (#606) * fix: remove api-docs and swagger package (#609) * Added Obfuscate util for obfuscating Phone and email (#621) * Added Obfuscate util * Fix obfuscate error (#664) * Obfuscate Error Fixed * Fixed ProfileDiff email and phone * Refactoring code Co-authored-by: Lakshay Manchanda <[email protected]> * Lint issues fixed (#666) * Fix/devtomain (#668) * Dev to Main Sync (#573) * new task status will be returned * passing test * api for overduetasks * enhancement/newTaskWorkflow * fix/task test * enhancement/handle default task status * response/overduetasks message added * using constants * used constants where ever possible * added missed constant * made some changes in overDueTasks * Made small enhancement * lint fixes * integration test for /tasks/overduetasks * changes in task tests * resolved errors * unit test for tasks * update unit test for tasks * resolve newTask-workflow unit test error * fix integration error * add validation to check year of experience (#537) * api name changes * refactor code * add PATCH /users/:userId endpoint and logging endpoint (#526) * merge profileDiffs to user data * add /:username endpoint Add fetchProfileDiffData & addOrUpdate of profile.js. Add add & addProfileLog of logs.js. * add integration test for /users/:username and renamed variables of /users/:username endpoint * change /users/:username data fetching method * resolve eslint error * add log fetch * fix linting error * renamed variables * refactor and change users/:userId changed username to userId remove addProfileLog from models/logs add error handling for controllers/updateUser add superUser authorization to logs fetch route refactored users.test.js * refactor users/:userId add profileDiffStatus constants renamed update to updateProfileDiff in controller * refactor users/:userId add logs and profileDiff contants change fetch to fetchLogs of models/logs change add to addLog of models/logs used constants super_user & profile_diff_approved * Added /profileDiffs (#525) * Fix Confilicts * Removed Parameter * lint fix * Restoring yarn.lock * Made suggested changes * Fixed * Made /users/verify (#554) * Made /users/verify * Made requested changes * Yarn.lock restored * return tasks according to startedOn field (#532) * return tasks according to endsOn field * made changes acc to failed tests * fixed error * returning all self tasks * sort based on startedOn * create indexes in firestore * use field and order as parameters * fix integration test Co-authored-by: akshay shinde <[email protected]> * Verified checks (#552) * eature(TDD): Add TDD setup and soft-enable 50% coverage markers #942 * Revert "Merge branch 'feature/tdd-setup-#492' of https://github.com/Real-Dev-Squad/website-backend into develop" This reverts commit 71a1334, reversing changes made to 2474758. * checks for verified status * return message updated * tests for verified status * resolved integration test Co-authored-by: ankushdharkar <[email protected]> * identity -> profile and username -> userId (#547) * Fixing conflicts * Renamed in verify function * Fixed Fixture * Fixing conflicts (#555) Co-authored-by: Ankush Dharkar <[email protected]> * Function to reject a ProfileDiff (#572) Co-authored-by: Ankush Dharkar <[email protected]> Co-authored-by: akshay shinde <[email protected]> Co-authored-by: pavangbhat <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Aryan-9211 <[email protected]> Co-authored-by: Akshay Shinde <[email protected]> Co-authored-by: ankushdharkar <[email protected]> Co-authored-by: Ankush Dharkar <[email protected]> * sync develop to main (#588) * add unit tests for models/auction.js (#543) * ignore unnecessary files in test coverage report * change ignored folders * add unit test for models/auction.js * add unit test for makeNewBid * fix auction unit test fix fetchAvailableAuctions rename changes * add edge cases for makeNewBid * change currencies fixture function to array * add unit tests for models/challenges and add time utils (#551) * add challenges unit test * minor changes move postChallenge to beforeEach block add time constant remove eslint disable line * add time utils and change challenges function add time utils add unit test for time utils rename start_date to start_at fix challengeData contains time in milliseconds * remove es-lint disable comment * remove challenge model fix * stub date.now for test case * add unit test for models/wallets.js (#549) * add unit test for models/wallets.js * change currencies to object * refactor currenciesData * fix auction test (#590) * Create LICENSE * add authorizeRoles middleware with tests (#581) * add authorizeRoles middleware and integration tests for it * update js docs and add unit tests * jsdocs update and add one additional test * refactor userHasPermission and add more edge case test for it * refactor remove validateRoles & userHasPermission add global constants VALID_ROLES * fix role validation * refactor roles name (#613) Co-authored-by: Ookla <[email protected]> * refactor currency fixture (#600) * add unit tests for services/githubService (#559) * add unit tests for githubService * rename axios to utils while importing * Chaincode in user (#597) * Added feature of updating chaincode in user Object * Test for chaincode field in User object * Fix UpdateUser Function (#584) * Fix UpdateUser Function * Suggested changes * Updated updateUser function * Fixes getProfileDiff function (#599) * Fixes getProfileDiff function User data was visible without encryption. In this PR, Email and Phone number are somwwhat encypted. Showing only first and last two characters of User's Phone number. For emails, only first two characters and last four characters are visible. Rest of the details of Email and Phone are hidden using Asterisk. Approve and Timestamp fields are not allowed. They are not returning in getProfileDiff function as a field in user data. * Removed the firestore config file * fixed conflicts * Removed un-necessary change * Removed un-necessary change * Updated getUsersById for email (#594) * updated getUsersById for email * Fixed Users tests to remove phone and email * Removed comments form Users tests file * updated getUsersById for email * Fixed Users tests to remove phone and email * Removed comments form Users tests file * Changes in per_page var GithubService * Fixes in getUserById (controller) * Updated getUserByID and githubService Co-authored-by: Rohan Singh <[email protected]> Co-authored-by: Shubham Yadav <[email protected]> Co-authored-by: Ookla <[email protected]> Co-authored-by: Rahul Goyal <[email protected]> Co-authored-by: Arunesh Choudhary <[email protected]> Co-authored-by: Jalpa Patel <[email protected]> Co-authored-by: Ankur Narkhede <[email protected]> Co-authored-by: akshay shinde <[email protected]> Co-authored-by: pavangbhat <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Aryan-9211 <[email protected]> Co-authored-by: Akshay Shinde <[email protected]> Co-authored-by: ankushdharkar <[email protected]> Co-authored-by: Ankush Dharkar <[email protected]> Co-authored-by: Rohan Singh <[email protected]> Co-authored-by: Shubham Yadav <[email protected]> Co-authored-by: Ookla <[email protected]> Co-authored-by: Rahul Goyal <[email protected]> Co-authored-by: Arunesh Choudhary <[email protected]> Co-authored-by: Jalpa Patel <[email protected]> * rfc: Removed duplicate ROLES constant (#644) (#646) * Removed ROLES constant from user.js * Changed import paths for the same in depending files fix: Passing superUser to authorizeUser instead of undefined in logs route Co-authored-by: Samarpan Harit <[email protected]> * Modifies /members to return only unarchived users (by default) (#649) * Updated getUsers method in members model * Added a new role archived in ROLES constant * Added a query param includeArchived(default value false) * By default only unarchived users are returned * Updated and added integration test for /members endpoint * Updated swagger documention for /members route * Added includeArchived query param in doc * Updated description and summary * Renamed query param includeArchived to show showArchived * Added validaton for /members endpoint * Added test for invalid showArchived query param value * rfc: Using new variable for boolean showArchived * Updated tests for GET /members endpoint * Updated addUser test util (#659) (#661) * Add user in firestore without roles * Update user roles after adding the user * Added a new endpoint to add default archived role (#651) (#654) * Added model,route,controller methods * Added integration test for this endpoint * Feat/contribution object task (#676) * added Id for the contribution object * Revert "added Id for the contribution object" This reverts commit f1dfdac. * removed yarn.lock changes * fix: 🔨 removed swagger comments from routes file (#658) * fix: 🔨 removed swagger comments from routes file * fix: removed unused variables * fix lint errors * add: added deleted code * replaced yarn file with original one * fix: resolved merge conflicts * rfc: Implemented correct semantics in the test setup for members integration tests (#680) (#681) * Adds default archived role for new users (#662) * Added default archived role for new users (#660) * Updated addOrUpdate model function * Added deleteRoles test util to delete all/specified roles * Fixed integration tests for /users/add-default-archived-role * Updated integration tests for /members * rfc: Added seperate methods for deleteRoles and deleteRolesObject * Updated deleteRoles and deleteRolesObject utils * Added param and description jsdoc comments * Added a log for error * Added necessary logs in deleteRoles and deleteRolesObject * API Sign Out Feature (#679) * configure signout route and clear the cookies * changed to post request * changed to post request * Storing cookie in a constant * reconfigured signout route and redirects * remove redirect * getting and deleting cookies from request * tests for signout * Modified Signout Tests * added a signout controller * Refactoring route to /auth/signout * removed signout controller and placed in auth controller * Removed response to return cookie name * lint fix * Improved test and corrected typo in auth controller * Adding domain to the clear cookie * Changed the variable name from cookie to cookieName * add cookie properties to clear cookie * fix: Added /users/add-default-archived-roles route (#685) Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Rohan Singh <[email protected]> Co-authored-by: Shubham Yadav <[email protected]> Co-authored-by: Ookla <[email protected]> Co-authored-by: Rahul Goyal <[email protected]> Co-authored-by: Arunesh Choudhary <[email protected]> Co-authored-by: Jalpa Patel <[email protected]> Co-authored-by: poonammohata <[email protected]> Co-authored-by: Ankur Narkhede <[email protected]> Co-authored-by: akshay shinde <[email protected]> Co-authored-by: pavangbhat <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Aryan-9211 <[email protected]> Co-authored-by: Akshay Shinde <[email protected]> Co-authored-by: ankushdharkar <[email protected]> Co-authored-by: Ankush Dharkar <[email protected]> Co-authored-by: Samarpan Harit <[email protected]> Co-authored-by: Samarpan Harit <[email protected]> Co-authored-by: vinayak-trivedi <[email protected]> Co-authored-by: Rajat Mehra <[email protected]> Co-authored-by: Ritik Jaiswal <[email protected]> Co-authored-by: Lakshay Manchanda <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Rohan Singh <[email protected]> Co-authored-by: Shubham Yadav <[email protected]> Co-authored-by: Ookla <[email protected]> Co-authored-by: Rahul Goyal <[email protected]> Co-authored-by: Arunesh Choudhary <[email protected]> Co-authored-by: Jalpa Patel <[email protected]> Co-authored-by: poonammohata <[email protected]> Co-authored-by: Ankur Narkhede <[email protected]> Co-authored-by: akshay shinde <[email protected]> Co-authored-by: pavangbhat <[email protected]> Co-authored-by: Pallab Sonowal <[email protected]> Co-authored-by: Aryan-9211 <[email protected]> Co-authored-by: Akshay Shinde <[email protected]> Co-authored-by: Samarpan Harit <[email protected]> Co-authored-by: Samarpan Harit <[email protected]> Co-authored-by: vinayak-trivedi <[email protected]> Co-authored-by: Rajat Mehra <[email protected]> Co-authored-by: Ritik Jaiswal <[email protected]>
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.
No description provided.