Merge pull request #765 from MallanagoudaBiradar/SetupGuideFix

setup-guide-port-survey-data-fix

Author: VISHNUDAS-tunerlabs

documentation/1.0.0/ReadMe.md

@@ -57,7 +57,7 @@ To set up the Project application, ensure you have Docker and Docker Compose ins
 > **Caution:** Before proceeding, please ensure that the ports given here are available and open. It is essential to verify their availability prior to moving forward. You can run below command in your terminal to check this
 
 ```
-for port in 3000 3001 3002 6000 5001 4000 9092 5432 7007 2181 2707 3569; do
+for port in 3000 3001 3002 6001 5001 4000 9092 5432 7007 2181 2707 3569; do
     if lsof -iTCP:$port -sTCP:LISTEN &>/dev/null; then
         echo "Port $port is in use"
     else

documentation/1.0.0/dockerized/docker-compose-project.yml

@@ -45,7 +45,7 @@ services:
     image: shikshalokamqa/elevate-project-service:1.0.2
     container_name: project
     ports:
-      - '6000:6000'
+      - '6001:6001'
     command: ['nodemon', 'app.js']
     environment:
       - MONGODB_URL=mongodb://mongo:27017/elevate-project

documentation/1.0.0/dockerized/envs/interface_env

@@ -4,7 +4,7 @@ APPLICATION_PORT=3569
 ENTITY_SERVICE_BASE_URL=http://entity_management:5001
 INSTALLED_PACKAGES=elevate-user elevate-scheduler elevate-project elevate-entity-management
 NOTIFICATION_SERVICE_BASE_URL=http://notification:3002
-PROJECT_SERVICE_BASE_URL=http://project:6000
+PROJECT_SERVICE_BASE_URL=http://project:6001
 RATE_LIMITER_ENABLED=false
 RATE_LIMITER_GENERAL_LIMIT=50
 RATE_LIMITER_NUMBER_OF_PROXIES=3

documentation/1.0.0/dockerized/envs/project_env

@@ -4,7 +4,7 @@ API_DOC_URL=/project/api-doc
 APPLICATION_BASE_URL=/project/
 APPLICATION_ENV=development
 APPLICATION_HOST=project
-APPLICATION_PORT=6000
+APPLICATION_PORT=6001
 APP_PORTAL_BASE_URL=https://dev.elevate-ml.shikshalokam.org
 CLOUD_STORAGE=GCP
 CLOUD_STORAGE_ACCOUNTNAME=sl-mentoring-dev-storage@sl-dev-project.iam.gserviceaccount.com

documentation/3.4.0/common-files/dockerized/project-with-survey/insert_sample_solutions.js

@@ -3,10 +3,10 @@ const { MongoClient } = require('mongodb')
 const url = 'mongodb://localhost:27017/' // MongoDB URL
 const projectDB = 'elevate-project'
 const entityDB = 'elevate-entity'
-const samikshaDB = "elevate-samiksha";
+const samikshaDB = 'elevate-samiksha'
 const entityData = require('./entity_sampleData.js')
 const projectData = require('./project_sampleData.js')
-const surveyData = require("./survey_sampleData.js");
+const surveyData = require('./survey_sampleData.js')
 
 // MongoDB Error Code for Duplicate Key
 const DUPLICATE_KEY_ERROR_CODE = 11000
@@ -116,7 +116,6 @@ async function insertData(collectionName, dataFile, currentDB = projectDB) {
 	}
 }
 
-
 async function main({ dataToBeInserted }) {
 	const collectionsToInsert = [
 		{ name: 'entities', data: dataToBeInserted.entities, db: entityDB },
@@ -130,20 +129,23 @@ async function main({ dataToBeInserted }) {
 		{ name: 'projectCategories', data: dataToBeInserted.projectCategoriesData, db: projectDB },
 		{ name: 'configurations', data: dataToBeInserted.configurationData, db: projectDB },
 		{ name: 'organizationExtension', data: dataToBeInserted.organizationExtensionData, db: projectDB },
-    	{ name: "solutions", data: dataToBeInserted.solutionData, db:samikshaDB},
-    	{ name: "criteria",  data:dataToBeInserted.criteriaData, db : samikshaDB},
-    	{ name: "criteriaQuestions", data: dataToBeInserted.criteriaQuestionsData, db : samikshaDB},
-    	{ name: "frameworks", data: dataToBeInserted.frameworkData, db : samikshaDB},
-    	{ name: "questions", data: dataToBeInserted.questionsData, db : samikshaDB},
-		{ name: "observations", data: dataToBeInserted.observationData, db : samikshaDB},
-    	{ name: "surveys", data: dataToBeInserted.surveyData, db : samikshaDB},
-    	{ name: "organizationExtension", data: dataToBeInserted.organizationExtensionData, db : samikshaDB},
-
+		{ name: 'solutions', data: dataToBeInserted.solutionData, db: samikshaDB },
+		{ name: 'criteria', data: dataToBeInserted.criteriaData, db: samikshaDB },
+		{ name: 'criteriaQuestions', data: dataToBeInserted.criteriaQuestionsData, db: samikshaDB },
+		{ name: 'frameworks', data: dataToBeInserted.frameworkData, db: samikshaDB },
+		{ name: 'questions', data: dataToBeInserted.questionsData, db: samikshaDB },
+		{ name: 'observations', data: dataToBeInserted.observationData, db: samikshaDB },
+		{ name: 'surveys', data: dataToBeInserted.surveyData, db: samikshaDB },
+		{ name: 'organizationExtension', data: dataToBeInserted.organizationExtensionData, db: samikshaDB },
+		{ name: 'programs', data: dataToBeInserted.programData, db: samikshaDB },
+		{ name: 'observationSubmissions', data: dataToBeInserted.observationSubmissionData, db: samikshaDB },
 	]
 
 	console.log(`\n=================================================`)
 	console.log(
-		`🗑️ Starting CLEANUP for ${dataToBeInserted === entityData ? 'Entity Data' : 'Project Data & Survey Data' } Collections...`
+		`🗑️ Starting CLEANUP for ${
+			dataToBeInserted === entityData ? 'Entity Data' : 'Project Data & Survey Data'
+		} Collections...`
 	)
 	console.log(`=================================================`)
 
@@ -155,7 +157,9 @@ async function main({ dataToBeInserted }) {
 
 	console.log(`\n=================================================`)
 	console.log(
-		`➕ Starting INSERTION for ${dataToBeInserted === entityData ? 'Entity Data' : 'Project Data & Survey Data '} Collections...`
+		`➕ Starting INSERTION for ${
+			dataToBeInserted === entityData ? 'Entity Data' : 'Project Data & Survey Data '
+		} Collections...`
 	)
 	console.log(`=================================================`)
 
@@ -182,11 +186,10 @@ main({ dataToBeInserted: projectData })
 	})
 	.catch(console.error)
 
-
 main({ dataToBeInserted: surveyData })
-.then(() => {
-  console.log('\n=======================================')
-  console.log('✅ survey data population process finished.')
-  console.log('=======================================')
-})
-.catch(console.error)
+	.then(() => {
+		console.log('\n=======================================')
+		console.log('✅ survey data population process finished.')
+		console.log('=======================================')
+	})
+	.catch(console.error)