From a0cac0236f7f745487e49d110a73721ece89d982 Mon Sep 17 00:00:00 2001
From: areeqakbr <ariqakbar.muhammad.ma16@gmail.com>
Date: Sun, 16 Feb 2025 22:20:29 +0700
Subject: [PATCH] [UPDATE] update responses for all get services

---
 model/dto/req/{devicePort.go => devicePort_dto.go} | 0
 repository/backbone_repo.go                        | 5 +++--
 repository/devicePort_repo.go                      | 4 ++--
 repository/fishbone_repo.go                        | 6 +++---
 repository/tower_repo.go                           | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)
 rename model/dto/req/{devicePort.go => devicePort_dto.go} (100%)

diff --git a/model/dto/req/devicePort.go b/model/dto/req/devicePort_dto.go
similarity index 100%
rename from model/dto/req/devicePort.go
rename to model/dto/req/devicePort_dto.go
diff --git a/repository/backbone_repo.go b/repository/backbone_repo.go
index 772aa77..4ab6696 100644
--- a/repository/backbone_repo.go
+++ b/repository/backbone_repo.go
@@ -35,7 +35,8 @@ func (r *backboneRepo) Post(backbone entity.Backbone) error {
 
 func (r *backboneRepo) GetAll() ([]entity.Backbone, error) {
 	var backbones []entity.Backbone
-	err := r.db.Find(&backbones).Error
+	// err := r.db.Find(&backbones).Error
+	err := r.db.Preload("DeviceStart").Preload("DeviceEnd").Find(&backbones).Error
 	if err != nil {
 		return backbones, err
 	}
@@ -52,7 +53,7 @@ func (r *backboneRepo) Update(id uuid.UUID, updates map[string]interface{}) erro
 
 func (r *backboneRepo) GetByID(id uuid.UUID) (entity.Backbone, error) {
 	var backbone entity.Backbone
-	err := r.db.Where("id = ?", id).First(&backbone).Error
+	err := r.db.Where("id = ?", id).Preload("DeviceStart").Preload("DeviceEnd").First(&backbone).Error
 	if err != nil {
 		return backbone, err
 	}
diff --git a/repository/devicePort_repo.go b/repository/devicePort_repo.go
index 1c9c024..fcb3026 100644
--- a/repository/devicePort_repo.go
+++ b/repository/devicePort_repo.go
@@ -35,7 +35,7 @@ func (r *devicePortRepo) Post(devicePort entity.DevicePort) error {
 
 func (r *devicePortRepo) GetAll() ([]entity.DevicePort, error) {
 	var devicePorts []entity.DevicePort
-	err := r.db.Find(&devicePorts).Error
+	err := r.db.Preload("Device").Find(&devicePorts).Error
 	if err != nil {
 		return devicePorts, err
 	}
@@ -52,7 +52,7 @@ func (r *devicePortRepo) Update(id uuid.UUID,updates map[string]interface{}) err
 
 func (r *devicePortRepo) GetByID(id uuid.UUID) (entity.DevicePort, error) {
 	var devicePort entity.DevicePort
-	err := r.db.Where("id = ?", id).First(&devicePort).Error
+	err := r.db.Where("id = ?", id).Preload("Device").First(&devicePort).Error
 	if err != nil {
 		return devicePort, err 
 	}
diff --git a/repository/fishbone_repo.go b/repository/fishbone_repo.go
index b11bfa9..0e7f537 100644
--- a/repository/fishbone_repo.go
+++ b/repository/fishbone_repo.go
@@ -35,9 +35,9 @@ func (r *fishboneRepo) Post(fishbone entity.Fishbone) error {
 
 func (r *fishboneRepo) GetAll() ([]entity.Fishbone, error) {
     var fishbones []entity.Fishbone
-    err := r.db.Find(&fishbones).Error
+    err := r.db.Preload("DeviceStart").Preload("DeviceEnd").Preload("Backbone").Preload("Backbone.DeviceStart").Preload("Backbone.DeviceEnd").Find(&fishbones).Error
     if err != nil {
-        return fishbones, err
+        return fishbones, err   
     }
     return fishbones, nil
 }
@@ -52,7 +52,7 @@ func (r *fishboneRepo) Update(id uuid.UUID,updates map[string]interface{}) error
 
 func (r *fishboneRepo) GetByID(id uuid.UUID) (entity.Fishbone, error) {    
     var fishbone entity.Fishbone
-    err := r.db.Where("id = ?", id).First(&fishbone).Error
+    err := r.db.Where("id = ?", id).Preload("DeviceStart").Preload("DeviceEnd").Preload("Backbone.DeviceStart").Preload("Backbone.DeviceEnd").First(&fishbone).Error
     if err != nil {
         return fishbone, err
     }
diff --git a/repository/tower_repo.go b/repository/tower_repo.go
index 7c2f8f3..6a65267 100644
--- a/repository/tower_repo.go
+++ b/repository/tower_repo.go
@@ -34,7 +34,7 @@ func (r *towerRepo) Post(tower entity.Tower) error {
 
 func (r *towerRepo) GetAll() ([]entity.Tower, error) {
 	var towers []entity.Tower
-	err := r.db.Find(&towers).Error
+	err := r.db.Preload("Device").Find(&towers).Error
 	if err != nil {
 		return towers, err
 	}
@@ -51,7 +51,7 @@ func (r *towerRepo) Update(id uuid.UUID,updates map[string]interface{}) error {
 
 func (r *towerRepo) GetByID(id uuid.UUID) (entity.Tower, error) {
 	var tower entity.Tower
-	err := r.db.Where("id = ?", id).First(&tower).Error
+	err := r.db.Where("id = ?", id).Preload("Device").First(&tower).Error
 	if err != nil {
 		return tower, err
 	}