Merge pull request '[UPDATE] update responses for all get services' (#3) from feature/responses into dev
Reviewed-on: winter-access/backend_nam#3
This commit is contained in:
commit
c7a23a51a4
|
|
@ -35,7 +35,8 @@ func (r *backboneRepo) Post(backbone entity.Backbone) error {
|
||||||
|
|
||||||
func (r *backboneRepo) GetAll() ([]entity.Backbone, error) {
|
func (r *backboneRepo) GetAll() ([]entity.Backbone, error) {
|
||||||
var backbones []entity.Backbone
|
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 {
|
if err != nil {
|
||||||
return backbones, err
|
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) {
|
func (r *backboneRepo) GetByID(id uuid.UUID) (entity.Backbone, error) {
|
||||||
var backbone entity.Backbone
|
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 {
|
if err != nil {
|
||||||
return backbone, err
|
return backbone, err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ func (r *devicePortRepo) Post(devicePort entity.DevicePort) error {
|
||||||
|
|
||||||
func (r *devicePortRepo) GetAll() ([]entity.DevicePort, error) {
|
func (r *devicePortRepo) GetAll() ([]entity.DevicePort, error) {
|
||||||
var devicePorts []entity.DevicePort
|
var devicePorts []entity.DevicePort
|
||||||
err := r.db.Find(&devicePorts).Error
|
err := r.db.Preload("Device").Find(&devicePorts).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return devicePorts, err
|
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) {
|
func (r *devicePortRepo) GetByID(id uuid.UUID) (entity.DevicePort, error) {
|
||||||
var devicePort entity.DevicePort
|
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 {
|
if err != nil {
|
||||||
return devicePort, err
|
return devicePort, err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,9 +35,9 @@ func (r *fishboneRepo) Post(fishbone entity.Fishbone) error {
|
||||||
|
|
||||||
func (r *fishboneRepo) GetAll() ([]entity.Fishbone, error) {
|
func (r *fishboneRepo) GetAll() ([]entity.Fishbone, error) {
|
||||||
var fishbones []entity.Fishbone
|
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 {
|
if err != nil {
|
||||||
return fishbones, err
|
return fishbones, err
|
||||||
}
|
}
|
||||||
return fishbones, nil
|
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) {
|
func (r *fishboneRepo) GetByID(id uuid.UUID) (entity.Fishbone, error) {
|
||||||
var fishbone entity.Fishbone
|
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 {
|
if err != nil {
|
||||||
return fishbone, err
|
return fishbone, err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ func (r *towerRepo) Post(tower entity.Tower) error {
|
||||||
|
|
||||||
func (r *towerRepo) GetAll() ([]entity.Tower, error) {
|
func (r *towerRepo) GetAll() ([]entity.Tower, error) {
|
||||||
var towers []entity.Tower
|
var towers []entity.Tower
|
||||||
err := r.db.Find(&towers).Error
|
err := r.db.Preload("Device").Find(&towers).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return towers, err
|
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) {
|
func (r *towerRepo) GetByID(id uuid.UUID) (entity.Tower, error) {
|
||||||
var tower entity.Tower
|
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 {
|
if err != nil {
|
||||||
return tower, err
|
return tower, err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue