claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move enums to Data project.

Browse Source
This commit is contained in:
Natalia Portillo
2025-11-14 16:31:35 +00:00
parent 5bffbc342e
commit 4a5708b910
67 changed files with 753 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marechai.App/Enums.cs
View File

@@ -1,14 +0,0 @@
namespace Marechai.App;
public enum NewsType
{
NewComputerInDb = 1,
NewConsoleInDb = 2,
NewComputerInCollection = 3,
NewConsoleInCollection = 4,
UpdatedComputerInDb = 5,
UpdatedConsoleInDb = 6,
UpdatedComputerInCollection = 7,
UpdatedConsoleInCollection = 8,
NewMoneyDonation = 9
}

3
Marechai.App/Marechai.App.csproj
View File

@@ -38,5 +38,8 @@
SkiaRenderer;
</UnoFeatures>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Marechai.Data\Marechai.Data.csproj"/>
</ItemGroup>
</Project>

1
Marechai.App/Presentation/NewsViewModel.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Threading.Tasks;
using Marechai.App.Services;
using Marechai.Data;
namespace Marechai.App.Presentation;

1
Marechai.Data/Dtos/BasePhotoDto.cs
View File

@@ -24,7 +24,6 @@
*******************************************************************************/
using System.Text.Json.Serialization;
using Marechai.Database;
namespace Marechai.Data.Dtos;

1
Marechai.Data/Dtos/BaseScanDto.cs
View File

@@ -24,7 +24,6 @@
*******************************************************************************/
using System.Text.Json.Serialization;
using Marechai.Database;
namespace Marechai.Data.Dtos;

1
Marechai.Data/Dtos/CompanyDto.cs
View File

@@ -25,7 +25,6 @@
using System.ComponentModel.DataAnnotations;
using System.Text.Json.Serialization;
using Marechai.Database;
namespace Marechai.Data.Dtos;

1
Marechai.Data/Dtos/DocumentScanBaseDto.cs
View File

@@ -24,7 +24,6 @@
*******************************************************************************/
using System.Text.Json.Serialization;
using Marechai.Database;
namespace Marechai.Data.Dtos;

47
Marechai.Data/Dtos/MachineDto.cs
View File

@@ -25,41 +25,56 @@
using System.ComponentModel.DataAnnotations;
using System.Text.Json.Serialization;
using Marechai.Database;
namespace Marechai.Data.Dtos;
public class MachineDto : BaseDto<int>
{
[JsonPropertyName("name")] [Required] public required string Name { get; set; }
[JsonPropertyName("name")]
[Required]
public required string Name { get; set; }
[JsonPropertyName("model")] public string? Model { get; set; }
[JsonPropertyName("model")]
public string? Model { get; set; }
[JsonPropertyName("company_id")] public int CompanyId { get; set; }
[JsonPropertyName("company_id")]
public int CompanyId { get; set; }
[JsonPropertyName("company_logo")] public Guid? CompanyLogo { get; set; }
[JsonPropertyName("company_logo")]
public Guid? CompanyLogo { get; set; }
[JsonPropertyName("introduced")] public DateTime? Introduced { get; set; }
[JsonPropertyName("introduced")]
public DateTime? Introduced { get; set; }
[JsonPropertyName("family_id")] public int? FamilyId { get; set; }
[JsonPropertyName("family_id")]
public int? FamilyId { get; set; }
[JsonPropertyName("family_name")] public string? FamilyName { get; set; }
[JsonPropertyName("family_name")]
public string? FamilyName { get; set; }
[JsonIgnore] public List<GpuDto>? Gpus { get; set; }
[JsonIgnore]
public List<GpuDto>? Gpus { get; set; }
[JsonIgnore] public List<MemoryDto>? Memory { get; set; }
[JsonIgnore]
public List<MemoryDto>? Memory { get; set; }
[JsonIgnore] public List<ProcessorDto>? Processors { get; set; }
[JsonIgnore]
public List<ProcessorDto>? Processors { get; set; }
[JsonIgnore] public List<SoundSynthDto>? SoundSynthesizers { get; set; }
[JsonIgnore]
public List<SoundSynthDto>? SoundSynthesizers { get; set; }
[JsonIgnore] public List<StorageDto>? Storage { get; set; }
[JsonIgnore]
public List<StorageDto>? Storage { get; set; }
[JsonPropertyName("company")] public string? Company { get; set; }
[JsonPropertyName("company")]
public string? Company { get; set; }
[JsonPropertyName("type")] public MachineType Type { get; set; }
[JsonPropertyName("type")]
public MachineType Type { get; set; }
[JsonPropertyName("family")] public string? Family { get; set; }
[JsonPropertyName("family")]
public string? Family { get; set; }
[JsonIgnore]
public string IntroducedView =>

3
Marechai.Data/Dtos/MediaDto.cs
View File

@@ -26,8 +26,7 @@
using System.ComponentModel.DataAnnotations;
using System.Text.Json.Serialization;
using Aaru.CommonTypes;
using Marechai.Database;
using Marechai.Database.Models;
using Marechai.Data.Models;
namespace Marechai.Data.Dtos;

1
Marechai.Data/Dtos/MemoryByMachineDto.cs
View File

@@ -24,7 +24,6 @@
*******************************************************************************/
using System.Text.Json.Serialization;
using Marechai.Database;
namespace Marechai.Data.Dtos;

1
Marechai.Data/Dtos/MemoryDto.cs
View File

@@ -24,7 +24,6 @@
*******************************************************************************/
using System.Text.Json.Serialization;
using Marechai.Database;
namespace Marechai.Data.Dtos;

1
Marechai.Data/Dtos/NewsDto.cs
View File

@@ -24,7 +24,6 @@
*******************************************************************************/
using System.Text.Json.Serialization;
using Marechai.Database;
namespace Marechai.Data.Dtos;

41
Marechai.Data/Dtos/SoftwareVariantDto.cs
View File

@@ -25,45 +25,58 @@
using System.ComponentModel.DataAnnotations;
using System.Text.Json.Serialization;
using Marechai.Database;
namespace Marechai.Data.Dtos;
public class SoftwareVariantDto : BaseDto<ulong>
{
[JsonPropertyName("name")] [Required] public required string Name { get; set; }
[JsonPropertyName("name")]
[Required]
public required string Name { get; set; }
[JsonPropertyName("version")] public string? Version { get; set; }
[JsonPropertyName("version")]
public string? Version { get; set; }
[JsonPropertyName("introduced")] public DateTime? Introduced { get; set; }
[JsonPropertyName("introduced")]
public DateTime? Introduced { get; set; }
[JsonPropertyName("parent_id")] public ulong? ParentId { get; set; }
[JsonPropertyName("parent_id")]
public ulong? ParentId { get; set; }
[JsonPropertyName("parent")] public string? Parent { get; set; }
[JsonPropertyName("parent")]
public string? Parent { get; set; }
[JsonPropertyName("version_id")]
[Required]
public ulong SoftwareVersionId { get; set; }
[JsonPropertyName("software_version")] public string? SoftwareVersion { get; set; }
[JsonPropertyName("software_version")]
public string? SoftwareVersion { get; set; }
[JsonPropertyName("minimum_memory")] public ulong? MinimumMemory { get; set; }
[JsonPropertyName("minimum_memory")]
public ulong? MinimumMemory { get; set; }
[JsonPropertyName("recommended_memory")]
public ulong? RecommendedMemory { get; set; }
[JsonPropertyName("required_storage")] public ulong? RequiredStorage { get; set; }
[JsonPropertyName("required_storage")]
public ulong? RequiredStorage { get; set; }
[JsonPropertyName("part_number")] public string? PartNumber { get; set; }
[JsonPropertyName("part_number")]
public string? PartNumber { get; set; }
[JsonPropertyName("serial_number")] public string? SerialNumber { get; set; }
[JsonPropertyName("serial_number")]
public string? SerialNumber { get; set; }
[JsonPropertyName("product_code")] public string? ProductCode { get; set; }
[JsonPropertyName("product_code")]
public string? ProductCode { get; set; }
[JsonPropertyName("catalogue_number")] public string? CatalogueNumber { get; set; }
[JsonPropertyName("catalogue_number")]
public string? CatalogueNumber { get; set; }
[JsonPropertyName("distribution_mode")]
public DistributionMode DistributionMode { get; set; }
[JsonPropertyName("family")] public string? Family { get; set; }
[JsonPropertyName("family")]
public string? Family { get; set; }
}

1
Marechai.Data/Dtos/StorageByMachineDto.cs
View File

@@ -25,7 +25,6 @@
using System.ComponentModel.DataAnnotations;
using System.Text.Json.Serialization;
using Marechai.Database;
namespace Marechai.Data.Dtos;

1
Marechai.Data/Dtos/StorageDto.cs
View File

@@ -24,7 +24,6 @@
*******************************************************************************/
using System.Text.Json.Serialization;
using Marechai.Database;
namespace Marechai.Data.Dtos;

3
Marechai.Database/Enums.cs → Marechai.Data/Enums.cs
View File

@@ -23,13 +23,12 @@
// Copyright © 2003-2026 Natalia Portillo
*******************************************************************************/
using System;
using System.ComponentModel.DataAnnotations;
// ReSharper disable UnusedMember.Global
// ReSharper disable InconsistentNaming
namespace Marechai.Database;
namespace Marechai.Data;
public enum NewsType
{

4
Marechai.Data/Marechai.Data.csproj
View File

@@ -5,9 +5,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Marechai.Database\Marechai.Database.csproj"/>
<PackageReference Include="Aaru.CommonTypes"/>
</ItemGroup>
</Project>

2
Marechai.Database/Models/OpticalDiscTrack.cs → Marechai.Data/Models/OpticalDiscTrack.cs
View File

@@ -1,6 +1,6 @@
using Aaru.CommonTypes.Enums;
namespace Marechai.Database.Models;
namespace Marechai.Data.Models;
// Not for a table
public class OpticalDiscTrack

2
Marechai.Database/Models/VariableBlockSize.cs → Marechai.Data/Models/VariableBlockSize.cs
View File

@@ -23,7 +23,7 @@
// Copyright © 2003-2026 Natalia Portillo
*******************************************************************************/
namespace Marechai.Database.Models;
namespace Marechai.Data.Models;
// Not for a table
public class VariableBlockSize

3
Marechai.Database/Marechai.Database.csproj
View File

@@ -15,4 +15,7 @@
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Json.Microsoft"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Marechai.Data\Marechai.Data.csproj"/>
</ItemGroup>
</Project>

1
Marechai.Database/Models/Audit.cs
View File

@@ -26,6 +26,7 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Marechai.Data;
namespace Marechai.Database.Models;

1
Marechai.Database/Models/BasePhoto.cs
View File

@@ -26,6 +26,7 @@
using System;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using Marechai.Data;
namespace Marechai.Database.Models;

1
Marechai.Database/Models/BaseScan.cs
View File

@@ -26,6 +26,7 @@
using System;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using Marechai.Data;
namespace Marechai.Database.Models;

1
Marechai.Database/Models/Company.cs
View File

@@ -28,6 +28,7 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using Marechai.Data;
namespace Marechai.Database.Models;

2
Marechai.Database/Models/DocumentScanBase.cs
View File

@@ -23,6 +23,8 @@
// Copyright © 2003-2026 Natalia Portillo
*******************************************************************************/
using Marechai.Data;
namespace Marechai.Database.Models;
public abstract class DocumentScanBase : BaseScan

1
Marechai.Database/Models/Machine.cs
View File

@@ -26,6 +26,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Marechai.Data;
namespace Marechai.Database.Models;

1
Marechai.Database/Models/MarechaiContext.cs
View File

@@ -26,6 +26,7 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Marechai.Data;
using Marechai.Database.Schemas;
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;

1
Marechai.Database/Models/MasteringText.cs
View File

@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using Marechai.Data;
namespace Marechai.Database.Models;

2
Marechai.Database/Models/Media.cs
View File

@@ -27,6 +27,8 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Aaru.CommonTypes;
using Marechai.Data;
using Marechai.Data.Models;
namespace Marechai.Database.Models;

1
Marechai.Database/Models/MediaDump.cs
View File

@@ -25,6 +25,7 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Marechai.Data;
namespace Marechai.Database.Models;

1
Marechai.Database/Models/MediaDumpSubchannelImage.cs
View File

@@ -24,6 +24,7 @@
*******************************************************************************/
using System.ComponentModel.DataAnnotations.Schema;
using Marechai.Data;
namespace Marechai.Database.Models;

1
Marechai.Database/Models/MemoryByMachine.cs
View File

@@ -24,6 +24,7 @@
*******************************************************************************/
using System.ComponentModel;
using Marechai.Data;
namespace Marechai.Database.Models;

1
Marechai.Database/Models/MemoryByOwnedMachine.cs
View File

@@ -24,6 +24,7 @@
*******************************************************************************/
using System.ComponentModel;
using Marechai.Data;
namespace Marechai.Database.Models;

1
Marechai.Database/Models/News.cs
View File

@@ -25,6 +25,7 @@
using System;
using System.ComponentModel;
using Marechai.Data;
namespace Marechai.Database.Models;

1
Marechai.Database/Models/OwnedMachine.cs
View File

@@ -26,6 +26,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using Marechai.Data;
namespace Marechai.Database.Models;

1
Marechai.Database/Models/SoftwareVariant.cs
View File

@@ -26,6 +26,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Marechai.Data;
namespace Marechai.Database.Models;

1
Marechai.Database/Models/StorageByMachine.cs
View File

@@ -24,6 +24,7 @@
*******************************************************************************/
using System.ComponentModel.DataAnnotations;
using Marechai.Data;
namespace Marechai.Database.Models;

1
Marechai.Database/Models/StorageByOwnedMachine.cs
View File

@@ -24,6 +24,7 @@
*******************************************************************************/
using System.ComponentModel.DataAnnotations;
using Marechai.Data;
namespace Marechai.Database.Models;

3
Marechai.Database/Operations/Update.cs
View File

@@ -27,6 +27,7 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using Marechai.Data;
using Marechai.Database.Schemas.Sql;
namespace Marechai.Database;
@@ -422,9 +423,7 @@ public partial class Operations
dataAdapter.Fill(dataSet);
foreach(DataRow dataRow in dataSet.Tables[0].Rows)
{
consoleIdAndCompanyId.Add(int.Parse(dataRow["id"].ToString()), int.Parse(dataRow["company"].ToString()));
}
trans = connection.BeginTransaction();

2
Marechai.Server/Controllers/ComputersController.cs
View File

@@ -26,8 +26,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;

2
Marechai.Server/Controllers/ConsolesController.cs
View File

@@ -26,8 +26,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;

2
Marechai.Server/Controllers/MachinesController.cs
View File

@@ -28,8 +28,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;

2
Marechai.Server/Controllers/NewsController.cs
View File

@@ -27,8 +27,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;

2
Marechai/Helpers/Exif.cs
View File

@@ -28,8 +28,8 @@ using System.Diagnostics;
using System.Globalization;
using System.Text.Json;
using System.Text.Json.Serialization;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
namespace Marechai.Helpers;

2
Marechai/Pages/Admin/Details/Book.razor
View File

@@ -28,8 +28,8 @@
@page "/admin/books/details/{Id:long}"
@page "/admin/books/edit/{Id:long}"
@page "/admin/books/create"
@using Marechai.Data
@using Marechai.Data.Dtos
@using Marechai.Database
@using Marechai.Database.Models
@inherits OwningComponentBase<BooksService>
@inject IStringLocalizer<BooksService> L

2
Marechai/Pages/Admin/Details/Book.razor.cs
View File

@@ -32,8 +32,8 @@ using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
using Blazorise;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Marechai.Helpers;
using Marechai.Shared;

2
Marechai/Pages/Admin/Details/Company.razor
View File

@@ -28,8 +28,8 @@
@page "/admin/companies/details/{Id:int}"
@page "/admin/companies/edit/{Id:int}"
@page "/admin/companies/create"
@using Marechai.Data
@using Marechai.Data.Dtos
@using Marechai.Database
@using Marechai.Database.Models
@inherits OwningComponentBase<CompaniesService>
@inject IStringLocalizer<CompaniesService> L

2
Marechai/Pages/Admin/Details/Company.razor.cs
View File

@@ -30,8 +30,8 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Blazorise;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Marechai.Helpers;
using Marechai.Shared;

2
Marechai/Pages/Admin/Details/Document.razor
View File

@@ -28,8 +28,8 @@
@page "/admin/documents/details/{Id:long}"
@page "/admin/documents/edit/{Id:long}"
@page "/admin/documents/create"
@using Marechai.Data
@using Marechai.Data.Dtos
@using Marechai.Database
@using Marechai.Database.Models
@inherits OwningComponentBase<DocumentsService>
@inject IStringLocalizer<DocumentsService> L

2
Marechai/Pages/Admin/Details/Document.razor.cs
View File

@@ -32,8 +32,8 @@ using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
using Blazorise;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Marechai.Helpers;
using Marechai.Shared;

2
Marechai/Pages/Admin/Details/Machine.razor
View File

@@ -28,8 +28,8 @@
@page "/admin/machines/details/{Id:int}"
@page "/admin/machines/edit/{Id:int}"
@page "/admin/machines/create"
@using Marechai.Data
@using Marechai.Data.Dtos
@using Marechai.Database
@using Marechai.Database.Models
@inherits OwningComponentBase<MachinesService>
@inject IStringLocalizer<MachinesService> L

2
Marechai/Pages/Admin/Details/Machine.razor.cs
View File

@@ -28,8 +28,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Blazorise;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Shared;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Authorization;

4
Marechai/Pages/Admin/Details/MachinePhoto.razor
View File

@@ -27,9 +27,9 @@
@page "/admin/machines/photo/details/{Id:guid}"
@page "/admin/machines/photo/edit/{Id:guid}"
@using Marechai.Database
@using Marechai.Data
@using Marechai.Database.Models
@using Orientation = Marechai.Database.Orientation
@using Orientation = Marechai.Data.Orientation
@inherits OwningComponentBase<MachinePhotosService>
@inject IStringLocalizer<MachinePhotosService> L
@inject NavigationManager NavigationManager

4
Marechai/Pages/Admin/Details/MachinePhoto.razor.cs
View File

@@ -27,13 +27,13 @@ using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Blazorise;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Marechai.Shared;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Authorization;
using Orientation = Marechai.Database.Orientation;
using Orientation = Marechai.Data.Orientation;
namespace Marechai.Pages.Admin.Details;

2
Marechai/Pages/Admin/Details/MagazineIssue.razor
View File

@@ -28,8 +28,8 @@
@page "/admin/magazine_issues/details/{Id:long}"
@page "/admin/magazine_issues/edit/{Id:long}"
@page "/admin/magazine_issues/create"
@using Marechai.Data
@using Marechai.Data.Dtos
@using Marechai.Database
@using Marechai.Database.Models
@inherits OwningComponentBase<MagazineIssuesService>
@inject IStringLocalizer<MagazineIssuesService> L

2
Marechai/Pages/Admin/Details/MagazineIssue.razor.cs
View File

@@ -32,8 +32,8 @@ using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
using Blazorise;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Marechai.Helpers;
using Marechai.Shared;

2
Marechai/Pages/Admin/Details/SoftwareVariant.razor
View File

@@ -28,8 +28,8 @@
@page "/admin/software_variants/details/{Id:long}"
@page "/admin/software_variants/edit/{Id:long}"
@page "/admin/software_variants/create"
@using Marechai.Data
@using Marechai.Data.Dtos
@using Marechai.Database
@using Marechai.Database.Models
@inherits OwningComponentBase<SoftwareVariantsService>
@inject IStringLocalizer<SoftwareVariantsService> L

2
Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs
View File

@@ -28,8 +28,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Blazorise;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Shared;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Authorization;

3
Marechai/Pages/Companies/View.razor
View File

@@ -26,8 +26,7 @@
}
@page "/company/{Id:int}"
@using Marechai.Database
@using Marechai.Data
@using Marechai.Database.Models
@inherits OwningComponentBase<CompaniesService>
@inject IStringLocalizer<CompaniesService> L

2
Marechai/Pages/Companies/View.razor.cs
View File

@@ -27,8 +27,8 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Microsoft.AspNetCore.Components;

2
Marechai/Pages/Machines/View.razor
View File

@@ -27,8 +27,8 @@
}
@page "/machine/{Id:int}"
@using Marechai.Data
@using Marechai.Data.Dtos
@using Marechai.Database
@inherits OwningComponentBase<MachinesService>
@inject IStringLocalizer<MachinesService> L
@inject IWebHostEnvironment Host

13
Marechai/Services/ComputersService.cs
View File

@@ -26,8 +26,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Microsoft.EntityFrameworkCore;
@@ -52,7 +52,10 @@ public class ComputersService(MarechaiContext context)
public async Task<List<MachineDto>> GetComputersByLetterAsync(char c) => await context.Machines
.Include(m => m.Company)
.Where(m => m.Type == MachineType.Computer && EF.Functions.Like(m.Name, $"{c}%"))
.Where(m => m.Type ==
MachineType.Computer &&
EF.Functions.Like(m.Name,
$"{c}%"))
.OrderBy(m => m.Company.Name)
.ThenBy(m => m.Name)
.Select(m => new MachineDto
@@ -65,7 +68,11 @@ public class ComputersService(MarechaiContext context)
public async Task<List<MachineDto>> GetComputersByYearAsync(int year) => await context.Machines
.Include(m => m.Company)
.Where(m => m.Type == MachineType.Computer && m.Introduced != null && m.Introduced.Value.Year == year)
.Where(m => m.Type ==
MachineType.Computer &&
m.Introduced != null &&
m.Introduced.Value.Year ==
year)
.OrderBy(m => m.Company.Name)
.ThenBy(m => m.Name)
.Select(m => new MachineDto

15
Marechai/Services/ConsolesService.cs
View File

@@ -26,8 +26,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Microsoft.EntityFrameworkCore;
@@ -52,7 +52,11 @@ public class ConsolesService(MarechaiContext context)
public async Task<List<MachineDto>> GetConsolesByLetterAsync(char c) => await context.Machines
.Include(m => m.Company)
.Where(m => m.Type == MachineType.Console && EF.Functions.Like(m.Name, $"{c}%"))
.Where(m =>
m.Type ==
MachineType.Console &&
EF.Functions.Like(m.Name,
$"{c}%"))
.OrderBy(m => m.Company.Name)
.ThenBy(m => m.Name)
.Select(m => new MachineDto
@@ -65,7 +69,12 @@ public class ConsolesService(MarechaiContext context)
public async Task<List<MachineDto>> GetConsolesByYearAsync(int year) => await context.Machines
.Include(m => m.Company)
.Where(m => m.Type == MachineType.Console && m.Introduced != null && m.Introduced.Value.Year == year)
.Where(m =>
m.Type ==
MachineType.Console &&
m.Introduced != null &&
m.Introduced.Value.Year ==
year)
.OrderBy(m => m.Company.Name)
.ThenBy(m => m.Name)
.Select(m => new MachineDto

4
Marechai/Services/MachinesService.cs
View File

@@ -27,8 +27,8 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Localization;
@@ -185,9 +185,7 @@ public class MachinesService
IQueryable<CompanyLogo> logos = context.CompanyLogos.Where(l => l.CompanyId == company.Id);
if(model.Introduced.HasValue)
{
model.CompanyLogo = (await logos.FirstOrDefaultAsync(l => l.Year >= model.Introduced.Value.Year))?.Guid;
}
if(model.CompanyLogo is null && logos.Any()) model.CompanyLogo = (await logos.FirstAsync())?.Guid;
}

2
Marechai/Services/MemoriesByMachineService.cs
View File

@@ -26,8 +26,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Microsoft.EntityFrameworkCore;

2
Marechai/Services/NewsService.cs
View File

@@ -26,8 +26,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Localization;

2
Marechai/Services/StorageByMachineService.cs
View File

@@ -26,8 +26,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Marechai.Data;
using Marechai.Data.Dtos;
using Marechai.Database;
using Marechai.Database.Models;
using Microsoft.EntityFrameworkCore;