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

Question and Question Set migration #245

Merged
merged 22 commits into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
90 changes: 88 additions & 2 deletions docker-compose-mentoring.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,24 @@ services:
redis:
image: 'redis:7.0.0'
restart: 'always'
expose:
- '6379'
ports:
- '6379:6379'
networks:
- elevate_net
logging:
driver: none
# redis_bullmq:
# image: 'redis:7.0.0'
# container_name: redis_bullmq
# restart: 'always'
# command: redis-server --appendonly yes --maxmemory-policy noeviction
# ports:
# - '6380:6379'
# networks:
# - elevate_net
# volumes:
# - redis_data:/data

mentoring:
build: './'
image: elevate/mentoring:1.0
Expand All @@ -64,6 +76,8 @@ services:
- MONGODB_URL=mongodb://mongo:27017/elevate-mentoring
- KAFKA_URL=kafka:9092
- USER_SERIVCE_HOST=http://user:3001
- DEV_DATABASE_URL=postgres://postgres:postgres@citus_master:5432/mentoring-local

depends_on:
- kafka
- mongo
Expand All @@ -81,6 +95,7 @@ services:
- MONGODB_URL=mongodb://mongo:27017/elevate-mentoring
- KAFKA_URL=kafka:9092
- REDIS_HOST=redis://redis:6379
- DEV_DATABASE_URL=postgres://postgres:postgres@citus_master:5432/user-local
depends_on:
- kafka
- mongo
Expand All @@ -102,10 +117,81 @@ services:
- mongo
networks:
- elevate_net
scheduler:
build: '../scheduler/'
image: elevate/notificatschedulerion:1.0
volumes:
- ../scheduler/src/:/var/src
ports:
- '4000:4000'
command: ['nodemon', 'app.js']
environment:
- KAFKA_URL=kafka:9092
- MONGODB_URL=mongodb://mongo:27017/elevate-scheduler
depends_on:
- kafka
- mongo
#- redis_bullmq
networks:
- elevate_net

# master:
# container_name: 'citus_master'
# image: 'citusdata/citus:11.2.0'
# ports: ['${COORDINATOR_EXTERNAL_PORT:-5432}:5432']
# labels: ['com.citusdata.role=Master']
# environment: &AUTH
# POSTGRES_USER: '${POSTGRES_USER:-postgres}'
# POSTGRES_PASSWORD: '${POSTGRES_PASSWORD:-postgres}'
# PGUSER: '${POSTGRES_USER:-postgres}'
# PGPASSWORD: '${POSTGRES_PASSWORD:-postgres}'
# POSTGRES_HOST_AUTH_METHOD: '${POSTGRES_HOST_AUTH_METHOD:-trust}'
# networks:
# - elevate_net
# worker:
# image: 'citusdata/citus:11.2.0'
# labels: ['com.citusdata.role=Worker']
# depends_on: [manager]
# environment: *AUTH
# command: '/wait-for-manager.sh'
# volumes:
# - healthcheck-volume:/healthcheck
# networks:
# - elevate_net
# manager:
# container_name: '${COMPOSE_PROJECT_NAME:-citus}_manager'
# image: 'citusdata/membership-manager:0.3.0'
# volumes:
# - '${DOCKER_SOCK:-/var/run/docker.sock}:/var/run/docker.sock'
# - healthcheck-volume:/healthcheck
# depends_on: [master]
# environment: *AUTH
# networks:
# - elevate_net

citus:
image: citusdata/citus:11.2.0
container_name: 'citus_master'
ports:
- 5432:5432
# command: >
# bash -c "while ! pg_isready -h localhost -U postgres -q; do sleep 1; done &&
# psql -h localhost -U postgres -d <database_name> -c 'CREATE EXTENSION citus; SELECT create_distributed_table(\"notification_templates\", \"id\");'"
environment: &AUTH
POSTGRES_USER: '${POSTGRES_USER:-postgres}'
POSTGRES_PASSWORD: '${POSTGRES_PASSWORD:-postgres}'
PGUSER: '${POSTGRES_USER:-postgres}'
PGPASSWORD: '${POSTGRES_PASSWORD:-postgres}'
POSTGRES_DB: 'user-local'
POSTGRES_HOST_AUTH_METHOD: '${POSTGRES_HOST_AUTH_METHOD:-trust}'
networks:
- elevate_net
networks:
elevate_net:
external: false
volumes:
zookeeper-data:
kafka-data:
mongo-data:
redis_data:
healthcheck-volume:
1 change: 0 additions & 1 deletion src/.husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@

cd src
npx lint-staged
npm test
8 changes: 8 additions & 0 deletions src/.sequelizerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const path = require('path')

module.exports = {
config: path.resolve('./configs', 'postgres.js'),
'models-path': path.resolve('./database/models'),
'seeders-path': path.resolve('./database/seeders'),
'migrations-path': path.resolve('./database/migrations'),
}
26 changes: 13 additions & 13 deletions src/api-doc/MentorED-Mentoring.postman_collection.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"info": {
"_postman_id": "822d6a3b-72c8-485f-964b-f0cf4c778d9a",
"_postman_id": "30976341-d211-4422-aabd-318b65bde8ea",
"name": "MentorED-Mentoring",
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
"_exporter_id": "21498549"
Expand Down Expand Up @@ -892,7 +892,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n \"question\": \"How much you rate the audio/video quality of session\",\n \"options\": [\"1\",\"2\"],\n \"deleted\": false,\n \"responseType\": \"radio\",\n \"value\": \"1\",\n \"hint\": \"\"\n}",
"raw": "{\n \"name\": \"keyvalue\",\n \"question\": \"To what extent did you feel comfortable sharing your thoughts in the session?\",\n \"type\": \"rating\",\n \"options\": null,\n \"no_of_stars\": 5,\n \"status\": \"active\",\n \"category\": null,\n \"rendering_data\": {\n \"value\": \"\",\n \"class\": \"ion-margin\",\n \"disabled\": false,\n \"noOfstars\": \"5\",\n \"position\": \"floating\",\n \"validation\": {\n \"required\": false\n }\n },\n \"meta\": null\n}",
"options": {
"raw": {
"language": "json"
Expand Down Expand Up @@ -920,17 +920,17 @@
],
"body": {
"mode": "raw",
"raw": "{ \"question\": \"How much you rate the audio/video quality of session\",\n \"options\": [\"1\",\"2\",\"3\"],\n \"deleted\": false,\n \"responseType\": \"radio\",\n \"value\": \"1\",\n \"hint\": \"1\"\n}",
"raw": "{\n \"name\": \"keyvalue\",\n \"question\": \"To what extent did you feel comfortable sharing your thoughts in the session?\",\n \"type\": \"rating\",\n \"options\": null,\n \"no_of_stars\": 5,\n \"status\": \"active\",\n \"category\": null,\n \"rendering_data\": {\n \"noOfstars\": \"10\",\n \"position\": \"floating\",\n \"validation\": {\n \"required\": false\n }\n }\n}",
"options": {
"raw": {
"language": "json"
}
}
},
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/questions/update/6296e6892fdc1f037cbf4529",
"raw": "{{MentoringBaseUrl}}mentoring/v1/questions/update/9",
"host": ["{{MentoringBaseUrl}}mentoring"],
"path": ["v1", "questions", "update", "6296e6892fdc1f037cbf4529"]
"path": ["v1", "questions", "update", "9"]
}
},
"response": []
Expand All @@ -947,9 +947,9 @@
}
],
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/questions/read/6296e6892fdc1f037cbf4529",
"raw": "{{MentoringBaseUrl}}mentoring/v1/questions/read/9",
"host": ["{{MentoringBaseUrl}}mentoring"],
"path": ["v1", "questions", "read", "6296e6892fdc1f037cbf4529"]
"path": ["v1", "questions", "read", "9"]
}
},
"response": []
Expand All @@ -972,7 +972,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n \"questions\": [\"6296e6892fdc1f037cbf4529\"],\n \"code\": \"feedback\"\n}",
"raw": "{\n \"questions\": [\n 1,\n 2,\n 9\n ],\n \"code\": \"feedback\"\n}",
"options": {
"raw": {
"language": "json"
Expand Down Expand Up @@ -1000,17 +1000,17 @@
],
"body": {
"mode": "raw",
"raw": "{\n \"questions\": [\"6296e6892fdc1f037cbf4529\",\"6296e65c2fdc1f037cbf4527\",\"6296e6522fdc1f037cbf4525\"],\n \"code\": \"feedback\"\n}",
"raw": "{\n \"questions\": [\n 1,\n 9\n ],\n \"code\": \"feedback\"\n}",
"options": {
"raw": {
"language": "json"
}
}
},
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/questionsSet/update/629978caf0cf0901d7d74d12",
"raw": "{{MentoringBaseUrl}}mentoring/v1/questionsSet/update/13",
"host": ["{{MentoringBaseUrl}}mentoring"],
"path": ["v1", "questionsSet", "update", "629978caf0cf0901d7d74d12"]
"path": ["v1", "questionsSet", "update", "13"]
}
},
"response": []
Expand Down Expand Up @@ -1039,9 +1039,9 @@
}
},
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/questionsSet/read/629978caf0cf0901d7d74d12",
"raw": "{{MentoringBaseUrl}}mentoring/v1/questionsSet/read/13",
"host": ["{{MentoringBaseUrl}}mentoring"],
"path": ["v1", "questionsSet", "read", "629978caf0cf0901d7d74d12"]
"path": ["v1", "questionsSet", "read", "13"]
}
},
"response": []
Expand Down
Loading