Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge back to develop-2.6 from master #444

Merged
merged 27 commits into from
Dec 28, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d448dfe
added script to update AP email templates
nevil-mathew Sep 5, 2023
5007ab3
Merge pull request #264 from ELEVATE-Project/ap-email-template-update
rakeshSgr Sep 5, 2023
ef0796f
Changed MongoDB Version In Docker Compose
joffinjoy Sep 19, 2023
0d2ff67
Modified README For Mongo Version & Comments To Specify OSI Licence I…
joffinjoy Sep 19, 2023
a5a04e4
Updated Comment
joffinjoy Sep 19, 2023
a95e392
Updated Readme
joffinjoy Sep 19, 2023
382ea53
Modified Docker-Compose-Mentoring
joffinjoy Sep 19, 2023
1be9647
docker compose and readme update
Nov 10, 2023
f05bd23
Merge pull request #327 from ELEVATE-Project/readmeupdate
rakeshSgr Nov 10, 2023
cb4c66e
docker compose fix
Nov 10, 2023
f3949a1
Merge pull request #328 from ELEVATE-Project/readmeupdate
rakeshSgr Nov 10, 2023
ae071e1
compose file update
Nov 10, 2023
0caad94
Merge pull request #329 from ELEVATE-Project/readmeupdate
rakeshSgr Nov 10, 2023
1d1cb76
migration added to update notification template
VISHNUDAS-tunerlabs Dec 19, 2023
0765e34
Merge pull request #439 from ELEVATE-Project/BUG-1133
joffinjoy Dec 19, 2023
2540732
added migration to change the pkey
nevil-mathew Dec 19, 2023
ec9db8a
updated delete queries to do a hard delete
nevil-mathew Dec 19, 2023
26744d0
moved up the updateEnrollmentCount for failsafe
nevil-mathew Dec 19, 2023
be88825
Merge pull request #440 from ELEVATE-Project/fix-1136
joffinjoy Dec 20, 2023
e950b58
Made Saas Check Optional For Mentor & Their Sessions
joffinjoy Dec 20, 2023
765beb2
Minor Optimization
joffinjoy Dec 20, 2023
5111bc4
Merge pull request #441 from ELEVATE-Project/issue1141
joffinjoy Dec 20, 2023
f0a69ce
Conflict Resolution
joffinjoy Dec 21, 2023
765297d
Migration Fix
joffinjoy Dec 21, 2023
0e9189f
Made QuestionSet Code Immutable
joffinjoy Dec 21, 2023
82bd116
Modified Documentation
joffinjoy Dec 21, 2023
06e4bba
Minor Typo Correction
joffinjoy Dec 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Changed MongoDB Version In Docker Compose
  • Loading branch information
joffinjoy committed Sep 19, 2023
commit ef0796f613aaaa447f47f3f9d01ca0447fc2e956
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
gelf-address: 'udp://0.0.0.0:12201'
tag: 'kafka-logs'
mongo:
image: 'mongo:5'
image: 'mongo:4.1.4'
restart: 'always'
command:
- '--logpath'
Expand Down Expand Up @@ -210,4 +210,4 @@ services:
kafka-data:
mongo-data:
fbdata:
logs:
logs:
134 changes: 134 additions & 0 deletions src/.env.backup
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
# Mentoring Service Config

# Port on which service runs
APPLICATION_PORT = 3000

#Service environment
APPLICATION_ENV = development

#Route after base url
APPLICATION_BASE_URL = /mentoring/

#Mongo db connectivity url
MONGODB_URL = mongodb://localhost:27017/elevate-mentoring

#Token secret to verify the access token
ACCESS_TOKEN_SECRET = 'bsj82AHBxahusub12yexlashsbxAXADHBlaj'

# Internal access token for communicationcation between services via network call
INTERNAL_ACCESS_TOKEN = 'Fgn1xT7pmCK9PSxVt7yr'

# Kafka hosted server url
KAFKA_URL = localhost:9092

# Kafka group to which consumer belongs
KAFKA_GROUP_ID = userservice

# Kafka topic to push notification data
NOTIFICATION_KAFKA_TOPIC = notificationtopic

# Kafka topic name to consume from mentoring topic
KAFKA_MENTORING_TOPIC ="mentoringtopic"

# Kafka topic to push recording data
KAFKA_RECORDING_TOPIC ="recordingtopic"

SESSION_KAFKA_TOPIC='session'

# Any one of three features available for cloud storage
CLOUD_STORAGE = 'GCP/AWS/AZURE'

# Gcp json config file path
GCP_PATH = 'gcp.json'

# Gcp bucket name which stores files
DEFAULT_GCP_BUCKET_NAME = 'gcp-bucket-storage-name'

# Gcp project id
GCP_PROJECT_ID = 'project-id'

# Aws access key id
AWS_ACCESS_KEY_ID = 'aws-access-key-id'

# Aws secret access key
AWS_SECRET_ACCESS_KEY = 'aws-secret-access-key'

# Aws region where bucket will be located
AWS_BUCKET_REGION = 'ap-south-1'

# Aws end point
AWS_BUCKET_ENDPOINT = 's3.ap-south-1.amazonaws.com'

# Aws bucket name which stores files
DEFAULT_AWS_BUCKET_NAME = 'aws-bucket-storage-name'

# Azure storage account name
AZURE_ACCOUNT_NAME = 'account-name'

# Azure storage account key
AZURE_ACCOUNT_KEY = 'azure-account-key'

# Azure storage container which stores files
DEFAULT_AZURE_CONTAINER_NAME = 'azure-container-storage-name'

#user serice host
USER_SERIVCE_HOST = 'http://localhost:3001'

#user serice base url
USER_SERIVCE_BASE_URL = '/user/'

# Big blue button url
BIG_BLUE_BUTTON_URL = https://dev.mentoring.shikshalokam.org

# Big blue button base url
BIB_BLUE_BUTTON_BASE_URL = /bigbluebutton/

# Meeting end callback events end point
MEETING_END_CALLBACK_EVENTS = https%3A%2F%2Fdev.elevate-apis.shikshalokam.org%2Fmentoring%2Fv1%2Fsessions%2Fcompleted

# Big blue button secret key
BIG_BLUE_BUTTON_SECRET_KEY = n

# Big blue button recording ready callback url
RECORDING_READY_CALLBACK_URL = http%3A%2F%2Flocalhost%3A3000%2F%3FmeetingID%3Dmeet123

#Enable logging of network request
ENABLE_LOG = true


# Api doc url
API_DOC_URL = '/api-doc'

#Internal cache expiry time
INTERNAL_CACHE_EXP_TIME = 86400

#kafka rating topic
RATING_KAFKA_TOPIC = 'Rating'

# Redis Host connectivity url
REDIS_HOST = redis://redis:6379

#Kafka internal communicationcation
CLEAR_INTERNAL_CACHE = 'mentoringInternal'

#Enable email for reported issue.
ENABLE_EMAIL_FOR_REPORT_ISSUE = true

#Email id of the support team.
SUPPORT_EMAIL_ID = '[email protected],[email protected]'

#Email template code for reported issue.
REPORT_ISSUE_EMAIL_TEMPLATE_CODE = 'user_issue_reported'

#Big blur button logout url
BIG_BLUE_BUTTON_SESSION_END_URL = 'https%3A%2F%2Fmentoring.shikshalokam.org%2Fsessions%2Fdetails%2F'

SESSION_KAFKA_TOPIC = 'session'

ERROR_LOG_LEVEL='1'

DISABLE_LOG='false'

APPLICATION_URL='asdfp8asfd8'

DEV_DATABASE_URL= "postgres://joffin:password@localhost:5432/elevate_mentoring"