Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
689075c
Merge branch 'main' of github.com:tekdi/user-microservice into main
Shubham4026 Jan 24, 2025
e07418f
Merge branch 'release-1.0.0' of github.com:tekdi/user-microservice in…
Shubham4026 Jan 24, 2025
ff75ac3
Merge branch 'release-1.0.0' of github.com:tekdi/user-microservice in…
Shubham4026 Jan 24, 2025
d7a83bc
Merge remote-tracking branch 'origin/release-1.0.1' into main
Shubham4026 Apr 8, 2025
f26d409
Merge branch 'release-1.0.1' of github.com:tekdi/user-microservice in…
Shubham4026 Apr 9, 2025
83cce4f
Merge pull request #232 from tekdi/release-1.0.1
snehal0904 Apr 10, 2025
62fbf7e
Merge pull request #242 from tekdi/sdbv_rbac_changes
Shubham4026 Apr 17, 2025
106baa4
Merge pull request #244 from tekdi/sdbv_rbac_changes
Shubham4026 Apr 22, 2025
3ab7e22
Merge pull request #267 from tekdi/sdbv_rbac_changes
Shubham4026 May 5, 2025
793b0b6
Merge branch 'release-1.0.1' of github.com:tekdi/user-microservice in…
Shubham4026 May 5, 2025
fb43151
Update user-adapter.ts
Shubham4026 May 6, 2025
0e9d5a7
Merge branch 'main' of github.com:tekdi/user-microservice into main
Shubham4026 May 6, 2025
f0b1f55
Merge pull request #268 from tekdi/release-1.0.1
Shubham4026 May 6, 2025
e826620
Merge branch 'main' of github.com:tekdi/user-microservice into main
Shubham4026 May 6, 2025
7cd6e58
remove otp send on email
May 7, 2025
4a85ead
Remove Send OTP from reate user
May 7, 2025
9b42ac2
Merge pull request #269 from Sourav-Tekdi/userServiceIssue
Shubham4026 May 7, 2025
d84958a
Merge pull request #270 from tekdi/sdbv_rbac_changes
Shubham4026 May 7, 2025
31120dc
Merge pull request #271 from tekdi/release-1.0.1
Shubham4026 May 7, 2025
fc4290b
Merge branch 'main' of github.com:tekdi/user-microservice into main
Shubham4026 May 7, 2025
af23322
Assign Enrolment ID to Each User
May 9, 2025
3d51d58
Merge pull request #272 from Sourav-Tekdi/enrolmentId
Shubham4026 May 9, 2025
07749e5
Add createdAt Field to User Read API Output
May 23, 2025
e70e1da
Merge pull request #286 from Sourav-Tekdi/createdAtNew
Shubham4026 May 23, 2025
3183810
msg91 Key support
Shubham4026 May 27, 2025
d50698c
Merge pull request #290 from Shubham4026/user_local
Shubham4026 May 27, 2025
1b80d2e
Update user-adapter.ts
Shubham4026 May 27, 2025
dabc00f
Merge pull request #295 from tekdi/sdbv_rbac_changes
Shubham4026 May 28, 2025
43ee2ab
Merge branch 'main' of github.com:tekdi/user-microservice into main
Shubham4026 May 28, 2025
eea7d92
Update Prod-Deployment.yaml
AbhilashKD Jun 4, 2025
dacd7fb
Update Prod-Deployment.yaml
AbhilashKD Jun 4, 2025
a39dc8f
Added AWS support for SMS
Shubham4026 Jun 11, 2025
d853eff
Merge branch 'main' of github.com:tekdi/user-microservice into main
Shubham4026 Jun 11, 2025
5e1b908
Academic Year chaanges in team leader
Shubham4026 Jun 13, 2025
bec4e08
Merge branch 'sdbv_rbac_changes' of github.com:tekdi/user-microservic…
Shubham4026 Jun 13, 2025
88994e6
Merge pull request #323 from Shubham4026/user_local
Shubham4026 Jun 13, 2025
3606339
Merge pull request #324 from tekdi/sdbv_rbac_changes
Shubham4026 Jun 13, 2025
45ee6d3
Merge branch 'main' of github.com:tekdi/user-microservice into main
Shubham4026 Jun 13, 2025
d7ad8e5
Set event Type
Jun 16, 2025
94c1fc6
Merge pull request #331 from Sourav-Tekdi/formChangesNew
Shubham4026 Jun 16, 2025
eb376d2
Update made for Cohort Change kafka
Shubham4026 Jun 19, 2025
faaf8fe
Merge pull request #337 from Shubham4026/user_local
Shubham4026 Jun 19, 2025
a4690c1
Merge branch 'sdbv_rbac_changes' of github.com:tekdi/user-microservic…
Shubham4026 Jun 19, 2025
c60c7fb
Merge pull request #338 from tekdi/main
Shubham4026 Jun 19, 2025
7df3596
Create kafka topic
Jun 23, 2025
521ab58
Merge pull request #347 from Sourav-Tekdi/cohort_changes
Shubham4026 Jun 23, 2025
76458d4
add ui configuration
Jun 24, 2025
232197f
add params on tenant creation
Jun 24, 2025
c8005af
Merge pull request #350 from tekdi/sdbv_rbac_changes
Shubham4026 Jun 24, 2025
43759d2
add
Jun 25, 2025
ae348fc
Merge pull request #349 from Sourav-Tekdi/uiConfigNew
Shubham4026 Jun 26, 2025
b565521
Cohort Changes for Kafka
Shubham4026 Jun 28, 2025
361e439
Merge pull request #363 from Shubham4026/user_local
Shubham4026 Jun 30, 2025
09421fd
Merge pull request #365 from tekdi/sdbv_rbac_changes
Shubham4026 Jun 30, 2025
c62bad3
Added Log for Create User an Dynamic Log generation
Shubham4026 Jul 7, 2025
f3d8906
Merge branch 'sdbv_rbac_changes' of github.com:tekdi/user-microservic…
Shubham4026 Jul 7, 2025
f1df8b5
Merge pull request #373 from Shubham4026/user_local
Shubham4026 Jul 7, 2025
952e831
Merge pull request #375 from tekdi/sdbv_rbac_changes
Shubham4026 Jul 8, 2025
9107ea2
Log File check
Shubham4026 Jul 7, 2025
d63bfd7
Added Perfomance Checka and Bottleneck removal
Shubham4026 Jul 8, 2025
2bfee6f
Merge pull request #378 from Shubham4026/user_local
Shubham4026 Jul 8, 2025
bae8d7d
Merge pull request #379 from Shubham4026/user_local
Shubham4026 Jul 8, 2025
1088c2a
Time logging
Shubham4026 Jul 8, 2025
11f1f7b
Merge pull request #381 from Shubham4026/user_local
Shubham4026 Jul 8, 2025
08c2939
DB connection Increased
Shubham4026 Jul 9, 2025
584babf
Merge pull request #383 from Shubham4026/user_local
Shubham4026 Jul 9, 2025
d74980f
Merge pull request #380 from tekdi/sdbv_rbac_changes
Shubham4026 Jul 9, 2025
1c3bd61
Removed Unused Logs and No logs for file
Shubham4026 Jul 10, 2025
a1324d6
Merge branch 'sdbv_rbac_changes' of github.com:tekdi/user-microservic…
Shubham4026 Jul 10, 2025
0dc8179
Merge pull request #386 from Shubham4026/user_local
Shubham4026 Jul 10, 2025
b433466
Merge pull request #387 from Shubham4026/user_local
Shubham4026 Jul 11, 2025
f672902
Kafka changes
Jul 11, 2025
2f4b295
Merge pull request #388 from Sourav-Tekdi/kafka_changes
Shubham4026 Jul 11, 2025
0e10932
Publish Cohort Events Fixed
Shubham4026 Jul 14, 2025
ca3deae
Merge pull request #390 from Shubham4026/user_local
Shubham4026 Jul 14, 2025
1034ad2
Fixed Cohort Data Query
Shubham4026 Jul 14, 2025
cb6889e
Merge pull request #391 from Shubham4026/user_local
Shubham4026 Jul 14, 2025
199b99a
Merge pull request #392 from tekdi/sdbv_rbac_changes
Shubham4026 Jul 14, 2025
51a3e68
update ield option read api defaul limit
Jul 15, 2025
1a2fd21
Update routeconfig.js
Shubham4026 Jul 16, 2025
3b0ef23
Merge pull request #393 from Sourav-Tekdi/field_option_limit
Shubham4026 Jul 17, 2025
d5db76d
Merge pull request #398 from tekdi/sdbv_rbac_changes
Shubham4026 Jul 17, 2025
0e39a84
Structure Change for custom fields
Shubham4026 Jul 17, 2025
d9a1047
Merge branch 'sdbv_rbac_changes' of github.com:tekdi/user-microservic…
Shubham4026 Jul 17, 2025
46f5973
Merge pull request #400 from Shubham4026/user_local
Shubham4026 Jul 17, 2025
5f66677
Initial plan
Copilot Jul 29, 2025
b69e6f6
Initial exploration and plan for /health endpoint implementation
Copilot Jul 29, 2025
3d62857
Implement /health endpoint with PostgreSQL connectivity check
Copilot Jul 29, 2025
c7f3822
Merge pull request #417 from tekdi/copilot/fix-c767a8ae-dee4-4603-a89…
Shubham4026 Jul 29, 2025
4133894
set file format
Jul 30, 2025
cd0c7fb
Merge pull request #419 from Sourav-Tekdi/file_type
Shubham4026 Jul 30, 2025
efcb458
Merge pull request #426 from tekdi/sdbv_rbac_changes
Shubham4026 Aug 6, 2025
ec6442f
set file size and format
Aug 7, 2025
43c4660
Merge pull request #427 from Sourav-Tekdi/image_fix_new
Shubham4026 Aug 7, 2025
d54eb9e
Active Check on Geolocation Data
Shubham4026 Aug 13, 2025
9345262
Merge branch 'sdbv_rbac_changes' of github.com:tekdi/user-microservic…
Shubham4026 Aug 13, 2025
b577867
Merge pull request #430 from Shubham4026/user-service
Shubham4026 Aug 13, 2025
0358b2d
Merge branch 'main' of github.com:tekdi/user-microservice into user-s…
Shubham4026 Aug 13, 2025
ef7b192
Merge pull request #432 from Shubham4026/user-service
Shubham4026 Aug 13, 2025
23ab59a
Merge pull request #431 from tekdi/sdbv_rbac_changes
Shubham4026 Aug 13, 2025
29cc6f4
set tenant type
Aug 13, 2025
aaf7e17
Merge pull request #433 from Sourav-Tekdi/tenantTypeSet
Shubham4026 Aug 14, 2025
0524ba7
Kakfa Fix for Centralized Report
Shubham4026 Aug 18, 2025
2b0c587
Merge pull request #437 from tekdi/main
Shubham4026 Aug 18, 2025
4358156
Added default Tenant Id in header for Searh user
Shubham4026 Aug 22, 2025
e80d2bb
Merge branch 'sdbv_rbac_changes' of github.com:tekdi/user-microservic…
Shubham4026 Aug 22, 2025
79daf0f
Merge pull request #440 from Shubham4026/user-service
snehal0904 Aug 22, 2025
a30cb26
Optimzation of Field Value Queries
Shubham4026 Aug 22, 2025
fdd997e
Merge branch 'sdbv_rbac_changes' of github.com:tekdi/user-microservic…
Shubham4026 Aug 22, 2025
3cb236c
Merge pull request #441 from Shubham4026/user-service
snehal0904 Aug 22, 2025
edcb5bc
Merge pull request #442 from tekdi/sdbv_rbac_changes
Shubham4026 Aug 25, 2025
0b5fab9
Create build.yaml
Ishan-ttpl Aug 26, 2025
760b55c
Create qa-prod-deployment.yaml
Ishan-ttpl Aug 26, 2025
556105e
Update build.yaml
Ishan-ttpl Aug 28, 2025
071f7a5
Update build.yaml
Ishan-ttpl Aug 28, 2025
0f925f4
Name Filter added in Search API
Shubham4026 Aug 28, 2025
e9a3837
Merge branch 'sdbv_rbac_changes' of github.com:tekdi/user-microservic…
Shubham4026 Aug 28, 2025
2e92cc4
Merge pull request #443 from Shubham4026/user-service
snehal0904 Aug 29, 2025
6e05dde
Inactive user in keycloak
Sep 3, 2025
4682f8d
comment resolved
Sep 3, 2025
46a68f5
add
Sep 3, 2025
0ad797e
Merge pull request #446 from Sourav-Tekdi/inactive_ueser_keycloak
Shubham4026 Sep 3, 2025
45ca1ec
Merge pull request #447 from tekdi/sdbv_rbac_changes
Shubham4026 Sep 3, 2025
d130223
Update qa-prod-deployment.yaml
Ishan-ttpl Sep 3, 2025
01e4913
Update qa-prod-deployment.yaml
Ishan-ttpl Sep 3, 2025
10670c5
Update qa-prod-deployment.yaml
Ishan-ttpl Sep 3, 2025
2f7b034
Removed unused Pipelines and rename pipelines as per environment
Sep 4, 2025
7dd4661
whatsapp notification
apurvaubade Sep 10, 2025
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
89 changes: 0 additions & 89 deletions .github/workflows/Prod-Deployment.yaml

This file was deleted.

58 changes: 58 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Tag-based Image Build for QA and PROD

on:
push:
tags:
- "v*"
workflow_dispatch:
inputs:
environment:
description: "Target environment (qa or prod)"
required: true
default: "qa"
tag:
description: "Image tag to deploy"
required: true

jobs:
build:
name: Build and Push Docker Image to AWS ECR
runs-on: ubuntu-latest

# Use qa for tag pushes, or the chosen input for workflow_dispatch
environment: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.environment || 'qa' }}

env:
ENVIRONMENT: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.environment || 'qa' }}
TAG: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref_name }}

steps:
- name: Check out code
uses: actions/checkout@v2

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_REGION }}

- name: Extract ECR Registry from Repository
run: |
FULL_REPO="${{ secrets.ECR_REPOSITORY }}"
REGISTRY="$(echo $FULL_REPO | cut -d'/' -f1)"
echo "ECR_REGISTRY=$REGISTRY" >> $GITHUB_ENV
echo "ECR_REPOSITORY=$FULL_REPO" >> $GITHUB_ENV

- name: Log in to Amazon ECR
run: |
aws ecr get-login-password --region ${{ secrets.AWS_REGION }} \
| docker login --username AWS --password-stdin ${{ env.ECR_REGISTRY }}

- name: Build, Tag, and Push Docker Image
run: |
IMAGE_URI="${{ env.ECR_REPOSITORY }}:${{ env.TAG }}"
echo "Building image: $IMAGE_URI"
docker build -t $IMAGE_URI .
docker push $IMAGE_URI
docker rmi $IMAGE_URI
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Deploy to Tekdi-QA-Server
name: Deploy to Dev Server Dockerised
on:
push:
branches:
- sdbv_rbac_changes
- main
jobs:
deploy:
runs-on: ubuntu-latest
Expand All @@ -16,12 +16,12 @@ jobs:
username: ${{ secrets.USERNAME_TEKDI_QA }}
key: ${{ secrets.EC2_SSH_KEY_TEKDI_QA }}
port: ${{ secrets.PORT_TEKDI_QA }}
script: |
script: |
cd ${{ secrets.TARGET_DIR_TEKDI_QA }}
if [ -f .env ]; then
rm .env
fi
echo '${{ secrets.QA_ENV }}"' > .env
echo '${{ secrets.DEV_ENV }}"' > .env
ls -ltra
./deploy.sh
#Testing
87 changes: 0 additions & 87 deletions .github/workflows/dev-pratham-eks-deployment.yaml

This file was deleted.

76 changes: 76 additions & 0 deletions .github/workflows/qa-prod-deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: BACKEND-TAG-BASED-DEPLOYMENT-AWS-EKS

on:
workflow_dispatch:
inputs:
environment:
description: "Target environment (qa or prod)"
required: true
default: "qa"
tag:
description: "Image tag to deploy"
required: true

jobs:
deploy:
name: Deploy Backend Service
runs-on: ubuntu-latest
environment: ${{ github.event.inputs.environment }}

steps:
# Step 1: Checkout code
- name: Check out repository
uses: actions/checkout@v2

# Step 2: Set TAG environment variable
- name: Set TAG environment variable
run: |
TAG="${{ github.event.inputs.tag }}"
echo "TAG=$TAG" >> $GITHUB_ENV

# Step 3: Debug TAG value
- name: Debug TAG value
run: echo "TAG value:${{ env.TAG }}"

# Step 4: Configure AWS credentials
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_REGION }}

# Step 5: Decode ConfigMap manifest from secret
- name: Write ConfigMap manifest
run: |
mkdir -p manifest
echo "${{ secrets.ENV_FILE_CONTENT_BACKEND }}" | base64 -d > manifest/configmap.yaml
echo "Generated ConfigMap:"
cat manifest/configmap.yaml

# Step 6: Update Deployment Manifest
- name: Update Deployment Manifest
env:
IMAGE_TAG: ${{ env.TAG }}
ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
run: |
mkdir -p manifest
envsubst < manifest/backend.yaml > manifest/backend-service-updated.yaml
echo "Updated deployment manifest:"
cat manifest/backend-service-updated.yaml

# Step 7: Deploy to AWS EKS
- name: Deploy to AWS EKS
env:
EKS_CLUSTER_NAME: ${{ secrets.EKS_CLUSTER_NAME }}
AWS_REGION: ${{ secrets.AWS_REGION }}
NAMESPACE: ${{ github.event.inputs.environment == 'prod' && 'default' || 'microservices-qa' }}
run: |
aws eks update-kubeconfig --name $EKS_CLUSTER_NAME --region $AWS_REGION
kubectl apply -f manifest/configmap.yaml -n $NAMESPACE
kubectl apply -f manifest/backend-service-updated.yaml -n $NAMESPACE
# Restart pods to pick up new config
kubectl rollout restart deployment backend -n $NAMESPACE
sleep 10
echo "Pods status:"
kubectl get pods -n $NAMESPACE | grep backend
Loading