From 167faca7be8d96bdfcc0befe1f606c2fb9f60d5f Mon Sep 17 00:00:00 2001
From: MadushikaAmarasekara
 <63671982+MadushikaAmarasekara@users.noreply.github.com>
Date: Sat, 4 Oct 2025 19:16:01 +1000
Subject: [PATCH 01/11] Comment added to trigger backend CI by Madushika

---
 .github/workflows/backend_ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml
index d69725aa..c5cd3094 100644
--- a/.github/workflows/backend_ci.yml
+++ b/.github/workflows/backend_ci.yml
@@ -1,4 +1,5 @@
 # week08/.github/workflows/backend_ci.yml
+# Comment added to trigger backend CI workflow - Madushika Amarasekara
 
 name: Backend CI - Test, Build and Push Images to ACR
 

From 677df42be408a3cc39fd4daae03b686cd7ae8b13 Mon Sep 17 00:00:00 2001
From: MadushikaAmarasekara
 <63671982+MadushikaAmarasekara@users.noreply.github.com>
Date: Sun, 5 Oct 2025 16:51:00 +1100
Subject: [PATCH 02/11] Commit to dev branch

---
 .github/workflows/backend_ci.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml
index c5cd3094..c80d741b 100644
--- a/.github/workflows/backend_ci.yml
+++ b/.github/workflows/backend_ci.yml
@@ -9,13 +9,20 @@ on:
   # Manual trigger
   workflow_dispatch:
 
+  workflow_run:
+    workflows: ["Backend CI - Test, Build and Push Images to ACR"]
+    types: [completed]
+
   # Automatically on pushes to main branch
   push:
     branches:
-      - main
+      - dev
     paths: # Only trigger if changes are in backend directories
       - 'backend/**'
       - '.github/workflows/backend_ci.yml' # Trigger if this workflow file changes
+  pull_request:
+    branches:
+      - main
 
 # Define global environment variables that can be used across jobs
 env:
@@ -24,7 +31,7 @@ env:
   ACR_LOGIN_SERVER: ${{ secrets.AZURE_CONTAINER_REGISTRY }}
   # Dynamically generate image tags based on Git SHA and GitHub Run ID
   # This provides unique, traceable tags for each image build
-  IMAGE_TAG: ${{ github.sha }}-${{ github.run_id }}
+  IMAGE_TAG: ${{ github.ref_name }}-${{ github.sha }}
 
 jobs:
   # Job 1: Run tests and linting for all backend services
@@ -132,14 +139,14 @@ jobs:
     # Build and Push Docker image for Product Service
     - name: Build and Push Product Service Image
       run: |
-        docker build -t ${{ env.ACR_LOGIN_SERVER }}/product_service:latest ./backend/product_service/
-        docker push ${{ env.ACR_LOGIN_SERVER }}/product_service:latest
+        docker build -t ${{ env.ACR_LOGIN_SERVER }}/product_service:${{ env.IMAGE_TAG }} ./backend/product_service/
+        docker push ${{ env.ACR_LOGIN_SERVER }}/product_service:${{ env.IMAGE_TAG }}
 
     # Build and Push Docker image for Order Service
     - name: Build and Push Order Service Image
       run: |
-        docker build -t ${{ env.ACR_LOGIN_SERVER }}/order_service:latest ./backend/order_service/
-        docker push ${{ env.ACR_LOGIN_SERVER }}/order_service:latest
+        docker build -t ${{ env.ACR_LOGIN_SERVER }}/order_service:${{ env.IMAGE_TAG }} ./backend/order_service/
+        docker push ${{ env.ACR_LOGIN_SERVER }}/order_service:${{ env.IMAGE_TAG }}
 
     # Logout from Azure for security (runs even if image push fails)
     - name: Logout from Azure

From 33601806f057fd459492746bfbce3a2ce0de29d7 Mon Sep 17 00:00:00 2001
From: MadushikaAmarasekara
 <63671982+MadushikaAmarasekara@users.noreply.github.com>
Date: Sun, 5 Oct 2025 16:55:15 +1100
Subject: [PATCH 03/11] Commit to dev branch 2

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

diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml
index c80d741b..aa709fbf 100644
--- a/.github/workflows/backend_ci.yml
+++ b/.github/workflows/backend_ci.yml
@@ -1,5 +1,5 @@
 # week08/.github/workflows/backend_ci.yml
-# Comment added to trigger backend CI workflow - Madushika Amarasekara
+# Comment added to trigger backend CI workflow bt Madushika Amarasekara
 
 name: Backend CI - Test, Build and Push Images to ACR
 

From c4d79a58ae85bba1bc676f85361f3531ce032fba Mon Sep 17 00:00:00 2001
From: MadushikaAmarasekara
 <63671982+MadushikaAmarasekara@users.noreply.github.com>
Date: Sun, 5 Oct 2025 16:58:56 +1100
Subject: [PATCH 04/11] Commit to dev branch 3

---
 .github/workflows/backend_ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml
index aa709fbf..b0035b21 100644
--- a/.github/workflows/backend_ci.yml
+++ b/.github/workflows/backend_ci.yml
@@ -9,10 +9,6 @@ on:
   # Manual trigger
   workflow_dispatch:
 
-  workflow_run:
-    workflows: ["Backend CI - Test, Build and Push Images to ACR"]
-    types: [completed]
-
   # Automatically on pushes to main branch
   push:
     branches:

From 435705b785478ed28efec6937f1a9e301f043c8f Mon Sep 17 00:00:00 2001
From: MadushikaAmarasekara
 <63671982+MadushikaAmarasekara@users.noreply.github.com>
Date: Sun, 5 Oct 2025 17:14:24 +1100
Subject: [PATCH 05/11] Commit to dev branch 4

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

diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml
index b0035b21..f6863a7e 100644
--- a/.github/workflows/backend_ci.yml
+++ b/.github/workflows/backend_ci.yml
@@ -1,5 +1,5 @@
 # week08/.github/workflows/backend_ci.yml
-# Comment added to trigger backend CI workflow bt Madushika Amarasekara
+# Comment added to trigger backend CI workflow by Madushika Amarasekara
 
 name: Backend CI - Test, Build and Push Images to ACR
 

From 12e7973983d230894dafeb3604ae86e5dcaa20fe Mon Sep 17 00:00:00 2001
From: MadushikaAmarasekara
 <63671982+MadushikaAmarasekara@users.noreply.github.com>
Date: Sun, 5 Oct 2025 17:20:15 +1100
Subject: [PATCH 06/11] Commit backend CD to dev branch

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

diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml
index 6035ed15..5c6274fd 100644
--- a/.github/workflows/backend-cd.yml
+++ b/.github/workflows/backend-cd.yml
@@ -6,15 +6,18 @@ on:
       aks_cluster_name:
         description: 'Name of the AKS Cluster to deploy to'
         required: true
-        default: '<aks_cluster_name>'
+        default: 'mywk8aks'
       aks_resource_group:
         description: 'Resource Group of the AKS Cluster'
         required: true
-        default: '<resource_group_name>'
+        default: 'ci-wk8-rg'
       aks_acr_name:
         description: 'Name of ACR'
         required: true
-        default: '<acr_name>'
+        default: 'mywk8acr'
+  workflow_run:
+    workflows: ["Backend CI - Test, Build and Push Images to ACR"]
+    types: [completed]
 
 jobs:
   deploy_backend:

From 729f4fe52aab9890c14cfdb8edf33c733f236e06 Mon Sep 17 00:00:00 2001
From: MadushikaAmarasekara
 <63671982+MadushikaAmarasekara@users.noreply.github.com>
Date: Sun, 5 Oct 2025 17:21:32 +1100
Subject: [PATCH 07/11] Add workflow_run to backend CD

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

diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml
index f6863a7e..00e9e674 100644
--- a/.github/workflows/backend_ci.yml
+++ b/.github/workflows/backend_ci.yml
@@ -1,5 +1,5 @@
 # week08/.github/workflows/backend_ci.yml
-# Comment added to trigger backend CI workflow by Madushika Amarasekara
+# Comment added to trigger backend CI workflow - Madushika Amarasekara
 
 name: Backend CI - Test, Build and Push Images to ACR
 

From de40f44a7894e49795c77785def82ba5df4169a7 Mon Sep 17 00:00:00 2001
From: MadushikaAmarasekara
 <63671982+MadushikaAmarasekara@users.noreply.github.com>
Date: Sun, 5 Oct 2025 17:27:04 +1100
Subject: [PATCH 08/11] Add workflow_run to backend CD 1

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

diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml
index 5c6274fd..f062063e 100644
--- a/.github/workflows/backend-cd.yml
+++ b/.github/workflows/backend-cd.yml
@@ -17,7 +17,7 @@ on:
         default: 'mywk8acr'
   workflow_run:
     workflows: ["Backend CI - Test, Build and Push Images to ACR"]
-    types: [completed]
+    types: [completed, success]
 
 jobs:
   deploy_backend:

From c368d5b9e2a6fc77483d3a932484117e99733de7 Mon Sep 17 00:00:00 2001
From: MadushikaAmarasekara
 <63671982+MadushikaAmarasekara@users.noreply.github.com>
Date: Sun, 5 Oct 2025 17:29:29 +1100
Subject: [PATCH 09/11] Add workflow_run to backend CD 2

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

diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml
index 00e9e674..f6863a7e 100644
--- a/.github/workflows/backend_ci.yml
+++ b/.github/workflows/backend_ci.yml
@@ -1,5 +1,5 @@
 # week08/.github/workflows/backend_ci.yml
-# Comment added to trigger backend CI workflow - Madushika Amarasekara
+# Comment added to trigger backend CI workflow by Madushika Amarasekara
 
 name: Backend CI - Test, Build and Push Images to ACR
 

From 49d019ff0b2dd6792d69bd289fb1da74c7c25d5c Mon Sep 17 00:00:00 2001
From: MadushikaAmarasekara
 <63671982+MadushikaAmarasekara@users.noreply.github.com>
Date: Sun, 5 Oct 2025 17:41:03 +1100
Subject: [PATCH 10/11] Add workflow_run to backend CD 3

---
 .github/workflows/backend-cd.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml
index f062063e..a5fe90cc 100644
--- a/.github/workflows/backend-cd.yml
+++ b/.github/workflows/backend-cd.yml
@@ -17,10 +17,11 @@ on:
         default: 'mywk8acr'
   workflow_run:
     workflows: ["Backend CI - Test, Build and Push Images to ACR"]
-    types: [completed, success]
+    types: [completed]
 
 jobs:
   deploy_backend:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     environment: Production
     

From 374fce1e442c8d96bd37f748be8821eba2320f73 Mon Sep 17 00:00:00 2001
From: MadushikaAmarasekara
 <63671982+MadushikaAmarasekara@users.noreply.github.com>
Date: Sun, 5 Oct 2025 17:42:10 +1100
Subject: [PATCH 11/11] Add workflow_run to backend CD 4

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

diff --git a/.github/workflows/backend_ci.yml b/.github/workflows/backend_ci.yml
index f6863a7e..00e9e674 100644
--- a/.github/workflows/backend_ci.yml
+++ b/.github/workflows/backend_ci.yml
@@ -1,5 +1,5 @@
 # week08/.github/workflows/backend_ci.yml
-# Comment added to trigger backend CI workflow by Madushika Amarasekara
+# Comment added to trigger backend CI workflow - Madushika Amarasekara
 
 name: Backend CI - Test, Build and Push Images to ACR