Move enums to Data project.

Marechai.App/Enums.cs

@@ -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
-}

Marechai.App/Marechai.App.csproj

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

Marechai.App/Presentation/NewsViewModel.cs

@@ -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;
 

Marechai.Data/Dtos/BasePhotoDto.cs

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

Marechai.Data/Dtos/BaseScanDto.cs

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

Marechai.Data/Dtos/CompanyDto.cs

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

Marechai.Data/Dtos/DocumentScanBaseDto.cs

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

Marechai.Data/Dtos/MachineDto.cs

@@ -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 =>

Marechai.Data/Dtos/MediaDto.cs

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

Marechai.Data/Dtos/MemoryByMachineDto.cs

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

Marechai.Data/Dtos/MemoryDto.cs

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

Marechai.Data/Dtos/NewsDto.cs

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

Marechai.Data/Dtos/SoftwareVariantDto.cs

@@ -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; }
 }

Marechai.Data/Dtos/StorageByMachineDto.cs

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

Marechai.Data/Dtos/StorageDto.cs

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

Marechai.Data/Enums.cs

@@ -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
 {

Marechai.Data/Marechai.Data.csproj

@@ -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>

Marechai.Data/Models/OpticalDiscTrack.cs

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

Marechai.Data/Models/VariableBlockSize.cs

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

Marechai.Database/Marechai.Database.csproj

@@ -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>

Marechai.Database/Models/Audit.cs

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

Marechai.Database/Models/BasePhoto.cs

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

Marechai.Database/Models/BaseScan.cs

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

Marechai.Database/Models/Company.cs

@@ -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;
 

Marechai.Database/Models/DocumentScanBase.cs

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

Marechai.Database/Models/Machine.cs

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

Marechai.Database/Models/MarechaiContext.cs

@@ -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;

Marechai.Database/Models/MasteringText.cs

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

Marechai.Database/Models/Media.cs

@@ -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;
 

Marechai.Database/Models/MediaDump.cs

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

Marechai.Database/Models/MediaDumpSubchannelImage.cs

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

Marechai.Database/Models/MemoryByMachine.cs

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

Marechai.Database/Models/MemoryByOwnedMachine.cs

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

Marechai.Database/Models/News.cs

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

Marechai.Database/Models/OwnedMachine.cs

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

Marechai.Database/Models/SoftwareVariant.cs

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

Marechai.Database/Models/StorageByMachine.cs

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

Marechai.Database/Models/StorageByOwnedMachine.cs

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

Marechai.Database/Operations/Update.cs

@@ -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();
 

Marechai.Server/Controllers/ComputersController.cs

@@ -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;

Marechai.Server/Controllers/ConsolesController.cs

@@ -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;

Marechai.Server/Controllers/MachinesController.cs

@@ -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;

Marechai.Server/Controllers/NewsController.cs

@@ -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;

Marechai/Helpers/Exif.cs

@@ -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;
 

Marechai/Pages/Admin/Details/Book.razor

@@ -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

Marechai/Pages/Admin/Details/Book.razor.cs

@@ -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;

Marechai/Pages/Admin/Details/Company.razor

@@ -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

Marechai/Pages/Admin/Details/Company.razor.cs

@@ -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;

Marechai/Pages/Admin/Details/Document.razor

@@ -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

Marechai/Pages/Admin/Details/Document.razor.cs

@@ -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;

Marechai/Pages/Admin/Details/Machine.razor

@@ -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

Marechai/Pages/Admin/Details/Machine.razor.cs

@@ -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;

Marechai/Pages/Admin/Details/MachinePhoto.razor

@@ -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

Marechai/Pages/Admin/Details/MachinePhoto.razor.cs

@@ -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;
 

Marechai/Pages/Admin/Details/MagazineIssue.razor

@@ -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

Marechai/Pages/Admin/Details/MagazineIssue.razor.cs

@@ -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;

Marechai/Pages/Admin/Details/SoftwareVariant.razor

@@ -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

Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs

@@ -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;

Marechai/Pages/Companies/View.razor

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

Marechai/Pages/Companies/View.razor.cs

@@ -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;
 

Marechai/Pages/Machines/View.razor

@@ -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

Marechai/Services/ComputersService.cs

@@ -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

Marechai/Services/ConsolesService.cs

@@ -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

Marechai/Services/MachinesService.cs

@@ -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;
         }

Marechai/Services/MemoriesByMachineService.cs

@@ -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;
 

Marechai/Services/NewsService.cs

@@ -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;

Marechai/Services/StorageByMachineService.cs

@@ -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;