From 5a57506bbf115b8c6a3e7f2830b8a345c5d8dbca Mon Sep 17 00:00:00 2001 From: Akash Shah Date: Mon, 30 Sep 2024 18:38:38 +0530 Subject: [PATCH 01/11] Update README.md --- README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c7b0690c9..ba3ca2b9c 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@
-The Mentor building block enables effective mentoring interactions between mentors and mentees. The capability aims to create a transparent eco-system to learn, connect, solve, and share within communities. Mentor is an open-source mentoring application that facilitates peer learning and professional development by creating a community of mentors and mentees. +The User service block enables secure and highly extensible user management and organization management capabilities - User registration, Live and JWT basesd session management, Delete user, Forgot password with email notifications.
@@ -742,13 +742,11 @@ npm test # Used in -This project was built to be used with [Mentor Service](https://github.com/ELEVATE-Project/mentoring.git). +This project was built to be used with [Mentoring Service](https://github.com/ELEVATE-Project/mentoring.git), [Project Service](https://github.com/ELEVATE-Project/project-service.git), [Survey Service](https://github.com/ELEVATE-Project/samiksha-service.git), [User Service](https://github.com/ELEVATE-Project/user.git). -Notification service repo can be found [here](https://github.com/ELEVATE-Project/notification.git). +The frontend/mobile application for Mentoring [repo](https://github.com/ELEVATE-Project/mentoring-mobile-app) and Projects and Survey [repo](https://github.com/ELEVATE-Project/observation-survey-projects-pwa) -The PWA [repo](https://github.com/ELEVATE-Project/mentoring-mobile-app). - -You can learn more about the full implementation of Mentor [here](https://elevate-docs.shikshalokam.org/.mentorEd/intro) . +You can learn more about the full implementation of various capabilities of ELEVATE [here](https://elevate-docs.shikshalokam.org) .
# Team @@ -761,7 +759,7 @@ You can learn more about the full implementation of Mentor [here](https://elevat # Open Source Dependencies -Several open source dependencies that have aided user service development: +Several open-source dependencies have aided user service development: ![NodeJS](https://img.shields.io/badge/node.js-6DA55F?style=for-the-badge&logo=node.js&logoColor=white) ![MongoDB](https://img.shields.io/badge/MongoDB-%234ea94b.svg?style=for-the-badge&logo=mongodb&logoColor=white) From 2ad8e0f3bada17cd15d179aada73e32650000caa Mon Sep 17 00:00:00 2001 From: Rocky <49852443+rakeshSgr@users.noreply.github.com> Date: Thu, 5 Dec 2024 18:00:45 +0530 Subject: [PATCH 02/11] Update package.json --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index 4aa21d6eb..c7832005c 100644 --- a/src/package.json +++ b/src/package.json @@ -16,7 +16,7 @@ "elevate-migrations": "module/migrations/bin/migrations.js", "integration": "node app.js", "test:integration": "jest --verbose ./integration-test --config=integrationJest.config.js --runInBand", - "db:init": "sequelize-cli db:create && sequelize-cli db:migrate ", + "db:init": "sequelize-cli db:create || echo 'Database already exists or some issue while creating db, Please check' && sequelize-cli db:migrate ", "db:seed:all": "sequelize-cli db:seed:all" }, "author": "Aman Kumar Gupta ", From 77edc9e9c190dd42d4471301c3a72242189b52b7 Mon Sep 17 00:00:00 2001 From: Rocky <49852443+rakeshSgr@users.noreply.github.com> Date: Wed, 11 Dec 2024 15:39:18 +0530 Subject: [PATCH 03/11] Update package.json --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index c7832005c..24bb8e16c 100644 --- a/src/package.json +++ b/src/package.json @@ -17,7 +17,7 @@ "integration": "node app.js", "test:integration": "jest --verbose ./integration-test --config=integrationJest.config.js --runInBand", "db:init": "sequelize-cli db:create || echo 'Database already exists or some issue while creating db, Please check' && sequelize-cli db:migrate ", - "db:seed:all": "sequelize-cli db:seed:all" + "db:seed:all": "sequelize-cli db:seed:all || echo 'Seeded data already exists or some issue while seeding the data, Please check' " }, "author": "Aman Kumar Gupta ", "license": "ISC", From 0df66893532ed39fd5664e423f268bab08611a88 Mon Sep 17 00:00:00 2001 From: PraveenDass Date: Wed, 13 Aug 2025 13:15:21 +0530 Subject: [PATCH 04/11] adding related org with code --- src/services/organization.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/services/organization.js b/src/services/organization.js index 377dc0ecf..557c6157b 100644 --- a/src/services/organization.js +++ b/src/services/organization.js @@ -418,6 +418,15 @@ module.exports = class OrganizationsHelper { responseCode: 'CLIENT_ERROR', }) } + //Get related orgs with code + if (organisationDetails.related_orgs && organisationDetails.related_orgs.length > 0) { + let orgFilters = { id: { [Op.in]: organisationDetails.related_orgs } } + const relatedOrgsIdAndCode = await organizationQueries.findAll(orgFilters) + organisationDetails.relatedOrgsIdAndCode = relatedOrgsIdAndCode.map((eachOrg) => ({ + id: eachOrg.id, + code: eachOrg.code, + })) + } return responses.successResponse({ statusCode: httpStatusCode.ok, From b36207a622fb442fbd987d8cf8a5ec92c0f2415d Mon Sep 17 00:00:00 2001 From: Akash Shah Date: Mon, 30 Sep 2024 18:38:38 +0530 Subject: [PATCH 05/11] Update README.md --- README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c7b0690c9..ba3ca2b9c 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@
-The Mentor building block enables effective mentoring interactions between mentors and mentees. The capability aims to create a transparent eco-system to learn, connect, solve, and share within communities. Mentor is an open-source mentoring application that facilitates peer learning and professional development by creating a community of mentors and mentees. +The User service block enables secure and highly extensible user management and organization management capabilities - User registration, Live and JWT basesd session management, Delete user, Forgot password with email notifications.
@@ -742,13 +742,11 @@ npm test # Used in -This project was built to be used with [Mentor Service](https://github.com/ELEVATE-Project/mentoring.git). +This project was built to be used with [Mentoring Service](https://github.com/ELEVATE-Project/mentoring.git), [Project Service](https://github.com/ELEVATE-Project/project-service.git), [Survey Service](https://github.com/ELEVATE-Project/samiksha-service.git), [User Service](https://github.com/ELEVATE-Project/user.git). -Notification service repo can be found [here](https://github.com/ELEVATE-Project/notification.git). +The frontend/mobile application for Mentoring [repo](https://github.com/ELEVATE-Project/mentoring-mobile-app) and Projects and Survey [repo](https://github.com/ELEVATE-Project/observation-survey-projects-pwa) -The PWA [repo](https://github.com/ELEVATE-Project/mentoring-mobile-app). - -You can learn more about the full implementation of Mentor [here](https://elevate-docs.shikshalokam.org/.mentorEd/intro) . +You can learn more about the full implementation of various capabilities of ELEVATE [here](https://elevate-docs.shikshalokam.org) .
# Team @@ -761,7 +759,7 @@ You can learn more about the full implementation of Mentor [here](https://elevat # Open Source Dependencies -Several open source dependencies that have aided user service development: +Several open-source dependencies have aided user service development: ![NodeJS](https://img.shields.io/badge/node.js-6DA55F?style=for-the-badge&logo=node.js&logoColor=white) ![MongoDB](https://img.shields.io/badge/MongoDB-%234ea94b.svg?style=for-the-badge&logo=mongodb&logoColor=white) From 64374e435693f62f5097812c22dca0a8c11afcd1 Mon Sep 17 00:00:00 2001 From: Rocky <49852443+rakeshSgr@users.noreply.github.com> Date: Thu, 5 Dec 2024 18:00:45 +0530 Subject: [PATCH 06/11] Update package.json --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index 51f05042b..156a5514d 100644 --- a/src/package.json +++ b/src/package.json @@ -16,7 +16,7 @@ "elevate-migrations": "module/migrations/bin/migrations.js", "integration": "node app.js", "test:integration": "jest --verbose ./integration-test --config=integrationJest.config.js --runInBand", - "db:init": "sequelize-cli db:create && sequelize-cli db:migrate ", + "db:init": "sequelize-cli db:create || echo 'Database already exists or some issue while creating db, Please check' && sequelize-cli db:migrate ", "db:seed:all": "sequelize-cli db:seed:all" }, "author": "Aman Kumar Gupta ", From 9c8d6c0dd4f84636e816dce1878671f33f891a8b Mon Sep 17 00:00:00 2001 From: Rocky <49852443+rakeshSgr@users.noreply.github.com> Date: Wed, 11 Dec 2024 15:39:18 +0530 Subject: [PATCH 07/11] Update package.json --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index 156a5514d..86f32c449 100644 --- a/src/package.json +++ b/src/package.json @@ -17,7 +17,7 @@ "integration": "node app.js", "test:integration": "jest --verbose ./integration-test --config=integrationJest.config.js --runInBand", "db:init": "sequelize-cli db:create || echo 'Database already exists or some issue while creating db, Please check' && sequelize-cli db:migrate ", - "db:seed:all": "sequelize-cli db:seed:all" + "db:seed:all": "sequelize-cli db:seed:all || echo 'Seeded data already exists or some issue while seeding the data, Please check' " }, "author": "Aman Kumar Gupta ", "license": "ISC", From bf91f8cfc7f9123a78074ba840965af1a54aa30c Mon Sep 17 00:00:00 2001 From: PraveenDass Date: Wed, 13 Aug 2025 13:15:21 +0530 Subject: [PATCH 08/11] adding related org with code --- src/services/organization.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/services/organization.js b/src/services/organization.js index c83a854b0..8d772cd53 100644 --- a/src/services/organization.js +++ b/src/services/organization.js @@ -426,6 +426,15 @@ module.exports = class OrganizationsHelper { responseCode: 'CLIENT_ERROR', }) } + //Get related orgs with code + if (organisationDetails.related_orgs && organisationDetails.related_orgs.length > 0) { + let orgFilters = { id: { [Op.in]: organisationDetails.related_orgs } } + const relatedOrgsIdAndCode = await organizationQueries.findAll(orgFilters) + organisationDetails.relatedOrgsIdAndCode = relatedOrgsIdAndCode.map((eachOrg) => ({ + id: eachOrg.id, + code: eachOrg.code, + })) + } return responses.successResponse({ statusCode: httpStatusCode.ok, From 69a9afdf8cd2829c97ebf2ae5809da801b570bfd Mon Sep 17 00:00:00 2001 From: PraveenDass Date: Thu, 4 Sep 2025 13:18:02 +0530 Subject: [PATCH 09/11] reverting package.json changes --- src/package.json | 4 ++-- src/services/organization.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/package.json b/src/package.json index 86f32c449..51f05042b 100644 --- a/src/package.json +++ b/src/package.json @@ -16,8 +16,8 @@ "elevate-migrations": "module/migrations/bin/migrations.js", "integration": "node app.js", "test:integration": "jest --verbose ./integration-test --config=integrationJest.config.js --runInBand", - "db:init": "sequelize-cli db:create || echo 'Database already exists or some issue while creating db, Please check' && sequelize-cli db:migrate ", - "db:seed:all": "sequelize-cli db:seed:all || echo 'Seeded data already exists or some issue while seeding the data, Please check' " + "db:init": "sequelize-cli db:create && sequelize-cli db:migrate ", + "db:seed:all": "sequelize-cli db:seed:all" }, "author": "Aman Kumar Gupta ", "license": "ISC", diff --git a/src/services/organization.js b/src/services/organization.js index 8d772cd53..2811a4e02 100644 --- a/src/services/organization.js +++ b/src/services/organization.js @@ -430,7 +430,7 @@ module.exports = class OrganizationsHelper { if (organisationDetails.related_orgs && organisationDetails.related_orgs.length > 0) { let orgFilters = { id: { [Op.in]: organisationDetails.related_orgs } } const relatedOrgsIdAndCode = await organizationQueries.findAll(orgFilters) - organisationDetails.relatedOrgsIdAndCode = relatedOrgsIdAndCode.map((eachOrg) => ({ + organisationDetails.related_org_details = relatedOrgsIdAndCode.map((eachOrg) => ({ id: eachOrg.id, code: eachOrg.code, })) From 9b463c93fe6877743bbcdf100605310be6900316 Mon Sep 17 00:00:00 2001 From: PraveenDass Date: Thu, 4 Sep 2025 13:21:31 +0530 Subject: [PATCH 10/11] reverting package.json changes --- src/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/package.json b/src/package.json index 86f32c449..51f05042b 100644 --- a/src/package.json +++ b/src/package.json @@ -16,8 +16,8 @@ "elevate-migrations": "module/migrations/bin/migrations.js", "integration": "node app.js", "test:integration": "jest --verbose ./integration-test --config=integrationJest.config.js --runInBand", - "db:init": "sequelize-cli db:create || echo 'Database already exists or some issue while creating db, Please check' && sequelize-cli db:migrate ", - "db:seed:all": "sequelize-cli db:seed:all || echo 'Seeded data already exists or some issue while seeding the data, Please check' " + "db:init": "sequelize-cli db:create && sequelize-cli db:migrate ", + "db:seed:all": "sequelize-cli db:seed:all" }, "author": "Aman Kumar Gupta ", "license": "ISC", From 48656144daba294d766c3187b0a75b3d7bbf1b69 Mon Sep 17 00:00:00 2001 From: PraveenDass Date: Mon, 8 Sep 2025 12:53:49 +0530 Subject: [PATCH 11/11] addressed PR comments --- src/services/organization.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/services/organization.js b/src/services/organization.js index 2811a4e02..ddc68b890 100644 --- a/src/services/organization.js +++ b/src/services/organization.js @@ -427,13 +427,15 @@ module.exports = class OrganizationsHelper { }) } //Get related orgs with code + organisationDetails.related_org_details = [] if (organisationDetails.related_orgs && organisationDetails.related_orgs.length > 0) { - let orgFilters = { id: { [Op.in]: organisationDetails.related_orgs } } - const relatedOrgsIdAndCode = await organizationQueries.findAll(orgFilters) - organisationDetails.related_org_details = relatedOrgsIdAndCode.map((eachOrg) => ({ - id: eachOrg.id, - code: eachOrg.code, - })) + const options = { + attributes: ['id', 'code'], + } + organisationDetails.related_org_details = await organizationQueries.findAll( + { id: { [Op.in]: organisationDetails.related_orgs } }, + options + ) } return responses.successResponse({