From e249bf722f416dcc7afa03e99d661636775e61d8 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 18:24:29 +0530
Subject: [PATCH 01/30] Create .env

---
 .github/.env | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/.env

diff --git a/.github/.env b/.github/.env
new file mode 100644
index 00000000..303230f4
--- /dev/null
+++ b/.github/.env
@@ -0,0 +1 @@
+MONGO_PASSWORD=COC7X88tgXsMcW7S

From 06956e543706939974e77042e1192fdcabf5359b Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 18:29:17 +0530
Subject: [PATCH 02/30] Update mongoC.js

---
 mongoC.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mongoC.js b/mongoC.js
index 7c8631d7..a795c9f3 100644
--- a/mongoC.js
+++ b/mongoC.js
@@ -5,7 +5,8 @@ import dotenv from 'dotenv';
 dotenv.config();
 
 const password = encodeURIComponent(process.env.MONGO_PASSWORD.trim());
-const connectionString = `mongodb+srv://integrationninjas:${password}@ev-cluster.zk5mtjd.mongodb.net/?retryWrites=true&w=majority&appName=dev-cluster`; // clustore url
+//mongodb+srv://devavratsingh2002:<db_password>@cluster0.ml9lh.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0
+const connectionString = `mongodb+srv://integrationninjas:${password}@cluster0.ml9lh.mongodb.net/?retryWrites=true&w=majority&appName=dev-cluster`; // clustore url
 const client = new MongoClient(connectionString);
 let conn;
 try {
@@ -15,4 +16,4 @@ try {
   console.error(e);
 }
 let db = conn.db("integration_ninjas");
-export default db;
\ No newline at end of file
+export default db;

From ad0c5f43363d8056abc060904c13b95b231c4c02 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 18:55:37 +0530
Subject: [PATCH 03/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 377ea928..b0f6c500 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Create .env file
         run: echo "MONGO_PASSWORD=${{ secrets.MONGO_PASSWORD }}" >> .env
       - name: Login to docker hub
-        run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}       
+        run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}       
       - name: Build docker image
         run: docker build -t integrationninjas/nodejs-app .  
       - name: Publish image to docker hub
@@ -29,4 +29,4 @@ jobs:
       - name: Delete old container
         run: docker rm -f nodejs-app-container  
       - name: Run docker container
-        run: docker run -d -p 4000:4000 --name nodejs-app-container integrationninjas/nodejs-app  
\ No newline at end of file
+        run: docker run -d -p 4000:4000 --name nodejs-app-container integrationninjas/nodejs-app  

From 75d73d30aee3ecf8e5401fb1b491d129c07040f9 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 18:58:26 +0530
Subject: [PATCH 04/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index b0f6c500..5f8079d7 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -16,17 +16,17 @@ jobs:
       - name: Login to docker hub
         run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}       
       - name: Build docker image
-        run: docker build -t integrationninjas/nodejs-app .  
+        run: docker build -t luciferdev966/my-docker-repo .  
       - name: Publish image to docker hub
-        run: docker push integrationninjas/nodejs-app:latest
+        run: docker push luciferdev966/my-docker-repo:latest
         
   deploy:
     needs: build
     runs-on: self-hosted
     steps:
       - name: Pull image from docker hub
-        run: docker pull integrationninjas/nodejs-app:latest
+        run: docker pull luciferdev966/my-docker-repo:latest
       - name: Delete old container
         run: docker rm -f nodejs-app-container  
       - name: Run docker container
-        run: docker run -d -p 4000:4000 --name nodejs-app-container integrationninjas/nodejs-app  
+        run: docker run -d -p 4000:4000 --name nodejs-app-container luciferdev966/my-docker-repo  

From bf04b7e3061264e33a40bb6e92f7cfe034ef71b5 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:06:26 +0530
Subject: [PATCH 05/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 5f8079d7..944845ac 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -3,7 +3,7 @@ name: Deploy Node Application
 on:
   push: 
     branches:
-      - mean-ec2-docker
+      - main
 
 jobs:
   build:

From 1258071f1b8a6284db434f7e9c2067a719e0ca79 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:11:58 +0530
Subject: [PATCH 06/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 944845ac..5f8079d7 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -3,7 +3,7 @@ name: Deploy Node Application
 on:
   push: 
     branches:
-      - main
+      - mean-ec2-docker
 
 jobs:
   build:

From c367833b6883c3378879acaf0cc0f81f84d56eac Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:14:00 +0530
Subject: [PATCH 07/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 5f8079d7..b9f00112 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -1,4 +1,4 @@
-name: Deploy Node Application
+name: Deploy Node Application on ec2
 
 on:
   push: 

From 7fe9e03b1af3b24256447583d274b9419c1877cc Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:18:06 +0530
Subject: [PATCH 08/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index b9f00112..29e23a37 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Create .env file
         run: echo "MONGO_PASSWORD=${{ secrets.MONGO_PASSWORD }}" >> .env
       - name: Login to docker hub
-        run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}       
+        run: echo "dckr_pat_Ok3AORXtYQGQ_NxcIh-WTw_jssw" | docker login -u luciferdev966 --password-stdin      
       - name: Build docker image
         run: docker build -t luciferdev966/my-docker-repo .  
       - name: Publish image to docker hub

From 5f2d2bdc7ff5faf98d4462b4511018ce78a9abf3 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:21:44 +0530
Subject: [PATCH 09/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 29e23a37..57d80d11 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Login to docker hub
         run: echo "dckr_pat_Ok3AORXtYQGQ_NxcIh-WTw_jssw" | docker login -u luciferdev966 --password-stdin      
       - name: Build docker image
-        run: docker build -t luciferdev966/my-docker-repo .  
+        run: docker build -t luciferdev966/my-docker-repo:latest .  
       - name: Publish image to docker hub
         run: docker push luciferdev966/my-docker-repo:latest
         

From 520a70766c1a13c1db18aa3d3d88b4b342f92242 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:24:21 +0530
Subject: [PATCH 10/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 57d80d11..3513eb04 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -16,16 +16,16 @@ jobs:
       - name: Login to docker hub
         run: echo "dckr_pat_Ok3AORXtYQGQ_NxcIh-WTw_jssw" | docker login -u luciferdev966 --password-stdin      
       - name: Build docker image
-        run: docker build -t luciferdev966/my-docker-repo:latest .  
+        run: docker build -t luciferdev966/my-docker-repo .  
       - name: Publish image to docker hub
-        run: docker push luciferdev966/my-docker-repo:latest
+        run: docker push luciferdev966/my-docker-repo
         
   deploy:
     needs: build
     runs-on: self-hosted
     steps:
       - name: Pull image from docker hub
-        run: docker pull luciferdev966/my-docker-repo:latest
+        run: docker pull luciferdev966/my-docker-repo
       - name: Delete old container
         run: docker rm -f nodejs-app-container  
       - name: Run docker container

From 8c5ea85e8b11040b7d1580303341309e78d90072 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:26:35 +0530
Subject: [PATCH 11/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 3513eb04..5d7380f4 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Create .env file
         run: echo "MONGO_PASSWORD=${{ secrets.MONGO_PASSWORD }}" >> .env
       - name: Login to docker hub
-        run: echo "dckr_pat_Ok3AORXtYQGQ_NxcIh-WTw_jssw" | docker login -u luciferdev966 --password-stdin      
+        run: echo "dckr_pat_3TYf61TN206KewF0Jly-Ug133oE" | docker login -u luciferdev966 --password-stdin      
       - name: Build docker image
         run: docker build -t luciferdev966/my-docker-repo .  
       - name: Publish image to docker hub

From 837d83d62fd250661eb7e301702e2c791049bfc5 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:30:37 +0530
Subject: [PATCH 12/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 5d7380f4..9ce9aece 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -24,6 +24,8 @@ jobs:
     needs: build
     runs-on: self-hosted
     steps:
+      - name: make root and docker owner of /var/run/docker.sock
+      - run: sudo chown root:docker /var/run/docker.sock
       - name: Pull image from docker hub
         run: docker pull luciferdev966/my-docker-repo
       - name: Delete old container

From e04b63a1d724b525aaae647cabe1d02ae9941e38 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:31:57 +0530
Subject: [PATCH 13/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 9ce9aece..6e964c4b 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: self-hosted
     steps:
       - name: make root and docker owner of /var/run/docker.sock
-      - run: sudo chown root:docker /var/run/docker.sock
+        run: sudo chown root:docker /var/run/docker.sock
       - name: Pull image from docker hub
         run: docker pull luciferdev966/my-docker-repo
       - name: Delete old container

From 006ee380216b021ff05a06df098069f917b4aefc Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:39:23 +0530
Subject: [PATCH 14/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 6e964c4b..ab9074ea 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -24,8 +24,8 @@ jobs:
     needs: build
     runs-on: self-hosted
     steps:
-      - name: make root and docker owner of /var/run/docker.sock
-        run: sudo chown root:docker /var/run/docker.sock
+      - name: switch to root user
+        run: sudo su
       - name: Pull image from docker hub
         run: docker pull luciferdev966/my-docker-repo
       - name: Delete old container

From bc6a8d7ec3158b8b58e81d5b8ed070234a453c2c Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:42:25 +0530
Subject: [PATCH 15/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index ab9074ea..958f262c 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -24,8 +24,8 @@ jobs:
     needs: build
     runs-on: self-hosted
     steps:
-      - name: switch to root user
-        run: sudo su
+      - name: make owner to github-runner
+        run: sudo chown github-runner:docker /var/run/docker.sock
       - name: Pull image from docker hub
         run: docker pull luciferdev966/my-docker-repo
       - name: Delete old container

From 7ec06d4c55f6be1aa5cced3ccd985174c5095c76 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:45:26 +0530
Subject: [PATCH 16/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 958f262c..222ba907 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: self-hosted
     steps:
       - name: make owner to github-runner
-        run: sudo chown github-runner:docker /var/run/docker.sock
+        run: sudo chown ubuntu:docker /var/run/docker.sock
       - name: Pull image from docker hub
         run: docker pull luciferdev966/my-docker-repo
       - name: Delete old container

From 1daa9d60a1c1686a7b4c6934607c009b3be36d43 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Sat, 7 Dec 2024 00:06:29 +0530
Subject: [PATCH 17/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 222ba907..ceb0c490 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v4
       - name: Create .env file
-        run: echo "MONGO_PASSWORD=${{ secrets.MONGO_PASSWORD }}" >> .env
+        run: echo "MONGO_PASSWORD=${{ secrets.MONGO_PASSWORD }}">> .env
       - name: Login to docker hub
         run: echo "dckr_pat_3TYf61TN206KewF0Jly-Ug133oE" | docker login -u luciferdev966 --password-stdin      
       - name: Build docker image
@@ -31,4 +31,4 @@ jobs:
       - name: Delete old container
         run: docker rm -f nodejs-app-container  
       - name: Run docker container
-        run: docker run -d -p 4000:4000 --name nodejs-app-container luciferdev966/my-docker-repo  
+        run: docker run -d  --name nodejs-app-container -p 4000:4000 luciferdev966/my-docker-repo  

From fd6adc3f396ba5d6cdaa4898d7fcca9edbb83a7b Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Sat, 7 Dec 2024 00:34:41 +0530
Subject: [PATCH 18/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index ceb0c490..fff1eccd 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -31,4 +31,4 @@ jobs:
       - name: Delete old container
         run: docker rm -f nodejs-app-container  
       - name: Run docker container
-        run: docker run -d  --name nodejs-app-container -p 4000:4000 luciferdev966/my-docker-repo  
+        run: docker run -d  --name nodejs-app-container -p 4000:4000 luciferdev966/my-docker-repo tail -f /dev/null

From faa9a98a39ba74bbc6cafa57a64fde8d011469b0 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Sat, 7 Dec 2024 00:42:47 +0530
Subject: [PATCH 19/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index fff1eccd..58c642b0 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -28,7 +28,5 @@ jobs:
         run: sudo chown ubuntu:docker /var/run/docker.sock
       - name: Pull image from docker hub
         run: docker pull luciferdev966/my-docker-repo
-      - name: Delete old container
-        run: docker rm -f nodejs-app-container  
       - name: Run docker container
-        run: docker run -d  --name nodejs-app-container -p 4000:4000 luciferdev966/my-docker-repo tail -f /dev/null
+        run: docker run -d  --name nodejs-app-container -p 4000:4000 luciferdev966/my-docker-repo

From 5fe2cb215744d9830b1ca02a9a1dffc5afb68ce9 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Sat, 7 Dec 2024 00:45:07 +0530
Subject: [PATCH 20/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 58c642b0..b04f348a 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -29,4 +29,4 @@ jobs:
       - name: Pull image from docker hub
         run: docker pull luciferdev966/my-docker-repo
       - name: Run docker container
-        run: docker run -d  --name nodejs-app-container -p 4000:4000 luciferdev966/my-docker-repo
+        run: docker run -d  --name nodejs-app-container-new -p 4000:4000 luciferdev966/my-docker-repo

From 7d993f0f8518806b0aa64c93a6cc557b80ae1a30 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Sat, 7 Dec 2024 00:48:44 +0530
Subject: [PATCH 21/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index b04f348a..0a2e2531 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -29,4 +29,4 @@ jobs:
       - name: Pull image from docker hub
         run: docker pull luciferdev966/my-docker-repo
       - name: Run docker container
-        run: docker run -d  --name nodejs-app-container-new -p 4000:4000 luciferdev966/my-docker-repo
+        run: docker run -d  --name nodejs-app-container-divineoath -p 4000:4000 luciferdev966/my-docker-repo

From cc157cdecf63614913c4b9a108c5ae657252870b Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Sat, 7 Dec 2024 00:53:48 +0530
Subject: [PATCH 22/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 0a2e2531..94b0db1e 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -30,3 +30,5 @@ jobs:
         run: docker pull luciferdev966/my-docker-repo
       - name: Run docker container
         run: docker run -d  --name nodejs-app-container-divineoath -p 4000:4000 luciferdev966/my-docker-repo
+      - name: Look on Container
+        run: docker ps

From 2573da498300f95adc285320b4d928c8d412eed0 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Sat, 7 Dec 2024 00:58:19 +0530
Subject: [PATCH 23/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 94b0db1e..0ae103d2 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -28,6 +28,8 @@ jobs:
         run: sudo chown ubuntu:docker /var/run/docker.sock
       - name: Pull image from docker hub
         run: docker pull luciferdev966/my-docker-repo
+      - name: remove container used before 
+        run: docker rm -f nodejs-app-container-divineoath
       - name: Run docker container
         run: docker run -d  --name nodejs-app-container-divineoath -p 4000:4000 luciferdev966/my-docker-repo
       - name: Look on Container

From 35bd9553c463297285bed929ca12d4bb0f4cb265 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Sat, 7 Dec 2024 20:14:14 +0530
Subject: [PATCH 24/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 0ae103d2..b003539f 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -31,6 +31,6 @@ jobs:
       - name: remove container used before 
         run: docker rm -f nodejs-app-container-divineoath
       - name: Run docker container
-        run: docker run -d  --name nodejs-app-container-divineoath -p 4000:4000 luciferdev966/my-docker-repo
+        run: docker run -d  --name=nodejs-app-container-divineoath -p 4000:4000 luciferdev966/my-docker-repo
       - name: Look on Container
         run: docker ps

From ebaf9dff0b5c20d4c4f25f15071713bd7f33f89f Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Sat, 7 Dec 2024 23:35:38 +0530
Subject: [PATCH 25/30] Update index.js

---
 index.js | 64 ++++++++++++++++++++++++++++++++------------------------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/index.js b/index.js
index 8b28c932..8474f674 100644
--- a/index.js
+++ b/index.js
@@ -1,46 +1,56 @@
-import express from 'express';
-import bodyParser from 'body-parser';
 
-import db from "./mongoC.js";
+import express from 'express';
+import client from './mongoC.js';
 
-const port = process.env.PORT || 4000;
+const port = process.env.PORT || 3000;
 const app = express();
 
+// Middleware to set CORS headers
 app.use((_req, res, next) => {
     res.header('Access-Control-Allow-Origin', '*');
     res.header('Access-Control-Allow-Headers', '*');
-  
     next();
-  });
+});
 
-// Parses the text as url encoded data
-app.use(bodyParser.urlencoded({ extended: true }));
- 
-// Parses the text as json
-app.use(bodyParser.json());
+// Middleware to parse JSON request bodies
+app.use(express.json()); // Replaces body-parser.json()
 
+// Middleware to parse URL-encoded request bodies
+app.use(express.urlencoded({ extended: true })); // Replaces body-parser.urlencoded()
+
+// Route to test the server
 app.get('/', (req, res) => {
     res.send('Hello World, from express');
-})
-
-app.post('/addUser',async (req, res) => {
-    let collection = await db.collection("users");
-    let newDocument = req.body;
-    newDocument.date = new Date();
-    let result = await collection.insertOne(newDocument);
-    console.log("rreq"+req.body);
-    res.send(result).status(204);
 });
 
-app.get('/getUsers', async(req, res) => {
-    let collection = await db.collection("users");
-    let results = await collection.find({})
-      
-      .toArray();
-    res.send(results).status(200);
+// Route to add a user
+app.post('/addUser', async (req, res) => {
+    try {
+        let collection = await client.collection("users");
+        let newDocument = req.body;
+        newDocument.date = new Date();
+        let result = await collection.insertOne(newDocument);
+        console.log("Request Body: ", req.body);
+        res.status(204).send(result); // Send status code 204 (No Content)
+    } catch (error) {
+        console.error("Error inserting user: ", error);
+        res.status(500).send("Error adding user");
+    }
+});
+
+// Route to get all users
+app.get('/getUsers', async (req, res) => {
+    try {
+        let collection = await client.collection("users");
+        let results = await collection.find({}).toArray();
+        res.status(200).send(results); // Send status code 200 (OK)
+    } catch (error) {
+        console.error("Error fetching users: ", error);
+        res.status(500).send("Error fetching users");
+    }
 });
 
+// Start the server
 app.listen(port, function () {
     console.log("Server is listening at port:" + port);
 });
- 
\ No newline at end of file

From 89fba77acbbe663bea33dc7906e2fbb4615e50a1 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Sat, 7 Dec 2024 23:36:15 +0530
Subject: [PATCH 26/30] Update mongoC.js

---
 mongoC.js | 63 +++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/mongoC.js b/mongoC.js
index a795c9f3..a0c6d8d5 100644
--- a/mongoC.js
+++ b/mongoC.js
@@ -1,19 +1,50 @@
-import { MongoClient } from "mongodb";
-import dotenv from 'dotenv';
 
-// Call dotenv.config() to load environment variables from .env file
-dotenv.config();
+// import mongodb from 'mongodb'; 
+// const { MongoClient } = mongodb;
+// import dotenv from 'dotenv';
 
-const password = encodeURIComponent(process.env.MONGO_PASSWORD.trim());
-//mongodb+srv://devavratsingh2002:<db_password>@cluster0.ml9lh.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0
-const connectionString = `mongodb+srv://integrationninjas:${password}@cluster0.ml9lh.mongodb.net/?retryWrites=true&w=majority&appName=dev-cluster`; // clustore url
-const client = new MongoClient(connectionString);
-let conn;
-try {
-  conn = await client.connect();
-  console.log("connection successful")
-} catch(e) {
-  console.error(e);
+// // Call dotenv.config() to load environment variables from .env file
+// dotenv.config();
+
+// const password = encodeURIComponent(process.env.MONGO_PASSWORD.trim());
+// //mongodb+srv://devavratsingh2002:<db_password>@cluster0.ml9lh.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0
+// const connectionString = `mongodb+srv://integrationninjas:${password}@cluster0.ml9lh.mongodb.net/?retryWrites=true&w=majority&appName=dev-cluster`; // clustore url
+// const client = new MongoClient(connectionString);
+// let conn;
+// try {
+//   conn = await client.connect();
+//   console.log("connection successful")
+// } catch(e) {
+//   console.error(e);
+// }
+// let db = conn.db("integration_ninjas");
+//export default db;
+
+import mongodb from 'mongodb'; 
+const { MongoClient,ServerApiVersion  } = mongodb;
+// import { ServerApiVersion } from 'mongodb';
+const uri = "mongodb+srv://devavratsingh2002:KkqJ2XWRK2VpibrT@cluster0.ml9lh.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0";
+
+// Create a MongoClient with a MongoClientOptions object to set the Stable API version
+const client = new MongoClient(uri, {
+  serverApi: {
+    version: ServerApiVersion.v1,
+    strict: true,
+    deprecationErrors: true,
+  }
+});
+
+async function run() {
+  try {
+    // Connect the client to the server	(optional starting in v4.7)
+    await client.connect();
+    // Send a ping to confirm a successful connection
+    await client.db("admin").command({ ping: 1 });
+    console.log("Pinged your deployment. You successfully connected to MongoDB!");
+  } finally {
+    // Ensures that the client will close when you finish/error
+    await client.close();
+  }
 }
-let db = conn.db("integration_ninjas");
-export default db;
+run().catch(console.dir);
+export default client;

From 451979dc887622aa92eef2afc788145da885e229 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Sat, 7 Dec 2024 23:39:04 +0530
Subject: [PATCH 27/30] Update Dockerfile

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 49fbe5f9..4128449a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,5 +3,5 @@ WORKDIR /app
 COPY package.json ./
 RUN npm install
 COPY . .
-EXPOSE 4000
-CMD [ "npm", "run", "start" ]
\ No newline at end of file
+EXPOSE 3000
+CMD [ "npm", "run", "start" ]

From 09c0ff3889d3d1073c94d2e445c5449fe90e5eca Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Sat, 7 Dec 2024 23:39:48 +0530
Subject: [PATCH 28/30] Update .env

---
 .github/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/.env b/.github/.env
index 303230f4..7b7f0293 100644
--- a/.github/.env
+++ b/.github/.env
@@ -1 +1 @@
-MONGO_PASSWORD=COC7X88tgXsMcW7S
+MONGO_PASSWORD=KkqJ2XWRK2VpibrT

From 644d5241c865349fcee98bec4cd2d0ddb32a5488 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Sat, 7 Dec 2024 23:41:27 +0530
Subject: [PATCH 29/30] Update mongoC.js

---
 mongoC.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mongoC.js b/mongoC.js
index a0c6d8d5..dd93e04a 100644
--- a/mongoC.js
+++ b/mongoC.js
@@ -6,7 +6,7 @@
 // // Call dotenv.config() to load environment variables from .env file
 // dotenv.config();
 
-// const password = encodeURIComponent(process.env.MONGO_PASSWORD.trim());
+
 // //mongodb+srv://devavratsingh2002:<db_password>@cluster0.ml9lh.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0
 // const connectionString = `mongodb+srv://integrationninjas:${password}@cluster0.ml9lh.mongodb.net/?retryWrites=true&w=majority&appName=dev-cluster`; // clustore url
 // const client = new MongoClient(connectionString);
@@ -23,7 +23,8 @@
 import mongodb from 'mongodb'; 
 const { MongoClient,ServerApiVersion  } = mongodb;
 // import { ServerApiVersion } from 'mongodb';
-const uri = "mongodb+srv://devavratsingh2002:KkqJ2XWRK2VpibrT@cluster0.ml9lh.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0";
+const password = encodeURIComponent(process.env.MONGO_PASSWORD.trim());
+const uri = "mongodb+srv://devavratsingh2002:${password}@cluster0.ml9lh.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0";
 
 // Create a MongoClient with a MongoClientOptions object to set the Stable API version
 const client = new MongoClient(uri, {

From de1bab764fd81fb66599d063f62669261055ec46 Mon Sep 17 00:00:00 2001
From: DEVAVRAT SINGH <95224039+Devavrt1234@users.noreply.github.com>
Date: Sat, 7 Dec 2024 23:44:21 +0530
Subject: [PATCH 30/30] Update cicd.yml

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index b003539f..9adf428c 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -31,6 +31,6 @@ jobs:
       - name: remove container used before 
         run: docker rm -f nodejs-app-container-divineoath
       - name: Run docker container
-        run: docker run -d  --name=nodejs-app-container-divineoath -p 4000:4000 luciferdev966/my-docker-repo
+        run: docker run -d  --name=nodejs-app-container-divineoath -p 3000:3000 luciferdev966/my-docker-repo
       - name: Look on Container
         run: docker ps