docker changes

README.md

@@ -56,7 +56,7 @@ Elevate user services can be setup in local using two methods:
 
 ### Local Dependencies Steps
 
-1. Update dependency (Mongo, Kafka etc) IP addresses in .env with "**host.docker.internal**".
+1. Update dependency (Mongo v4.1.4, Kafka etc) IP addresses in .env with "**host.docker.internal**".
 
     Eg:
 
@@ -102,7 +102,7 @@ Elevate user services can be setup in local using two methods:
 
 ### Remote Dependencies Steps
 
-1. Update dependency (Mongo, Kafka etc) Ip addresses in .env with respective remote server IPs.
+1. Update dependency (Mongo v4.1.4, Kafka etc) Ip addresses in .env with respective remote server IPs.
 
     Eg:
 
@@ -170,9 +170,6 @@ Elevate user services can be setup in local using two methods:
     # Database connectivity url
     MONGODB_URL = mongodb://localhost:27017/db-name
 
-    # Number of rounds for encryption
-    SALT_ROUNDS = 10
-
     # Token secret to generate access token
     ACCESS_TOKEN_SECRET = 'access-token-secret'
 
@@ -230,12 +227,6 @@ Elevate user services can be setup in local using two methods:
     # Internal access token for communicationcation between services via network call
     INTERNAL_ACCESS_TOKEN = 'internal-access-token'
 
-    # Mentor screct code for registering
-    MENTOR_SECRET_CODE = 'secret-code'
-
-    #Enable logging of network request
-    ENABLE_LOG = true
-
     # JWT Access Token expiry In Days
     ACCESS_TOKEN_EXPIRY = '1'
 
@@ -279,7 +270,7 @@ Elevate user services can be setup in local using two methods:
 -   Node - 16.0.0
 -   Kafka - 3.1.0
 -   Jest - 28.1.1
--   MongoDB - 4.4.14
+-   MongoDB - 4.1.4
 -   Redis - 7.0.0
 
 # Migrations Commands
@@ -405,4 +396,3 @@ Several open source dependencies that have aided user service development:
 
 <!-- ![GitHub](https://img.shields.io/badge/github-%23121011.svg?style=for-the-badge&logo=github&logoColor=white)
 ![CircleCI](https://img.shields.io/badge/circle%20ci-%23161616.svg?style=for-the-badge&logo=circleci&logoColor=white) -->
-

deployment/ansible.yml

@@ -57,10 +57,6 @@
      #   src={{ release_path }}
       #  dest={{ current_path }}
        # state=link
-
-    - name: Delete old pm2 process
-      command: pm2 delete elevate-user
-      ignore_errors: yes
 
     - name: set permission
       shell: chmod 744 {{ current_path }}/src/scripts/json2env.sh  
@@ -78,6 +74,14 @@
       register: apiDocResponse 
     - debug: msg=" Api-doc {{ apiDocResponse }} "
 
+
+    - name: Run Migrations
+      command: "chdir={{current_path}}/src npx sequelize-cli db:migrate"
+
+    - name: Delete old pm2 process
+      command: pm2 delete elevate-user
+      ignore_errors: yes
+
     - name: Delete release folder
       shell: rm -rf  {{ release_path }}
 

dev-ops/docker-compose.yml

@@ -1,35 +1,39 @@
 version: '3'
 services:
   zookeeper:
-    image: 'bitnami/zookeeper:3.8.0'
+    image: 'confluentinc/cp-zookeeper:7.3.0'
+    ports:
+      - '2181:2181'
     environment:
       - ALLOW_ANONYMOUS_LOGIN=yes
+      - ZOOKEEPER_CLIENT_PORT=2181
+      - ZOOKEEPER_TICK_TIME=2000
     networks:
       - elevate_net
     logging:
-      driver: none
+      driver: json-file
   kafka:
-    image: 'bitnami/kafka:3.1.0'
+    image: 'confluentinc/cp-kafka:7.3.0'
+    ports:
+      - '9092:9092'
     environment:
-      - KAFKA_BROKER_ID=1
-      - KAFKA_CFG_LISTENERS=CLIENT://:9092,EXTERNAL://:9093
-      - KAFKA_CFG_ADVERTISED_LISTENERS=CLIENT://kafka:9092,EXTERNAL://localhost:9093
-      - KAFKA_CFG_ZOOKEEPER_CONNECT=zookeeper:2181
-      - ALLOW_PLAINTEXT_LISTENER=yes
-      - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CLIENT:PLAINTEXT,EXTERNAL:PLAINTEXT
-      - KAFKA_CFG_INTER_BROKER_LISTENER_NAME=CLIENT
+      KAFKA_BROKER_ID: 1
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:9093
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
     depends_on:
       - zookeeper
     networks:
       - elevate_net
-
     logging:
-      driver: none
-  mongo:
-    image: 'mongo:4.4.14'
+      driver: json-file
+  postgres:
+    image: 'postgres:16'
     restart: 'always'
     ports:
-      - '27017:27017'
+      - '5432:5432'
     networks:
       - elevate_net
     logging:
@@ -42,24 +46,23 @@ services:
     networks:
       - elevate_net
     logging:
-      driver: none
-  user_test:
+      driver: json-file
+  user_elevate_2.5:
     build: '../'
-    image: elevate/user:1.0
+    # image: elevate/user:1.0
     volumes:
       - ../src/:/var/src
     ports:
-      - '3001:3001'
+      - '5001:5001'
     command: [ 'nodemon', 'app.js' ]
     environment:
-      - MONGODB_URL=mongodb://mongo:27017/elevate-mentoring
       - KAFKA_URL=kafka:9092
       - REDIS_HOST=redis://redis:6379
     env_file:
       - integration_test.env
     depends_on:
       - kafka
-      - mongo
+      - postgres
       - redis
     networks:
       - elevate_net

dev-ops/integration_test.env

@@ -1,127 +1,98 @@
-#User Service Config
-
-# Port on which service runs
-APPLICATION_PORT = 3001
-
-# Service environment
-APPLICATION_ENV = development
-
-# Database connectivity url
-MONGODB_URL = mongodb://mongo:27017/elevate-mentoring
-
-
-# Number of rounds for encryption
-SALT_ROUNDS = 10
-
-# Token secret to generate access token
-ACCESS_TOKEN_SECRET = 'test'
-
-# Token secret to generate refresh token
-REFRESH_TOKEN_SECRET = 'refresh-token-secret'
-
-# Kafka hosted server url
-KAFKA_URL = localhost:9092
-
-# Kafka group to which consumer belongs
-KAFKA_GROUP_ID = userservice
-
-# Kafka topic to consume data from
-KAFKA_TOPIC = 'testTopic'
-
-# Kafka topic to push notification data
-NOTIFICATION_KAFKA_TOPIC = 'testTopic'
-
-# Any one of three features available for cloud storage
-CLOUD_STORAGE = 'AWS'
-
-# 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'
-
-# Internal access token for communicationcation between services via network call
-INTERNAL_ACCESS_TOKEN = 'internal-access-token'
-
-# Mentor screct code for registering
-MENTOR_SECRET_CODE = 'secret-code'
-
-#Enable logging of network request
-ENABLE_LOG = true
-
-# JWT Access Token expiry In Days
-ACCESS_TOKEN_EXPIRY = '1'
-
-# JWT Refresh Token expiry In Days
-REFRESH_TOKEN_EXPIRY = '183'
-
-# Redis Host connectivity url
-REDIS_HOST = 'redis://localhost:6379'
-
-# Otp expiration time for forgetpassword or registration process
-OTP_EXP_TIME = 86400
-
-# Enable email based otp verification for registration process
-ENABLE_EMAIL_OTP_VERIFICATION = false
-
-# Api doc url
-API_DOC_URL = '/api-doc'
-
-#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'
-#kafka rating topic
-RATING_KAFKA_TOPIC = 'Rating'
-
-#Internal cache expiry time
-INTERNAL_CACHE_EXP_TIME = 86400
-
-#Kafka internal communicationcation
-CLEAR_INTERNAL_CACHE = 'userInternal'
-
-APP_NAME = 'user'
-
-REGISTRATION_EMAIL_TEMPLATE_CODE = 'code'
-
-OTP_EMAIL_TEMPLATE_CODE = 'ssss'
-REDIS_CACHE_EXP_TIME = 11
-
-KEY="g5MQ7HG/r5gPCPQQCwfBBEduAt72ewJIY/gWc0RNoak="
-IV="2lIctRkqzYMWbwlW1jCC9A=="
-
-ERROR_LOG_LEVEL='silly'
-DISABLE_LOG=false
-
-ADMIN_SECRET_CODE=W5bF7gesuS0xsNWmpsKy
+ACCESS_TOKEN_EXPIRY=1
+ACCESS_TOKEN_SECRET=bsj82AHBxahusub12yexlashsbxAXADHBlaj
+API_DOC_URL = /user/api-doc
+APP_NAME=MentorED
+APPLICATION_ENV=development
+
+#APPLICATION_PORT=3001
+
+#CLOUD SERVICE DETAILS
+AWS_ACCESS_KEY_ID= "test"
+AWS_BUCKET_ENDPOINT= "s3.ap-south-1.amazonaws.com"
+AWS_BUCKET_REGION= "ap-south-1"
+AWS_SECRET_ACCESS_KEY= "/0UfS/0ooVQAwQMcwaW9yi"
+
+AZURE_ACCOUNT_KEY=test
+AZURE_ACCOUNT_NAME=mentoring
+CLEAR_INTERNAL_CACHE=userinternal
+CLOUD_STORAGE=AWS
+
+DEFAULT_AWS_BUCKET_NAME=mentoring-dev-storage
+DEFAULT_AZURE_CONTAINER_NAME=mentoring-images
+DEFAULT_GCP_BUCKET_NAME=mentoring-dev-storage
+ENABLE_EMAIL_OTP_VERIFICATION=false
+
+GCP_PATH=gcp.json
+GCP_PROJECT_ID=sl-dev-project
+INTERNAL_ACCESS_TOKEN=internal_access_token
+INTERNAL_CACHE_EXP_TIME=86400
+IV=LHYOA5YnTonqcgrm15k3/Q==
+
+#KAFKA 
+KAFKA_GROUP_ID=mentoring
+KAFKA_TOPIC= mentoring
+#KAFKA_URL= localhost:9092
+KEY=E/m3RD/aM3Ed3lLfYVcKizakG9R+bFybAPZSLjIP2hY=
+
+NOTIFICATION_KAFKA_TOPIC=dev.notifications
+OTP_EMAIL_TEMPLATE_CODE=emailotp
+OTP_EXP_TIME=86400
+
+#REDIS_HOST=redis://localhost:6379
+
+#refresh tokens deatils
+REFRESH_TOKEN_EXPIRY=183
+REFRESH_TOKEN_SECRET=371hkjkjady2y3ihdkajshdkiq23iuekw71yekhaskdvkvegavy23t78veqwexqvxveit6ttxyeeytt62tx236vv
+
+#EMAIL TEMPLATES
+REGISTRATION_EMAIL_TEMPLATE_CODE=registration
+REGISTRATION_OTP_EMAIL_TEMPLATE_CODE=registrationotp
+
+
+DEFAULT_OCI_BUCKET_NAME= dev-mentoring
+OCI_ACCESS_KEY_ID= 23b90f80de10cc226f7a4d617e0f4012a544d01d
+OCI_BUCKET_ENDPOINT= https://axgqmpkrpmt5.compat.objectstorage.ap-hyderabad-1.oraclecloud.com
+OCI_BUCKET_REGION= ap-hyderabad-1
+OCI_SECRET_ACCESS_KEY= 22levMw5Cinz6/NsAKXXakZMpzCet9yu6nn4dVeSmNE=
+
+
+ERROR_LOG_LEVEL= silly
+DISABLE_LOG= false
+DEFAULT_ORGANISATION_CODE=default_code
+
+#new
+DEV_DATABASE_URL=postgres://postgres:postgres@localhost:5432/user-local
+ADMIN_SECRET_CODE=W5bF7gesuS0xsNWmpsKy
+MENTORING_SERVICE_URL= test
+DEFAULT_QUEUE="test"
+
+INVITEE_EMAIL_TEMPLATE_CODE='test'
+ADMIN_INVITEE_UPLOAD_EMAIL_TEMPLATE_CODE='test'
+MENTOR_INVITATION_EMAIL_TEMPLATE_CODE="test"
+MENTEE_INVITATION_EMAIL_TEMPLATE_CODE="test"
+#Default role
+DEFAULT_ROLE="mentee"
+
+#sample file upload path
+SAMPLE_CSV_FILE_PATH=sample/bulk_user_creation.csv
+
+#Email template for org admin invitation
+ORG_ADMIN_INVITATION_EMAIL_TEMPLATE_CODE=invite_org_admin
+DEFAULT_ORG_ID=1
+MENTORING_SERVICE_URL=http://mentoring:3002
+#Email template for mentor role request accepted
+MENTOR_REQUEST_ACCEPTED_EMAIL_TEMPLATE_CODE=mentor_request_accepted
+
+#Email template for mentor role request rejected
+MENTOR_REQUEST_REJECTED_EMAIL_TEMPLATE_CODE=mentor_request_rejected
+DEFAULT_ROLE=mentee
+PORTAL_URL = 'https://mentored.shikshalokam.org/auth/login'
+
+#Host name for scheduler service
+SCHEDULER_SERVICE_HOST="http://localhost:4000"
+
+#base URL for scheduler service
+SCHEDULER_SERVICE_BASE_URL= /scheduler/
+
+#Refresh interval for materialized views
+REFRESH_VIEW_INTERVAL= 540000