Résolution des conflits lors du merge de feature/DTO dans develop

This commit is contained in:
CERNON Timothé
2025-10-09 15:07:17 +02:00
32 changed files with 373 additions and 0 deletions

View File

@@ -0,0 +1,10 @@
namespace PF3.DTO.Show.Request;
public class CreateShowDto
{
public string? Name { get; set; }
public string? Place { get; set; }
public string? Description { get; set; }
public string? PyrotechnicImplementationPlan { get; set; }
public DateTime? Date { get; set; }
}

View File

@@ -0,0 +1,6 @@
namespace PF3.DTO.Show.Request;
public class IdShowDto
{
public int? Id { get; set; }
}

View File

@@ -0,0 +1,11 @@
namespace PF3.DTO.Show.Request;
public class UpdateShowDto
{
public int? Id { get; set; }
public string? Name { get; set; }
public string? Place { get; set; }
public string? Description { get; set; }
public string? PyrotechnicImplementationPlan { get; set; }
public DateTime? Date { get; set; }
}

View File

@@ -0,0 +1,11 @@
namespace PF3.DTO.Show.Response;
public class ReadShowDto
{
public int? Id { get; set; }
public string? Name { get; set; }
public string? Place { get; set; }
public string? Description { get; set; }
public string? PyrotechnicImplementationPlan { get; set; }
public DateTime? Date { get; set; }
}

View File

@@ -0,0 +1,14 @@
namespace PF3.DTO.SoundCategory.Request;
public class CreateSoundDto
{
public string? Name { get; set; }
public string? Type { get; set; }
public string? Artist { get; set; }
public string? Duration { get; set; }
public string? Kind { get; set; }
public string? Format { get; set; }
public DateTime? CreationDate { get; set; }
public string? SoundCategoryId { get; set; }
}

View File

@@ -0,0 +1,6 @@
namespace PF3.DTO.SoundCategory.Request;
public class IdSoundto
{
public int? Id { get; set; }
}

View File

@@ -0,0 +1,15 @@
namespace PF3.DTO.SoundCategory.Request;
public class UpdateSoundDto
{
public int? Id { get; set; }
public string? Name { get; set; }
public string? Type { get; set; }
public string? Artist { get; set; }
public string? Duration { get; set; }
public string? Kind { get; set; }
public string? Format { get; set; }
public DateTime? CreationDate { get; set; }
public string? SoundCategoryId { get; set; }
}

View File

@@ -0,0 +1,15 @@
namespace PF3.DTO.SoundCategory.Response;
public class ReadSoundDto
{
public int? Id { get; set; }
public string? Name { get; set; }
public string? Type { get; set; }
public string? Artist { get; set; }
public string? Duration { get; set; }
public string? Kind { get; set; }
public string? Format { get; set; }
public DateTime? CreationDate { get; set; }
public string? SoundCategoryId { get; set; }
}

View File

@@ -0,0 +1,6 @@
namespace PF3.DTO.SoundCategory.Request;
public class CreateSoundCategoryDto
{
public string? Name { get; set; }
}

View File

@@ -0,0 +1,6 @@
namespace PF3.DTO.SoundCategory.Request;
public class IdSoundCategoryDto
{
public int? Id { get; set; }
}

View File

@@ -0,0 +1,7 @@
namespace PF3.DTO.SoundCategory.Request;
public class UpdateSoundCategoryDto
{
public int? Id { get; set; }
public string? Name { get; set; }
}

View File

@@ -0,0 +1,7 @@
namespace PF3.DTO.SoundCategory.Response;
public class ReadSoundCategoryDto
{
public int? Id { get; set; }
public string? Name { get; set; }
}

View File

@@ -0,0 +1,9 @@
namespace PF3.DTO.SoundTimecode.Request;
public class CreateSoundTimecodeDto
{
public int? ShowId { get; set; }
public int? SoundId { get; set; }
public string? Start { get; set; }
public string? End { get; set; }
}

View File

@@ -0,0 +1,6 @@
namespace PF3.DTO.SoundTimecode.Request;
public class IdSoundTimecodeDto
{
public int? Id { get; set; }
}

View File

@@ -0,0 +1,10 @@
namespace PF3.DTO.SoundTimecode.Request;
public class UpdateSoundTimecodeDto
{
public int? Id { get; set; }
public int? ShowId { get; set; }
public int? SoundId { get; set; }
public string? Start { get; set; }
public string? End { get; set; }
}

View File

@@ -0,0 +1,10 @@
namespace PF3.DTO.SoundTimecode.Response;
public class ReadSoundTimecodeDto
{
public int? Id { get; set; }
public int? ShowId { get; set; }
public int? SoundId { get; set; }
public string? Start { get; set; }
public string? End { get; set; }
}

View File

@@ -0,0 +1,9 @@
namespace PF3.DTO.Staff.Request;
public class CreateStaffDto
{
public string? FirstName { get; set; }
public string? LastName { get; set; }
public string? Profession { get; set; }
public string? Email { get; set; }
}

View File

@@ -0,0 +1,6 @@
namespace PF3.DTO.Staff.Request;
public class IdStaffDto
{
public int? Id { get; set; }
}

View File

@@ -0,0 +1,10 @@
namespace PF3.DTO.Staff.Request;
public class UpdateStaffDto
{
public int? Id { get; set; }
public string? FirstName { get; set; }
public string? LastName { get; set; }
public string? Profession { get; set; }
public string? Email { get; set; }
}

View File

@@ -0,0 +1,10 @@
namespace PF3.DTO.Staff.Response;
public class ReadStaffDto
{
public int? Id { get; set; }
public string? FirstName { get; set; }
public string? LastName { get; set; }
public string? Profession { get; set; }
public string? Email { get; set; }
}

View File

@@ -0,0 +1,10 @@
namespace PF3.DTO.Truck.Request;
public class CreateTruckDto
{
public string? Type { get; set; }
public double? MaxExplosiveCapacity { get; set; }
public string? Sizes { get; set; }
public bool? Statut { get; set; }
public int? ShowId { get; set; }
}

View File

@@ -0,0 +1,6 @@
namespace PF3.DTO.Truck.Request;
public class IdTruckDto
{
public int? Id { get; set; }
}

View File

@@ -0,0 +1,11 @@
namespace PF3.DTO.Truck.Request;
public class UpdateTruckDto
{
public int? Id { get; set; }
public string? Type { get; set; }
public string? MaxExplosiveCapacity { get; set; }
public string? Sizes { get; set; }
public bool? Statut { get; set; }
public int? ShowId { get; set; }
}

View File

@@ -0,0 +1,11 @@
namespace PF3.DTO.Truck.Response;
public class ReadTruckDto
{
public int? Id { get; set; }
public string? Type { get; set; }
public string? MaxExplosiveCapacity { get; set; }
public string? Sizes { get; set; }
public bool? Statut { get; set; }
public int? ShowId { get; set; }
}

27
PF3/Models/Show.cs Normal file
View File

@@ -0,0 +1,27 @@
using System.ComponentModel.DataAnnotations;
namespace PF3.Models;
public class Show
{
[Key] public int Id { get; set; }
[Required]
public string? Name { get; set; }
[Required, MaxLength(120)]
public string? Place { get; set; }
[MaxLength(500)]
public string? Description { get; set; }
// Lien (chemin/URL/nom de fichier) vers le plan dimplémentation pyrotechnique
[Required, MaxLength(500)]
public string? PyrotechnicImplementationPlan { get; set; }
public DateTime? Date { get; set; }
public ICollection<Staff> Staff { get; set; } = new List<Staff>();
public ICollection<Truck> Trucks { get; set; } = new List<Truck>();
public ICollection<SoundTimecode> SoundCues { get; set; } = new List<SoundTimecode>();
}

35
PF3/Models/Sound.cs Normal file
View File

@@ -0,0 +1,35 @@
using System.ComponentModel.DataAnnotations;
using PF3.Models;
namespace PF3.Models;
public class Sound
{
[Key] public int Id { get; set; }
[Required, MaxLength(120)]
public string Name { get; set; } = null!;
[Required, MaxLength(60)]
public string? Type { get; set; }
[Required, MaxLength(120)]
public string? Artist { get; set; }
[Required, Range(0, int.MaxValue)]
public int? Duration { get; set; }
[Required, MaxLength(40)]
public string? Kind { get; set; }
[Required, MaxLength(40)]
public string? Format { get; set; }
public DateTime? CreationDate { get; set; }
[Required]
public int SoundCategoryId { get; set; }
public SoundCategory? Category { get; set; }
public ICollection<SoundTimecode> ShowPlacements { get; set; } = new List<SoundTimecode>();
}

View File

@@ -0,0 +1,13 @@
using System.ComponentModel.DataAnnotations;
namespace PF3.Models;
public class SoundCategory
{
[Key] public int Id { get; set; }
[Required, MaxLength(60)]
public string Name { get; set; } = null!;
public ICollection<Sound> Sounds { get; set; } = new List<Sound>();
}

View File

@@ -0,0 +1,22 @@
using System.ComponentModel.DataAnnotations;
namespace PF3.Models;
public class SoundTimecode
{
[Key] public int Id { get; set; }
[Required]
public int ShowId { get; set; }
public Show? Show { get; set; }
[Required]
public int SoundId { get; set; }
public Sound? Sound { get; set; }
[Required, Range(0, int.MaxValue)]
public int Start { get; set; }
[Required, Range(0, int.MaxValue)]
public int End { get; set; }
}

22
PF3/Models/Staff.cs Normal file
View File

@@ -0,0 +1,22 @@
using System.ComponentModel.DataAnnotations;
namespace PF3.Models;
public class Staff
{
[Key] public int Id { get; set; }
[Required, MaxLength(60)]
public string FirstName { get; set; } = null!;
[Required, MaxLength(60)]
public string LastName { get; set; } = null!;
[Required, MaxLength(100)]
public string? Profession { get; set; }
[Required, MaxLength(120)]
public string? Email { get; set; }
public ICollection<Show> Shows { get; set; } = new List<Show>();
}

24
PF3/Models/Truck.cs Normal file
View File

@@ -0,0 +1,24 @@
using System.ComponentModel.DataAnnotations;
namespace PF3.Models;
public class Truck
{
[Key] public int Id { get; set; }
[Required, MaxLength(40)]
public string Type { get; set; } = null!;
[Range(0, double.MaxValue)]
public double? MaxExplosiveCapacity { get; set; }
[Required, MaxLength(80)]
public string? Sizes { get; set; }
[Required, MaxLength(40)]
public string? Statut { get; set; }
[Required]
public int ShowId { get; set; }
public Show? Show { get; set; }
}

View File

@@ -11,4 +11,11 @@
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2"/>
</ItemGroup>
<ItemGroup>
<Folder Include="DTO\Show\" />
<Folder Include="DTO\SoundCategory\" />
<Folder Include="DTO\SoundTimecode\" />
<Folder Include="Endpoint\" />
</ItemGroup>
</Project>