From 4900ce87f70a773eb70c0a12ae956c102da6551f Mon Sep 17 00:00:00 2001
From: Manish <manish.zure@marcoaiot.com>
Date: Mon, 17 Nov 2025 11:32:07 +0530
Subject: [PATCH] Rebase issues solved

---
 lib/helpers/services/api_endpoints.dart |  4 +--
 lib/helpers/services/api_service.dart   | 42 +++++++------------------
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/lib/helpers/services/api_endpoints.dart b/lib/helpers/services/api_endpoints.dart
index 4ee46e4..05ce110 100644
--- a/lib/helpers/services/api_endpoints.dart
+++ b/lib/helpers/services/api_endpoints.dart
@@ -1,8 +1,8 @@
 class ApiEndpoints {
-  // static const String baseUrl = "https://stageapi.marcoaiot.com/api";
+  static const String baseUrl = "https://stageapi.marcoaiot.com/api";
   // static const String baseUrl = "https://stageapi.marcoaiot.com/api";
   // static const String baseUrl = "https://api.marcoaiot.com/api";
-  static const String baseUrl = "https://devapi.marcoaiot.com/api";
+  //static const String baseUrl = "https://devapi.marcoaiot.com/api";
 
   static const String getMasterCurrencies = "/Master/currencies/list";
   static const String getMasterExpensesCategories =
diff --git a/lib/helpers/services/api_service.dart b/lib/helpers/services/api_service.dart
index 6061bcc..e1aee7d 100644
--- a/lib/helpers/services/api_service.dart
+++ b/lib/helpers/services/api_service.dart
@@ -427,35 +427,22 @@ class ApiService {
   }
 
   /// Get details of a single service project
-  static Future<ServiceProjectDetailModel?> getServiceProjectDetailApi(
-      String projectId) async {
-    final endpoint = "${ApiEndpoints.getServiceProjectDetail}/$projectId";
-    logSafe("Fetching details for Service Project ID: $projectId");
   static Future<ServiceProjectDetailModel?> getServiceProjectDetailApi(
       String projectId) async {
     final endpoint = "${ApiEndpoints.getServiceProjectDetail}/$projectId";
     logSafe("Fetching details for Service Project ID: $projectId");
 
-    try {
-      final response = await _getRequest(endpoint);
     try {
       final response = await _getRequest(endpoint);
 
       if (response == null) {
-        logSafe("Service Project Detail request failed: null response",
-            level: LogLevel.error);
-        return null;
-      }
-      if (response == null) {
-        logSafe("Service Project Detail request failed: null response",
-            level: LogLevel.error);
+        logSafe(
+          "Service Project Detail request failed: null response",
+          level: LogLevel.error,
+        );
         return null;
       }
 
-      final jsonResponse = _parseResponseForAllData(
-        response,
-        label: "Service Project Detail",
-      );
       final jsonResponse = _parseResponseForAllData(
         response,
         label: "Service Project Detail",
@@ -465,23 +452,18 @@ class ApiService {
         return ServiceProjectDetailModel.fromJson(jsonResponse);
       }
     } catch (e, stack) {
-      logSafe("Exception during getServiceProjectDetailApi: $e",
-          level: LogLevel.error);
-      logSafe("StackTrace: $stack", level: LogLevel.debug);
-    }
-      if (jsonResponse != null) {
-        return ServiceProjectDetailModel.fromJson(jsonResponse);
-      }
-    } catch (e, stack) {
-      logSafe("Exception during getServiceProjectDetailApi: $e",
-          level: LogLevel.error);
-      logSafe("StackTrace: $stack", level: LogLevel.debug);
+      logSafe(
+        "Exception during getServiceProjectDetailApi: $e",
+        level: LogLevel.error,
+      );
+      logSafe(
+        "StackTrace: $stack",
+        level: LogLevel.debug,
+      );
     }
 
     return null;
   }
-    return null;
-  }
 
   /// Get Service Project List
   static Future<ServiceProjectListModel?> getServiceProjectsListApi({