From 5c579077246b37a0810cb34d6fce9f6336259bc0 Mon Sep 17 00:00:00 2001
From: kshitige <mkshitige@gmail.com>
Date: Mon, 14 Apr 2025 19:36:19 +0530
Subject: [PATCH 1/2] changes in asset add

---
 .../APIS/AdminApi/AssetadmintController.php   | 66 ++++++++++++++++++-
 1 file changed, 63 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php b/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php
index 24c4c6c..8bb79e6 100644
--- a/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php
+++ b/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php
@@ -25,6 +25,60 @@ class AssetadmintController extends Controller
         $this->adminService = $adminService;
     }
 
+    // public function storeAssest(CreateAssetRequest $request)
+    // {
+    //     try {
+    //         $additionalInfo = $request->has('additional_info') && is_string($request->additional_info)
+    //             ? json_decode($request->additional_info, true)
+    //             : $request->additional_info;
+
+    //         $assetData = [
+    //             'entity_type' => $request->entity_type,
+    //             'createdTime' => $request->created_time ?? now()->timestamp,
+    //             'tenantId' => $request->tenant_id ?? Str::uuid()->toString(),
+    //             'customerId' => $request->customer_xid,
+    //             'name' => $request->name,
+    //             'type' => $request->type,
+    //             'label' => $request->label,
+    //             'assetProfileId' => $request->asset_profile_id ?? Str::uuid()->toString(),
+    //             'externalId' => $request->external_id ?? Str::uuid()->toString(),
+    //             'version' => $request->version ?? '1.0',
+    //             'additionalInfo' => $additionalInfo ?? ['description' => 'Default asset description'],
+    //         ];
+
+    //         $response = $this->adminService->createAsset($assetData);
+
+    //         if (!$response) {
+    //             throw new Exception('Failed to create asset via admin service');
+    //         }
+
+    //         $asset = new Asset();
+    //         $asset->id = $response['id']['id'] ?? Str::uuid()->toString();
+    //         $asset->entity_type = $response['entityType'] ?? $assetData['entity_type'];
+    //         $asset->created_time = $response['createdTime'] ?? $assetData['createdTime'];
+    //         $asset->tenant_id = $assetData['tenantId'];
+    //         $asset->customer_xid = $assetData['customerId'];
+    //         $asset->name = $response['name'] ?? $assetData['name'];
+    //         $asset->type = $response['type'] ?? $assetData['type'];
+    //         $asset->label = $response['label'] ?? $assetData['label'];
+    //         $asset->asset_profile_id = $assetData['assetProfileId'];
+    //         $asset->external_id = $assetData['externalId'];
+    //         $asset->version = $response['version'] ?? $assetData['version'];
+    //         $asset->additional_info = json_encode($response['additionalInfo'] ?? $assetData['additionalInfo']);
+
+    //         $asset->save();
+
+    //         return response()->json([
+    //             'message' => 'Asset created successfully!',
+    //             'data' => $asset,
+    //             'api_response' => $response
+    //         ], 200);
+    //     } catch (Exception $e) {
+    //         Log::error('Error in creating asset: ' . $e->getMessage());
+    //         return response()->json(['error' => $e->getMessage()], 500);
+    //     }
+    // }
+
     public function storeAssest(CreateAssetRequest $request)
     {
         try {
@@ -49,7 +103,7 @@ class AssetadmintController extends Controller
             $response = $this->adminService->createAsset($assetData);
 
             if (!$response) {
-                throw new Exception('Failed to create asset via admin service');
+                throw new \Exception('Failed to create asset via admin service');
             }
 
             $asset = new Asset();
@@ -68,17 +122,23 @@ class AssetadmintController extends Controller
 
             $asset->save();
 
+            // Fetch only the customer name
+            $customerName = \App\Models\Customer::where('id', $asset->customer_xid)->value('name');
+
             return response()->json([
                 'message' => 'Asset created successfully!',
                 'data' => $asset,
-                'api_response' => $response
+                'customer_name' => $customerName,
+                // 'api_response' => $response
             ], 200);
-        } catch (Exception $e) {
+
+        } catch (\Exception $e) {
             Log::error('Error in creating asset: ' . $e->getMessage());
             return response()->json(['error' => $e->getMessage()], 500);
         }
     }
 
+
     public function listAssest()
     {
         try {
-- 
2.34.1


From b12e46162000e1ac1da42b0cb7b1e2de8602df46 Mon Sep 17 00:00:00 2001
From: kshitige <mkshitige@gmail.com>
Date: Tue, 15 Apr 2025 11:29:12 +0530
Subject: [PATCH 2/2] asset store customer name

---
 app/Http/Controllers/APIS/AdminApi/AssetadmintController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php b/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php
index c668035..dc8d7b1 100644
--- a/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php
+++ b/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php
@@ -117,7 +117,7 @@ class AssetadmintController extends Controller
             $asset->additional_info = json_encode($response['additionalInfo'] ?? $assetData['additionalInfo']);
             $asset->save();
             // Fetch only the customer name
-            $customerName = \App\Models\Customer::where('id', $asset->customer_xid)->value('name');
+            $customerName = \App\Models\Customer::where('id', $assetData['customerId'])->value('name');
             return response()->json([
                 'message' => 'Asset created successfully!',
                 'data' => $asset,
-- 
2.34.1