From e13fdf2a0dbffcdeb5a235cbc4e389c899ec2580 Mon Sep 17 00:00:00 2001
From: Sharon Dcruz <sharondcruz@cosq.net>
Date: Mon, 4 Aug 2025 11:09:51 +0530
Subject: [PATCH] Updated

---
 firestore.indexes.json | 107 ++++++++++++++++++++++++++++++-----------
 1 file changed, 79 insertions(+), 28 deletions(-)

diff --git a/firestore.indexes.json b/firestore.indexes.json
index 913b031..150acf4 100644
--- a/firestore.indexes.json
+++ b/firestore.indexes.json
@@ -75,7 +75,21 @@
       "queryScope": "COLLECTION",
       "fields": [
         {
-          "fieldPath": "data.clientId",
+          "fieldPath": "clientId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "timestamp",
+          "order": "DESCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "notifications",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "clientId",
           "order": "ASCENDING"
         },
         {
@@ -88,6 +102,70 @@
         }
       ]
     },
+    {
+      "collectionGroup": "notifications",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "ownerId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "timestamp",
+          "order": "DESCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "notifications",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "ownerId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "type",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "timestamp",
+          "order": "DESCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "notifications",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "trainerId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "timestamp",
+          "order": "DESCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "notifications",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "type",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "userId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "timestamp",
+          "order": "DESCENDING"
+        }
+      ]
+    },
     {
       "collectionGroup": "notifications",
       "queryScope": "COLLECTION",
@@ -96,10 +174,6 @@
           "fieldPath": "data.ownerId",
           "order": "ASCENDING"
         },
-        {
-          "fieldPath": "type",
-          "order": "ASCENDING"
-        },
         {
           "fieldPath": "timestamp",
           "order": "DESCENDING"
@@ -114,35 +188,12 @@
           "fieldPath": "data.trainerId",
           "order": "ASCENDING"
         },
-        {
-          "fieldPath": "type",
-          "order": "ASCENDING"
-        },
         {
           "fieldPath": "timestamp",
           "order": "DESCENDING"
         }
       ]
     },
-    {
-      "collectionGroup": "notifications",
-      "queryScope": "COLLECTION",
-      "fields": [
-        {
-          "fieldPath": "type",
-          "order": "ASCENDING"
-        },
-        {
-          "fieldPath": "recipientId",
-          "order": "ASCENDING"
-        },
-        {
-          "fieldPath": "timestamp",
-          "order": "DESCENDING"
-        }
-      ]
-    },
-
     {
       "collectionGroup": "workout_logs",
       "queryScope": "COLLECTION",