Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-07-29 08:28:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix PhotoSubjects not being added and parsed properly

Browse source
This commit is contained in:
jvyden 2021-11-07 18:06:49 -05:00
commit eb744d46a1
No known key found for this signature in database
GPG key ID: 18BCF2BE0262B278
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ProjectLighthouse/Controllers/PhotosController.cs
View file

@ -5,6 +5,7 @@ using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Xml.Serialization;
using Kettu;
using LBPUnion.ProjectLighthouse.Serialization;
using LBPUnion.ProjectLighthouse.Types;
using Microsoft.AspNetCore.Mvc;
@ -40,21 +41,25 @@ namespace LBPUnion.ProjectLighthouse.Controllers
photo.CreatorId = user.UserId;
photo.Creator = user;
foreach (PhotoSubject subject in photo.SubjectsXmlDontUse) // fine for here
foreach (PhotoSubject subject in photo.Subjects)
{
subject.User = await this.database.Users.FirstOrDefaultAsync(u => u.Username == subject.Username);
if (subject.User == null) return this.BadRequest();
subject.UserId = subject.User.UserId;
Logger.Log($"Adding PhotoSubject (userid {subject.UserId}) to db");
this.database.PhotoSubjects.Add(subject);
}
await this.database.SaveChangesAsync();
photo.PhotoSubjectCollection = photo.Subjects.Aggregate(string.Empty, (s, subject) => s + subject.PhotoSubjectId);
// photo.Slot = await this.database.Slots.FirstOrDefaultAsync(s => s.SlotId == photo.SlotId);
photo.PhotoSubjectIds = photo.Subjects.Select(subject => subject.PhotoSubjectId.ToString()).ToArray();
// photo.Slot = await this.database.Slots.FirstOrDefaultAsync(s => s.SlotId == photo.SlotId);
Logger.Log($"Adding PhotoSubjectCollection ({photo.PhotoSubjectCollection}) to photo");
this.database.Photos.Add(photo);

6
ProjectLighthouse/Types/Photo.cs
View file

@ -39,14 +39,12 @@ namespace LBPUnion.ProjectLighthouse.Types
[NotMapped]
[XmlArray("subjects")]
[XmlArrayItem("subject")]
public List<PhotoSubject> SubjectsXmlDontUse {
get => null!;
set => Subjects = value;
}
public List<PhotoSubject>? SubjectsXmlDontUseLiterallyEver;
[NotMapped]
public List<PhotoSubject> Subjects {
get {
if (this.SubjectsXmlDontUseLiterallyEver != null) return this.SubjectsXmlDontUseLiterallyEver;
if (this.subjects != null) return this.subjects;
List<PhotoSubject> response = new();