root
/
NAM-APJATEL-BACKEND
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add image_urls to nearest device

This commit is contained in:
areeqakbr 2025-06-20 09:28:31 +07:00
parent 8edbdfaa56
commit 433512e3da
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
model/dto/res/nearest_devices.go
View File

@ -20,6 +20,7 @@ type NearestDeviceResponse struct {
Province *string `json:"province,omitempty"` Province *string `json:"province,omitempty"`
City *string `json:"city,omitempty"` City *string `json:"city,omitempty"`
District *string `json:"district,omitempty"` District *string `json:"district,omitempty"`
ImageURL *string `json:"image_url"`
// Connection counts // Connection counts
BackboneCount int `json:"backbone_count"` BackboneCount int `json:"backbone_count"`
@ -44,7 +45,8 @@ type NearestDeviceDetailResponse struct {
Province *string `json:"province,omitempty"` Province *string `json:"province,omitempty"`
City *string `json:"city,omitempty"` City *string `json:"city,omitempty"`
District *string `json:"district,omitempty"` District *string `json:"district,omitempty"`
ImageURL *string `json:"image_url,omitempty"` ImageURL *string `json:"image_url"`
ImageURLs []string `json:"image_urls"`
// Detailed connection information // Detailed connection information
Backbones []BackboneConnectionInfo `json:"backbones"` Backbones []BackboneConnectionInfo `json:"backbones"`

10
utils/helper/nearest_device_helper.go
View File

@ -49,6 +49,7 @@ func ConvertToNearestDeviceResponses(devices []entity.DeviceWithDistance, repo r
Province: device.Province, Province: device.Province,
City: device.City, City: device.City,
District: device.District, District: device.District,
ImageURL: device.ImageURL,
BackboneCount: backboneCount, BackboneCount: backboneCount,
FishboneCount: fishboneCount, FishboneCount: fishboneCount,
TowerCount: towerCount, TowerCount: towerCount,
@ -95,6 +96,13 @@ func ConvertToNearestDeviceDetailResponse(device entity.Device, distance float64
fishboneInfos := convertToFishboneConnectionInfos(fishbones, device.ID) fishboneInfos := convertToFishboneConnectionInfos(fishbones, device.ID)
towerInfos := convertToTowerConnectionInfos(towers, device.Latitude, device.Longitude) towerInfos := convertToTowerConnectionInfos(towers, device.Latitude, device.Longitude)
allImageURLs := device.GetAllImageURLs()
if len(allImageURLs) == 0 {
allImageURLs = []string{}
}
log.Printf("Device %s has %d images", device.DeviceCode, len(allImageURLs))
response := res.NearestDeviceDetailResponse{ response := res.NearestDeviceDetailResponse{
ID: device.ID, ID: device.ID,
DeviceCode: device.DeviceCode, DeviceCode: device.DeviceCode,
@ -108,7 +116,7 @@ func ConvertToNearestDeviceDetailResponse(device entity.Device, distance float64
Province: device.Province, Province: device.Province,
City: device.City, City: device.City,
District: device.District, District: device.District,
ImageURL: device.ImageURL, ImageURLs: device.GetAllImageURLs(),
Backbones: backboneInfos, Backbones: backboneInfos,
Fishbones: fishboneInfos, Fishbones: fishboneInfos,
Towers: towerInfos, Towers: towerInfos,