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

June15 pilot #236

Merged
merged 623 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
623 commits
Select commit Hold shift + click to select a range
7e29133
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into c…
Dhanashree-Patil95 Apr 19, 2024
e7d8e68
Fix[applied authguard]
Dhanashree-Patil95 Apr 19, 2024
caed0fc
Fix[Fix Mark and update attendance API due to change in search API]
Dhanashree-Patil95 Apr 19, 2024
8e3e0f7
Merge pull request #127 from Dhanashree-Patil95/MarkAttendance
vijaykhollam Apr 19, 2024
d1d6d54
Merge pull request #125 from Dhanashree-Patil95/changes
vijaykhollam Apr 20, 2024
d886e70
Cohort Member: Swagger & search API changes
apurvaubade Apr 20, 2024
1ea8cc4
add
Sourav-Tekdi Apr 20, 2024
7bc61b6
add
Sourav-Tekdi Apr 20, 2024
95f869f
resolved conflict
Sourav-Tekdi Apr 20, 2024
dbf4c05
remove commented code
apurvaubade Apr 22, 2024
bc314e0
Merge pull request #121 from apurvaubade/new
vijaykhollam Apr 22, 2024
a399964
COHORT: Search api changes
Sourav-Tekdi Apr 22, 2024
a7faff3
add
Sourav-Tekdi Apr 22, 2024
a0ea333
add
Sourav-Tekdi Apr 22, 2024
48c5fb3
remove comented code
Sourav-Tekdi Apr 22, 2024
e7e18ce
comment remove
Sourav-Tekdi Apr 22, 2024
4bda4b6
remove comented code
Sourav-Tekdi Apr 22, 2024
89ad0bd
Fix[changes for swagger]
Dhanashree-Patil95 Apr 23, 2024
5ddc00f
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into s…
Sourav-Tekdi Apr 24, 2024
0275f74
Merge pull request #128 from souravbhowmik1999/searchCohrtChanges
vijaykhollam Apr 24, 2024
7a7f54c
Fix[Privilege Create API]
Dhanashree-Patil95 Apr 24, 2024
19db470
add
Sourav-Tekdi Apr 24, 2024
f23176b
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into d…
Sourav-Tekdi Apr 24, 2024
7a53602
Fix[Role create API]
Dhanashree-Patil95 Apr 24, 2024
b707134
COHORT: Delete API changes
Sourav-Tekdi Apr 24, 2024
02f49c7
COHORT: Delete API changes
Sourav-Tekdi Apr 24, 2024
ec1c194
Fix[route name change]
Dhanashree-Patil95 Apr 24, 2024
02a498e
Fix[Added error handling for checkTenantID method ]
Dhanashree-Patil95 Apr 24, 2024
8449b62
Merge pull request #130 from Dhanashree-Patil95/roleNew
vijaykhollam Apr 24, 2024
09abc3f
update cohort sattus
Sourav-Tekdi Apr 24, 2024
98227ae
Merge pull request #129 from Dhanashree-Patil95/rback
vijaykhollam Apr 25, 2024
b02cb78
Task #217036: Create Assign Privilege API
Shubham4026 Apr 25, 2024
32543f1
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into b…
Shubham4026 Apr 25, 2024
f64830d
Privilege:Delete privilege API
apurvaubade Apr 25, 2024
13e19ee
Merge pull request #132 from apurvaubade/latest
vaivk369 Apr 25, 2024
e138505
Fix[API to get list of privileges for a role of a tenant , swagger ch…
Dhanashree-Patil95 Apr 25, 2024
efa3803
Fix[role dto changes]
Dhanashree-Patil95 Apr 25, 2024
ad56aea
Pull changes
Dhanashree-Patil95 Apr 25, 2024
1783fd0
Fix[changes suggested by bot]
Dhanashree-Patil95 Apr 25, 2024
e95d67c
Assign Role: assign roles to a user in a tenant
Sourav-Tekdi Apr 25, 2024
9dd9fed
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into u…
Sourav-Tekdi Apr 25, 2024
99aadda
Merge pull request #135 from souravbhowmik1999/userRoleMapping
vaivk369 Apr 26, 2024
086ec75
Merge pull request #133 from Dhanashree-Patil95/routrNew
vaivk369 Apr 26, 2024
abb8076
Merge pull request #131 from souravbhowmik1999/deleteCohot
vaivk369 Apr 26, 2024
a2118ac
Task #218126: Create Role Search API
Shubham4026 Apr 26, 2024
ecc05a3
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into b…
Shubham4026 Apr 26, 2024
e7a1c7a
Merge pull request #136 from Shubham4026/backend_features
vaivk369 Apr 26, 2024
1f5588c
Role:Delete Role API
apurvaubade Apr 26, 2024
fca810d
Merge pull request #138 from apurvaubade/DeleteRole_new
vaivk369 Apr 26, 2024
521ca17
UserRole:Delete Userrole API
apurvaubade Apr 26, 2024
9b53884
Merge pull request #139 from apurvaubade/DeleteRole_new
vaivk369 Apr 26, 2024
799345e
Task #218147 feat : created RBAC module for token generation
Xitija Apr 26, 2024
0afdfb8
Task #218147 feat : added rbac guard and strategy
Xitija Apr 26, 2024
cb1ae7e
Task #218147 feat : added rbac guard to api
Xitija Apr 26, 2024
3d85dfd
Task #218147 chore : added more data to decoded token
Xitija Apr 26, 2024
5444068
Task #218147 chore : added actual user data to token
Xitija Apr 26, 2024
8e48272
Task #218147 feat : checked iss and aud valid
Xitija Apr 26, 2024
2b32055
Merge pull request #140 from Xitija/Shiksha-2.0
vaivk369 Apr 29, 2024
e5b7ed3
Task #218126 fix:Update Get Privilge Query to Take Multiple Role IDs
Shubham4026 Apr 29, 2024
ac64a75
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into b…
Shubham4026 Apr 29, 2024
16cc557
Merge pull request #141 from Shubham4026/backend_features
vijaykhollam Apr 29, 2024
b73d678
Fix[Bulk attendance fix]
Dhanashree-Patil95 Apr 29, 2024
46009fa
Fix[dto fix]
Dhanashree-Patil95 Apr 29, 2024
062e9d8
Merge pull request #142 from Dhanashree-Patil95/change
vijaykhollam Apr 29, 2024
53a8f41
Task #218147 refactor : modified find priviledge method
Xitija Apr 29, 2024
65bc1a5
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into S…
Xitija Apr 29, 2024
27de8a9
user tenent mapping
Sourav-Tekdi Apr 30, 2024
a5c41d8
Task #218350 : Create token as per tenant Id
Xitija Apr 30, 2024
6e72e51
Task #218350 : chore - removed unwanted console log
Xitija Apr 30, 2024
ee85332
Merge pull request #143 from Xitija/Shiksha-2.0
vijaykhollam Apr 30, 2024
16b1839
Cohort managenet: Minor validation changes
Sourav-Tekdi May 1, 2024
546b458
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into c…
Sourav-Tekdi May 1, 2024
093cd07
Change the validator for the status property from IsString to IsBoolean
Sourav-Tekdi May 2, 2024
ca3f49a
Correct the type of the filters property to setFilters for better typ…
Sourav-Tekdi May 2, 2024
0cdba9b
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into u…
Sourav-Tekdi May 2, 2024
953217f
Jira Tusk #PS-267 API to map a user to multiple tenants
Sourav-Tekdi May 2, 2024
7a68a84
Resolve PR chnages
Sourav-Tekdi May 3, 2024
b036a6a
Resolve PR chnages
Sourav-Tekdi May 3, 2024
c1a0ae9
Resolve PR chnages
Sourav-Tekdi May 3, 2024
e6242c2
Resolve PR chnages
Sourav-Tekdi May 3, 2024
9d39fb2
Resolve PR chnages
Sourav-Tekdi May 3, 2024
c202df5
Fix[attendance list API ]
Dhanashree-Patil95 May 6, 2024
8fda1b4
Dto class name changes
Sourav-Tekdi May 7, 2024
57ba955
Merge pull request #147 from souravbhowmik1999/userTenantMapping
vaivk369 May 7, 2024
8fb8e3c
Task #218686 refactor findUserDetails to get tenants associated with …
Sourav-Tekdi May 7, 2024
c640485
Task #218686 refactor findUserDetails to get tenants associated with …
Sourav-Tekdi May 7, 2024
405f8ab
veriable name changes
Sourav-Tekdi May 7, 2024
bf51aa0
Merge pull request #148 from Dhanashree-Patil95/change
vaivk369 May 7, 2024
0659a4b
Merge pull request #146 from souravbhowmik1999/cohortMemberMinorChanges
vaivk369 May 7, 2024
f5f79a6
Issue #0 fix: error while compiling 'in-memory-faceted-search' module…
vaivk369 May 7, 2024
743d3ab
Merge pull request #150 from vaivk369/vk-2.0
vaivk369 May 7, 2024
427b71c
Fix[Mark and update attendance change with additional column scope]
Dhanashree-Patil95 May 7, 2024
c9f7f7f
Fix[Set default limit for attendance search to 20]
Dhanashree-Patil95 May 8, 2024
ab19d60
Fix[attendance enum change]
Dhanashree-Patil95 May 8, 2024
19040ff
query changes
Sourav-Tekdi May 8, 2024
994f5cc
update user api
Sourav-Tekdi May 8, 2024
faafadc
filter Changes
Sourav-Tekdi May 8, 2024
62cd67c
Merge pull request #149 from souravbhowmik1999/setValudation
vaivk369 May 8, 2024
4eecd27
Task #218277 : feat - added permission decorator
Xitija May 8, 2024
08dd2b6
Task #218277 : feat - addded rbac strategy and guard
Xitija May 8, 2024
4886164
Task #218763 - fix: issue for user Auth API
Xitija May 8, 2024
d058282
Merge pull request #151 from Dhanashree-Patil95/change
vaivk369 May 8, 2024
68d79e7
chore: uncommented role auth guard
Xitija May 8, 2024
f4ea75d
Merge pull request #152 from Xitija/Shiksha-2.0
vaivk369 May 9, 2024
a2b04f1
Task:PS-338-chore[change in response structure for list API]
Dhanashree-Patil95 May 9, 2024
6800b22
Merge pull request #153 from Dhanashree-Patil95/change
vaivk369 May 9, 2024
85fef88
Task #218845 : chore - added error handling and validation to rbac to…
Xitija May 9, 2024
af6777f
Task #218845 : chore - removed console logs
Xitija May 9, 2024
8f5f979
Task #218845 : refactor - RBAC token to reduce size
Xitija May 9, 2024
3c47b72
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into S…
Xitija May 9, 2024
35152a2
response body changes
Sourav-Tekdi May 10, 2024
6853810
response body changes
Sourav-Tekdi May 10, 2024
a285e14
Merge pull request #155 from souravbhowmik1999/responceBody
vijaykhollam May 10, 2024
4556651
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into S…
Xitija May 10, 2024
64ee1b3
Task #218848: feat - config List for privileges
Xitija May 10, 2024
a8a2bb3
Merge pull request #154 from Xitija/Shiksha-2.0
vaivk369 May 10, 2024
2a6c57a
Task #216365 fix: Added Email Support in Create Users API and Updated…
Shubham4026 May 10, 2024
ad295c2
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into s…
Shubham4026 May 10, 2024
d50c0bd
Merge pull request #157 from Shubham4026/sprint4_features
vaivk369 May 10, 2024
0810526
User: Editable fields show and update
Sourav-Tekdi May 11, 2024
4e7367f
JIRA PS-371 User create wrapper API - mapping user to tenanat with ro…
Sourav-Tekdi May 14, 2024
cfebee9
remove commented code
Sourav-Tekdi May 14, 2024
295de9c
Task:PS-408 Attendance:Added sort functionality to data from attendan…
Dhanashree-Patil95 May 15, 2024
2a2e486
Merge pull request #159 from souravbhowmik1999/removeRoleFromUser
vaivk369 May 15, 2024
4e9e72e
Merge pull request #161 from Dhanashree-Patil95/change
vaivk369 May 15, 2024
db8406d
Task PS-378 FieldValues: Support to store multiple selected values fr…
Sourav-Tekdi May 15, 2024
07b65dc
Task PS-408Attendance: Chore [Fixed "toDate" and "fromDate" filter]
Dhanashree-Patil95 May 15, 2024
3291ed1
add
Sourav-Tekdi May 15, 2024
106b62b
add
Sourav-Tekdi May 15, 2024
c1d4e8c
Fix[swagger fix]
Dhanashree-Patil95 May 15, 2024
1e7d27f
Task:PS-372 User: Delete user API- delete user from keycloak,user & r…
apurvaubade May 15, 2024
08a2b5c
Resolve all comments
apurvaubade May 15, 2024
91bc18c
Merge pull request #162 from Dhanashree-Patil95/change
vaivk369 May 15, 2024
29e3112
comment changes
Sourav-Tekdi May 16, 2024
08b239c
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into S…
Sourav-Tekdi May 16, 2024
b94ee72
Merge pull request #163 from souravbhowmik1999/SetfieldValuesInUser
vaivk369 May 16, 2024
bef8dcc
Merge pull request #164 from apurvaubade/DeleteUser
vaivk369 May 16, 2024
6562ff7
PS-369: Added Check Valid Email API
Shubham4026 May 17, 2024
2a0b95a
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into s…
Shubham4026 May 17, 2024
dc747de
Valid Email Check
Shubham4026 May 17, 2024
3581261
Merge pull request #165 from Shubham4026/sprint4_features
vaivk369 May 17, 2024
739eb9d
Cohort Module bug
Sourav-Tekdi May 20, 2024
348b421
add
Sourav-Tekdi May 20, 2024
0fe18df
Uncomment JWT token
Sourav-Tekdi May 20, 2024
4199070
spelling mistakes
Sourav-Tekdi May 21, 2024
fe93942
PS-582 Fix: Fixed Bug of Get User API. REmoved Arraty in case of Chec…
Shubham4026 May 21, 2024
7a44ed3
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into s…
Shubham4026 May 21, 2024
5ee08a8
PS-582 Fix: Added Type Safety.
Shubham4026 May 21, 2024
7fe5054
add
Sourav-Tekdi May 21, 2024
7b71b9e
add
Sourav-Tekdi May 21, 2024
b843c4b
Merge pull request #167 from Shubham4026/sprint4_features
vijaykhollam May 21, 2024
e06022a
add
Sourav-Tekdi May 22, 2024
146eb91
search api changes
Sourav-Tekdi May 23, 2024
0351ca7
Role base field show
Sourav-Tekdi May 23, 2024
a835da4
Merge pull request #171 from souravbhowmik1999/roleBaseGetUserData
vaivk369 May 23, 2024
fb86099
Task #219973: feat : global exception filter for microservice
Xitija May 27, 2024
ebe95e7
User Profile: Set and show order for field values
Sourav-Tekdi May 27, 2024
48ee786
Merge pull request #172 from souravbhowmik1999/orderChanges
vaivk369 May 27, 2024
41e28fe
set message for blank data
Sourav-Tekdi May 27, 2024
d9cc1bb
Merge pull request #166 from souravbhowmik1999/CohortMinorChangesNew
vijaykhollam May 27, 2024
417fe69
add
Sourav-Tekdi May 27, 2024
46e9a56
add
Sourav-Tekdi May 28, 2024
ae58121
add
Sourav-Tekdi May 28, 2024
44140b9
Changed role APIs responses
poojakarma May 28, 2024
2ccfe80
Field Vaue: Required field value in array format
Sourav-Tekdi May 28, 2024
1dede31
Merge pull request #173 from poojakarma/Changes_Responses_of_Role_Apis
vaivk369 May 28, 2024
925913a
Merge pull request #174 from souravbhowmik1999/frontendChangesNew
vaivk369 May 28, 2024
1d7e3ee
feat: modified responses of user
Xitija May 28, 2024
6e5a22f
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into S…
Xitija May 28, 2024
f1213cc
chore : removed console logs
Xitija May 28, 2024
aa822e4
Merge pull request #175 from Xitija/Shiksha-2.0
vaivk369 May 28, 2024
44464b6
PS-634:Task[Changes in respose iof Cohort API]
Dhanashree-Patil95 May 28, 2024
50c17fe
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into r…
Dhanashree-Patil95 May 28, 2024
c9b1637
add
Sourav-Tekdi May 28, 2024
f7d1160
PS-634:chore[Changes in response message ]
Dhanashree-Patil95 May 28, 2024
f4ce508
Changes reponses of Privilege
poojakarma May 28, 2024
a73f4ef
Tusk #PS-665 Cohort Management: Response body changes
Sourav-Tekdi May 29, 2024
75fffd6
resolve conflict
Sourav-Tekdi May 29, 2024
74320c5
Resolved comments
poojakarma May 29, 2024
e0b746e
Merge pull request #177 from poojakarma/Changes_Responses_of_Role_Apis
vaivk369 May 29, 2024
28a8f2b
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into r…
Dhanashree-Patil95 May 29, 2024
a0c8fcb
PS-634:chore-[changes in catch block error message]
Dhanashree-Patil95 May 29, 2024
1ecae10
PS-634:chore-[Added exception filters in controller]
Dhanashree-Patil95 May 29, 2024
701e1b6
Change Responses in UserRole APIS
poojakarma May 29, 2024
f963f80
chore: removed commented code of user-adapter
Xitija May 29, 2024
67a6e17
Merge pull request #176 from Dhanashree-Patil95/responseChange
vaivk369 May 29, 2024
86bc418
confilct resolved
poojakarma May 29, 2024
2e18c63
refactor : added new api responses for assignprivileges
Xitija May 29, 2024
909dcba
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into S…
Xitija May 29, 2024
9fecb40
Merge pull request #180 from Xitija/Shiksha-2.0
vaivk369 May 29, 2024
13315ee
APIID changes
Sourav-Tekdi May 29, 2024
70cac08
conflict resolve
Sourav-Tekdi May 29, 2024
79b7b94
Merge pull request #178 from souravbhowmik1999/ctMbResChanges
vaivk369 May 29, 2024
2515124
Resolved comments
poojakarma May 29, 2024
667a0f6
Merge branch 'Shiksha-2.0' of https://github.com/tekdi/shiksha-backen…
poojakarma May 29, 2024
6fea9fc
Merge pull request #179 from poojakarma/Changes_Responses_of_Role_Apis
vaivk369 May 29, 2024
e2614e5
add
Sourav-Tekdi May 30, 2024
1b1ce23
PS-547 Masked PI data in the user table and columns
Sourav-Tekdi May 30, 2024
e597f79
Task #220234 : chore - Changed responses of user tenant mapping
Xitija May 30, 2024
8975870
Task #220234 : chore - minor changes
Xitija May 30, 2024
d4cd71c
Task #220234 : chore - minor changes for user tenant mapping
Xitija May 30, 2024
e887794
show field name
Sourav-Tekdi May 30, 2024
7aa43a0
resolve comments
Sourav-Tekdi May 30, 2024
0e8a3b9
Merge pull request #182 from souravbhowmik1999/MaskingSet
vijaykhollam May 30, 2024
44b3484
Revert "Task #PS-726 & PS-730 Masked PI data in the user table and co…
vaivk369 May 30, 2024
584a94b
Merge pull request #184 from tekdi/revert-182-MaskingSet
vaivk369 May 30, 2024
054119d
Task #220234 : chore - Changed responses of fields APIs mapping
Xitija May 30, 2024
8b0045d
conclude-merge
Xitija May 30, 2024
0c680ad
Merge pull request #185 from Xitija/Shiksha-2.0
vaivk369 May 30, 2024
6498654
Task #220234 : chore - minor fix
Xitija May 30, 2024
17b3eb8
Task #220252 : refactor - Update responses for keycloak auth apis
Xitija May 30, 2024
0215c7f
conclude-merge
Xitija May 30, 2024
159f36d
Merge pull request #186 from Xitija/Shiksha-2.0
vaivk369 May 30, 2024
3cd26aa
Issue PS-728 fix: Adeed name data in Custom field Response
Shubham4026 May 31, 2024
879d470
Merge pull request #188 from Shubham4026/sprint6_features
vaivk369 May 31, 2024
3d1d48e
Adding Backend file for Shiksha
AbhilashKD May 31, 2024
f408286
Added the repo for backend
AbhilashKD May 31, 2024
9407125
Create eks-pratham-deployment.yamleks-pratham-deployment.yaml
AbhilashKD May 31, 2024
866be4a
Renamed the EKS file
AbhilashKD May 31, 2024
27d10ef
Removed EKS file
AbhilashKD May 31, 2024
41df3d4
Added EKS file
AbhilashKD May 31, 2024
be96174
Changed the file name
AbhilashKD May 31, 2024
a51e590
Update eks-pratham-deployment.yaml
AbhilashKD May 31, 2024
4a3881c
Update Profile: Store wrong data into database
Sourav-Tekdi Jun 2, 2024
6d39f10
Merge pull request #192 from souravbhowmik1999/fieldValueUpdate
Sourav-Tekdi Jun 2, 2024
d02182e
Issue Fix PS-766: Added DTO validation in Update User API
Shubham4026 Jun 3, 2024
a386751
Merge branch 'Shiksha-2.0' of github.com:tekdi/shiksha-backend into s…
Shubham4026 Jun 3, 2024
4ff47aa
Merge pull request #193 from Shubham4026/sprint6_features
vaivk369 Jun 4, 2024
d0ddc21
Issue PS-770 Feat: Added Logic for fetching state Options .
Shubham4026 Jun 4, 2024
40b499a
Revert "Issue PS-770 Feat: Added Logic for fetching state Options ."
Shubham4026 Jun 4, 2024
2f70a66
Issue PS-766 fix: Added minor chaneg in update DTO.
Shubham4026 Jun 4, 2024
c3520d0
Merge pull request #194 from Shubham4026/sprint6_features
vaivk369 Jun 4, 2024
b7247f8
Update eks-pratham-deployment.yaml
AbhilashKD Jun 5, 2024
6e7696a
Update backend.yaml
AbhilashKD Jun 5, 2024
df13de7
Update eks-pratham-deployment.yaml
AbhilashKD Jun 5, 2024
c720e57
Update eks-pratham-deployment.yaml
AbhilashKD Jun 5, 2024
2c317e3
Cohort: Update Cohort Data
Sourav-Tekdi Jun 5, 2024
94fddfc
Merge pull request #197 from souravbhowmik1999/UserData
Sourav-Tekdi Jun 5, 2024
f546fc8
add
Sourav-Tekdi Jun 5, 2024
c1a4882
add
Sourav-Tekdi Jun 5, 2024
4e8b71e
Merge pull request #199 from souravbhowmik1999/UserData
Sourav-Tekdi Jun 5, 2024
ea3141b
Update backend.yaml
AbhilashKD Jun 7, 2024
eb6a021
Update eks-pratham-deployment.yaml
AbhilashKD Jun 7, 2024
c7766f2
Update eks-pratham-deployment.yaml
AbhilashKD Jun 7, 2024
d306789
auto deploy test
Sourav-Tekdi Jun 11, 2024
1cf279d
Merge pull request #205 from souravbhowmik1999/testPilot-15
vijaykhollam Jun 11, 2024
7c015f7
Update eks-pratham-deployment.yaml
AbhilashKD Jun 11, 2024
32fc88a
User Create: Email Field Optional for User Creation
Sourav-Tekdi Jun 12, 2024
ee17d4d
Merge pull request #206 from souravbhowmik1999/emailValidation
vijaykhollam Jun 12, 2024
d705dbf
Update backend.yaml
AbhilashKD Jun 12, 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
38 changes: 38 additions & 0 deletions .coderabbit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
language: "en"

early_access: false

reviews:
request_changes_workflow: true
high_level_summary: true
poem: false
review_status: true
collapse_walkthrough: false
path_filters:
- "!**/.xml"
path_instructions:
- path: "**/*.js"
instructions: "Review the JavaScript code for conformity with the Google JavaScript style guide, highlighting any deviations."
- path: "**/*.ts"
instructions: |
"Review the JavaScript code for conformity with the Google JavaScript style guide, highlighting any deviations. Ensure that:
- The code adheres to best practices associated with nodejs.
- The code adheres to best practices associated with nestjs framework.
- The code adheres to best practices recommended for performance.
- The code adheres to similar naming conventions for controllers, models, services, methods, variables."
auto_review:
enabled: true
ignore_title_keywords:
- "WIP"
- "DO NOT MERGE"
drafts: false
base_branches:
- "master"
- "dev"
- "feat/*"
- "feat-*"
- "release-*"
- "Shiksha-2.0"

chat:
auto_reply: true
4 changes: 2 additions & 2 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Docker Image CI
name: Docker Image CI

on:
push:
branches: [ main ]
branches: [ oblf-21stFeb ]

jobs:
build:
Expand Down
78 changes: 78 additions & 0 deletions .github/workflows/eks-pratham-deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: Deploy to EKS-Pratham
on:
push:
branches:
- june15-pilot
env:
ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
EKS_CLUSTER_NAME: ${{ secrets.EKS_CLUSTER_NAME }}
AWS_REGION: ${{ secrets.AWS_REGION_NAME }}
jobs:
build:
name: Deployment
runs-on: ubuntu-latest
steps:
- name: Set short git commit SHA
id: commit
uses: prompt/actions-commit-hash@v2
- name: Check out code
uses: actions/checkout@v2
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{env.AWS_REGION}}
- name: Setup Node Env
uses: actions/setup-node@v3
with:
node-version: 21.1.0
- name: Copy .env file
env:
ENV_FILE_CONTENT: ${{ secrets.ENV_FILE_CONTENT }}
run: echo "$ENV_FILE_CONTENT" > manifest/configmap.yaml
- name: Show PWD and list content
run: |
echo "Current Working Directory: pwd"
pwd
ls -ltra
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}
- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
- name: Build, tag, and push image to Amazon ECR
env:
ECR_REGISTRY: ${{ secrets.ECR_REPOSITORY }}
IMAGE_TAG: ${{ secrets.ECR_IMAGE }}
run: |
docker build -t ${{ secrets.ECR_REPOSITORY }}:${{ secrets.IMAGE_TAG }} .
docker push ${{ secrets.ECR_REPOSITORY }}:${{ secrets.IMAGE_TAG }}
- name: Update kube config
run: aws eks update-kubeconfig --name ${{ secrets.EKS_CLUSTER_NAME }} --region ${{ secrets.AWS_REGION_NAME }}
- name: Deploy to EKS
env:
ECR_REGISTRY: ${{ secrets.ECR_REPOSITORY }}
IMAGE_TAG: ${{ secrets.IMAGE_TAG }}
ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
ECR_IMAGE: ${{ secrets.ECR_IMAGE }}
run: |
export ECR_REPOSITORY=${{ secrets.ECR_REPOSITORY }}
export IMAGE_TAG=${{ secrets.IMAGE_TAG }}
export ECR_IMAGE=${{ secrets.ECR_IMAGE }}
envsubst < manifest/backend.yaml > manifest/backend-updated.yaml
cat manifest/backend-updated.yaml
rm -rf manifest/backend-service.yaml
kubectl delete deployment backend
kubectl delete service backend
kubectl delete cm backend-service-config
kubectl apply -f manifest/backend-updated.yaml
kubectl apply -f manifest/configmap.yaml
sleep 10
kubectl get pods
kubectl get services
kubectl get deployment
21 changes: 21 additions & 0 deletions .github/workflows/pratham-qa.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Deploy to QA
on:
push:
branches:
- Shiksha-2.0
jobs:
deploy:
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
-
name: Deploy Stack
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST_NAME_PRATHAM_QA }}
username: ${{ secrets.USERNAME_PRATHAM_QA }}
key: ${{ secrets.EC2_SSH_KEY_PRATHAM_QA }}
port: ${{ secrets.PORT_PRATHAM_QA }}
script: |
cd ${{ secrets.TARGET_DIR_PRATHAM_QA }}
./deploy.sh
42 changes: 42 additions & 0 deletions .github/workflows/prod-oblf.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Deploy to DEV
on:
push:
branches:
- prod-oblf
jobs:
build:
name: Generate Build and Deploy to DEV
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Setup Node Env
uses: actions/setup-node@v3
with:
node-version: 21.1.0

- name: Deploy to Server 1
uses: easingthemes/ssh-deploy@main
env:
SSH_PRIVATE_KEY: ${{ secrets.EC2_SSH_KEY }}
REMOTE_HOST: ${{ secrets.HOST_DNS }}
REMOTE_USER: ${{ secrets.USERNAME_OBLF }}
TARGET: ${{ secrets.TARGET_DIR }}

- name: Set up SSH key
run: |
mkdir -p ~/.ssh
echo "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
# Add the SSH key to the known_hosts file (replace hostname with your actual hostname)
ssh-keyscan -H ${{ secrets.HOST_DNS }} >> ~/.ssh/known_hosts
sudo apt-get install sshpass

- name: Deploy to server
run: |
sshpass -p '${{ secrets.EC2_SSH_KEY }}' ssh -v -o StrictHostKeyChecking=no ${{ secrets.USERNAME_OBLF }}@${{ secrets.HOST_DNS }} <<'ENDSSH'
cd /home/oblf-21Feb/oblf-githubaction-backend
./deploy.sh
ENDSSH

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:21.1.0 as dependencies
FROM node:20 as dependencies
WORKDIR usr/src/app
COPY package*.json ./
RUN npm install
Expand Down
30 changes: 0 additions & 30 deletions Dockerfile1

This file was deleted.

34 changes: 34 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
pipeline {
agent any
stages {
stage('Checkout'){
steps{
cleanWs()
sh 'rm -rf *'
//checkout scmGit(branches: [[name: '*/main']], extensions: [], userRemoteConfigs: [[credentialsId: 'githubtoken', url: 'https://github.com/tekdi/onest.network.backend.git']])
// checkout scmGit(branches: [[name: '*/dev']], extensions: [], userRemoteConfigs: [[credentialsId: 'ONEST-ID', url: 'https://github.com/tekdi/onest.network.backend.git']])
checkout scmGit(branches: [[name: '*/Shiksha-2.0']], extensions: [], userRemoteConfigs: [[credentialsId: 'github-1', url: 'https://github.com/tekdi/shiksha-backend.git']])
}
}

stage ('Build-image') {
steps {
sh 'docker build -t shiksha-backend-2.0 .'
}
}

stage ('Deploy') {
steps {
sh 'docker-compose up -d --force-recreate --no-deps backend'
}
}
post {
stage ('Deploy') {
// Send notification to Slack
slackSend(channel: '#your_channel_name', color: 'good', message: "Build ${currentBuild.result}: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})")
}
}


}
}
30 changes: 0 additions & 30 deletions Jenkinsfile1

This file was deleted.

49 changes: 7 additions & 42 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,11 @@
version: '3.7'
version: "3.6"

services:
main:
container_name: shiksha-backend
build:
context: .
target: development
volumes:
- .:/usr/src/app
- /usr/src/app/node_modules
backend:
image: shiksha-backend-2.0
container_name: "shiksha-backend-2.0"
restart: always
ports:
- ${SERVER_PORT}:${SERVER_PORT}
- 9229:9229
command: yarn run start:dev
- 3000:3000
env_file:
- .env
networks:
- webnet
restart: always
# depends_on:
# - redis
# - postgres
# redis:
# container_name: redis
# image: redis:5
# networks:
# - webnet
# postgres:
# container_name: postgres
# image: postgres:11
# networks:
# - webnet
# environment:
# POSTGRES_PASSWORD: ${DB_PASSWORD}
# POSTGRES_USER: ${DB_USERNAME}
# POSTGRES_DB: ${DB_DATABASE_NAME}
# PG_DATA: /var/lib/postgresql/data
# ports:
# - 5432:5432
# volumes:
# - pgdata:/var/lib/postgresql/data
networks:
webnet:
# volumes:
# pgdata:
- /home/ubuntu-backend-shiksha2.0/.env
44 changes: 44 additions & 0 deletions manifest/backend.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
apiVersion: apps/v1
kind: Deployment
metadata:
creationTimestamp: null
labels:
app: backend
name: backend
spec:
replicas: 1
selector:
matchLabels:
app: backend
strategy: {}
template:
metadata:
creationTimestamp: null
labels:
app: backend
spec:
containers:
- image: ${ECR_REPOSITORY}:${IMAGE_TAG}
imagePullPolicy: ""
name: backend-pratham
ports:
- containerPort: 3000
envFrom:
- configMapRef:
name: backend-service-config
resources: {}
restartPolicy: Always
status: {}

---
apiVersion: v1
kind: Service
metadata:
name: backend
spec:
type: ClusterIP
ports:
- port: 3000
protocol: TCP
selector:
app: backend
Loading
Loading