diff --git a/LANCommander.Server.Services/Mappers/MappingProfile.cs b/LANCommander.Server.Services/Mappers/MappingProfile.cs index d5761686..5c7c37fe 100644 --- a/LANCommander.Server.Services/Mappers/MappingProfile.cs +++ b/LANCommander.Server.Services/Mappers/MappingProfile.cs @@ -1,5 +1,6 @@ using System.Linq.Expressions; using AutoMapper; +using LANCommander.SDK.Enums; using LANCommander.SDK.Models; using LANCommander.Server.Services; @@ -24,7 +25,8 @@ namespace LANCommander.Server CreateMap(); CreateMap(); CreateMap(); - CreateMap(); + CreateMap() + .ForMember(dest => dest.Scripts, opt => opt.MapFrom(src => src.Scripts != null ? src.Scripts.Where(s => s.Type != ScriptType.Package) : null)); CreateMap(); CreateMap(); CreateMap(); @@ -69,7 +71,10 @@ namespace LANCommander.Server .MaxDepth(5) .ForMember(dest => dest.DependentGames, - opt => opt.MapFrom(src => src.DependentGames.Select(d => d.Id))); + opt => opt.MapFrom(src => src.DependentGames.Select(d => d.Id))) + .ForMember(dest => + dest.Scripts, + opt => opt.MapFrom(src => src.Scripts != null ? src.Scripts.Where(s => s.Type != ScriptType.Package) : null)); CreateMap() .ForMember(dest => @@ -100,6 +105,7 @@ namespace LANCommander.Server CreateMap() .ForMember(dest => dest.BaseGameId, opt => opt.MapFrom(src => src.BaseGameId ?? Guid.Empty)) .ForMember(dest => dest.BaseGame, opt => opt.MapFrom(src => src.BaseGame != null ? src.BaseGame.Title : null)) + .ForMember(dest => dest.Scripts, opt => opt.MapFrom(src => src.Scripts != null ? src.Scripts.Where(s => s.Type != ScriptType.Package) : null)) .ReverseMap() .ForMember(dest => dest.BaseGameId, opt => opt.Ignore()) .ForMember(dest => dest.BaseGame, opt => opt.Ignore()); @@ -112,7 +118,9 @@ namespace LANCommander.Server CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); - CreateMap().ReverseMap(); + CreateMap() + .ForMember(dest => dest.Scripts, opt => opt.MapFrom(src => src.Scripts != null ? src.Scripts.Where(s => s.Type != ScriptType.Package) : null)) + .ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); diff --git a/LANCommander.Server/Endpoints/GameEndpoints.cs b/LANCommander.Server/Endpoints/GameEndpoints.cs index 5b322988..e693a152 100644 --- a/LANCommander.Server/Endpoints/GameEndpoints.cs +++ b/LANCommander.Server/Endpoints/GameEndpoints.cs @@ -225,7 +225,7 @@ public static class GameEndpoints var results = await scriptService .AsSplitQuery() .AsNoTracking() - .GetAsync(s => s.GameId == id); + .GetAsync(s => s.GameId == id && s.Type != SDK.Enums.ScriptType.Package); return mapper.Map>(results); }, tags: ["Scripts", $"Games/{id}/Scripts", "Games", $"Games/{id}"]); diff --git a/LANCommander.Server/Endpoints/RedistributablesEndpoints.cs b/LANCommander.Server/Endpoints/RedistributablesEndpoints.cs index f42be694..b6aac43a 100644 --- a/LANCommander.Server/Endpoints/RedistributablesEndpoints.cs +++ b/LANCommander.Server/Endpoints/RedistributablesEndpoints.cs @@ -59,7 +59,7 @@ public static class RedistributablesEndpoints var results = await scriptService .AsSplitQuery() .AsNoTracking() - .GetAsync(s => s.RedistributableId == id); + .GetAsync(s => s.RedistributableId == id && s.Type != SDK.Enums.ScriptType.Package); return mapper.Map>(results); }, tags: ["Scripts", $"Redistributables/{id}/Scripts", "Redistributables", $"Redistributables/{id}"]); diff --git a/LANCommander.Server/Endpoints/ToolsEndpoints.cs b/LANCommander.Server/Endpoints/ToolsEndpoints.cs index a6dbe3a0..3b83af9f 100644 --- a/LANCommander.Server/Endpoints/ToolsEndpoints.cs +++ b/LANCommander.Server/Endpoints/ToolsEndpoints.cs @@ -58,7 +58,7 @@ public static class ToolsEndpoints var results = await scriptService .AsSplitQuery() .AsNoTracking() - .GetAsync(s => s.RedistributableId == id); + .GetAsync(s => s.RedistributableId == id && s.Type != SDK.Enums.ScriptType.Package); return mapper.Map>(results); }, tags: ["Scripts", $"Tools/{id}/Scripts", "Tools", $"Tools/{id}"]); diff --git a/LANCommander.Server/LANCommanderMappingProfile.cs b/LANCommander.Server/LANCommanderMappingProfile.cs index 26ad4515..ff817c08 100644 --- a/LANCommander.Server/LANCommanderMappingProfile.cs +++ b/LANCommander.Server/LANCommanderMappingProfile.cs @@ -1,5 +1,6 @@ using System.Linq.Expressions; using AutoMapper; +using LANCommander.SDK.Enums; using LANCommander.SDK.Models; namespace LANCommander.Server @@ -20,7 +21,8 @@ namespace LANCommander.Server CreateMap(); CreateMap(); CreateMap(); - CreateMap(); + CreateMap() + .ForMember(dest => dest.Scripts, opt => opt.MapFrom(src => src.Scripts != null ? src.Scripts.Where(s => s.Type != ScriptType.Package) : null)); CreateMap(); CreateMap(); CreateMap(); @@ -41,7 +43,10 @@ namespace LANCommander.Server .MaxDepth(5) .ForMember(dest => dest.DependentGames, - opt => opt.MapFrom(src => src.DependentGames.Select(d => d.Id))); + opt => opt.MapFrom(src => src.DependentGames.Select(d => d.Id))) + .ForMember(dest => + dest.Scripts, + opt => opt.MapFrom(src => src.Scripts != null ? src.Scripts.Where(s => s.Type != ScriptType.Package) : null)); CreateMap() .ForMember(dest =>