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

Kt task/user overview #190

Open
wants to merge 606 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
606 commits
Select commit Hold shift + click to select a range
e6e9ac9
added certificate key to projection
VISHNUDAS-tunerlabs Nov 23, 2022
fe13502
Merge pull request #105 from shikshalokam/ED-103-certificate
aks30 Nov 23, 2022
fd36779
Merge pull request #116 from shikshalokam/master
aks30 Nov 23, 2022
a08fca0
ED-103 staging-fix
VISHNUDAS-tunerlabs Nov 24, 2022
3dfb1a3
model change
VISHNUDAS-tunerlabs Nov 24, 2022
ac074b8
staging fix
VISHNUDAS-tunerlabs Nov 24, 2022
4fe882c
Merge pull request #106 from shikshalokam/ED-103-staging
aks30 Nov 25, 2022
9cc5491
Merge pull request #117 from shikshalokam/master
aks30 Nov 25, 2022
929d9f1
avoid template url from updation
VISHNUDAS-tunerlabs Nov 25, 2022
f2ddb14
remove certificate key from updation
VISHNUDAS-tunerlabs Nov 25, 2022
ef36a8c
Merge pull request #107 from shikshalokam/ED-103-staging
aks30 Nov 25, 2022
f23c803
Merge pull request #118 from shikshalokam/master
aks30 Nov 25, 2022
d99d402
console added to check in staging
VISHNUDAS-tunerlabs Nov 25, 2022
aa58b70
Merge pull request #108 from shikshalokam/ED-103-staging
aks30 Nov 25, 2022
b597c19
Merge pull request #119 from shikshalokam/master
aks30 Nov 25, 2022
cf6faaf
console added and template details changes
VISHNUDAS-tunerlabs Nov 25, 2022
0bfca03
Merge pull request #109 from shikshalokam/ED-103-staging
aks30 Nov 25, 2022
1efef67
Merge pull request #120 from shikshalokam/master
aks30 Nov 25, 2022
785afe5
console change
VISHNUDAS-tunerlabs Nov 25, 2022
6af012d
Merge pull request #110 from shikshalokam/ED-103-staging
aks30 Nov 25, 2022
a62f8ab
Merge pull request #121 from shikshalokam/master
aks30 Nov 25, 2022
63dd62f
Make logs as a string.
aks30 Nov 28, 2022
31c8b7e
Log raw data.
aks30 Nov 28, 2022
2907532
certificate creation sync mode enabled
VISHNUDAS-tunerlabs Dec 2, 2022
4e9d5eb
Merge pull request #111 from shikshalokam/certificate-sync
aks30 Dec 2, 2022
3738224
Merge branch 'release-5.1.0' into master
VISHNUDAS-tunerlabs Dec 2, 2022
ca40f5e
issuedOn key added for sync mode
VISHNUDAS-tunerlabs Dec 5, 2022
cd2c33c
Merge pull request #112 from shikshalokam/certificate-sync
aks30 Dec 5, 2022
f715e06
async mode enabled, certificate list change to pass complete templateUrl
VISHNUDAS-tunerlabs Dec 12, 2022
a1136c1
code optimized- downloadable templateUrl
VISHNUDAS-tunerlabs Dec 12, 2022
b33ecd4
Merge pull request #113 from shikshalokam/certificate-sync
aks30 Dec 12, 2022
9f694a5
generate complete templateUrl capability added to userAssigned fn
VISHNUDAS-tunerlabs Dec 12, 2022
5a6f719
Merge pull request #114 from shikshalokam/certificate-sync
aks30 Dec 12, 2022
9c16a6b
consoles removed
VISHNUDAS-tunerlabs Dec 12, 2022
89cfb4c
console removed
VISHNUDAS-tunerlabs Dec 12, 2022
7df0588
Merge pull request #115 from shikshalokam/deploy-issue
aks30 Dec 12, 2022
747b8f6
removed global varaiable assign and check of issuer kid
VISHNUDAS-tunerlabs Dec 13, 2022
3f326f4
chenge in envVariables
VISHNUDAS-tunerlabs Dec 13, 2022
c41ac9d
Merge pull request #117 from shikshalokam/service-deployment-issue
aks30 Dec 13, 2022
e5754ba
console added to check issue
VISHNUDAS-tunerlabs Dec 13, 2022
8930991
Merge pull request #118 from shikshalokam/service-deployment-issue
aks30 Dec 13, 2022
c0b83ba
console added to debug
VISHNUDAS-tunerlabs Dec 13, 2022
0cfc855
Merge pull request #119 from shikshalokam/service-deployment-issue
aks30 Dec 13, 2022
95a4dee
console is added to check callback call, kafka condition added to avo…
VISHNUDAS-tunerlabs Dec 13, 2022
79c8b11
Merge pull request #120 from shikshalokam/service-deployment-issue
aks30 Dec 13, 2022
c042ad2
kafka consumer check for eligible key absent added
VISHNUDAS-tunerlabs Dec 13, 2022
50c7f3c
Merge pull request #121 from shikshalokam/service-deployment-issue
aks30 Dec 13, 2022
fb4fe9d
console added to check callback && updated rc response check condition
VISHNUDAS-tunerlabs Dec 13, 2022
f550e93
Merge pull request #122 from shikshalokam/service-deployment-issue
aks30 Dec 13, 2022
8b3de75
kafka push for sync mode removed
VISHNUDAS-tunerlabs Dec 13, 2022
c6e3efa
Merge pull request #123 from shikshalokam/service-deployment-issue
aks30 Dec 14, 2022
691259b
guest access path updated with certificateCallback
VISHNUDAS-tunerlabs Dec 15, 2022
99b147e
Merge pull request #124 from shikshalokam/service-deployment-issue
aks30 Dec 15, 2022
88e5586
referenceId added to project tasks
VISHNUDAS-tunerlabs Dec 20, 2022
7eba508
Merge pull request #125 from shikshalokam/service-deployment-issue
aks30 Dec 20, 2022
c4bdbcf
comparing with task externalId
VISHNUDAS-tunerlabs Dec 21, 2022
141ceaf
refereceid key removed
VISHNUDAS-tunerlabs Dec 21, 2022
947d9a9
reference id replacement issue resolved
VISHNUDAS-tunerlabs Dec 21, 2022
a138d29
referenceId replacement fix
VISHNUDAS-tunerlabs Dec 21, 2022
8fae418
Merge pull request #126 from shikshalokam/service-deployment-issue
aks30 Dec 21, 2022
6c6f0ff
completedDate added to projection
VISHNUDAS-tunerlabs Dec 21, 2022
db865c2
Merge pull request #127 from shikshalokam/service-deployment-issue
aks30 Dec 21, 2022
5741c0f
console added to check kid issue
VISHNUDAS-tunerlabs Dec 28, 2022
70bf0b5
ISSUER_KID check added from env
VISHNUDAS-tunerlabs Dec 28, 2022
6bf23ca
Merge pull request #129 from shikshalokam/issuerKid-Error
aks30 Dec 28, 2022
03e9784
solution model updated
VISHNUDAS-tunerlabs Dec 29, 2022
8bae30f
Merge pull request #130 from shikshalokam/SolutionModelUpdate
aks30 Dec 29, 2022
53f1db1
setUserProfileInProject migration script added
VISHNUDAS-tunerlabs Jan 3, 2023
9d3fc2c
subfolder changed
VISHNUDAS-tunerlabs Jan 3, 2023
657c13f
Merge pull request #131 from shikshalokam/prod-script
aks30 Jan 3, 2023
d41d3c2
changed from userName to firstName and lastName
Jan 18, 2023
7163a83
Merge pull request #132 from shikshalokam/ED-1078
aks30 Jan 18, 2023
a10b6df
Fixing reissue certificate
Jan 20, 2023
425d994
Merge pull request #133 from shikshalokam/ED-1078
aks30 Jan 20, 2023
4f7cf55
added only first name in validation
Jan 20, 2023
9b9632a
Merge pull request #134 from shikshalokam/ED-1078
aks30 Jan 20, 2023
33195e6
Debug ED-1078
Jan 20, 2023
6060d97
Merge pull request #135 from shikshalokam/ED-1078
aks30 Jan 20, 2023
f95c8ba
removed console log
Jan 20, 2023
f80861c
Merge pull request #136 from shikshalokam/ED-1078
aks30 Jan 20, 2023
896993a
projectName length restricted
VISHNUDAS-tunerlabs Jan 23, 2023
af8f79c
Merge pull request #137 from shikshalokam/projectNameFix
aks30 Jan 23, 2023
4f21926
Added Program Join and consent
Feb 1, 2023
077dd7c
Done WIth Project
Feb 1, 2023
c50395f
Added Project Update Script
Feb 1, 2023
306b44a
Added Project Update Script
Feb 1, 2023
85631c9
add delete also
Feb 2, 2023
19a6507
add delete also
Feb 2, 2023
00fb708
Added Both Script
Feb 2, 2023
2ec50de
Added Both Script
Feb 3, 2023
bf2be1b
Added Both Script
Feb 3, 2023
27697e6
Added Both Script
Feb 3, 2023
1db856c
Updated PR
Feb 3, 2023
56d73c3
Done with Scripts
Feb 3, 2023
5af2f00
Done with Scripts
Feb 3, 2023
da2a602
Updated Code
Feb 3, 2023
01260a7
Updated Code
Feb 3, 2023
f4d10e9
updated script
Feb 6, 2023
36d84c6
Updated script
Feb 6, 2023
3e0ada3
Merge pull request #138 from shikshalokam/ProductionBugFix
aks30 Feb 6, 2023
fbcfb11
Saving Changes
Feb 7, 2023
6416529
saving changes
Feb 7, 2023
f188688
Raising Pr for project join programs
Feb 13, 2023
1f63f41
Done with Project code
Feb 13, 2023
eebfda9
Added user Role Information
Feb 14, 2023
4766648
hasAcceptedTAndC check added to importFromLibrary API
VISHNUDAS-tunerlabs Feb 18, 2023
fd5cc58
Merge pull request #141 from shikshalokam/ED-1299
aks30 Feb 20, 2023
b77f5de
env check issue fix
VISHNUDAS-tunerlabs Feb 23, 2023
f9f385e
Merge pull request #142 from shikshalokam/envIssueFix-Project-Certifi…
aks30 Feb 23, 2023
e29e526
resolved comments
Mar 7, 2023
31c72e5
resolved comments
Mar 7, 2023
f078a04
resolved comments
Mar 7, 2023
f1a910c
resolved comments
Mar 8, 2023
5f4858c
fix for ED-1463
Mar 23, 2023
1b34fdf
fixed program listing
Mar 23, 2023
fe31eb7
fixed program listing
Mar 23, 2023
172ebdf
fixed program listing
Mar 23, 2023
6b8ad5e
Merge pull request #143 from shikshalokam/ED-1463
aks30 Mar 23, 2023
f68f14f
fixed non targeted to targeted project issue
Mar 23, 2023
48a7533
fixed non targeted to targeted project issue
Mar 23, 2023
9475618
added integrated api to check solution is targeted or not
Mar 24, 2023
0518231
added integrated api to check solution is targeted or not
Mar 24, 2023
7a5d78d
added integrated api to check solution is targeted or not
Mar 24, 2023
4378772
added integrated api to check solution is targeted or not
Mar 24, 2023
d697df9
added integrated api to check solution is targeted or not
Mar 24, 2023
df010cb
fixed code
Mar 27, 2023
52e5573
Fixed Public and private project for solution
Mar 27, 2023
d9b0420
Fixed Public and private project for solution
Mar 28, 2023
c5ac1c7
Fixed Public and private project for solution
Mar 28, 2023
2166e80
Merge pull request #144 from shikshalokam/ED-1528
aks30 Mar 28, 2023
243d700
fixed comments'
Apr 6, 2023
73fa151
fixed comments
Apr 6, 2023
7eb8d54
fixed comments
Apr 6, 2023
cb6377c
merged with master
Apr 6, 2023
30a9f32
resolved conflict
Apr 7, 2023
41a9314
resolved conflict
Apr 7, 2023
d383bf7
resolved conflicts
Apr 7, 2023
bc836f1
resolved conflicts
Apr 7, 2023
7cd790e
Done with ED-98 Project PII
Apr 11, 2023
5049942
Added validation for program join API
Apr 11, 2023
a9c4c04
Merge pull request #140 from shikshalokam/ED-98
aks30 Apr 11, 2023
62a62fb
Added PR checklist
May 2, 2023
5cfff6d
Merge pull request #146 from shikshalokam/PR
aks30 May 2, 2023
0e0e8a1
change added to not join old programs internally
VISHNUDAS-tunerlabs May 9, 2023
e105da4
code formatted
VISHNUDAS-tunerlabs May 9, 2023
23e29b3
comments added
VISHNUDAS-tunerlabs May 9, 2023
1f64c38
Merge pull request #147 from shikshalokam/6.0-API-Integration
aks30 May 9, 2023
9bc2206
passing consentShared = true for internal calls
VISHNUDAS-tunerlabs May 19, 2023
81dc944
Merge pull request #148 from shikshalokam/6.0-API-Integration
aks30 May 19, 2023
a3985da
change added to pass userRoleInformation instead entire body data
VISHNUDAS-tunerlabs May 22, 2023
9eb4cf2
Merge pull request #149 from shikshalokam/6.0-API-Integration
aks30 May 22, 2023
d7c4d09
Bug Fix: ProjectId is not getting passed fixed in dev and staging
May 29, 2023
f1d8f5d
Merge pull request #150 from shikshalokam/6.0.0-Bug-Fix
aks30 May 29, 2023
54b1d55
Bug fix catching error if no entity data found
VISHNUDAS-tunerlabs Jun 2, 2023
699fc33
Merge pull request #151 from shikshalokam/6.0.0-QA-Fix
aks30 Jun 2, 2023
d463923
Change to create project from private solution
VISHNUDAS-tunerlabs Jun 16, 2023
65f4e87
added release note
Jun 16, 2023
47eec23
added release note
Jun 16, 2023
dc97d5a
solution model updated
VISHNUDAS-tunerlabs Jun 16, 2023
7fe31f2
Merge pull request #153 from shikshalokam/ReleaseNote
aks30 Jun 16, 2023
7cdcb6a
review changes
VISHNUDAS-tunerlabs Jun 19, 2023
5eca4d7
Review resolves
VISHNUDAS-tunerlabs Jun 19, 2023
6e6882b
Merge pull request #152 from shikshalokam/6.0.0-QA-Fix
aks30 Jun 19, 2023
f9feb03
added hasAcceptedTandC in project template details api from project c…
Jun 28, 2023
8a708f8
Merge pull request #154 from shikshalokam/TandC
aks30 Jun 28, 2023
d4a668b
ED-2448
VISHNUDAS-tunerlabs Jul 2, 2023
08716eb
Merge pull request #155 from shikshalokam/6.0.0-QA-Fix
aks30 Jul 3, 2023
de1cc8f
ED-2448
VISHNUDAS-tunerlabs Jul 3, 2023
ec3a219
ED-2448 changes
VISHNUDAS-tunerlabs Jul 3, 2023
a200434
ED-2448 review changes
VISHNUDAS-tunerlabs Jul 4, 2023
be615d1
Review changes
VISHNUDAS-tunerlabs Jul 4, 2023
3e23242
function response added
VISHNUDAS-tunerlabs Jul 4, 2023
8eb84e0
Merge pull request #156 from shikshalokam/6.0.0-QA-Fix
aks30 Jul 4, 2023
2459bff
Fix ED-2556
VISHNUDAS-tunerlabs Jul 10, 2023
80de556
remove link from userRoleInformation
VISHNUDAS-tunerlabs Jul 10, 2023
79eb6e5
Merge pull request #157 from shikshalokam/ED-2556
aks30 Jul 10, 2023
768d598
Added Release Tag
Jul 12, 2023
fb8b457
Merge pull request #158 from shikshalokam/ReleaseNote
aks30 Jul 12, 2023
438e7a7
Added setup guide and db schema along with example
Jul 19, 2023
2f69c40
Merge pull request #159 from shikshalokam/SetupGuide
aks30 Jul 24, 2023
36d3172
Saving changes for User DMS
Nov 2, 2023
c587ecd
Fixing Prod Issue
Nov 7, 2023
b088243
Fixing Prod Issue
Nov 7, 2023
fa1cb2a
Added Release Note for 7.0.0
Nov 7, 2023
dfe8831
Saving Changes to resolve other PR comments
Nov 10, 2023
a6e204e
Fixing Prod Bug for diksha Issue
Nov 10, 2023
279acc8
Fixing Diksha Prod Bug
Nov 10, 2023
2c1abcf
Added third script as well
Nov 14, 2023
dcb40e1
Added third script as well
Nov 14, 2023
102a61c
Updated Readme file
Nov 15, 2023
8984045
Done with user delete Flow in projects
Nov 17, 2023
77a8475
Done with user delete Flow in projects
Nov 17, 2023
d6448a6
Done with user delete Flow in projects
Nov 17, 2023
fae654c
Done with user delete Flow in projects
Nov 17, 2023
8b1e664
Done with user delete Flow in projects
Nov 17, 2023
6395c18
Added step three in readme file
Nov 17, 2023
83b4885
Done with user delete Flow in projects
Nov 17, 2023
2505bb6
Done with user delete Flow in projects
Nov 17, 2023
f0d25c0
Added validation steps as well
Nov 17, 2023
0669038
Merge pull request #160 from shikshalokam/DIKSHA-Prod-Bug-Fix
aks30 Nov 18, 2023
34aa33f
Updated PR
Nov 20, 2023
aaf7bb4
Updated PR
Nov 20, 2023
61b7839
Added ON of status for user delete
Nov 23, 2023
0ed9833
Added ON of status for user delete
Nov 23, 2023
d484d17
Added ON of status for user delete
Nov 23, 2023
91a4ebf
Added ON of status for user delete
Nov 23, 2023
774d28c
Resolved Comments
Nov 27, 2023
9afb504
Resolved Comments
Nov 27, 2023
37a2d2f
Merge pull request #161 from shikshalokam/USER-DMS
aks30 Nov 28, 2023
cb59983
Added Long Term fix for NVSK
Dec 18, 2023
9fdff10
Merge pull request #163 from shikshalokam/ED-3094
aks30 Dec 18, 2023
6325cb8
Added encEmail delete
Dec 21, 2023
e3aba1e
Merge pull request #164 from shikshalokam/encEmailDelete
aks30 Dec 21, 2023
4331e50
worked on validation for req body and db userlocation data
praveenKDass Jan 11, 2024
a44b553
Fix: Prod Obervation led imp with task level obs fix
Jan 12, 2024
afe4fd9
removing console
praveenKDass Jan 12, 2024
51534b5
validation dynamic and remving commented codes
praveenKDass Jan 12, 2024
afb9c72
pr modification for validation
praveenKDass Jan 12, 2024
ddad1f5
resolveing PR comments
praveenKDass Jan 12, 2024
faedd67
comment and name change on validation
praveenKDass Jan 12, 2024
7ed2c29
Fix: Prod Obervation led imp with task level obs fix
Jan 16, 2024
37026dd
Merge pull request #165 from shikshalokam/ProdBugFix
aks30 Jan 16, 2024
43a0fe9
Merge branch 'master' into issue-userprojectdetails
Jan 17, 2024
4f49b58
Fix: NVSK Long term fix
Jan 17, 2024
ad02354
Fix: NVSK Long term fix
Jan 17, 2024
5735e0a
Fix: NVSK Long term fix
Jan 17, 2024
3463333
Merge pull request #166 from shikshalokam/issue-userprojectdetails
aks30 Jan 18, 2024
79b10f7
upgrading node from 12 to 18
praveenKDass Mar 14, 2024
2e1c995
security_issue-fixes
praveenKDass Mar 21, 2024
6b63511
code quality bug fixes
praveenKDass Mar 28, 2024
391812c
added releasenotes for 8.0.0
praveenKDass Apr 2, 2024
d2ec2c9
removed unwanted header from release note
praveenKDass Apr 3, 2024
ef2150b
upgrade node -v from 18 to 20
praveenKDass Apr 16, 2024
3a000da
Merge pull request #168 from shikshalokam/security_fixes
aks30 Apr 16, 2024
6366e6d
feat:listing api for pending projects
Jun 20, 2024
22e64bd
feat:apis added to list projects which are created and assigned to a …
Jun 21, 2024
84524c7
feat:apis added to list projects which are created and assigned to a …
Jun 21, 2024
12d83c2
feat:apis added to list projects which are created and assigned to a …
Jun 21, 2024
32cbd3e
feat: resolving comments on the pr
Jun 21, 2024
de744a0
feat:changes as per pr comment
Jun 21, 2024
e574894
feat:removed unused code and created only one route
Jun 22, 2024
a1dd8b0
feat:removed unused code
Jun 22, 2024
e381270
feat:changes as per pr review
Jun 22, 2024
822bf81
feat:minor changes
Jun 23, 2024
76b44f7
feat:changes as per pr review
Jun 23, 2024
93e61ef
feat:changes as per pr review
Jun 23, 2024
2ee7dbd
Merge pull request #169 from shikshalokam/kt-task/userOverview
ankit1shahu Jun 23, 2024
411331f
feat:cosmetic change usersProject/userProject to userProject/project
Jun 24, 2024
140b630
feat:cosmetic change usersProject/userProject to userProject/overview
Jun 24, 2024
40fc6e8
Merge branch 'master' of https://github.com/shikshalokam/ml-projects-…
Jun 24, 2024
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
25 changes: 24 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,27 @@ KAFKA_URL = "172.31.0.4:9092"
KAFKA_GROUP_ID = "projects" // Kafka group id

# SUBMISSION TOPIC
SUBMISSION_TOPIC = "dev.sl.projects.submissions" // Kafka topic name for pushing projects submissions
SUBMISSION_TOPIC = "dev.sl.projects.submissions" // Kafka topic name for pushing projects submissions
PROJECT_SUBMISSION_TOPIC = "dev.sl.projects.submissions" // project submission topic

# SUNBIRD LOCATION AND USER READ
USER_SERVICE_URL = "http://user-service:3000" // service used for user profile read location search are using this base url

#service name
SERVICE_NAME = ml-project-service // ml-project service name

# sunbird-rc service
CERTIFICATE_SERVICE_URL = http://registry-service:8081 // sunbird-RC registry service URL

PROJECT_CERTIFICATE_ON_OFF = "ON/OFF" // Project certificate enable or disable flag

USER_DELETE_ON_OFF = ON/OFF // enable/disable user delete flow

USER_DELETE_TOPIC = {{env_name}}.delete.user // Topic name for user delete event consumer

ID = ID = {{env_name}}.{{sunbird_instance}}.ml.core.service // ID of service

TELEMETRY_ON_OFF = ON/OFF // telemetry service on off

TELEMETRY_TOPIC = {{env_name}}.telemetry.raw // Topic name for telemetry

36 changes: 36 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@

# Description
These recommendations are intended to promote code quality and team communication during software development. They cover a variety of topics, including ensuring that pull requests are submitted to the correct branch, documenting new methods, preserving consistency across many services, and avoiding typical blunders like accessing APIs or DB queries within loops. Sensitive data should not be uploaded, and changes to environment variables or database models should be executed consistently. Teams may work more effectively and develop higher-quality software by adhering to these standards.


## Type of change
Please choose appropriate options.

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Enhancement (additive changes to improve performance)
- [ ] This change requires a documentation update

## Checklist

- [ ] It's critical to avoid making needless file modifications in contributions, such as adding new lines, console logs, or additional spaces, to guarantee cleaner and more efficient code. Furthermore, eliminating unnecessary imports from a file might enhance code readability and efficiency.
- [ ] Ensure that the pull request is assigned to the right base branch and that the development branch name contains the JIRA Task Id. Furthermore, each commit message should include the JIRA Task Id in the manner "ED-100: message".
- [ ] Only update packages if it is mentioned and authorized in the design document, and make sure that you have the required permissions.
- [ ] Avoid making API and database queries inside a loop as it can lead to performance issues and slow down the system.
- [ ] When calling another function inside a given function, add comments explaining the purpose and meaning of the passed arguments and expected return values.
- [ ] If adding a blank argument in a function, add a comment explaining the reason for the blank argument.
- [ ] Before submitting a pull request, do a self-review of your code to ensure there are no conflicts with the base branch and all comments have been addressed.
- [ ] Before merging a pull request, it's important to have other team members review it to catch any potential errors or issues
- [ ] To maintain code integrity, it's important to remove all related changes when removing code during a code review.
- [ ] If new constants, endpoints, or utility functions are introduced, it is important to check if they already exist in the service to avoid any duplication.
- [ ] Whenever a new environment variable is added to a service, it's important to ensure that the necessary changes are made to related files such as ".env.sample" and "envVariables.js" to maintain consistency and avoid errors. Additionally, the new environment variable should be added to the devops repository to ensure that it is properly documented and accessible to the team.
- [ ] When adding a new function to a service, it is important to document it with relevant information such as the name, parameters, and return value in a consistent format across all services. Additionally, if there are any changes to the API response, ensure that the documentation in the controllers is updated accordingly.
- [ ] Write a clear and concise commit message that describes the changes made.
- [ ] Maintain consistent function signature and code across all services when adding a function to multiple services. Implement changes to database models in all services that use the same model.
- [ ] Use only let and const. Do not use var.
- [ ] Make common functions for repetitive code blocks.
- [ ] Avoid uploading sensitive information such as secret tokens or passwords in pull requests to ensure data security.
- [ ] Maintain consistent indentation and spacing throughout the code.


3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,6 @@ config/credentials/*
*.DS_Store

package-lock.json
keycloak-public-keys/

.dcignore
72 changes: 72 additions & 0 deletions DBSchema/certificateTemplates.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"_id" : "637cb340261b7c0008253fa6",
"status" : "active",
"deleted" : false,
"criteria" : {
"validationText" : "Complete validation message",
"expression" : "C1&&C2&&C3",
"conditions" : {
"C1" : {
"validationText" : "Project Should be submitted within program Enddate",
"expression" : "C1&&C2",
"conditions" : {
"C1" : {
"scope" : "project",
"key" : "status",
"operator" : "==",
"value" : "submitted"
},
"C2" : {
"scope" : "project",
"key" : "completedDate",
"operator" : "<",
"value" : "15-08-2022"
}
}
},
"C2" : {
"validationText" : "Evidence project level validation",
"expression" : "C1",
"conditions" : {
"C1" : {
"scope" : "project",
"key" : "attachments",
"function" : "count",
"filter" : {
"key" : "type",
"value" : "all"
},
"operator" : ">",
"value" : 1
}
}
},
"C3" : {
"validationText" : "Evidence task level validation",
"expression" : "C1",
"conditions" : {
"C1" : {
"scope" : "task",
"key" : "attachments",
"function" : "count",
"filter" : {
"key" : "type",
"value" : "all"
},
"operator" : ">",
"value" : 1
}
}
}
}
},
"issuer" : {
"name" : "Gujarat"
},
"solutionId" : "5ff9dc1b9259097d48017bbe",
"programId" : "605083ba09b7bd61555580fb",
"updatedAt" : "2022-11-22T11:37:37.495+0000",
"createdAt" : "2022-11-22T11:32:16.639+0000",
"__v" : 0,
"templateUrl" : "certificateTemplates/637cb340261b7c0008253fa6/ba9aa220-ff1b-4717-b6ea-ace55f04fc16_22-10-2022-1669117057492.svg"
}
16 changes: 16 additions & 0 deletions DBSchema/programUsers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"_id": "645358eb6144f31d8e8fcef4",
"programId": "5f75b90454670074deacf087",
"userId": "f5591238-63c8-4716-a1c9-27c18a32a4d4",
"__v": 0,
"createdAt": "2023-05-04T07:04:11.874Z",
"resourcesStarted": false,
"updatedAt": "2023-05-04T07:04:11.874Z",
"userProfile": null,
"userRoleInformation": {
"role": "HM",
"state": "db331a8c-b9e2-45f8-b3c0-7ec1e826b6df",
"district": "1dcbc362-ec4c-4559-9081-e0c2864c2931",
"school": "c5726207-4f9f-4f45-91f1-3e9e8e84d824"
}
}
90 changes: 90 additions & 0 deletions DBSchema/programs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
[
{
"_id":"5f34e44681871d939950bca6",
"resourceType":[
"Program"
],
"language":[
"English"
],
"keywords":[
"keywords 1",
"keywords 2"
],
"concepts":[

],
"createdFor":[
"01235953109336064029450"
],
"components":[
"5f34e44681871d939950bca7"
],
"isAPrivateProgram":false,
"rootOrganisations":[
"01235953109336064029450"
],
"deleted":false,
"externalId":"TN-Program-1597301830708",
"name":"TN-Program",
"description":"TN01-Mantra4Change-APSWREIS School Leader Feedback",
"owner":"140558b9-7df4-4993-be3c-31eb8b9ca368",
"createdBy":"140558b9-7df4-4993-be3c-31eb8b9ca368",
"updatedBy":"140558b9-7df4-4993-be3c-31eb8b9ca368",
"status":"active",
"imageCompression":{
"quality":10
},
"updatedAt":"2020-08-13T06:57:10.710+0000",
"createdAt":"2020-08-13T06:57:10.710+0000",
"__v":0
},
{
"_id":"5f35044f19377eecddb06921",
"resourceType":[
"Program"
],
"language":[
"English"
],
"keywords":[
"keywords 1",
"keywords 2"
],
"concepts":[

],
"createdFor":[
"0123221617357783046602"
],
"components":[
"5f35044f19377eecddb06922",
"5f3bc2d86ba5e3ecd7a42231",
"5f3bc2f16ba5e3ecd7a42233",
"5f3bc30a6ba5e3ecd7a42235",
"5f3bc31d6ba5e3ecd7a42237",
"5f3bc3306ba5e3ecd7a42239",
"5f3bc3456ba5e3ecd7a4223b",
"5f3bc38219377eecddb0695a",
"5f9f097cd1b9b71dbfed5f46"
],
"isAPrivateProgram":true,
"rootOrganisations":[
"0123221617357783046602"
],
"deleted":false,
"externalId":"Test Program-1597310031178",
"name":"Test Program",
"description":"Test - Mantra4Change-APSWREIS School Leader Feedback",
"owner":"86d2d978-5b20-4453-8a76-82b5a4c728c9",
"createdBy":"86d2d978-5b20-4453-8a76-82b5a4c728c9",
"updatedBy":"86d2d978-5b20-4453-8a76-82b5a4c728c9",
"status":"active",
"imageCompression":{
"quality":10
},
"updatedAt":"2020-08-13T09:13:51.180+0000",
"createdAt":"2020-08-13T09:13:51.180+0000",
"__v":0
}
]
46 changes: 46 additions & 0 deletions DBSchema/projectTemplateTasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
[
{
"_id": "5fd244911233354b094f16e4",
"createdBy": "140558b9-7df4-4993-be3c-31eb8b9ca368",
"updatedBy": "140558b9-7df4-4993-be3c-31eb8b9ca368",
"isDeleted": false,
"taskSequence": [],
"children": [],
"visibleIf": [],
"hasSubTasks": false,
"learningResources": [],
"deleted": false,
"type": "simple",
"projectTemplateId": "5fd21654e4d17b4af8aa6fa0",
"name": "Start planning the fest or cultural programme.",
"externalId": "IMP-3147bk-TASK5",
"description": "",
"updatedAt": "2020-12-10T15:53:53.016+0000",
"createdAt": "2020-12-10T15:53:53.016+0000",
"__v": 0,
"isDeletable": true,
"projectTemplateExternalId": "IMP-3147bk"
},
{
"_id": "5fd244911233354b094f16e5",
"createdBy": "140558b9-7df4-4993-be3c-31eb8b9ca368",
"updatedBy": "140558b9-7df4-4993-be3c-31eb8b9ca368",
"isDeleted": false,
"taskSequence": [],
"children": [],
"visibleIf": [],
"hasSubTasks": false,
"learningResources": [],
"deleted": false,
"type": "simple",
"projectTemplateId": "5fd21654e4d17b4af8aa6fa0",
"name": "Find trainers who can volunteer their time to help students practise.",
"externalId": "IMP-3147bk-TASK6",
"description": "",
"updatedAt": "2020-12-10T15:53:53.019+0000",
"createdAt": "2020-12-10T15:53:53.019+0000",
"__v": 0,
"isDeletable": true,
"projectTemplateExternalId": "IMP-3147bk"
}
]
65 changes: 65 additions & 0 deletions DBSchema/projectTemplates.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
[
{
"_id": "5fcf9954546a92494f2e587c",
"title": "test",
"externalId": "5bd5c4a6-0ccc-41fe-9633-d61ed5378a77",
"categories": [],
"duration": {
"value": "1W",
"label": "1 Week"
},
"difficultyLevel": {
"value": "B",
"label": "Basic"
},
"description": "test",
"concepts": [""],
"keywords": [""],
"status": "published",
"isDeleted": false,
"recommendedFor": [],
"tasks": [],
"createdAt": "2020-12-08T15:18:44+00:00",
"updatedAt": "2022-11-25T05:48:13.665+0000",
"createdBy": "SYSTEM",
"updatedBy": null,
"learningResources": [],
"isReusable": true,
"entityType": [],
"taskSequence": [],
"metaInformation": {
"supportingDocuments": [""],
"primaryAudience": [""]
}
},
{
"_id": "5fcf9954546a92494f2e587f",
"title": "Vidyagama facilitation project",
"externalId": "da9f31a1-dc9d-4665-9af4-d023258dc558",
"categories": [],
"duration": {
"value": "1W",
"label": "1 Week"
},
"difficultyLevel": {
"value": "B",
"label": "Basic"
},
"description": "Support HMs and teachers by identifying common good practices and challenges with respect to Vidyagama",
"concepts": [],
"keywords": [""],
"status": "published",
"isDeleted": false,
"recommendedFor": [],
"tasks": ["5fcf9954546a92494f2e587d", "5fcf9954546a92494f2e587e"],
"createdAt": "2020-12-08T15:18:44+00:00",
"updatedAt": "2020-12-08T15:18:44+00:00",
"createdBy": "SYSTEM",
"updatedBy": "SYSTEM",
"learningResources": [],
"isReusable": true,
"entityType": [],
"taskSequence": ["5fcf9954546a92494f2e587d", "5fcf9954546a92494f2e587e"],
"metaInformation": {}
}
]
Loading