refactor(dashboard_metadata): alter query for merchant scoped metadata (#5397)

Author: apoorvdixit88

crates/diesel_models/src/query/dashboard_metadata.rs

@@ -87,9 +87,8 @@ impl DashboardMetadata {
         org_id: String,
         data_types: Vec<enums::DashboardMetadata>,
     ) -> StorageResult<Vec<Self>> {
-        let predicate = dsl::user_id
-            .is_null()
-            .and(dsl::merchant_id.eq(merchant_id))
+        let predicate = dsl::merchant_id
+            .eq(merchant_id)
             .and(dsl::org_id.eq(org_id))
             .and(dsl::data_key.eq_any(data_types));
 

crates/router/src/db/dashboard_metadata.rs

@@ -276,8 +276,7 @@ impl DashboardMetadataInterface for MockDb {
         let query_result = dashboard_metadata
             .iter()
             .filter(|metadata_inner| {
-                metadata_inner.user_id.is_none()
-                    && metadata_inner.merchant_id == merchant_id
+                metadata_inner.merchant_id == merchant_id
                     && metadata_inner.org_id == org_id
                     && data_keys.contains(&metadata_inner.data_key)
             })