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

Update all object to visitNamur request

Browse Source
This commit is contained in:
Thomas Fransolet 2023-12-14 17:49:07 +01:00
parent 369b789abb
commit 17f9cd2334
7 changed files with 64 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Manager.Interfaces/DTO/SubSection/ArticleDTO.cs
View File

@ -13,4 +13,14 @@ namespace Manager.Interfaces.DTO
public bool isReadAudioAuto { get; set; } // MyVisit - True for audio play when open the article / false otherwise public bool isReadAudioAuto { get; set; } // MyVisit - True for audio play when open the article / false otherwise
public List<ImageDTO> images { get; set; } // Will check if ok or if we need need type of image (simpler) public List<ImageDTO> images { get; set; } // Will check if ok or if we need need type of image (simpler)
} }
public class ImageDTO
{
public List<TranslationDTO> title { get; set; }
public List<TranslationDTO> description { get; set; }
public string resourceId { get; set; }
public string source { get; set; } // url to resource id (local) or on internet
public int order { get; set; } // Order to show
public ResourceType type { get; set; }
}
} }

20
Manager.Interfaces/DTO/SubSection/MapDTO.cs
View File

@ -11,7 +11,8 @@ namespace Manager.Interfaces.DTO
public MapTypeApp mapType { get; set; } // Default = Hybrid public MapTypeApp mapType { get; set; } // Default = Hybrid
public List<GeoPointDTO> points { get; set; } public List<GeoPointDTO> points { get; set; }
public string iconResourceId { get; set; } public string iconResourceId { get; set; }
public string iconSource { get; set; } // url to resource id (local) or on internet public string iconSource { get; set; } // url to firebase storage or on internet
public List<CategorieDTO> categories { get; set; }
} }
public class GeoPointDTO public class GeoPointDTO
@ -19,15 +20,24 @@ namespace Manager.Interfaces.DTO
public int id { get; set; } public int id { get; set; }
public List<TranslationDTO> title { get; set; } public List<TranslationDTO> title { get; set; }
public List<TranslationDTO> description { get; set; } public List<TranslationDTO> description { get; set; }
public List<ImageGeoPoint> images { get; set; } public List<ContentGeoPoint> contents { get; set; }
public CategorieDTO categorie { get; set; }
public string latitude { get; set; } public string latitude { get; set; }
public string longitude { get; set; } public string longitude { get; set; }
} }
public class ImageGeoPoint public class CategorieDTO
{ {
public string imageResourceId { get; set; } public string name { get; set; }
public string imageSource { get; set; } // url to resource id (local) or on internet public string icon { get; set; }
}
public class ContentGeoPoint
{
public string resourceId { get; set; }
public ResourceType resourceType { get; set; }
public string resourceUrl { get; set; } // url to firebase storage or on internet
public string latitude { get; set; }
} }
public enum MapTypeApp public enum MapTypeApp

11
Manager.Interfaces/DTO/SubSection/QuizzDTO.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Security.AccessControl;
using System.Text; using System.Text;
namespace Manager.Interfaces.DTO namespace Manager.Interfaces.DTO
@ -17,8 +18,9 @@ namespace Manager.Interfaces.DTO
{ {
public List<TranslationDTO> label { get; set; } public List<TranslationDTO> label { get; set; }
public List<ResponseDTO> responses { get; set; } public List<ResponseDTO> responses { get; set; }
public string resourceId { get; set; } // question image public string resourceId { get; set; } // question image, audio or video
public string source { get; set; } public ResourceType resourceType { get; set; }
public string resourceUrl { get; set; } // url to firebase storage or on internet
public int order { get; set; } // Order to show public int order { get; set; } // Order to show
} }
@ -32,7 +34,8 @@ namespace Manager.Interfaces.DTO
public class LevelDTO public class LevelDTO
{ {
public List<TranslationDTO> label { get; set; } public List<TranslationDTO> label { get; set; }
public string resourceId { get; set; } // level result image public string resourceId { get; set; } // level result image or video
public string source { get; set; } public ResourceType resourceType { get; set; }
public string resourceUrl { get; set; } // url to firebase storage or on internet
} }
} }

8
Manager.Interfaces/DTO/SubSection/SliderDTO.cs
View File

@ -7,14 +7,16 @@ namespace Manager.Interfaces.DTO
{ {
public class SliderDTO public class SliderDTO
{ {
public List<ImageDTO> images { get; set; } public List<ContentDTO> contents { get; set; }
} }
public class ImageDTO { public class ContentDTO
{
public List<TranslationDTO> title { get; set; } public List<TranslationDTO> title { get; set; }
public List<TranslationDTO> description { get; set; } public List<TranslationDTO> description { get; set; }
public string resourceId { get; set; } public string resourceId { get; set; }
public string source { get; set; } // url to resource id (local) or on internet public string resourceUrl { get; set; } // url to firebase storage or on internet
public int order { get; set; } // Order to show public int order { get; set; } // Order to show
public ResourceType resourceType { get; set; }
} }
} }

24
ManagerService/Controllers/ConfigurationController.cs
View File

@ -350,10 +350,10 @@ namespace ManagerService.Controllers
} }
foreach (var point in mapDTO.points) { foreach (var point in mapDTO.points) {
foreach (var image in point.images) { foreach (var content in point.contents) {
if (image.imageResourceId != null) if (content.resourceId != null)
{ {
addResourceToList(resourceDTOs, image.imageResourceId); addResourceToList(resourceDTOs, content.resourceId);
} }
} }
} }
@ -361,11 +361,11 @@ namespace ManagerService.Controllers
break; break;
case SectionType.Slider: case SectionType.Slider:
SliderDTO sliderDTO = JsonConvert.DeserializeObject<SliderDTO>(section.data); SliderDTO sliderDTO = JsonConvert.DeserializeObject<SliderDTO>(section.data);
foreach (var image in sliderDTO.images) foreach (var content in sliderDTO.contents)
{ {
if (image.resourceId != null) if (content.resourceId != null)
{ {
addResourceToList(resourceDTOs, image.resourceId); addResourceToList(resourceDTOs, content.resourceId);
} }
} }
break; break;
@ -546,11 +546,11 @@ namespace ManagerService.Controllers
foreach (var point in mapDTO.points) foreach (var point in mapDTO.points)
{ {
foreach (var image in point.images) foreach (var content in point.contents)
{ {
if (image.imageResourceId != null) if (content.resourceId != null)
{ {
createResource(exportConfiguration.resources.Where(r => r.id == image.imageResourceId).FirstOrDefault()); createResource(exportConfiguration.resources.Where(r => r.id == content.resourceId).FirstOrDefault());
} }
} }
} }
@ -558,11 +558,11 @@ namespace ManagerService.Controllers
break; break;
case SectionType.Slider: case SectionType.Slider:
SliderDTO sliderDTO = JsonConvert.DeserializeObject<SliderDTO>(section.data); SliderDTO sliderDTO = JsonConvert.DeserializeObject<SliderDTO>(section.data);
foreach (var image in sliderDTO.images) foreach (var content in sliderDTO.contents)
{ {
if (image.resourceId != null) if (content.resourceId != null)
{ {
createResource(exportConfiguration.resources.Where(r => r.id == image.resourceId).FirstOrDefault()); createResource(exportConfiguration.resources.Where(r => r.id == content.resourceId).FirstOrDefault());
} }
} }
break; break;

27
ManagerService/Controllers/ResourceController.cs
View File

@ -18,6 +18,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Newtonsoft.Json; using Newtonsoft.Json;
using NSwag.Annotations; using NSwag.Annotations;
using static System.Net.Mime.MediaTypeNames;
namespace ManagerService.Controllers namespace ManagerService.Controllers
{ {
@ -446,49 +447,49 @@ namespace ManagerService.Controllers
mapDTO.iconResourceId = mapDTO.iconResourceId == id ? null : mapDTO.iconResourceId; mapDTO.iconResourceId = mapDTO.iconResourceId == id ? null : mapDTO.iconResourceId;
foreach (var point in mapDTO.points) foreach (var point in mapDTO.points)
{ {
foreach (var image in point.images) foreach (var content in point.contents)
{ {
image.imageSource = image.imageResourceId == id ? null : image.imageSource; content.resourceUrl = content.resourceId == id ? null : content.resourceUrl;
image.imageResourceId = image.imageResourceId == id ? null : image.imageResourceId; content.resourceId = content.resourceId == id ? null : content.resourceId;
} }
} }
section.Data = JsonConvert.SerializeObject(mapDTO); section.Data = JsonConvert.SerializeObject(mapDTO);
break; break;
case SectionType.Slider: case SectionType.Slider:
SliderDTO sliderDTO = JsonConvert.DeserializeObject<SliderDTO>(section.Data); SliderDTO sliderDTO = JsonConvert.DeserializeObject<SliderDTO>(section.Data);
List<ImageDTO> imagesToKeep = new List<ImageDTO>(); List<ContentDTO> contentsToKeep = new List<ContentDTO>();
foreach (var image in sliderDTO.images) foreach (var content in sliderDTO.contents)
{ {
if (image.resourceId != id) if (content.resourceId != id)
imagesToKeep.Add(image); contentsToKeep.Add(content);
} }
sliderDTO.images = imagesToKeep; sliderDTO.contents = contentsToKeep;
section.Data = JsonConvert.SerializeObject(sliderDTO); section.Data = JsonConvert.SerializeObject(sliderDTO);
break; break;
case SectionType.Quizz: case SectionType.Quizz:
QuizzDTO quizzDTO = JsonConvert.DeserializeObject<QuizzDTO>(section.Data); QuizzDTO quizzDTO = JsonConvert.DeserializeObject<QuizzDTO>(section.Data);
foreach (var question in quizzDTO.questions) foreach (var question in quizzDTO.questions)
{ {
question.source = question.resourceId == id ? null : question.source; question.resourceUrl = question.resourceId == id ? null : question.resourceUrl;
question.resourceId = question.resourceId == id ? null : question.resourceId; question.resourceId = question.resourceId == id ? null : question.resourceId;
} }
if (quizzDTO.bad_level != null) { if (quizzDTO.bad_level != null) {
quizzDTO.bad_level.source = quizzDTO.bad_level.resourceId == id ? null : quizzDTO.bad_level.source; quizzDTO.bad_level.resourceUrl = quizzDTO.bad_level.resourceId == id ? null : quizzDTO.bad_level.resourceUrl;
quizzDTO.bad_level.resourceId = quizzDTO.bad_level.resourceId == id ? null : quizzDTO.bad_level.resourceId; quizzDTO.bad_level.resourceId = quizzDTO.bad_level.resourceId == id ? null : quizzDTO.bad_level.resourceId;
} }
if (quizzDTO.medium_level != null) if (quizzDTO.medium_level != null)
{ {
quizzDTO.medium_level.source = quizzDTO.medium_level.resourceId == id ? null : quizzDTO.medium_level.source; quizzDTO.medium_level.resourceUrl = quizzDTO.medium_level.resourceId == id ? null : quizzDTO.medium_level.resourceUrl;
quizzDTO.medium_level.resourceId = quizzDTO.medium_level.resourceId == id ? null : quizzDTO.medium_level.resourceId; quizzDTO.medium_level.resourceId = quizzDTO.medium_level.resourceId == id ? null : quizzDTO.medium_level.resourceId;
} }
if (quizzDTO.good_level != null) if (quizzDTO.good_level != null)
{ {
quizzDTO.good_level.source = quizzDTO.good_level.resourceId == id ? null : quizzDTO.good_level.source; quizzDTO.good_level.resourceUrl = quizzDTO.good_level.resourceId == id ? null : quizzDTO.good_level.resourceUrl;
quizzDTO.good_level.resourceId = quizzDTO.good_level.resourceId == id ? null : quizzDTO.good_level.resourceId; quizzDTO.good_level.resourceId = quizzDTO.good_level.resourceId == id ? null : quizzDTO.good_level.resourceId;
} }
if (quizzDTO.great_level != null) if (quizzDTO.great_level != null)
{ {
quizzDTO.great_level.source = quizzDTO.great_level.resourceId == id ? null : quizzDTO.great_level.source; quizzDTO.great_level.resourceUrl = quizzDTO.great_level.resourceId == id ? null : quizzDTO.great_level.resourceUrl;
quizzDTO.great_level.resourceId = quizzDTO.great_level.resourceId == id ? null : quizzDTO.great_level.resourceId; quizzDTO.great_level.resourceId = quizzDTO.great_level.resourceId == id ? null : quizzDTO.great_level.resourceId;
} }
section.Data = JsonConvert.SerializeObject(quizzDTO); section.Data = JsonConvert.SerializeObject(quizzDTO);

2
ManagerService/Controllers/SectionController.cs
View File

@ -364,7 +364,7 @@ namespace ManagerService.Controllers
break; break;
case SectionType.Slider: case SectionType.Slider:
sliderDTO = new SliderDTO(); sliderDTO = new SliderDTO();
sliderDTO.images = new List<ImageDTO>(); sliderDTO.contents = new List<ContentDTO>();
section.Data = JsonConvert.SerializeObject(sliderDTO); // Include all info from specific section as JSON section.Data = JsonConvert.SerializeObject(sliderDTO); // Include all info from specific section as JSON
break; break;