UNOV/manager-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add nullable int beaconId + ensure ressource has no duplicate

Browse Source
This commit is contained in:
Fransolet Thomas 2023-02-17 16:53:24 +01:00
parent 042949ec60
commit 33f782346b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Manager.Interfaces/DTO/SectionDTO.cs
View File

@ -25,6 +25,6 @@ namespace Manager.Interfaces.DTO
public string longitude { get; set; } // MyVisit - Use to launch automatic content when current location is near public string longitude { get; set; } // MyVisit - Use to launch automatic content when current location is near
public int? meterZoneGPS { get; set; } // MyVisit - Nbr of meters of the zone to launch content public int? meterZoneGPS { get; set; } // MyVisit - Nbr of meters of the zone to launch content
public bool isBeacon { get; set; } // MyVisit - True if section use beacon, false otherwise public bool isBeacon { get; set; } // MyVisit - True if section use beacon, false otherwise
public int beaconId { get; set; } // MyVisit - Beacon' identifier public int? beaconId { get; set; } // MyVisit - Beacon' identifier
} }
} }

2
Manager.Interfaces/Models/Section.cs
View File

@ -69,7 +69,7 @@ namespace Manager.Interfaces.Models
public bool IsBeacon { get; set; } public bool IsBeacon { get; set; }
[BsonElement("BeaconId")] [BsonElement("BeaconId")]
public int BeaconId { get; set; } public int? BeaconId { get; set; }
[BsonElement("Latitude")] [BsonElement("Latitude")]
public string Latitude { get; set; } public string Latitude { get; set; }

6
ManagerService/Controllers/ConfigurationController.cs
View File

@ -382,7 +382,9 @@ namespace ManagerService.Controllers
} }
} }
foreach (var audio in articleDTO.audioIds.Where(a => a.language == language)) // If not a language is used for export in manager, if one is the myvisit app
var audios = language != null ? articleDTO.audioIds.Where(a => a.language == language) : articleDTO.audioIds;
foreach (var audio in audios)
{ {
if (audio.value != null) if (audio.value != null)
{ {
@ -636,7 +638,7 @@ namespace ManagerService.Controllers
Resource resource = _resourceService.GetById(resourceId); Resource resource = _resourceService.GetById(resourceId);
ResourceData resourceData = _resourceDataService.GetByResourceId(resourceId); ResourceData resourceData = _resourceDataService.GetByResourceId(resourceId);
if (resource != null && resourceData != null) { if (resource != null && resourceData != null && !resourceDTOs.Any(r => r.id == resource.Id)) {
resourceDTOs.Add(resource.ToDTO(resourceData.Data)); resourceDTOs.Add(resource.ToDTO(resourceData.Data));
} }
} }