diff --git a/Marechai.App/Enums.cs b/Marechai.App/Enums.cs deleted file mode 100644 index 883c6202..00000000 --- a/Marechai.App/Enums.cs +++ /dev/null @@ -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 -} \ No newline at end of file diff --git a/Marechai.App/Marechai.App.csproj b/Marechai.App/Marechai.App.csproj index 5fedfef5..a6fad1cc 100644 --- a/Marechai.App/Marechai.App.csproj +++ b/Marechai.App/Marechai.App.csproj @@ -1,42 +1,45 @@ - - net10.0-android;net10.0-browserwasm;net10.0-desktop - $(TargetFrameworks);net10.0-ios + + net10.0-android;net10.0-browserwasm;net10.0-desktop + $(TargetFrameworks);net10.0-ios - Exe - true + Exe + true - - Marechai.App - - net.marechai.app - - 1.0 - 1 - - O=Marechai.App - - Marechai.App powered by Uno Platform. + + Marechai.App + + net.marechai.app + + 1.0 + 1 + + O=Marechai.App + + Marechai.App powered by Uno Platform. - - - Lottie; - Hosting; - Toolkit; - Logging; - LoggingSerilog; - Mvvm; - Configuration; - HttpKiota; - Serialization; - Localization; - Navigation; - ThemeService; - SkiaRenderer; - - + + + Lottie; + Hosting; + Toolkit; + Logging; + LoggingSerilog; + Mvvm; + Configuration; + HttpKiota; + Serialization; + Localization; + Navigation; + ThemeService; + SkiaRenderer; + + + + + diff --git a/Marechai.App/Presentation/NewsViewModel.cs b/Marechai.App/Presentation/NewsViewModel.cs index 4e0e7300..09f9f988 100644 --- a/Marechai.App/Presentation/NewsViewModel.cs +++ b/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; diff --git a/Marechai.Data/Dtos/BasePhotoDto.cs b/Marechai.Data/Dtos/BasePhotoDto.cs index aa7f84ec..cf93c3e7 100644 --- a/Marechai.Data/Dtos/BasePhotoDto.cs +++ b/Marechai.Data/Dtos/BasePhotoDto.cs @@ -24,7 +24,6 @@ *******************************************************************************/ using System.Text.Json.Serialization; -using Marechai.Database; namespace Marechai.Data.Dtos; diff --git a/Marechai.Data/Dtos/BaseScanDto.cs b/Marechai.Data/Dtos/BaseScanDto.cs index 1dfd129e..08138761 100644 --- a/Marechai.Data/Dtos/BaseScanDto.cs +++ b/Marechai.Data/Dtos/BaseScanDto.cs @@ -24,7 +24,6 @@ *******************************************************************************/ using System.Text.Json.Serialization; -using Marechai.Database; namespace Marechai.Data.Dtos; diff --git a/Marechai.Data/Dtos/CompanyDto.cs b/Marechai.Data/Dtos/CompanyDto.cs index 75fa429b..4f03612e 100644 --- a/Marechai.Data/Dtos/CompanyDto.cs +++ b/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; diff --git a/Marechai.Data/Dtos/DocumentScanBaseDto.cs b/Marechai.Data/Dtos/DocumentScanBaseDto.cs index ebc92276..f8bb3f19 100644 --- a/Marechai.Data/Dtos/DocumentScanBaseDto.cs +++ b/Marechai.Data/Dtos/DocumentScanBaseDto.cs @@ -24,7 +24,6 @@ *******************************************************************************/ using System.Text.Json.Serialization; -using Marechai.Database; namespace Marechai.Data.Dtos; diff --git a/Marechai.Data/Dtos/MachineDto.cs b/Marechai.Data/Dtos/MachineDto.cs index 51ab2f89..868d8b7e 100644 --- a/Marechai.Data/Dtos/MachineDto.cs +++ b/Marechai.Data/Dtos/MachineDto.cs @@ -25,43 +25,58 @@ using System.ComponentModel.DataAnnotations; using System.Text.Json.Serialization; -using Marechai.Database; namespace Marechai.Data.Dtos; public class MachineDto : BaseDto { - [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? Gpus { get; set; } + [JsonIgnore] + public List? Gpus { get; set; } - [JsonIgnore] public List? Memory { get; set; } + [JsonIgnore] + public List? Memory { get; set; } - [JsonIgnore] public List? Processors { get; set; } + [JsonIgnore] + public List? Processors { get; set; } - [JsonIgnore] public List? SoundSynthesizers { get; set; } + [JsonIgnore] + public List? SoundSynthesizers { get; set; } - [JsonIgnore] public List? Storage { get; set; } + [JsonIgnore] + public List? 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 => - Introduced?.Year == 1000 ? "Prototype" : Introduced?.ToShortDateString() ?? "Unknown"; + Introduced?.Year == 1000 ? "Prototype" : Introduced?.ToShortDateString() ?? "Unknown"; } \ No newline at end of file diff --git a/Marechai.Data/Dtos/MediaDto.cs b/Marechai.Data/Dtos/MediaDto.cs index 03f40995..bc4f1af9 100644 --- a/Marechai.Data/Dtos/MediaDto.cs +++ b/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.Database.Models; +using Marechai.Data.Models; namespace Marechai.Data.Dtos; diff --git a/Marechai.Data/Dtos/MemoryByMachineDto.cs b/Marechai.Data/Dtos/MemoryByMachineDto.cs index 4b6eece0..d1959a5a 100644 --- a/Marechai.Data/Dtos/MemoryByMachineDto.cs +++ b/Marechai.Data/Dtos/MemoryByMachineDto.cs @@ -24,7 +24,6 @@ *******************************************************************************/ using System.Text.Json.Serialization; -using Marechai.Database; namespace Marechai.Data.Dtos; diff --git a/Marechai.Data/Dtos/MemoryDto.cs b/Marechai.Data/Dtos/MemoryDto.cs index a94bdc37..3e37d597 100644 --- a/Marechai.Data/Dtos/MemoryDto.cs +++ b/Marechai.Data/Dtos/MemoryDto.cs @@ -24,7 +24,6 @@ *******************************************************************************/ using System.Text.Json.Serialization; -using Marechai.Database; namespace Marechai.Data.Dtos; diff --git a/Marechai.Data/Dtos/NewsDto.cs b/Marechai.Data/Dtos/NewsDto.cs index 169089ca..59e02de6 100644 --- a/Marechai.Data/Dtos/NewsDto.cs +++ b/Marechai.Data/Dtos/NewsDto.cs @@ -24,7 +24,6 @@ *******************************************************************************/ using System.Text.Json.Serialization; -using Marechai.Database; namespace Marechai.Data.Dtos; diff --git a/Marechai.Data/Dtos/SoftwareVariantDto.cs b/Marechai.Data/Dtos/SoftwareVariantDto.cs index bdd0c2cc..f081a6d2 100644 --- a/Marechai.Data/Dtos/SoftwareVariantDto.cs +++ b/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 { - [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; } } \ No newline at end of file diff --git a/Marechai.Data/Dtos/StorageByMachineDto.cs b/Marechai.Data/Dtos/StorageByMachineDto.cs index d70123be..97de9eef 100644 --- a/Marechai.Data/Dtos/StorageByMachineDto.cs +++ b/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; diff --git a/Marechai.Data/Dtos/StorageDto.cs b/Marechai.Data/Dtos/StorageDto.cs index 5865158d..1a6456d3 100644 --- a/Marechai.Data/Dtos/StorageDto.cs +++ b/Marechai.Data/Dtos/StorageDto.cs @@ -24,7 +24,6 @@ *******************************************************************************/ using System.Text.Json.Serialization; -using Marechai.Database; namespace Marechai.Data.Dtos; diff --git a/Marechai.Database/Enums.cs b/Marechai.Data/Enums.cs similarity index 99% rename from Marechai.Database/Enums.cs rename to Marechai.Data/Enums.cs index 75bee362..2997581c 100644 --- a/Marechai.Database/Enums.cs +++ b/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 { diff --git a/Marechai.Data/Marechai.Data.csproj b/Marechai.Data/Marechai.Data.csproj index 6d86c227..a1dfda06 100644 --- a/Marechai.Data/Marechai.Data.csproj +++ b/Marechai.Data/Marechai.Data.csproj @@ -5,9 +5,7 @@ enable enable - - + - diff --git a/Marechai.Database/Models/OpticalDiscTrack.cs b/Marechai.Data/Models/OpticalDiscTrack.cs similarity index 90% rename from Marechai.Database/Models/OpticalDiscTrack.cs rename to Marechai.Data/Models/OpticalDiscTrack.cs index 66b874b1..1f51f644 100644 --- a/Marechai.Database/Models/OpticalDiscTrack.cs +++ b/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 diff --git a/Marechai.Database/Models/VariableBlockSize.cs b/Marechai.Data/Models/VariableBlockSize.cs similarity index 97% rename from Marechai.Database/Models/VariableBlockSize.cs rename to Marechai.Data/Models/VariableBlockSize.cs index 4646bf3b..eb46bc33 100644 --- a/Marechai.Database/Models/VariableBlockSize.cs +++ b/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 diff --git a/Marechai.Database/Marechai.Database.csproj b/Marechai.Database/Marechai.Database.csproj index 2d673a70..92c6a15d 100644 --- a/Marechai.Database/Marechai.Database.csproj +++ b/Marechai.Database/Marechai.Database.csproj @@ -15,4 +15,7 @@ + + + \ No newline at end of file diff --git a/Marechai.Database/Models/Audit.cs b/Marechai.Database/Models/Audit.cs index 913cce89..e79a84a9 100644 --- a/Marechai.Database/Models/Audit.cs +++ b/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; diff --git a/Marechai.Database/Models/BasePhoto.cs b/Marechai.Database/Models/BasePhoto.cs index a3f25768..7c29ef54 100644 --- a/Marechai.Database/Models/BasePhoto.cs +++ b/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; diff --git a/Marechai.Database/Models/BaseScan.cs b/Marechai.Database/Models/BaseScan.cs index dbbe6a7b..ab84b268 100644 --- a/Marechai.Database/Models/BaseScan.cs +++ b/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; diff --git a/Marechai.Database/Models/Company.cs b/Marechai.Database/Models/Company.cs index 3dfcd4b0..78d86b72 100644 --- a/Marechai.Database/Models/Company.cs +++ b/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; diff --git a/Marechai.Database/Models/DocumentScanBase.cs b/Marechai.Database/Models/DocumentScanBase.cs index f0008907..08074962 100644 --- a/Marechai.Database/Models/DocumentScanBase.cs +++ b/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 diff --git a/Marechai.Database/Models/Machine.cs b/Marechai.Database/Models/Machine.cs index 26c62ccb..ea05306d 100644 --- a/Marechai.Database/Models/Machine.cs +++ b/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; diff --git a/Marechai.Database/Models/MarechaiContext.cs b/Marechai.Database/Models/MarechaiContext.cs index 2ffe9ed7..fb891bbd 100644 --- a/Marechai.Database/Models/MarechaiContext.cs +++ b/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; diff --git a/Marechai.Database/Models/MasteringText.cs b/Marechai.Database/Models/MasteringText.cs index a855b555..c8dd83e0 100644 --- a/Marechai.Database/Models/MasteringText.cs +++ b/Marechai.Database/Models/MasteringText.cs @@ -1,4 +1,5 @@ using System.ComponentModel.DataAnnotations; +using Marechai.Data; namespace Marechai.Database.Models; diff --git a/Marechai.Database/Models/Media.cs b/Marechai.Database/Models/Media.cs index 68db98a2..434bd21c 100644 --- a/Marechai.Database/Models/Media.cs +++ b/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; diff --git a/Marechai.Database/Models/MediaDump.cs b/Marechai.Database/Models/MediaDump.cs index 9db21a17..dd4f3cda 100644 --- a/Marechai.Database/Models/MediaDump.cs +++ b/Marechai.Database/Models/MediaDump.cs @@ -25,6 +25,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using Marechai.Data; namespace Marechai.Database.Models; diff --git a/Marechai.Database/Models/MediaDumpSubchannelImage.cs b/Marechai.Database/Models/MediaDumpSubchannelImage.cs index ec9faad0..eba4197c 100644 --- a/Marechai.Database/Models/MediaDumpSubchannelImage.cs +++ b/Marechai.Database/Models/MediaDumpSubchannelImage.cs @@ -24,6 +24,7 @@ *******************************************************************************/ using System.ComponentModel.DataAnnotations.Schema; +using Marechai.Data; namespace Marechai.Database.Models; diff --git a/Marechai.Database/Models/MemoryByMachine.cs b/Marechai.Database/Models/MemoryByMachine.cs index 09f55145..7c840ec2 100644 --- a/Marechai.Database/Models/MemoryByMachine.cs +++ b/Marechai.Database/Models/MemoryByMachine.cs @@ -24,6 +24,7 @@ *******************************************************************************/ using System.ComponentModel; +using Marechai.Data; namespace Marechai.Database.Models; diff --git a/Marechai.Database/Models/MemoryByOwnedMachine.cs b/Marechai.Database/Models/MemoryByOwnedMachine.cs index 539d7c45..15f67d31 100644 --- a/Marechai.Database/Models/MemoryByOwnedMachine.cs +++ b/Marechai.Database/Models/MemoryByOwnedMachine.cs @@ -24,6 +24,7 @@ *******************************************************************************/ using System.ComponentModel; +using Marechai.Data; namespace Marechai.Database.Models; diff --git a/Marechai.Database/Models/News.cs b/Marechai.Database/Models/News.cs index f6830e33..e0972b74 100644 --- a/Marechai.Database/Models/News.cs +++ b/Marechai.Database/Models/News.cs @@ -25,6 +25,7 @@ using System; using System.ComponentModel; +using Marechai.Data; namespace Marechai.Database.Models; diff --git a/Marechai.Database/Models/OwnedMachine.cs b/Marechai.Database/Models/OwnedMachine.cs index 791908cb..e836afe5 100644 --- a/Marechai.Database/Models/OwnedMachine.cs +++ b/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; diff --git a/Marechai.Database/Models/SoftwareVariant.cs b/Marechai.Database/Models/SoftwareVariant.cs index 9216501f..17867b99 100644 --- a/Marechai.Database/Models/SoftwareVariant.cs +++ b/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; diff --git a/Marechai.Database/Models/StorageByMachine.cs b/Marechai.Database/Models/StorageByMachine.cs index c7ee3e9c..2d4336e7 100644 --- a/Marechai.Database/Models/StorageByMachine.cs +++ b/Marechai.Database/Models/StorageByMachine.cs @@ -24,6 +24,7 @@ *******************************************************************************/ using System.ComponentModel.DataAnnotations; +using Marechai.Data; namespace Marechai.Database.Models; diff --git a/Marechai.Database/Models/StorageByOwnedMachine.cs b/Marechai.Database/Models/StorageByOwnedMachine.cs index bbbc91f0..51825efd 100644 --- a/Marechai.Database/Models/StorageByOwnedMachine.cs +++ b/Marechai.Database/Models/StorageByOwnedMachine.cs @@ -24,6 +24,7 @@ *******************************************************************************/ using System.ComponentModel.DataAnnotations; +using Marechai.Data; namespace Marechai.Database.Models; diff --git a/Marechai.Database/Operations/Update.cs b/Marechai.Database/Operations/Update.cs index 04cbe10e..77374141 100644 --- a/Marechai.Database/Operations/Update.cs +++ b/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(); @@ -1200,7 +1199,7 @@ public partial class Operations dbCmd.Transaction = trans; dbCmd.CommandText = $"UPDATE `computers` SET `gpu` = {DbNone} WHERE `gpu` = 1;\n" + - "UPDATE `computers` SET `gpu` = NULL WHERE `gpu` = 2;\n" + + "UPDATE `computers` SET `gpu` = NULL WHERE `gpu` = 2;\n" + $"UPDATE `computers` SET `gpu` = {DbSoftware} WHERE `gpu` = 3;"; dbCmd.ExecuteNonQuery(); @@ -1213,7 +1212,7 @@ public partial class Operations dbCmd.Transaction = trans; dbCmd.CommandText = $"UPDATE `consoles` SET `gpu` = {DbNone} WHERE `gpu` = 1;\n" + - "UPDATE `consoles` SET `gpu` = NULL WHERE `gpu` = 2;\n" + + "UPDATE `consoles` SET `gpu` = NULL WHERE `gpu` = 2;\n" + $"UPDATE `consoles` SET `gpu` = {DbSoftware} WHERE `gpu` = 3;"; dbCmd.ExecuteNonQuery(); diff --git a/Marechai.Server/Controllers/ComputersController.cs b/Marechai.Server/Controllers/ComputersController.cs index 494d765a..5faa08fe 100644 --- a/Marechai.Server/Controllers/ComputersController.cs +++ b/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; diff --git a/Marechai.Server/Controllers/ConsolesController.cs b/Marechai.Server/Controllers/ConsolesController.cs index 84c6f3c9..4d626a3e 100644 --- a/Marechai.Server/Controllers/ConsolesController.cs +++ b/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; diff --git a/Marechai.Server/Controllers/MachinesController.cs b/Marechai.Server/Controllers/MachinesController.cs index 9a97e997..74bb8ce5 100644 --- a/Marechai.Server/Controllers/MachinesController.cs +++ b/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; diff --git a/Marechai.Server/Controllers/NewsController.cs b/Marechai.Server/Controllers/NewsController.cs index 8420dcb5..be7ed8e5 100644 --- a/Marechai.Server/Controllers/NewsController.cs +++ b/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; diff --git a/Marechai/Helpers/Exif.cs b/Marechai/Helpers/Exif.cs index 6cdc4f99..691a24cf 100644 --- a/Marechai/Helpers/Exif.cs +++ b/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; diff --git a/Marechai/Pages/Admin/Details/Book.razor b/Marechai/Pages/Admin/Details/Book.razor index 9e47be70..6c72c919 100644 --- a/Marechai/Pages/Admin/Details/Book.razor +++ b/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 @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/Book.razor.cs b/Marechai/Pages/Admin/Details/Book.razor.cs index 46177812..1c003b65 100644 --- a/Marechai/Pages/Admin/Details/Book.razor.cs +++ b/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; @@ -45,115 +45,115 @@ namespace Marechai.Pages.Admin.Details; public partial class Book { - const int _maxUploadSize = 25 * 1048576; - bool _addingCompany; - int? _addingCompanyId; - string _addingCompanyRoleId; - bool _addingMachine; - bool _addingMachineFamily; - int? _addingMachineFamilyId; - int? _addingMachineId; - bool _addingPerson; - int? _addingPersonId; - string _addingPersonRoleId; - bool _addingScan; - bool? _addToDatabase; - bool _allFinished; - AuthenticationState _authState; + const int _maxUploadSize = 25 * 1048576; + bool _addingCompany; + int? _addingCompanyId; + string _addingCompanyRoleId; + bool _addingMachine; + bool _addingMachineFamily; + int? _addingMachineFamilyId; + int? _addingMachineId; + bool _addingPerson; + int? _addingPersonId; + string _addingPersonRoleId; + bool _addingScan; + bool? _addToDatabase; + bool _allFinished; + AuthenticationState _authState; List _bookCompanies; List _bookMachineFamilies; List _bookMachines; List _bookPeople; List _companies; - bool? _convertAvif1440; - bool? _convertAvif1440Th; - bool? _convertAvif4K; - bool? _convertAvif4kTh; - bool? _convertAvifHd; - bool? _convertAvifHdTh; - bool? _convertHeif1440; - bool? _convertHeif1440Th; - bool? _convertHeif4k; - bool? _convertHeif4kTh; - bool? _convertHeifHd; - bool? _convertHeifHdTh; - bool? _convertJp2k1440; - bool? _convertJp2k1440Th; - bool? _convertJp2k4k; - bool? _convertJp2k4kTh; - bool? _convertJp2kHd; - bool? _convertJp2kHdTh; - bool? _convertJpeg1440; - bool? _convertJpeg1440Th; - bool? _convertJpeg4k; - bool? _convertJpeg4kTh; - bool? _convertJpegHd; - bool? _convertJpegHdTh; - bool? _convertWebp1440; - bool? _convertWebp1440Th; - bool? _convertWebp4k; - bool? _convertWebp4kTh; - bool? _convertWebpHd; - bool? _convertWebpHdTh; - List _countries; - bool _creating; + bool? _convertAvif1440; + bool? _convertAvif1440Th; + bool? _convertAvif4K; + bool? _convertAvif4kTh; + bool? _convertAvifHd; + bool? _convertAvifHdTh; + bool? _convertHeif1440; + bool? _convertHeif1440Th; + bool? _convertHeif4k; + bool? _convertHeif4kTh; + bool? _convertHeifHd; + bool? _convertHeifHdTh; + bool? _convertJp2k1440; + bool? _convertJp2k1440Th; + bool? _convertJp2k4k; + bool? _convertJp2k4kTh; + bool? _convertJp2kHd; + bool? _convertJp2kHdTh; + bool? _convertJpeg1440; + bool? _convertJpeg1440Th; + bool? _convertJpeg4k; + bool? _convertJpeg4kTh; + bool? _convertJpegHd; + bool? _convertJpegHdTh; + bool? _convertWebp1440; + bool? _convertWebp1440Th; + bool? _convertWebp4k; + bool? _convertWebp4kTh; + bool? _convertWebpHd; + bool? _convertWebpHdTh; + List _countries; + bool _creating; BookByMachineDto _currentBookByMachine; BookByMachineFamilyDto _currentBookByMachineFamily; CompanyByBookDto _currentCompanyByBook; PersonByBookDto _currentPersonByBook; - bool _deleteInProgress; - string _deleteText; - string _deleteTitle; - bool _deletingBookByMachine; - bool _deletingBookByMachineFamily; - bool _deletingCompanyByBook; - bool _deletingPersonByBook; - bool _deletingScan; - bool _editing; - bool _editingScan; - bool? _extractExif; - Modal _frmDelete; - string _imageFormat; - ElementReference _inputUpload; - bool _loaded; + bool _deleteInProgress; + string _deleteText; + string _deleteTitle; + bool _deletingBookByMachine; + bool _deletingBookByMachineFamily; + bool _deletingCompanyByBook; + bool _deletingPersonByBook; + bool _deletingScan; + bool _editing; + bool _editingScan; + bool? _extractExif; + Modal _frmDelete; + string _imageFormat; + ElementReference _inputUpload; + bool _loaded; List _machineFamilies; List _machines; BookDto _model; - bool? _moveFile; + bool? _moveFile; List _people; - double _progressValue; + double _progressValue; List _roles; - bool _savingCompany; - bool _savingMachine; - bool _savingMachineFamily; - bool _savingPerson; - List _scans; - ApplicationUser _scanUser; + bool _savingCompany; + bool _savingMachine; + bool _savingMachineFamily; + bool _savingPerson; + List _scans; + ApplicationUser _scanUser; BookScanDto _selectedScan; - bool _unknownCountry; - bool _unknownEdition; - bool _unknownIsbn; - bool _unknownNativeTitle; - bool _unknownPages; - bool _unknownPublished; - bool _unknownScanAuthor; - bool _unknownScanColorSpace; - bool _unknownScanComments; - bool _unknownScanCreationDate; - bool _unknownScanExifVersion; - bool _unknownScanHorizontalResolution; - bool _unknownScanPage; - bool _unknownScanResolutionUnit; - bool _unknownScanScannerManufacturer; - bool _unknownScanScannerModel; - bool _unknownScanSoftwareUsed; - bool _unknownScanVerticalResolution; - bool _uploaded; - bool _uploadError; - string _uploadErrorMessage; - bool _uploading; - uint? _uploadScanPage; - uint _uploadScanType; + bool _unknownCountry; + bool _unknownEdition; + bool _unknownIsbn; + bool _unknownNativeTitle; + bool _unknownPages; + bool _unknownPublished; + bool _unknownScanAuthor; + bool _unknownScanColorSpace; + bool _unknownScanComments; + bool _unknownScanCreationDate; + bool _unknownScanExifVersion; + bool _unknownScanHorizontalResolution; + bool _unknownScanPage; + bool _unknownScanResolutionUnit; + bool _unknownScanScannerManufacturer; + bool _unknownScanScannerModel; + bool _unknownScanSoftwareUsed; + bool _unknownScanVerticalResolution; + bool _uploaded; + bool _uploadError; + string _uploadErrorMessage; + bool _uploading; + uint? _uploadScanPage; + uint _uploadScanType; [Parameter] public long Id { get; set; } diff --git a/Marechai/Pages/Admin/Details/Company.razor b/Marechai/Pages/Admin/Details/Company.razor index 65062054..15062512 100644 --- a/Marechai/Pages/Admin/Details/Company.razor +++ b/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 @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/Company.razor.cs b/Marechai/Pages/Admin/Details/Company.razor.cs index b34f05ff..28dd41bf 100644 --- a/Marechai/Pages/Admin/Details/Company.razor.cs +++ b/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; @@ -47,51 +47,51 @@ namespace Marechai.Pages.Admin.Details; public partial class Company { - const int _maxUploadSize = 5 * 1048576; - bool _addingDescription; - AuthenticationState _authState; + const int _maxUploadSize = 5 * 1048576; + bool _addingDescription; + AuthenticationState _authState; List _companies; - List _countries; - bool _creating; - CompanyLogo _currentLogo; - int? _currentLogoYear; - bool _deleteInProgress; + List _countries; + bool _creating; + CompanyLogo _currentLogo; + int? _currentLogoYear; + bool _deleteInProgress; CompanyDescriptionDto _description; - bool _editing; - Modal _frmDelete; - Modal _frmLogoYear; - Modal _frmUpload; - ElementReference _inputUpload; - bool _loaded; - List _logos; + bool _editing; + Modal _frmDelete; + Modal _frmLogoYear; + Modal _frmUpload; + ElementReference _inputUpload; + bool _loaded; + List _logos; CompanyDto _model; - MarkdownPipeline _pipeline; - double _progressValue; - bool _readonlyDescription; - bool _savingLogo; - string _selectedDescriptionTab; - bool _unknownAddress; - bool _unknownCity; - bool _unknownCountry; - bool _unknownFacebook; - bool _unknownFounded; - bool _unknownLegalName; - bool _unknownLogoYear; - bool _unknownPostalCode; - bool _unknownProvince; - bool _unknownSold; - bool _unknownSoldTo; - bool _unknownTwitter; - bool _unknownWebsite; - bool _uploaded; - string _uploadedPngData; - string _uploadedSvgData; - string _uploadedWebpData; - bool _uploadError; - string _uploadErrorMessage; - bool _uploading; - MemoryStream _uploadMs; - bool _yearChangeInProgress; + MarkdownPipeline _pipeline; + double _progressValue; + bool _readonlyDescription; + bool _savingLogo; + string _selectedDescriptionTab; + bool _unknownAddress; + bool _unknownCity; + bool _unknownCountry; + bool _unknownFacebook; + bool _unknownFounded; + bool _unknownLegalName; + bool _unknownLogoYear; + bool _unknownPostalCode; + bool _unknownProvince; + bool _unknownSold; + bool _unknownSoldTo; + bool _unknownTwitter; + bool _unknownWebsite; + bool _uploaded; + string _uploadedPngData; + string _uploadedSvgData; + string _uploadedWebpData; + bool _uploadError; + string _uploadErrorMessage; + bool _uploading; + MemoryStream _uploadMs; + bool _yearChangeInProgress; [Parameter] public int Id { get; set; } diff --git a/Marechai/Pages/Admin/Details/Document.razor b/Marechai/Pages/Admin/Details/Document.razor index 0e64c4cc..236bbdd6 100644 --- a/Marechai/Pages/Admin/Details/Document.razor +++ b/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 @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/Document.razor.cs b/Marechai/Pages/Admin/Details/Document.razor.cs index 1d1f21dc..17d22855 100644 --- a/Marechai/Pages/Admin/Details/Document.razor.cs +++ b/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; @@ -45,112 +45,112 @@ namespace Marechai.Pages.Admin.Details; public partial class Document { - const int MAX_UPLOAD_SIZE = 25 * 1048576; - bool _addingCompany; - int? _addingCompanyId; - string _addingCompanyRoleId; - bool _addingMachine; - bool _addingMachineFamily; - int? _addingMachineFamilyId; - int? _addingMachineId; - bool _addingPerson; - int? _addingPersonId; - string _addingPersonRoleId; - bool _addingScan; - bool? _addToDatabase; - bool _allFinished; - AuthenticationState _authState; + const int MAX_UPLOAD_SIZE = 25 * 1048576; + bool _addingCompany; + int? _addingCompanyId; + string _addingCompanyRoleId; + bool _addingMachine; + bool _addingMachineFamily; + int? _addingMachineFamilyId; + int? _addingMachineId; + bool _addingPerson; + int? _addingPersonId; + string _addingPersonRoleId; + bool _addingScan; + bool? _addToDatabase; + bool _allFinished; + AuthenticationState _authState; List _companies; - bool? _convertAvif1440; - bool? _convertAvif1440Th; - bool? _convertAvif4k; - bool? _convertAvif4kTh; - bool? _convertAvifHd; - bool? _convertAvifHdTh; - bool? _convertHeif1440; - bool? _convertHeif1440Th; - bool? _convertHeif4K; - bool? _convertHeif4kTh; - bool? _convertHeifHd; - bool? _convertHeifHdTh; - bool? _convertJp2k1440; - bool? _convertJp2k1440Th; - bool? _convertJp2k4k; - bool? _convertJp2k4kTh; - bool? _convertJp2kHd; - bool? _convertJp2kHdTh; - bool? _convertJpeg1440; - bool? _convertJpeg1440Th; - bool? _convertJpeg4k; - bool? _convertJpeg4kTh; - bool? _convertJpegHd; - bool? _convertJpegHdTh; - bool? _convertWebp1440; - bool? _convertWebp1440Th; - bool? _convertWebp4K; - bool? _convertWebp4kTh; - bool? _convertWebpHd; - bool? _convertWebpHdTh; - List _countries; - bool _creating; + bool? _convertAvif1440; + bool? _convertAvif1440Th; + bool? _convertAvif4k; + bool? _convertAvif4kTh; + bool? _convertAvifHd; + bool? _convertAvifHdTh; + bool? _convertHeif1440; + bool? _convertHeif1440Th; + bool? _convertHeif4K; + bool? _convertHeif4kTh; + bool? _convertHeifHd; + bool? _convertHeifHdTh; + bool? _convertJp2k1440; + bool? _convertJp2k1440Th; + bool? _convertJp2k4k; + bool? _convertJp2k4kTh; + bool? _convertJp2kHd; + bool? _convertJp2kHdTh; + bool? _convertJpeg1440; + bool? _convertJpeg1440Th; + bool? _convertJpeg4k; + bool? _convertJpeg4kTh; + bool? _convertJpegHd; + bool? _convertJpegHdTh; + bool? _convertWebp1440; + bool? _convertWebp1440Th; + bool? _convertWebp4K; + bool? _convertWebp4kTh; + bool? _convertWebpHd; + bool? _convertWebpHdTh; + List _countries; + bool _creating; CompanyByDocumentDto _currentCompanyByDocument; DocumentByMachineDto _currentDocumentByMachine; DocumentByMachineFamilyDto _currentDocumentByMachineFamily; PersonByDocumentDto _currentPersonByDocument; - bool _deleteInProgress; - string _deleteText; - string _deleteTitle; - bool _deletingCompanyByDocument; - bool _deletingDocumentByMachine; - bool _deletingDocumentByMachineFamily; - bool _deletingPersonByDocument; - bool _deletingScan; + bool _deleteInProgress; + string _deleteText; + string _deleteTitle; + bool _deletingCompanyByDocument; + bool _deletingDocumentByMachine; + bool _deletingDocumentByMachineFamily; + bool _deletingPersonByDocument; + bool _deletingScan; List _documentCompanies; List _documentMachineFamilies; List _documentMachines; List _documentPeople; - bool _editing; - bool _editingScan; - bool? _extractExif; - Modal _frmDelete; - string _imageFormat; - ElementReference _inputUpload; - bool _loaded; + bool _editing; + bool _editingScan; + bool? _extractExif; + Modal _frmDelete; + string _imageFormat; + ElementReference _inputUpload; + bool _loaded; List _machineFamilies; List _machines; DocumentDto _model; - bool? _moveFile; + bool? _moveFile; List _people; - double _progressValue; + double _progressValue; List _roles; - bool _savingCompany; - bool _savingMachine; - bool _savingMachineFamily; - bool _savingPerson; - List _scans; - ApplicationUser _scanUser; + bool _savingCompany; + bool _savingMachine; + bool _savingMachineFamily; + bool _savingPerson; + List _scans; + ApplicationUser _scanUser; DocumentScanDto _selectedScan; - bool _unknownCountry; - bool _unknownNativeTitle; - bool _unknownPublished; - bool _unknownScanAuthor; - bool _unknownScanColorSpace; - bool _unknownScanComments; - bool _unknownScanCreationDate; - bool _unknownScanExifVersion; - bool _unknownScanHorizontalResolution; - bool _unknownScanPage; - bool _unknownScanResolutionUnit; - bool _unknownScanScannerManufacturer; - bool _unknownScanScannerModel; - bool _unknownScanSoftwareUsed; - bool _unknownScanVerticalResolution; - bool _uploaded; - bool _uploadError; - string _uploadErrorMessage; - bool _uploading; - uint? _uploadScanPage; - uint _uploadScanType; + bool _unknownCountry; + bool _unknownNativeTitle; + bool _unknownPublished; + bool _unknownScanAuthor; + bool _unknownScanColorSpace; + bool _unknownScanComments; + bool _unknownScanCreationDate; + bool _unknownScanExifVersion; + bool _unknownScanHorizontalResolution; + bool _unknownScanPage; + bool _unknownScanResolutionUnit; + bool _unknownScanScannerManufacturer; + bool _unknownScanScannerModel; + bool _unknownScanSoftwareUsed; + bool _unknownScanVerticalResolution; + bool _uploaded; + bool _uploadError; + string _uploadErrorMessage; + bool _uploading; + uint? _uploadScanPage; + uint _uploadScanType; [Parameter] public long Id { get; set; } diff --git a/Marechai/Pages/Admin/Details/Machine.razor b/Marechai/Pages/Admin/Details/Machine.razor index f8dd0704..401bac4d 100644 --- a/Marechai/Pages/Admin/Details/Machine.razor +++ b/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 @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/Machine.razor.cs b/Marechai/Pages/Admin/Details/Machine.razor.cs index feacf732..43feb60f 100644 --- a/Marechai/Pages/Admin/Details/Machine.razor.cs +++ b/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; @@ -38,48 +38,48 @@ namespace Marechai.Pages.Admin.Details; public partial class Machine { - bool _addingCpu; - int? _addingCpuId; - bool _addingGpu; - int? _addingGpuId; - bool _addingMemory; - long? _addingMemorySize; - double? _addingMemorySpeed; - int _addingMemoryType; - int _addingMemoryUsage; - float? _addingProcessorSpeed; - bool _addingScreen; - int? _addingScreenId; - bool _addingSound; - int? _addingSoundId; - bool _addingStorage; - int _addingStorageInterface; - long? _addingStorageSize; - int _addingStorageType; - AuthenticationState _authState; + bool _addingCpu; + int? _addingCpuId; + bool _addingGpu; + int? _addingGpuId; + bool _addingMemory; + long? _addingMemorySize; + double? _addingMemorySpeed; + int _addingMemoryType; + int _addingMemoryUsage; + float? _addingProcessorSpeed; + bool _addingScreen; + int? _addingScreenId; + bool _addingSound; + int? _addingSoundId; + bool _addingStorage; + int _addingStorageInterface; + long? _addingStorageSize; + int _addingStorageType; + AuthenticationState _authState; List _companies; List _cpus; - bool _creating; + bool _creating; ProcessorByMachineDto _currentCpuByMachine; GpuByMachineDto _currentGpuByMachine; MemoryByMachineDto _currentMemoryByMachine; ScreenByMachineDto _currentScreenByMachine; SoundSynthByMachineDto _currentSoundByMachine; StorageByMachineDto _currentStorageByMachine; - bool _deleteInProgress; - string _deleteText; - string _deleteTitle; - bool _deletingCpuByMachine; - bool _deletingGpuByMachine; - bool _deletingMemoryByMachine; - bool _deletingScreenByMachine; - bool _deletingSoundByMachine; - bool _deletingStorageByMachine; - bool _editing; + bool _deleteInProgress; + string _deleteText; + string _deleteTitle; + bool _deletingCpuByMachine; + bool _deletingGpuByMachine; + bool _deletingMemoryByMachine; + bool _deletingScreenByMachine; + bool _deletingSoundByMachine; + bool _deletingStorageByMachine; + bool _editing; List _families; - Modal _frmDelete; + Modal _frmDelete; List _gpus; - bool _loaded; + bool _loaded; List _machineCpus; List _machineGpus; List _machineMemories; @@ -87,23 +87,23 @@ public partial class Machine List _machineSound; List _machineStorage; MachineDto _model; - bool _noFamily; - List _photos; - bool _prototype; - bool _savingCpu; - bool _savingGpu; - bool _savingMemory; - bool _savingScreen; - bool _savingSound; - bool _savingStorage; + bool _noFamily; + List _photos; + bool _prototype; + bool _savingCpu; + bool _savingGpu; + bool _savingMemory; + bool _savingScreen; + bool _savingSound; + bool _savingStorage; List _screens; List _soundSynths; - bool _unknownIntroduced; - bool _unknownMemorySize; - bool _unknownMemorySpeed; - bool _unknownModel; - bool _unknownProcessorSpeed; - bool _unknownStorageSize; + bool _unknownIntroduced; + bool _unknownMemorySize; + bool _unknownMemorySpeed; + bool _unknownModel; + bool _unknownProcessorSpeed; + bool _unknownStorageSize; [Parameter] public int Id { get; set; } diff --git a/Marechai/Pages/Admin/Details/MachinePhoto.razor b/Marechai/Pages/Admin/Details/MachinePhoto.razor index 73c1d5b5..5dbd281f 100644 --- a/Marechai/Pages/Admin/Details/MachinePhoto.razor +++ b/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 @inject IStringLocalizer L @inject NavigationManager NavigationManager diff --git a/Marechai/Pages/Admin/Details/MachinePhoto.razor.cs b/Marechai/Pages/Admin/Details/MachinePhoto.razor.cs index ae8cde4e..581cf940 100644 --- a/Marechai/Pages/Admin/Details/MachinePhoto.razor.cs +++ b/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; @@ -44,7 +44,7 @@ public partial class MachinePhoto bool _editing; List _licenses; bool _loaded; - MachinePhotoDto _model; + MachinePhotoDto _model; bool _unknownAperture; bool _unknownAuthor; bool _unknownCameraManufacturer; diff --git a/Marechai/Pages/Admin/Details/MagazineIssue.razor b/Marechai/Pages/Admin/Details/MagazineIssue.razor index cac841d1..19ea36bd 100644 --- a/Marechai/Pages/Admin/Details/MagazineIssue.razor +++ b/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 @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/MagazineIssue.razor.cs b/Marechai/Pages/Admin/Details/MagazineIssue.razor.cs index ef26534c..6acc6e2c 100644 --- a/Marechai/Pages/Admin/Details/MagazineIssue.razor.cs +++ b/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; @@ -45,66 +45,66 @@ namespace Marechai.Pages.Admin.Details; public partial class MagazineIssue { - const int MAX_UPLOAD_SIZE = 25 * 1048576; - bool _addingMachine; - bool _addingMachineFamily; - int? _addingMachineFamilyId; - int? _addingMachineId; - bool _addingPerson; - int? _addingPersonId; - string _addingPersonRoleId; - bool _addingScan; - bool? _addToDatabase; - bool _allFinished; - AuthenticationState _authState; - bool? _convertAvif1440; - bool? _convertAvif1440Th; - bool? _convertAvif4K; - bool? _convertAvif4kTh; - bool? _convertAvifHd; - bool? _convertAvifHdTh; - bool? _convertHeif1440; - bool? _convertHeif1440Th; - bool? _convertHeif4K; - bool? _convertHeif4kTh; - bool? _convertHeifHd; - bool? _convertHeifHdTh; - bool? _convertJp2k1440; - bool? _convertJp2k1440Th; - bool? _convertJp2k4k; - bool? _convertJp2k4kTh; - bool? _convertJp2kHd; - bool? _convertJp2kHdTh; - bool? _convertJpeg1440; - bool? _convertJpeg1440Th; - bool? _convertJpeg4k; - bool? _convertJpeg4kTh; - bool? _convertJpegHd; - bool? _convertJpegHdTh; - bool? _convertWebp1440; - bool? _convertWebp1440Th; - bool? _convertWebp4k; - bool? _convertWebp4kTh; - bool? _convertWebpHd; - bool? _convertWebpHdTh; - bool _creating; + const int MAX_UPLOAD_SIZE = 25 * 1048576; + bool _addingMachine; + bool _addingMachineFamily; + int? _addingMachineFamilyId; + int? _addingMachineId; + bool _addingPerson; + int? _addingPersonId; + string _addingPersonRoleId; + bool _addingScan; + bool? _addToDatabase; + bool _allFinished; + AuthenticationState _authState; + bool? _convertAvif1440; + bool? _convertAvif1440Th; + bool? _convertAvif4K; + bool? _convertAvif4kTh; + bool? _convertAvifHd; + bool? _convertAvifHdTh; + bool? _convertHeif1440; + bool? _convertHeif1440Th; + bool? _convertHeif4K; + bool? _convertHeif4kTh; + bool? _convertHeifHd; + bool? _convertHeifHdTh; + bool? _convertJp2k1440; + bool? _convertJp2k1440Th; + bool? _convertJp2k4k; + bool? _convertJp2k4kTh; + bool? _convertJp2kHd; + bool? _convertJp2kHdTh; + bool? _convertJpeg1440; + bool? _convertJpeg1440Th; + bool? _convertJpeg4k; + bool? _convertJpeg4kTh; + bool? _convertJpegHd; + bool? _convertJpegHdTh; + bool? _convertWebp1440; + bool? _convertWebp1440Th; + bool? _convertWebp4k; + bool? _convertWebp4kTh; + bool? _convertWebpHd; + bool? _convertWebpHdTh; + bool _creating; MagazineByMachineDto _currentMagazineByMachine; MagazineByMachineFamilyDto _currentMagazineByMachineFamily; PersonByMagazineDto _currentPersonByMagazine; - bool _deleteInProgress; - string _deleteText; - string _deleteTitle; - bool _deletingMagazineByMachine; - bool _deletingMagazineByMachineFamily; - bool _deletingPersonByMagazine; - bool _deletingScan; - bool _editing; - bool _editingScan; - bool? _extractExif; - Modal _frmDelete; - string _imageFormat; - ElementReference _inputUpload; - bool _loaded; + bool _deleteInProgress; + string _deleteText; + string _deleteTitle; + bool _deletingMagazineByMachine; + bool _deletingMagazineByMachineFamily; + bool _deletingPersonByMagazine; + bool _deletingScan; + bool _editing; + bool _editingScan; + bool? _extractExif; + Modal _frmDelete; + string _imageFormat; + ElementReference _inputUpload; + bool _loaded; List _machineFamilies; List _machines; List _magazineMachineFamilies; @@ -112,39 +112,39 @@ public partial class MagazineIssue List _magazinePeople; List _magazines; MagazineIssueDto _model; - bool? _moveFile; + bool? _moveFile; List _people; - double _progressValue; + double _progressValue; List _roles; - bool _savingMachine; - bool _savingMachineFamily; - bool _savingPerson; - List _scans; - ApplicationUser _scanUser; + bool _savingMachine; + bool _savingMachineFamily; + bool _savingPerson; + List _scans; + ApplicationUser _scanUser; MagazineScanDto _selectedScan; - bool _unknownIssueNumber; - bool _unknownNativeCaption; - bool _unknownPages; - bool _unknownProductCode; - bool _unknownPublished; - bool _unknownScanAuthor; - bool _unknownScanColorSpace; - bool _unknownScanComments; - bool _unknownScanCreationDate; - bool _unknownScanExifVersion; - bool _unknownScanHorizontalResolution; - bool _unknownScanPage; - bool _unknownScanResolutionUnit; - bool _unknownScanScannerManufacturer; - bool _unknownScanScannerModel; - bool _unknownScanSoftwareUsed; - bool _unknownScanVerticalResolution; - bool _uploaded; - bool _uploadError; - string _uploadErrorMessage; - bool _uploading; - uint? _uploadScanPage; - uint _uploadScanType; + bool _unknownIssueNumber; + bool _unknownNativeCaption; + bool _unknownPages; + bool _unknownProductCode; + bool _unknownPublished; + bool _unknownScanAuthor; + bool _unknownScanColorSpace; + bool _unknownScanComments; + bool _unknownScanCreationDate; + bool _unknownScanExifVersion; + bool _unknownScanHorizontalResolution; + bool _unknownScanPage; + bool _unknownScanResolutionUnit; + bool _unknownScanScannerManufacturer; + bool _unknownScanScannerModel; + bool _unknownScanSoftwareUsed; + bool _unknownScanVerticalResolution; + bool _uploaded; + bool _uploadError; + string _uploadErrorMessage; + bool _uploading; + uint? _uploadScanPage; + uint _uploadScanType; [Parameter] public long Id { get; set; } diff --git a/Marechai/Pages/Admin/Details/SoftwareVariant.razor b/Marechai/Pages/Admin/Details/SoftwareVariant.razor index 19f33cc0..a6d972dd 100644 --- a/Marechai/Pages/Admin/Details/SoftwareVariant.razor +++ b/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 @inject IStringLocalizer L diff --git a/Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs b/Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs index 952ba6ba..3e68cf0d 100644 --- a/Marechai/Pages/Admin/Details/SoftwareVariant.razor.cs +++ b/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; @@ -38,37 +38,37 @@ namespace Marechai.Pages.Admin.Details; public partial class SoftwareVariant { - bool _addingCompany; - int? _addingCompanyId; - string _addingCompanyRoleId; - AuthenticationState _authState; + bool _addingCompany; + int? _addingCompanyId; + string _addingCompanyRoleId; + AuthenticationState _authState; List _companies; - bool _creating; + bool _creating; CompanyBySoftwareVariantDto _currentCompanyBySoftwareVariant; - bool _deleteInProgress; - string _deleteText; - string _deleteTitle; - bool _deletingCompanyBySoftwareVariant; - bool _editing; - Modal _frmDelete; - bool _loaded; + bool _deleteInProgress; + string _deleteText; + string _deleteTitle; + bool _deletingCompanyBySoftwareVariant; + bool _editing; + Modal _frmDelete; + bool _loaded; SoftwareVariantDto _model; List _roles; - bool _savingCompany; + bool _savingCompany; List _softwareVariantCompanies; List _softwareVariants; List _softwareVersions; - bool _unknownCatalogueNumber; - bool _unknownIntroduced; - bool _unknownMinimumMemory; - bool _unknownName; - bool _unknownParent; - bool _unknownPartNumber; - bool _unknownProductCode; - bool _unknownRecommendedMemory; - bool _unknownRequiredStorage; - bool _unknownSerialNumber; - bool _unknownVersion; + bool _unknownCatalogueNumber; + bool _unknownIntroduced; + bool _unknownMinimumMemory; + bool _unknownName; + bool _unknownParent; + bool _unknownPartNumber; + bool _unknownProductCode; + bool _unknownRecommendedMemory; + bool _unknownRequiredStorage; + bool _unknownSerialNumber; + bool _unknownVersion; [Parameter] public ulong Id { get; set; } diff --git a/Marechai/Pages/Companies/View.razor b/Marechai/Pages/Companies/View.razor index b45f3211..f3129010 100644 --- a/Marechai/Pages/Companies/View.razor +++ b/Marechai/Pages/Companies/View.razor @@ -1,5 +1,5 @@ @{ - /****************************************************************************** +/****************************************************************************** // MARECHAI: Master repository of computing history artifacts information // ---------------------------------------------------------------------------- // @@ -26,8 +26,7 @@ } @page "/company/{Id:int}" - -@using Marechai.Database +@using Marechai.Data @using Marechai.Database.Models @inherits OwningComponentBase @inject IStringLocalizer L diff --git a/Marechai/Pages/Companies/View.razor.cs b/Marechai/Pages/Companies/View.razor.cs index bfde8df8..77f4d523 100644 --- a/Marechai/Pages/Companies/View.razor.cs +++ b/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; @@ -36,7 +36,7 @@ namespace Marechai.Pages.Companies; public partial class View { - CompanyDto _company; + CompanyDto _company; List _computers; List _consoles; string _description; diff --git a/Marechai/Pages/Machines/View.razor b/Marechai/Pages/Machines/View.razor index 8d683ff7..25228ca8 100644 --- a/Marechai/Pages/Machines/View.razor +++ b/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 @inject IStringLocalizer L @inject IWebHostEnvironment Host diff --git a/Marechai/Services/ComputersService.cs b/Marechai/Services/ComputersService.cs index 9980a18e..983f385e 100644 --- a/Marechai/Services/ComputersService.cs +++ b/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; @@ -39,52 +39,59 @@ public class ComputersService(MarechaiContext context) await context.Machines.CountAsync(c => c.Type == MachineType.Computer); public Task GetMinimumYearAsync() => context.Machines - .Where(t => t.Type == MachineType.Computer && - t.Introduced.HasValue && - t.Introduced.Value.Year > 1000) - .MinAsync(t => t.Introduced.Value.Year); + .Where(t => t.Type == MachineType.Computer && + t.Introduced.HasValue && + t.Introduced.Value.Year > 1000) + .MinAsync(t => t.Introduced.Value.Year); public Task GetMaximumYearAsync() => context.Machines - .Where(t => t.Type == MachineType.Computer && - t.Introduced.HasValue && - t.Introduced.Value.Year > 1000) - .MaxAsync(t => t.Introduced.Value.Year); + .Where(t => t.Type == MachineType.Computer && + t.Introduced.HasValue && + t.Introduced.Value.Year > 1000) + .MaxAsync(t => t.Introduced.Value.Year); public async Task> GetComputersByLetterAsync(char c) => await context.Machines - .Include(m => m.Company) - .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 - { - Id = m.Id, - Name = m.Name, - Company = m.Company.Name - }) - .ToListAsync(); + .Include(m => m.Company) + .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 + { + Id = m.Id, + Name = m.Name, + Company = m.Company.Name + }) + .ToListAsync(); public async Task> GetComputersByYearAsync(int year) => await context.Machines - .Include(m => m.Company) - .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 - { - Id = m.Id, - Name = m.Name, - Company = m.Company.Name - }) - .ToListAsync(); + .Include(m => m.Company) + .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 + { + Id = m.Id, + Name = m.Name, + Company = m.Company.Name + }) + .ToListAsync(); public async Task> GetComputersAsync() => await context.Machines.Include(m => m.Company) - .Where(m => m.Type == MachineType.Computer) - .OrderBy(m => m.Company.Name) - .ThenBy(m => m.Name) - .Select(m => new MachineDto - { - Id = m.Id, - Name = m.Name, - Company = m.Company.Name - }) - .ToListAsync(); + .Where(m => m.Type == MachineType.Computer) + .OrderBy(m => m.Company.Name) + .ThenBy(m => m.Name) + .Select(m => new MachineDto + { + Id = m.Id, + Name = m.Name, + Company = m.Company.Name + }) + .ToListAsync(); } \ No newline at end of file diff --git a/Marechai/Services/ConsolesService.cs b/Marechai/Services/ConsolesService.cs index 631c3013..1f05edd5 100644 --- a/Marechai/Services/ConsolesService.cs +++ b/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; @@ -39,52 +39,61 @@ public class ConsolesService(MarechaiContext context) await context.Machines.CountAsync(c => c.Type == MachineType.Console); public Task GetMinimumYearAsync() => context.Machines - .Where(t => t.Type == MachineType.Console && - t.Introduced.HasValue && - t.Introduced.Value.Year > 1000) - .MinAsync(t => t.Introduced.Value.Year); + .Where(t => t.Type == MachineType.Console && + t.Introduced.HasValue && + t.Introduced.Value.Year > 1000) + .MinAsync(t => t.Introduced.Value.Year); public Task GetMaximumYearAsync() => context.Machines - .Where(t => t.Type == MachineType.Console && - t.Introduced.HasValue && - t.Introduced.Value.Year > 1000) - .MaxAsync(t => t.Introduced.Value.Year); + .Where(t => t.Type == MachineType.Console && + t.Introduced.HasValue && + t.Introduced.Value.Year > 1000) + .MaxAsync(t => t.Introduced.Value.Year); public async Task> GetConsolesByLetterAsync(char c) => await context.Machines - .Include(m => m.Company) - .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 - { - Id = m.Id, - Name = m.Name, - Company = m.Company.Name - }) - .ToListAsync(); + .Include(m => m.Company) + .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 + { + Id = m.Id, + Name = m.Name, + Company = m.Company.Name + }) + .ToListAsync(); public async Task> GetConsolesByYearAsync(int year) => await context.Machines - .Include(m => m.Company) - .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 - { - Id = m.Id, - Name = m.Name, - Company = m.Company.Name - }) - .ToListAsync(); + .Include(m => m.Company) + .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 + { + Id = m.Id, + Name = m.Name, + Company = m.Company.Name + }) + .ToListAsync(); public async Task> GetConsolesAsync() => await context.Machines.Include(m => m.Company) - .Where(m => m.Type == MachineType.Console) - .OrderBy(m => m.Company.Name) - .ThenBy(m => m.Name) - .Select(m => new MachineDto - { - Id = m.Id, - Name = m.Name, - Company = m.Company.Name - }) - .ToListAsync(); + .Where(m => m.Type == MachineType.Console) + .OrderBy(m => m.Company.Name) + .ThenBy(m => m.Name) + .Select(m => new MachineDto + { + Id = m.Id, + Name = m.Name, + Company = m.Company.Name + }) + .ToListAsync(); } \ No newline at end of file diff --git a/Marechai/Services/MachinesService.cs b/Marechai/Services/MachinesService.cs index f3ae96fe..20fce94c 100644 --- a/Marechai/Services/MachinesService.cs +++ b/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; @@ -44,36 +44,36 @@ public class MachinesService SoundSynthsService soundSynthsService ) { - readonly IStringLocalizer _l = localizer; + readonly IStringLocalizer _l = localizer; public async Task> GetAsync() => await context.Machines.OrderBy(m => m.Company.Name) - .ThenBy(m => m.Name) - .ThenBy(m => m.Family.Name) - .Select(m => new MachineDto - { - Id = m.Id, - Company = m.Company.Name, - Name = m.Name, - Model = m.Model, - Introduced = m.Introduced, - Type = m.Type, - Family = m.Family.Name - }) - .ToListAsync(); + .ThenBy(m => m.Name) + .ThenBy(m => m.Family.Name) + .Select(m => new MachineDto + { + Id = m.Id, + Company = m.Company.Name, + Name = m.Name, + Model = m.Model, + Introduced = m.Introduced, + Type = m.Type, + Family = m.Family.Name + }) + .ToListAsync(); public async Task GetAsync(int id) => await context.Machines.Where(m => m.Id == id) - .Select(m => new MachineDto - { - Id = m.Id, - Company = m.Company.Name, - CompanyId = m.CompanyId, - Name = m.Name, - Model = m.Model, - Introduced = m.Introduced, - Type = m.Type, - FamilyId = m.FamilyId - }) - .FirstOrDefaultAsync(); + .Select(m => new MachineDto + { + Id = m.Id, + Company = m.Company.Name, + CompanyId = m.CompanyId, + Name = m.Name, + Model = m.Model, + Introduced = m.Introduced, + Type = m.Type, + FamilyId = m.FamilyId + }) + .FirstOrDefaultAsync(); public async Task UpdateAsync(MachineDto dto, string userId) { @@ -185,9 +185,7 @@ public class MachinesService IQueryable 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; } @@ -203,27 +201,27 @@ public class MachinesService model.Gpus = await gpusService.GetByMachineAsync(machine.Id); model.Memory = await context.MemoryByMachine.Where(m => m.MachineId == machine.Id) - .Select(m => new MemoryDto - { - Type = m.Type, - Usage = m.Usage, - Size = m.Size, - Speed = m.Speed - }) - .ToListAsync(); + .Select(m => new MemoryDto + { + Type = m.Type, + Usage = m.Usage, + Size = m.Size, + Speed = m.Speed + }) + .ToListAsync(); model.Processors = await processorsService.GetByMachineAsync(machine.Id); model.SoundSynthesizers = await soundSynthsService.GetByMachineAsync(machine.Id); model.Storage = await context.StorageByMachine.Where(s => s.MachineId == machine.Id) - .Select(s => new StorageDto - { - Type = s.Type, - Interface = s.Interface, - Capacity = s.Capacity - }) - .ToListAsync(); + .Select(s => new StorageDto + { + Type = s.Type, + Interface = s.Interface, + Capacity = s.Capacity + }) + .ToListAsync(); return model; } diff --git a/Marechai/Services/MemoriesByMachineService.cs b/Marechai/Services/MemoriesByMachineService.cs index 3cb2a791..edf84b1e 100644 --- a/Marechai/Services/MemoriesByMachineService.cs +++ b/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; @@ -36,21 +36,21 @@ namespace Marechai.Services; public class MemoriesByMachineService(MarechaiContext context) { public async Task> GetByMachine(int machineId) => await context.MemoryByMachine - .Where(m => m.MachineId == machineId) - .Select(m => new MemoryByMachineDto - { - Id = m.Id, - Type = m.Type, - Usage = m.Usage, - Size = m.Size, - Speed = m.Speed, - MachineId = m.MachineId - }) - .OrderBy(m => m.Type) - .ThenBy(m => m.Usage) - .ThenBy(m => m.Size) - .ThenBy(m => m.Speed) - .ToListAsync(); + .Where(m => m.MachineId == machineId) + .Select(m => new MemoryByMachineDto + { + Id = m.Id, + Type = m.Type, + Usage = m.Usage, + Size = m.Size, + Speed = m.Speed, + MachineId = m.MachineId + }) + .OrderBy(m => m.Type) + .ThenBy(m => m.Usage) + .ThenBy(m => m.Size) + .ThenBy(m => m.Speed) + .ToListAsync(); public async Task DeleteAsync(long id, string userId) { diff --git a/Marechai/Services/NewsService.cs b/Marechai/Services/NewsService.cs index 058d1b8c..3e496915 100644 --- a/Marechai/Services/NewsService.cs +++ b/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; @@ -37,14 +37,14 @@ namespace Marechai.Services; public class NewsService(MarechaiContext context, IStringLocalizer localizer) { public async Task> GetAsync() => await context.News.OrderByDescending(n => n.Date) - .Select(n => new NewsDto - { - Id = n.Id, - Timestamp = n.Date, - Type = n.Type, - AffectedId = n.AddedId - }) - .ToListAsync(); + .Select(n => new NewsDto + { + Id = n.Id, + Timestamp = n.Date, + Type = n.Type, + AffectedId = n.AddedId + }) + .ToListAsync(); public List GetNews() { @@ -60,72 +60,72 @@ public class NewsService(MarechaiContext context, IStringLocalizer { case NewsType.NewComputerInDb: news.Add(new NewsDto(@new.AddedId, - localizer["New computer in database"], - @new.Date, - "machine", - $"{machine.Company.Name} {machine.Name}")); + localizer["New computer in database"], + @new.Date, + "machine", + $"{machine.Company.Name} {machine.Name}")); break; case NewsType.NewConsoleInDb: news.Add(new NewsDto(@new.AddedId, - localizer["New console in database"], - @new.Date, - "machine", - $"{machine.Company.Name} {machine.Name}")); + localizer["New console in database"], + @new.Date, + "machine", + $"{machine.Company.Name} {machine.Name}")); break; case NewsType.NewComputerInCollection: news.Add(new NewsDto(@new.AddedId, - localizer["New computer in collection"], - @new.Date, - "machine", - $"{machine.Company.Name} {machine.Name}")); + localizer["New computer in collection"], + @new.Date, + "machine", + $"{machine.Company.Name} {machine.Name}")); break; case NewsType.NewConsoleInCollection: news.Add(new NewsDto(@new.AddedId, - localizer["New console in collection"], - @new.Date, - "machine", - $"{machine.Company.Name} {machine.Name}")); + localizer["New console in collection"], + @new.Date, + "machine", + $"{machine.Company.Name} {machine.Name}")); break; case NewsType.UpdatedComputerInDb: news.Add(new NewsDto(@new.AddedId, - localizer["Updated computer in database"], - @new.Date, - "machine", - $"{machine.Company.Name} {machine.Name}")); + localizer["Updated computer in database"], + @new.Date, + "machine", + $"{machine.Company.Name} {machine.Name}")); break; case NewsType.UpdatedConsoleInDb: news.Add(new NewsDto(@new.AddedId, - localizer["Updated console in database"], - @new.Date, - "machine", - $"{machine.Company.Name} {machine.Name}")); + localizer["Updated console in database"], + @new.Date, + "machine", + $"{machine.Company.Name} {machine.Name}")); break; case NewsType.UpdatedComputerInCollection: news.Add(new NewsDto(@new.AddedId, - localizer["Updated computer in collection"], - @new.Date, - "machine", - $"{machine.Company.Name} {machine.Name}")); + localizer["Updated computer in collection"], + @new.Date, + "machine", + $"{machine.Company.Name} {machine.Name}")); break; case NewsType.UpdatedConsoleInCollection: news.Add(new NewsDto(@new.AddedId, - localizer["Updated console in collection"], - @new.Date, - "machine", - $"{machine.Company.Name} {machine.Name}")); + localizer["Updated console in collection"], + @new.Date, + "machine", + $"{machine.Company.Name} {machine.Name}")); break; diff --git a/Marechai/Services/StorageByMachineService.cs b/Marechai/Services/StorageByMachineService.cs index 2c7de4aa..a05782e6 100644 --- a/Marechai/Services/StorageByMachineService.cs +++ b/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; @@ -36,19 +36,19 @@ namespace Marechai.Services; public class StorageByMachineService(MarechaiContext context) { public async Task> GetByMachine(int machineId) => await context.StorageByMachine - .Where(s => s.MachineId == machineId) - .Select(s => new StorageByMachineDto - { - Id = s.Id, - Type = s.Type, - Interface = s.Interface, - Capacity = s.Capacity, - MachineId = s.MachineId - }) - .OrderBy(s => s.Type) - .ThenBy(s => s.Interface) - .ThenBy(s => s.Capacity) - .ToListAsync(); + .Where(s => s.MachineId == machineId) + .Select(s => new StorageByMachineDto + { + Id = s.Id, + Type = s.Type, + Interface = s.Interface, + Capacity = s.Capacity, + MachineId = s.MachineId + }) + .OrderBy(s => s.Type) + .ThenBy(s => s.Interface) + .ThenBy(s => s.Capacity) + .ToListAsync(); public async Task DeleteAsync(long id, string userId) {