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

Develop 2.5 deploy #347

Merged
merged 48 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
4016fe9
notification template selection related changes
Nov 10, 2023
2a49d4f
init checkpoint
nevil-mathew Nov 10, 2023
71eeed9
Merge branch 'views-final-backup' of https://github.com/ELEVATE-Proje…
nevil-mathew Nov 10, 2023
127fc88
updated multiple services with saas policy
nevil-mathew Nov 10, 2023
45cb10f
Modified RestructureBody Function
joffinjoy Nov 10, 2023
b369803
Added Comment For DB Write Error
joffinjoy Nov 10, 2023
27265d7
Custom_entity_text Field Clean Up Optimisation
joffinjoy Nov 10, 2023
2ab4e00
saas changes after view merge test
Nov 12, 2023
26c568d
Merge pull request #333 from ELEVATE-Project/views-saas-test
VISHNUDAS-tunerlabs Nov 12, 2023
7597805
scheduler related change added
Nov 14, 2023
adad75a
added scripts
nevil-mathew Nov 14, 2023
4eaf37d
updated postman collection
nevil-mathew Nov 15, 2023
7ab95a7
initial changes for associated saas
Nov 15, 2023
4cf33c0
merging latest view changeMerge branch 'saas-with-views-merge' into s…
Nov 15, 2023
74627d5
fixed validateInput utils function
nevil-mathew Nov 15, 2023
24c1a46
updated sessions.js
nevil-mathew Nov 15, 2023
d382def
Partially Modified Response Processor
joffinjoy Nov 15, 2023
0feba65
Merge pull request #331 from ELEVATE-Project/saas-with-views-merge
joffinjoy Nov 15, 2023
f00cb9d
Merge branch 'develop-2.5-deploy' into SAAS-changes
VISHNUDAS-tunerlabs Nov 15, 2023
d87260d
Merge pull request #330 from ELEVATE-Project/SAAS-changes
joffinjoy Nov 15, 2023
6037944
migration for alter extension table
priyanka-TL Nov 15, 2023
9817da4
Merge pull request #335 from ELEVATE-Project/apiFixes
joffinjoy Nov 15, 2023
dcc988c
seesion table alter
priyanka-TL Nov 15, 2023
d59a04b
Merge pull request #336 from ELEVATE-Project/apiFixes
joffinjoy Nov 15, 2023
a860b4b
Modified Migrations
joffinjoy Nov 15, 2023
fbc4e30
Modified Migration'
joffinjoy Nov 15, 2023
c299f76
update url
nevil-mathew Nov 15, 2023
05aa5e1
Merge pull request #337 from ELEVATE-Project/saas-with-views-merge
joffinjoy Nov 15, 2023
2ce6ab9
saas changes with associated option
Nov 15, 2023
cf01413
consoles removed
Nov 15, 2023
4bffe26
made index creation unique
nevil-mathew Nov 15, 2023
0b07e2a
Merge pull request #340 from ELEVATE-Project/saas-with-views-merge
joffinjoy Nov 15, 2023
3aa2de0
seeder for mentee enhancement questions
priyanka-TL Nov 15, 2023
2f501d2
Removing Modification
joffinjoy Nov 16, 2023
2910edd
added empty check to user response
nevil-mathew Nov 16, 2023
4fa9708
Merge pull request #342 from ELEVATE-Project/mentor-list-fix
joffinjoy Nov 16, 2023
d81b401
Merge pull request #338 from ELEVATE-Project/saas-changes-new
joffinjoy Nov 16, 2023
5c25116
ProcessDbResponse Fix
joffinjoy Nov 16, 2023
2ff87c9
Merge pull request #332 from ELEVATE-Project/entityTypeProcessorFix
joffinjoy Nov 16, 2023
e3d4058
Modified Array Entity Check
joffinjoy Nov 16, 2023
13e8607
Merge pull request #343 from ELEVATE-Project/entityTypeResponseFix
joffinjoy Nov 16, 2023
3e2314b
update mentor and mentee delete query
nevil-mathew Nov 16, 2023
019ff1e
Merge pull request #344 from ELEVATE-Project/mentor-list-fix
joffinjoy Nov 16, 2023
bb3f365
Merge pull request #341 from ELEVATE-Project/newQuestions
joffinjoy Nov 16, 2023
f0ffc5b
expiry check for token
priyanka-TL Nov 16, 2023
eb2f6a7
Merge pull request #345 from ELEVATE-Project/tokenIssueFix
joffinjoy Nov 16, 2023
13daf21
Added Missing Other Case
joffinjoy Nov 16, 2023
58b82e5
Merge pull request #346 from ELEVATE-Project/entityTypeResponseFix
joffinjoy Nov 16, 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
16 changes: 9 additions & 7 deletions docker-compose-mentoring.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@ services:
networks:
- elevate_net
interface:
build: '../interface/'
build: '../interface-service/'
image: elevate/interface:1.0
volumes:
- ../interface/src/:/var/src
- ../interface-service/src/:/var/src
ports:
- '3569:3569'
command: ['nodemon', 'app.js']
command: ['node', 'app.js']
networks:
- elevate_net
# master:
Expand Down Expand Up @@ -183,10 +183,10 @@ services:
citus:
image: citusdata/citus:11.2.0
container_name: 'citus_master'
#ports:
# - 5432:5432
expose:
- 5432
ports:
- 5432:5432
# expose:
# - 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\");'"
Expand All @@ -197,6 +197,8 @@ services:
PGPASSWORD: '${POSTGRES_PASSWORD:-postgres}'
POSTGRES_DB: 'user-local'
POSTGRES_HOST_AUTH_METHOD: '${POSTGRES_HOST_AUTH_METHOD:-trust}'
POSTGRES_LOG_STATEMENT: 'all' # Enable query logging (set to 'all' for all queries)

networks:
- elevate_net
pgadmin:
Expand Down
174 changes: 153 additions & 21 deletions src/api-doc/MentorED-Mentoring.postman_collection.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"info": {
"_postman_id": "5d4d24cb-3c5c-4486-8d85-bd10eeaae9c3",
"_postman_id": "d8b7643b-0f23-4360-aa77-1608b9b940e5",
"name": "MentorED-Mentoring",
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
"_exporter_id": "6350183",
"_collection_link": "https://cloudy-eclipse-8615.postman.co/workspace/MentorED~099846e5-b1d5-4043-84b9-1e9ac3fc1e4f/collection/6350183-5d4d24cb-3c5c-4486-8d85-bd10eeaae9c3?action=share&source=collection_link&creator=6350183"
"_exporter_id": "21498549"
},
"item": [
{
Expand Down Expand Up @@ -402,7 +401,7 @@
}
},
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/sessions/list?page=1&limit=2&status=published,completed",
"raw": "{{MentoringBaseUrl}}mentoring/v1/sessions/list?page=1&limit=2&recommended_for=hm,deo",
"host": ["{{MentoringBaseUrl}}mentoring"],
"path": ["v1", "sessions", "list"],
"query": [
Expand All @@ -414,14 +413,15 @@
"key": "limit",
"value": "2"
},
{
"key": "status",
"value": "published,completed"
},
{
"key": "search",
"value": "ankit",
"disabled": true
},
{
"key": "recommended_for",
"value": "hm,deo",
"description": "Filters to be applied should be passed like this."
}
]
},
Expand Down Expand Up @@ -543,7 +543,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n \"title\": \"Leadership session by rajesh\",\n \"description\": \"description\",\n \"start_date\": 1693479180,\n \"end_date\": 1693486379,\n \"recommended_for\": [\n \"hm\"\n ],\n \"categories\": [\n \"Educational leadership\"\n ],\n \"medium\": [\n \"1\"\n ],\n \"time_zone\": \"Asia/Calcutta\",\n \"image\": [\n \"users/1232s2133sdd1-12e2dasd3123.png\"\n ]\n}",
"raw": "{\n \"title\": \"Leadership session \",\n \"description\": \"description\",\n \"start_date\": 1700647200,\n \"end_date\": 1700650800,\n \"recommended_for\": [\n \"hm\"\n ],\n \"categories\": [\n \"educational_leadership\"\n ],\n \"medium\": [\n \"en_in\"\n ],\n \"time_zone\": \"Asia/Calcutta\",\n \"image\": [\n \"users/1232s2133sdd1-12e2dasd3123.png\"\n ]\n}",
"options": {
"raw": {
"language": "json"
Expand Down Expand Up @@ -737,7 +737,7 @@
"name": "mentees",
"item": [
{
"name": "Mentees Sessions",
"name": "Mentees Enrolled Sessions",
"request": {
"method": "GET",
"header": [
Expand All @@ -748,14 +748,10 @@
}
],
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/mentees/sessions?enrolled=true&page=1&limit=20",
"raw": "{{MentoringBaseUrl}}mentoring/v1/mentees/sessions?page=1&limit=20",
"host": ["{{MentoringBaseUrl}}mentoring"],
"path": ["v1", "mentees", "sessions"],
"query": [
{
"key": "enrolled",
"value": "true"
},
{
"key": "search",
"value": "my data",
Expand Down Expand Up @@ -892,7 +888,7 @@
"response": []
},
{
"name": "Get Mentor Profile",
"name": "Mentor Details",
"request": {
"method": "GET",
"header": [
Expand All @@ -903,15 +899,15 @@
}
],
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/mentors/profile/1",
"raw": "{{MentoringBaseUrl}}mentoring/v1/mentors/details/1",
"host": ["{{MentoringBaseUrl}}mentoring"],
"path": ["v1", "mentors", "profile", "1"]
"path": ["v1", "mentors", "details", "1"]
}
},
"response": []
},
{
"name": "Get Mentor upcommingSession",
"name": "Upcoming Sessions",
"request": {
"method": "GET",
"header": [
Expand All @@ -922,7 +918,7 @@
}
],
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/mentors/upcomingSessions/1?page=1&limit=5",
"raw": "{{MentoringBaseUrl}}mentoring/v1/mentors/upcomingSessions/1?page=1&limit=5&recommended_for=hm",
"host": ["{{MentoringBaseUrl}}mentoring"],
"path": ["v1", "mentors", "upcomingSessions", "1"],
"query": [
Expand All @@ -938,6 +934,10 @@
"key": "search",
"value": "testing5",
"disabled": true
},
{
"key": "recommended_for",
"value": "hm"
}
]
}
Expand Down Expand Up @@ -969,6 +969,50 @@
}
},
"response": []
},
{
"name": "Mentor List",
"request": {
"method": "GET",
"header": [
{
"key": "X-auth-token",
"value": "bearer {{token}}",
"type": "text"
}
],
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/mentors/list",
"host": ["{{MentoringBaseUrl}}mentoring"],
"path": ["v1", "mentors", "list"]
}
},
"response": []
},
{
"name": "Crearted Sessions",
"request": {
"method": "GET",
"header": [
{
"key": "X-auth-token",
"value": "bearer {{token}}",
"type": "text"
}
],
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/mentors/createdSessions?status=PUBLISHED,COMPLETED",
"host": ["{{MentoringBaseUrl}}mentoring"],
"path": ["v1", "mentors", "createdSessions"],
"query": [
{
"key": "status",
"value": "PUBLISHED,COMPLETED"
}
]
}
},
"response": []
}
]
},
Expand Down Expand Up @@ -1334,6 +1378,94 @@
}
},
"response": []
},
{
"name": "Build views",
"request": {
"method": "GET",
"header": [
{
"key": "X-auth-token",
"value": "bearer {{token}}",
"type": "text"
}
],
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/admin/triggerViewRebuild",
"host": ["{{MentoringBaseUrl}}mentoring"],
"path": ["v1", "admin", "triggerViewRebuild"]
}
},
"response": []
},
{
"name": "Build views (Internal)",
"request": {
"method": "GET",
"header": [
{
"key": "X-auth-token",
"value": "bearer {{token}}",
"type": "text"
}
],
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/admin/triggerViewRebuildInternal",
"host": ["{{MentoringBaseUrl}}mentoring"],
"path": ["v1", "admin", "triggerViewRebuildInternal"]
}
},
"response": []
},
{
"name": "Refresh Views",
"request": {
"method": "GET",
"header": [
{
"key": "internal_access_token",
"value": "{{internal_access_token}}",
"type": "text",
"disabled": true
},
{
"key": "X-auth-token",
"value": "bearer {{token}}",
"type": "text"
}
],
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/admin/triggerPeriodicViewRefresh",
"host": ["{{MentoringBaseUrl}}mentoring"],
"path": ["v1", "admin", "triggerPeriodicViewRefresh"]
}
},
"response": []
},
{
"name": "Refresh Views (Internal)",
"request": {
"method": "GET",
"header": [
{
"key": "internal_access_token",
"value": "{{internal_access_token}}",
"type": "text"
}
],
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/admin/triggerPeriodicViewRefreshInternal?model_name=Session",
"host": ["{{MentoringBaseUrl}}mentoring"],
"path": ["v1", "admin", "triggerPeriodicViewRefreshInternal"],
"query": [
{
"key": "model_name",
"value": "Session"
}
]
}
},
"response": []
}
]
},
Expand Down Expand Up @@ -1467,7 +1599,7 @@
],
"body": {
"mode": "raw",
"raw": "{\n\t\"user_id\":1,\n\t\"current_roles\":[\"mentor\"],\n\t\"new_roles\":[\"mentee\"]\n}"
"raw": "{\n \"user_id\": 2,\n \"current_roles\": [\n \"mentee\"\n ],\n \"new_roles\": [\n \"mentor\"\n ]\n}"
},
"url": {
"raw": "{{MentoringBaseUrl}}mentoring/v1/org-admin/roleChange",
Expand Down
5 changes: 5 additions & 0 deletions src/constants/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ module.exports = {
'/org-admin/roleChange',
'/org-admin/updateOrganization',
'/org-admin/deactivateUpcomingSession',
'/admin/triggerPeriodicViewRefreshInternal',
'/admin/triggerViewRebuildInternal',
],
COMPLETED_STATUS: 'COMPLETED',
PUBLISHED_STATUS: 'PUBLISHED',
Expand Down Expand Up @@ -128,6 +130,9 @@ module.exports = {
},
CURRENT: 'CURRENT',
ALL: 'ALL',
ASSOCIATED: 'ASSOCIATED',
PATCH_METHOD: 'PATCH',
GET_METHOD: 'GET',
excludedQueryParams: ['enrolled'],
materializedViewsPrefix: 'm_',
}
Loading