From 8ef2be9e31dc5530bb17ab2a7a85c08980b17f76 Mon Sep 17 00:00:00 2001 From: sayliraut Date: Thu, 10 Apr 2025 13:16:53 +0530 Subject: [PATCH 1/2] change in customer table --- .../migrations/2025_03_11_070823_create_customers_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2025_03_11_070823_create_customers_table.php b/database/migrations/2025_03_11_070823_create_customers_table.php index 5497910..41f1abd 100644 --- a/database/migrations/2025_03_11_070823_create_customers_table.php +++ b/database/migrations/2025_03_11_070823_create_customers_table.php @@ -29,7 +29,7 @@ return new class extends Migration $table->uuid('external_id')->nullable(); $table->integer('version')->default(1); $table->json('additional_info')->nullable(); - $table->bigInteger('country_xid')->nullable(); + $table->longText('country_xid')->nullable(); $table->longText('state_xid')->nullable(); $table->longText('city_xid')->nullable(); -- 2.34.1 From 91f2640607c64d733b84aad59a1fa9ff71acea36 Mon Sep 17 00:00:00 2001 From: sayliraut Date: Tue, 15 Apr 2025 10:55:45 +0530 Subject: [PATCH 2/2] update asset store --- .../APIS/AdminApi/AssetadmintController.php | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php b/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php index 24c4c6c..c9c11ac 100644 --- a/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php +++ b/app/Http/Controllers/APIS/AdminApi/AssetadmintController.php @@ -31,7 +31,6 @@ class AssetadmintController extends Controller $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, @@ -45,13 +44,10 @@ class AssetadmintController extends Controller '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'); + 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']; @@ -65,15 +61,16 @@ class AssetadmintController extends Controller $asset->external_id = $assetData['externalId']; $asset->version = $response['version'] ?? $assetData['version']; $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'); 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); } @@ -238,8 +235,4 @@ class AssetadmintController extends Controller return jsonResponseWithErrorMessage($e->getMessage(), 500); } } - - - - } -- 2.34.1