diff --git a/Aaru.Server.Database/Aaru.Server.Database.csproj b/Aaru.Server.Database/Aaru.Server.Database.csproj new file mode 100644 index 00000000..d5ad541c --- /dev/null +++ b/Aaru.Server.Database/Aaru.Server.Database.csproj @@ -0,0 +1,20 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + diff --git a/Aaru.Server/Models/Context.cs b/Aaru.Server.Database/Context.cs similarity index 97% rename from Aaru.Server/Models/Context.cs rename to Aaru.Server.Database/Context.cs index 49f3a304..9e673e07 100644 --- a/Aaru.Server/Models/Context.cs +++ b/Aaru.Server.Database/Context.cs @@ -32,17 +32,21 @@ using System.Data.Common; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Database.Models; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; +using OperatingSystem = Aaru.Server.Database.Models.OperatingSystem; +using Version = Aaru.Server.Database.Models.Version; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database; -public sealed class AaruServerContext : IdentityDbContext +public sealed class DbContext : IdentityDbContext { - public AaruServerContext() {} + public DbContext() {} - public AaruServerContext(DbContextOptions options) : base(options) {} + public DbContext(DbContextOptions options) : base(options) {} public DbSet Devices { get; set; } public DbSet Reports { get; set; } @@ -338,7 +342,7 @@ public sealed class AaruServerContext : IdentityDbContext internal static bool TableExists(string tableName) { - using var db = new AaruServerContext(); + using var db = new DbContext(); DbConnection connection = db.Database.GetDbConnection(); connection.Open(); diff --git a/Aaru.Server/Migrations/20191102132240_InitialMigration.Designer.cs b/Aaru.Server.Database/Migrations/20191102132240_InitialMigration.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20191102132240_InitialMigration.Designer.cs rename to Aaru.Server.Database/Migrations/20191102132240_InitialMigration.Designer.cs index 5123a95c..655faa7f 100644 --- a/Aaru.Server/Migrations/20191102132240_InitialMigration.Designer.cs +++ b/Aaru.Server.Database/Migrations/20191102132240_InitialMigration.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20191102132240_InitialMigration")] partial class InitialMigration { diff --git a/Aaru.Server/Migrations/20191102132240_InitialMigration.cs b/Aaru.Server.Database/Migrations/20191102132240_InitialMigration.cs similarity index 96% rename from Aaru.Server/Migrations/20191102132240_InitialMigration.cs rename to Aaru.Server.Database/Migrations/20191102132240_InitialMigration.cs index b2155d6f..75f58f2c 100644 --- a/Aaru.Server/Migrations/20191102132240_InitialMigration.cs +++ b/Aaru.Server.Database/Migrations/20191102132240_InitialMigration.cs @@ -1,47 +1,46 @@ -using Aaru.Server.Models; -using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class InitialMigration : Migration { protected override void Up(MigrationBuilder migrationBuilder) { #region Check for old tables - bool atasExists = AaruServerContext.TableExists("Atas"); - bool blockDescriptorsExists = AaruServerContext.TableExists("BlockDescriptors"); - bool chsExists = AaruServerContext.TableExists("Chs"); - bool commandsExists = AaruServerContext.TableExists("Commands"); - bool compactDiscOffsetsExists = AaruServerContext.TableExists("CompactDiscOffsets"); - bool densityCodesExists = AaruServerContext.TableExists("DensityCodes"); - bool devicesExists = AaruServerContext.TableExists("Devices"); - bool deviceStatsExists = AaruServerContext.TableExists("DeviceStats"); - bool filesystemsExists = AaruServerContext.TableExists("Filesystems"); - bool filtersExists = AaruServerContext.TableExists("Filters"); - bool fireWiresExists = AaruServerContext.TableExists("FireWires"); - bool mediaExists = AaruServerContext.TableExists("Media"); - bool mediaFormatsExists = AaruServerContext.TableExists("MediaFormats"); - bool mmcFeaturesExists = AaruServerContext.TableExists("MmcFeatures"); - bool mmcsExists = AaruServerContext.TableExists("Mmcs"); - bool mmcSdsExists = AaruServerContext.TableExists("MmcSds"); - bool operatingSystemsExists = AaruServerContext.TableExists("OperatingSystems"); - bool partitionsExists = AaruServerContext.TableExists("Partitions"); - bool pcmciasExists = AaruServerContext.TableExists("Pcmcias"); - bool scsiModesExists = AaruServerContext.TableExists("ScsiModes"); - bool scsiPagesExists = AaruServerContext.TableExists("ScsiPages"); - bool scsisExists = AaruServerContext.TableExists("Scsis"); - bool sscsExists = AaruServerContext.TableExists("Sscs"); - bool sscSupportedMediasExists = AaruServerContext.TableExists("SscSupportedMedias"); - bool supportedDensitiesExists = AaruServerContext.TableExists("SupportedDensities"); - bool testedMediasExists = AaruServerContext.TableExists("TestedMedias"); - bool testedSequentialMediasExists = AaruServerContext.TableExists("TestedSequentialMedias"); - bool uploadedReportsExists = AaruServerContext.TableExists("UploadedReports"); - bool usbProductsExists = AaruServerContext.TableExists("UsbProducts"); - bool usbsExists = AaruServerContext.TableExists("Usbs"); - bool usbVendorsExists = AaruServerContext.TableExists("UsbVendors"); - bool versionsExists = AaruServerContext.TableExists("Versions"); - bool efExists = AaruServerContext.TableExists("__MigrationHistory"); + bool atasExists = DbContext.TableExists("Atas"); + bool blockDescriptorsExists = DbContext.TableExists("BlockDescriptors"); + bool chsExists = DbContext.TableExists("Chs"); + bool commandsExists = DbContext.TableExists("Commands"); + bool compactDiscOffsetsExists = DbContext.TableExists("CompactDiscOffsets"); + bool densityCodesExists = DbContext.TableExists("DensityCodes"); + bool devicesExists = DbContext.TableExists("Devices"); + bool deviceStatsExists = DbContext.TableExists("DeviceStats"); + bool filesystemsExists = DbContext.TableExists("Filesystems"); + bool filtersExists = DbContext.TableExists("Filters"); + bool fireWiresExists = DbContext.TableExists("FireWires"); + bool mediaExists = DbContext.TableExists("Media"); + bool mediaFormatsExists = DbContext.TableExists("MediaFormats"); + bool mmcFeaturesExists = DbContext.TableExists("MmcFeatures"); + bool mmcsExists = DbContext.TableExists("Mmcs"); + bool mmcSdsExists = DbContext.TableExists("MmcSds"); + bool operatingSystemsExists = DbContext.TableExists("OperatingSystems"); + bool partitionsExists = DbContext.TableExists("Partitions"); + bool pcmciasExists = DbContext.TableExists("Pcmcias"); + bool scsiModesExists = DbContext.TableExists("ScsiModes"); + bool scsiPagesExists = DbContext.TableExists("ScsiPages"); + bool scsisExists = DbContext.TableExists("Scsis"); + bool sscsExists = DbContext.TableExists("Sscs"); + bool sscSupportedMediasExists = DbContext.TableExists("SscSupportedMedias"); + bool supportedDensitiesExists = DbContext.TableExists("SupportedDensities"); + bool testedMediasExists = DbContext.TableExists("TestedMedias"); + bool testedSequentialMediasExists = DbContext.TableExists("TestedSequentialMedias"); + bool uploadedReportsExists = DbContext.TableExists("UploadedReports"); + bool usbProductsExists = DbContext.TableExists("UsbProducts"); + bool usbsExists = DbContext.TableExists("Usbs"); + bool usbVendorsExists = DbContext.TableExists("UsbVendors"); + bool versionsExists = DbContext.TableExists("Versions"); + bool efExists = DbContext.TableExists("__MigrationHistory"); #endregion #region Drop old restrictions @@ -1706,13 +1705,13 @@ VolumeLevelsSql FROM MmcFeatures_old WHERE VolumeLevelsSql < 0"); CanReadATIP, CanReadBCA, CanReadC2Pointers, CanReadCMI, CanReadCorrectedSubchannel, CanReadCorrectedSubchannelWithC2, CanReadDCB, CanReadDDS, CanReadDMI, CanReadDiscInformation, CanReadFullTOC, CanReadHDCMI, CanReadLayerCapacity, CanReadFirstTrackPreGap, CanReadLeadIn, - CanReadLeadOut, CanReadMediaID, CanReadMediaSerial, CanReadPAC, CanReadPFI, CanReadPMA, - CanReadPQSubchannel, CanReadPQSubchannelWithC2, CanReadPRI, CanReadRWSubchannel, + CanReadLeadOut, CanReadMediaID, CanReadMediaSerial, CanReadPAC, CanReadPFI, CanReadPMA, + CanReadPQSubchannel, CanReadPQSubchannelWithC2, CanReadPRI, CanReadRWSubchannel, CanReadRWSubchannelWithC2, CanReadRecordablePFI, CanReadSpareAreaInformation, CanReadTOC, Density, - LongBlockSize, Manufacturer, MediaIsRecognized, MediumType, MediumTypeName, Model, - SupportsHLDTSTReadRawDVD, SupportsNECReadCDDA, SupportsPioneerReadCDDA, SupportsPioneerReadCDDAMSF, - SupportsPlextorReadCDDA, SupportsPlextorReadRawDVD, SupportsRead10, SupportsRead12, SupportsRead16, - SupportsRead6, SupportsReadCapacity16, SupportsReadCapacity, SupportsReadCd, SupportsReadCdMsf, + LongBlockSize, Manufacturer, MediaIsRecognized, MediumType, MediumTypeName, Model, + SupportsHLDTSTReadRawDVD, SupportsNECReadCDDA, SupportsPioneerReadCDDA, SupportsPioneerReadCDDAMSF, + SupportsPlextorReadCDDA, SupportsPlextorReadRawDVD, SupportsRead10, SupportsRead12, SupportsRead16, + SupportsRead6, SupportsReadCapacity16, SupportsReadCapacity, SupportsReadCd, SupportsReadCdMsf, SupportsReadCdRaw, SupportsReadCdMsfRaw, SupportsReadLong16, SupportsReadLong, ModeSense6Data, ModeSense10Data, CHSId, CurrentCHSId, LBASectors, LBA48Sectors, LogicalAlignment, NominalRotationRate, PhysicalBlockSize, SolidStateDevice, UnformattedBPT, UnformattedBPS, SupportsReadDmaLba, SupportsReadDmaRetryLba, @@ -1720,9 +1719,9 @@ VolumeLevelsSql FROM MmcFeatures_old WHERE VolumeLevelsSql < 0"); SupportsReadDmaLba48, SupportsReadLba48, SupportsReadDma, SupportsReadDmaRetry, SupportsReadRetry, SupportsReadSectors, SupportsReadLongRetry, SupportsSeek, CanReadingIntersessionLeadIn, CanReadingIntersessionLeadOut, IntersessionLeadInData, IntersessionLeadOutData, BlocksSql, - BlockSizeSql, LongBlockSizeSql, LBASectorsSql, LBA48SectorsSql, LogicalAlignmentSql, + BlockSizeSql, LongBlockSizeSql, LBASectorsSql, LBA48SectorsSql, LogicalAlignmentSql, NominalRotationRateSql, PhysicalBlockSizeSql, UnformattedBPTSql, UnformattedBPSSql, Read6Data, - Read10Data, Read12Data, Read16Data, ReadLong10Data, ReadLong16Data, ReadSectorsData, + Read10Data, Read12Data, Read16Data, ReadLong10Data, ReadLong16Data, ReadSectorsData, ReadSectorsRetryData, ReadDmaData, ReadDmaRetryData, ReadLbaData, ReadRetryLbaData, ReadDmaLbaData, ReadDmaRetryLbaData, ReadLba48Data, ReadDmaLba48Data, ReadLongData, ReadLongRetryData, ReadLongLbaData, ReadLongRetryLbaData, TocData, FullTocData, AtipData, PmaData, ReadCdData, @@ -1734,7 +1733,7 @@ VolumeLevelsSql FROM MmcFeatures_old WHERE VolumeLevelsSql < 0"); PioneerReadCddaData, PioneerReadCddaMsfData, NecReadCddaData, PlextorReadRawDVDData, HLDTSTReadRawDVDData, AtaId, MmcId, ScsiId) SELECT Id, IdentifyData, BlocksSql AS Blocks, BlockSizeSql AS BlockSize, CanReadAACS, CanReadADIP, - CanReadATIP, CanReadBCA, CanReadC2Pointers, CanReadCMI, CanReadCorrectedSubchannel, + CanReadATIP, CanReadBCA, CanReadC2Pointers, CanReadCMI, CanReadCorrectedSubchannel, CanReadCorrectedSubchannelWithC2, CanReadDCB, CanReadDDS, CanReadDMI, CanReadDiscInformation, CanReadFullTOC, CanReadHDCMI, CanReadLayerCapacity, CanReadFirstTrackPreGap, CanReadLeadIn, CanReadLeadOut, CanReadMediaID, CanReadMediaSerial, CanReadPAC, CanReadPFI, CanReadPMA, @@ -1750,20 +1749,20 @@ VolumeLevelsSql FROM MmcFeatures_old WHERE VolumeLevelsSql < 0"); LogicalAlignmentSql AS LogicalAlignment,NominalRotationRateSql AS NominalRotationRate, PhysicalBlockSizeSql AS PhysicalBlockSize, SolidStateDevice, {0} AS UnformattedBPT, UnformattedBPSSql AS UnformattedBPS, SupportsReadDmaLba, SupportsReadDmaRetryLba, SupportsReadLba, - SupportsReadRetryLba, SupportsReadLongLba, SupportsReadLongRetryLba, SupportsSeekLba, + SupportsReadRetryLba, SupportsReadLongLba, SupportsReadLongRetryLba, SupportsSeekLba, SupportsReadDmaLba48, SupportsReadLba48, SupportsReadDma, SupportsReadDmaRetry, SupportsReadRetry, - SupportsReadSectors, SupportsReadLongRetry, SupportsSeek, CanReadingIntersessionLeadIn, + SupportsReadSectors, SupportsReadLongRetry, SupportsSeek, CanReadingIntersessionLeadIn, CanReadingIntersessionLeadOut, IntersessionLeadInData, IntersessionLeadOutData, BlocksSql, - BlockSizeSql, LongBlockSizeSql, LBASectorsSql, LBA48SectorsSql, LogicalAlignmentSql, - NominalRotationRateSql, PhysicalBlockSizeSql, UnformattedBPTSql, UnformattedBPSSql, - Read6Data, Read10Data, Read12Data, Read16Data, ReadLong10Data, ReadLong16Data, - ReadSectorsData, ReadSectorsRetryData, ReadDmaData, ReadDmaRetryData, ReadLbaData, + BlockSizeSql, LongBlockSizeSql, LBASectorsSql, LBA48SectorsSql, LogicalAlignmentSql, + NominalRotationRateSql, PhysicalBlockSizeSql, UnformattedBPTSql, UnformattedBPSSql, + Read6Data, Read10Data, Read12Data, Read16Data, ReadLong10Data, ReadLong16Data, + ReadSectorsData, ReadSectorsRetryData, ReadDmaData, ReadDmaRetryData, ReadLbaData, ReadRetryLbaData, ReadDmaLbaData, ReadDmaRetryLbaData, ReadLba48Data, ReadDmaLba48Data, ReadLongData, ReadLongRetryData, ReadLongLbaData, ReadLongRetryLbaData, TocData, FullTocData, AtipData, PmaData, ReadCdData, ReadCdMsfData, ReadCdFullData, ReadCdMsfFullData, Track1PregapData, LeadInData, LeadOutData, C2PointersData, PQSubchannelData, RWSubchannelData, CorrectedSubchannelData, PQSubchannelWithC2Data, RWSubchannelWithC2Data, CorrectedSubchannelWithC2Data, PfiData, DmiData, - CmiData, DvdBcaData, DvdAacsData, DvdDdsData, DvdSaiData, PriData, EmbossedPfiData, + CmiData, DvdBcaData, DvdAacsData, DvdDdsData, DvdSaiData, PriData, EmbossedPfiData, AdipData, DcbData, HdCmiData, DvdLayerData, BluBcaData, BluDdsData, BluSaiData, BluDiData, BluPacData, PlextorReadCddaData, PioneerReadCddaData, PioneerReadCddaMsfData, NecReadCddaData, PlextorReadRawDVDData, HLDTSTReadRawDVDData, Ata_Id, Mmc_Id, Scsi_Id diff --git a/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.Designer.cs b/Aaru.Server.Database/Migrations/20191102231633_MakeFieldsUnsigned.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.Designer.cs rename to Aaru.Server.Database/Migrations/20191102231633_MakeFieldsUnsigned.Designer.cs index 70a8de00..3391be3d 100644 --- a/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.Designer.cs +++ b/Aaru.Server.Database/Migrations/20191102231633_MakeFieldsUnsigned.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20191102231633_MakeFieldsUnsigned")] partial class MakeFieldsUnsigned { diff --git a/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.cs b/Aaru.Server.Database/Migrations/20191102231633_MakeFieldsUnsigned.cs similarity index 99% rename from Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.cs rename to Aaru.Server.Database/Migrations/20191102231633_MakeFieldsUnsigned.cs index 253d4472..11072597 100644 --- a/Aaru.Server/Migrations/20191102231633_MakeFieldsUnsigned.cs +++ b/Aaru.Server.Database/Migrations/20191102231633_MakeFieldsUnsigned.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class MakeFieldsUnsigned : Migration { diff --git a/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.Designer.cs b/Aaru.Server.Database/Migrations/20191106230730_CreateIdentitySchema.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.Designer.cs rename to Aaru.Server.Database/Migrations/20191106230730_CreateIdentitySchema.Designer.cs index 97f458b6..32c167c8 100644 --- a/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.Designer.cs +++ b/Aaru.Server.Database/Migrations/20191106230730_CreateIdentitySchema.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20191106230730_CreateIdentitySchema")] partial class CreateIdentitySchema { diff --git a/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.cs b/Aaru.Server.Database/Migrations/20191106230730_CreateIdentitySchema.cs similarity index 99% rename from Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.cs rename to Aaru.Server.Database/Migrations/20191106230730_CreateIdentitySchema.cs index 9b5e2c30..3b1ba3d0 100644 --- a/Aaru.Server/Migrations/20191106230730_CreateIdentitySchema.cs +++ b/Aaru.Server.Database/Migrations/20191106230730_CreateIdentitySchema.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class CreateIdentitySchema : Migration { diff --git a/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.Designer.cs b/Aaru.Server.Database/Migrations/20191108004756_SetAllOnDeleteSetNull.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.Designer.cs rename to Aaru.Server.Database/Migrations/20191108004756_SetAllOnDeleteSetNull.Designer.cs index 54ce317a..a559c218 100644 --- a/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.Designer.cs +++ b/Aaru.Server.Database/Migrations/20191108004756_SetAllOnDeleteSetNull.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20191108004756_SetAllOnDeleteSetNull")] partial class SetAllOnDeleteSetNull { diff --git a/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.cs b/Aaru.Server.Database/Migrations/20191108004756_SetAllOnDeleteSetNull.cs similarity index 99% rename from Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.cs rename to Aaru.Server.Database/Migrations/20191108004756_SetAllOnDeleteSetNull.cs index 457c623d..062578dd 100644 --- a/Aaru.Server/Migrations/20191108004756_SetAllOnDeleteSetNull.cs +++ b/Aaru.Server.Database/Migrations/20191108004756_SetAllOnDeleteSetNull.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class SetAllOnDeleteSetNull : Migration { diff --git a/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.Designer.cs b/Aaru.Server.Database/Migrations/20191110143605_CascadeDeleteDensityCodes.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.Designer.cs rename to Aaru.Server.Database/Migrations/20191110143605_CascadeDeleteDensityCodes.Designer.cs index 8d324ab0..85e7176d 100644 --- a/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.Designer.cs +++ b/Aaru.Server.Database/Migrations/20191110143605_CascadeDeleteDensityCodes.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20191110143605_CascadeDeleteDensityCodes")] partial class CascadeDeleteDensityCodes { diff --git a/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.cs b/Aaru.Server.Database/Migrations/20191110143605_CascadeDeleteDensityCodes.cs similarity index 96% rename from Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.cs rename to Aaru.Server.Database/Migrations/20191110143605_CascadeDeleteDensityCodes.cs index de7f22b0..dd49e09e 100644 --- a/Aaru.Server/Migrations/20191110143605_CascadeDeleteDensityCodes.cs +++ b/Aaru.Server.Database/Migrations/20191110143605_CascadeDeleteDensityCodes.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class CascadeDeleteDensityCodes : Migration { diff --git a/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.Designer.cs b/Aaru.Server.Database/Migrations/20191110144834_CascadeDeleteBlockDescriptors.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.Designer.cs rename to Aaru.Server.Database/Migrations/20191110144834_CascadeDeleteBlockDescriptors.Designer.cs index aa983a20..9c5892dd 100644 --- a/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.Designer.cs +++ b/Aaru.Server.Database/Migrations/20191110144834_CascadeDeleteBlockDescriptors.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20191110144834_CascadeDeleteBlockDescriptors")] partial class CascadeDeleteBlockDescriptors { diff --git a/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.cs b/Aaru.Server.Database/Migrations/20191110144834_CascadeDeleteBlockDescriptors.cs similarity index 95% rename from Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.cs rename to Aaru.Server.Database/Migrations/20191110144834_CascadeDeleteBlockDescriptors.cs index 562c9471..41ba8ea3 100644 --- a/Aaru.Server/Migrations/20191110144834_CascadeDeleteBlockDescriptors.cs +++ b/Aaru.Server.Database/Migrations/20191110144834_CascadeDeleteBlockDescriptors.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class CascadeDeleteBlockDescriptors : Migration { diff --git a/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.Designer.cs b/Aaru.Server.Database/Migrations/20191113003156_CascadeDeleteMmcFeatures.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.Designer.cs rename to Aaru.Server.Database/Migrations/20191113003156_CascadeDeleteMmcFeatures.Designer.cs index 8592cfb8..ba85f394 100644 --- a/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.Designer.cs +++ b/Aaru.Server.Database/Migrations/20191113003156_CascadeDeleteMmcFeatures.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20191113003156_CascadeDeleteMmcFeatures")] partial class CascadeDeleteMmcFeatures { diff --git a/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.cs b/Aaru.Server.Database/Migrations/20191113003156_CascadeDeleteMmcFeatures.cs similarity index 95% rename from Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.cs rename to Aaru.Server.Database/Migrations/20191113003156_CascadeDeleteMmcFeatures.cs index 812f2401..01e07ab7 100644 --- a/Aaru.Server/Migrations/20191113003156_CascadeDeleteMmcFeatures.cs +++ b/Aaru.Server.Database/Migrations/20191113003156_CascadeDeleteMmcFeatures.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class CascadeDeleteMmcFeatures : Migration { diff --git a/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.Designer.cs b/Aaru.Server.Database/Migrations/20191117215158_CascadeDeleteSupportedDensities.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.Designer.cs rename to Aaru.Server.Database/Migrations/20191117215158_CascadeDeleteSupportedDensities.Designer.cs index 541ba9ce..98c4e435 100644 --- a/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.Designer.cs +++ b/Aaru.Server.Database/Migrations/20191117215158_CascadeDeleteSupportedDensities.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20191117215158_CascadeDeleteSupportedDensities")] partial class CascadeDeleteSupportedDensities { diff --git a/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.cs b/Aaru.Server.Database/Migrations/20191117215158_CascadeDeleteSupportedDensities.cs similarity index 97% rename from Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.cs rename to Aaru.Server.Database/Migrations/20191117215158_CascadeDeleteSupportedDensities.cs index 51048a33..60242d8d 100644 --- a/Aaru.Server/Migrations/20191117215158_CascadeDeleteSupportedDensities.cs +++ b/Aaru.Server.Database/Migrations/20191117215158_CascadeDeleteSupportedDensities.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class CascadeDeleteSupportedDensities : Migration { diff --git a/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.Designer.cs b/Aaru.Server.Database/Migrations/20191124212117_EFTypesUpdate.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20191124212117_EFTypesUpdate.Designer.cs rename to Aaru.Server.Database/Migrations/20191124212117_EFTypesUpdate.Designer.cs index 954c6fc4..2d97ef0d 100644 --- a/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.Designer.cs +++ b/Aaru.Server.Database/Migrations/20191124212117_EFTypesUpdate.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20191124212117_EFTypesUpdate")] partial class EFTypesUpdate { diff --git a/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.cs b/Aaru.Server.Database/Migrations/20191124212117_EFTypesUpdate.cs similarity index 99% rename from Aaru.Server/Migrations/20191124212117_EFTypesUpdate.cs rename to Aaru.Server.Database/Migrations/20191124212117_EFTypesUpdate.cs index 9aa2bd91..29ca99f1 100644 --- a/Aaru.Server/Migrations/20191124212117_EFTypesUpdate.cs +++ b/Aaru.Server.Database/Migrations/20191124212117_EFTypesUpdate.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class EFTypesUpdate : Migration { diff --git a/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.Designer.cs b/Aaru.Server.Database/Migrations/20191124220655_AddSupportsScrambledReadCd.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.Designer.cs rename to Aaru.Server.Database/Migrations/20191124220655_AddSupportsScrambledReadCd.Designer.cs index d4f35bf9..cc68aaec 100644 --- a/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.Designer.cs +++ b/Aaru.Server.Database/Migrations/20191124220655_AddSupportsScrambledReadCd.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20191124220655_AddSupportsScrambledReadCd")] partial class AddSupportsScrambledReadCd { diff --git a/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.cs b/Aaru.Server.Database/Migrations/20191124220655_AddSupportsScrambledReadCd.cs similarity index 94% rename from Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.cs rename to Aaru.Server.Database/Migrations/20191124220655_AddSupportsScrambledReadCd.cs index 10f9cda8..851c8718 100644 --- a/Aaru.Server/Migrations/20191124220655_AddSupportsScrambledReadCd.cs +++ b/Aaru.Server.Database/Migrations/20191124220655_AddSupportsScrambledReadCd.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class AddSupportsScrambledReadCd : Migration { diff --git a/Aaru.Server/Migrations/20191203212552_NameCountModel.Designer.cs b/Aaru.Server.Database/Migrations/20191203212552_NameCountModel.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20191203212552_NameCountModel.Designer.cs rename to Aaru.Server.Database/Migrations/20191203212552_NameCountModel.Designer.cs index 7334b50e..61c49132 100644 --- a/Aaru.Server/Migrations/20191203212552_NameCountModel.Designer.cs +++ b/Aaru.Server.Database/Migrations/20191203212552_NameCountModel.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20191203212552_NameCountModel")] partial class NameCountModel { diff --git a/Aaru.Server/Migrations/20191203212552_NameCountModel.cs b/Aaru.Server.Database/Migrations/20191203212552_NameCountModel.cs similarity index 91% rename from Aaru.Server/Migrations/20191203212552_NameCountModel.cs rename to Aaru.Server.Database/Migrations/20191203212552_NameCountModel.cs index f9ec8a9e..af1c170d 100644 --- a/Aaru.Server/Migrations/20191203212552_NameCountModel.cs +++ b/Aaru.Server.Database/Migrations/20191203212552_NameCountModel.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class NameCountModel : Migration { diff --git a/Aaru.Server/Migrations/20191204182314_RemoteStatistics.Designer.cs b/Aaru.Server.Database/Migrations/20191204182314_RemoteStatistics.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20191204182314_RemoteStatistics.Designer.cs rename to Aaru.Server.Database/Migrations/20191204182314_RemoteStatistics.Designer.cs index 7ba55113..e85076dd 100644 --- a/Aaru.Server/Migrations/20191204182314_RemoteStatistics.Designer.cs +++ b/Aaru.Server.Database/Migrations/20191204182314_RemoteStatistics.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20191204182314_RemoteStatistics")] partial class RemoteStatistics { diff --git a/Aaru.Server/Migrations/20191204182314_RemoteStatistics.cs b/Aaru.Server.Database/Migrations/20191204182314_RemoteStatistics.cs similarity index 97% rename from Aaru.Server/Migrations/20191204182314_RemoteStatistics.cs rename to Aaru.Server.Database/Migrations/20191204182314_RemoteStatistics.cs index dfe607d9..35d9c068 100644 --- a/Aaru.Server/Migrations/20191204182314_RemoteStatistics.cs +++ b/Aaru.Server.Database/Migrations/20191204182314_RemoteStatistics.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class RemoteStatistics : Migration { diff --git a/Aaru.Server/Migrations/20200710172932_AddGdRomSwapDiscCapabilities.Designer.cs b/Aaru.Server.Database/Migrations/20200710172932_AddGdRomSwapDiscCapabilities.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20200710172932_AddGdRomSwapDiscCapabilities.Designer.cs rename to Aaru.Server.Database/Migrations/20200710172932_AddGdRomSwapDiscCapabilities.Designer.cs index 0b98fd2c..b2e1da74 100644 --- a/Aaru.Server/Migrations/20200710172932_AddGdRomSwapDiscCapabilities.Designer.cs +++ b/Aaru.Server.Database/Migrations/20200710172932_AddGdRomSwapDiscCapabilities.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20200710172932_AddGdRomSwapDiscCapabilities")] partial class AddGdRomSwapDiscCapabilities { diff --git a/Aaru.Server/Migrations/20200710172932_AddGdRomSwapDiscCapabilities.cs b/Aaru.Server.Database/Migrations/20200710172932_AddGdRomSwapDiscCapabilities.cs similarity index 99% rename from Aaru.Server/Migrations/20200710172932_AddGdRomSwapDiscCapabilities.cs rename to Aaru.Server.Database/Migrations/20200710172932_AddGdRomSwapDiscCapabilities.cs index f0665676..d023a869 100644 --- a/Aaru.Server/Migrations/20200710172932_AddGdRomSwapDiscCapabilities.cs +++ b/Aaru.Server.Database/Migrations/20200710172932_AddGdRomSwapDiscCapabilities.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class AddGdRomSwapDiscCapabilities : Migration { diff --git a/Aaru.Server/Migrations/20200710184810_AddCanReadGdRomUsingSwapDisc.Designer.cs b/Aaru.Server.Database/Migrations/20200710184810_AddCanReadGdRomUsingSwapDisc.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20200710184810_AddCanReadGdRomUsingSwapDisc.Designer.cs rename to Aaru.Server.Database/Migrations/20200710184810_AddCanReadGdRomUsingSwapDisc.Designer.cs index 748a685b..24de28eb 100644 --- a/Aaru.Server/Migrations/20200710184810_AddCanReadGdRomUsingSwapDisc.Designer.cs +++ b/Aaru.Server.Database/Migrations/20200710184810_AddCanReadGdRomUsingSwapDisc.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20200710184810_AddCanReadGdRomUsingSwapDisc")] partial class AddCanReadGdRomUsingSwapDisc { diff --git a/Aaru.Server/Migrations/20200710184810_AddCanReadGdRomUsingSwapDisc.cs b/Aaru.Server.Database/Migrations/20200710184810_AddCanReadGdRomUsingSwapDisc.cs similarity index 92% rename from Aaru.Server/Migrations/20200710184810_AddCanReadGdRomUsingSwapDisc.cs rename to Aaru.Server.Database/Migrations/20200710184810_AddCanReadGdRomUsingSwapDisc.cs index bd0345c9..d75cd94d 100644 --- a/Aaru.Server/Migrations/20200710184810_AddCanReadGdRomUsingSwapDisc.cs +++ b/Aaru.Server.Database/Migrations/20200710184810_AddCanReadGdRomUsingSwapDisc.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class AddCanReadGdRomUsingSwapDisc : Migration { diff --git a/Aaru.Server/Migrations/20200710200444_AddAudioFieldsToGdromReadCapabilities.Designer.cs b/Aaru.Server.Database/Migrations/20200710200444_AddAudioFieldsToGdromReadCapabilities.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20200710200444_AddAudioFieldsToGdromReadCapabilities.Designer.cs rename to Aaru.Server.Database/Migrations/20200710200444_AddAudioFieldsToGdromReadCapabilities.Designer.cs index 79339f8a..095d65bb 100644 --- a/Aaru.Server/Migrations/20200710200444_AddAudioFieldsToGdromReadCapabilities.Designer.cs +++ b/Aaru.Server.Database/Migrations/20200710200444_AddAudioFieldsToGdromReadCapabilities.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20200710200444_AddAudioFieldsToGdromReadCapabilities")] partial class AddAudioFieldsToGdromReadCapabilities { diff --git a/Aaru.Server/Migrations/20200710200444_AddAudioFieldsToGdromReadCapabilities.cs b/Aaru.Server.Database/Migrations/20200710200444_AddAudioFieldsToGdromReadCapabilities.cs similarity index 99% rename from Aaru.Server/Migrations/20200710200444_AddAudioFieldsToGdromReadCapabilities.cs rename to Aaru.Server.Database/Migrations/20200710200444_AddAudioFieldsToGdromReadCapabilities.cs index a361e29f..8436d77a 100644 --- a/Aaru.Server/Migrations/20200710200444_AddAudioFieldsToGdromReadCapabilities.cs +++ b/Aaru.Server.Database/Migrations/20200710200444_AddAudioFieldsToGdromReadCapabilities.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class AddAudioFieldsToGdromReadCapabilities : Migration { diff --git a/Aaru.Server/Migrations/20200711180338_AddFieldsForF1hCommand06hSubcommand.Designer.cs b/Aaru.Server.Database/Migrations/20200711180338_AddFieldsForF1hCommand06hSubcommand.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20200711180338_AddFieldsForF1hCommand06hSubcommand.Designer.cs rename to Aaru.Server.Database/Migrations/20200711180338_AddFieldsForF1hCommand06hSubcommand.Designer.cs index 2830f73d..e45833ce 100644 --- a/Aaru.Server/Migrations/20200711180338_AddFieldsForF1hCommand06hSubcommand.Designer.cs +++ b/Aaru.Server.Database/Migrations/20200711180338_AddFieldsForF1hCommand06hSubcommand.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20200711180338_AddFieldsForF1hCommand06hSubcommand")] partial class AddFieldsForF1hCommand06hSubcommand { diff --git a/Aaru.Server/Migrations/20200711180338_AddFieldsForF1hCommand06hSubcommand.cs b/Aaru.Server.Database/Migrations/20200711180338_AddFieldsForF1hCommand06hSubcommand.cs similarity index 96% rename from Aaru.Server/Migrations/20200711180338_AddFieldsForF1hCommand06hSubcommand.cs rename to Aaru.Server.Database/Migrations/20200711180338_AddFieldsForF1hCommand06hSubcommand.cs index 99131f5c..b5ea5f26 100644 --- a/Aaru.Server/Migrations/20200711180338_AddFieldsForF1hCommand06hSubcommand.cs +++ b/Aaru.Server.Database/Migrations/20200711180338_AddFieldsForF1hCommand06hSubcommand.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class AddFieldsForF1hCommand06hSubcommand : Migration { diff --git a/Aaru.Server/Migrations/20200711231045_FixGdRomCapabilitiesFieldName.Designer.cs b/Aaru.Server.Database/Migrations/20200711231045_FixGdRomCapabilitiesFieldName.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20200711231045_FixGdRomCapabilitiesFieldName.Designer.cs rename to Aaru.Server.Database/Migrations/20200711231045_FixGdRomCapabilitiesFieldName.Designer.cs index bfffc740..3e2a8ef3 100644 --- a/Aaru.Server/Migrations/20200711231045_FixGdRomCapabilitiesFieldName.Designer.cs +++ b/Aaru.Server.Database/Migrations/20200711231045_FixGdRomCapabilitiesFieldName.Designer.cs @@ -1,14 +1,13 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20200711231045_FixGdRomCapabilitiesFieldName")] partial class FixGdRomCapabilitiesFieldName { diff --git a/Aaru.Server/Migrations/20200711231045_FixGdRomCapabilitiesFieldName.cs b/Aaru.Server.Database/Migrations/20200711231045_FixGdRomCapabilitiesFieldName.cs similarity index 95% rename from Aaru.Server/Migrations/20200711231045_FixGdRomCapabilitiesFieldName.cs rename to Aaru.Server.Database/Migrations/20200711231045_FixGdRomCapabilitiesFieldName.cs index 7002255c..955595fc 100644 --- a/Aaru.Server/Migrations/20200711231045_FixGdRomCapabilitiesFieldName.cs +++ b/Aaru.Server.Database/Migrations/20200711231045_FixGdRomCapabilitiesFieldName.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Migrations; -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class FixGdRomCapabilitiesFieldName : Migration { diff --git a/Aaru.Server/Migrations/20211208215447_AddNesHeaders.Designer.cs b/Aaru.Server.Database/Migrations/20211208215447_AddNesHeaders.Designer.cs similarity index 99% rename from Aaru.Server/Migrations/20211208215447_AddNesHeaders.Designer.cs rename to Aaru.Server.Database/Migrations/20211208215447_AddNesHeaders.Designer.cs index e3d16e2a..d3efcccd 100644 --- a/Aaru.Server/Migrations/20211208215447_AddNesHeaders.Designer.cs +++ b/Aaru.Server.Database/Migrations/20211208215447_AddNesHeaders.Designer.cs @@ -1,6 +1,5 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; @@ -8,9 +7,9 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] [Migration("20211208215447_AddNesHeaders")] partial class AddNesHeaders { diff --git a/Aaru.Server/Migrations/20211208215447_AddNesHeaders.cs b/Aaru.Server.Database/Migrations/20211208215447_AddNesHeaders.cs similarity index 99% rename from Aaru.Server/Migrations/20211208215447_AddNesHeaders.cs rename to Aaru.Server.Database/Migrations/20211208215447_AddNesHeaders.cs index dc3c17f2..8fcd5024 100644 --- a/Aaru.Server/Migrations/20211208215447_AddNesHeaders.cs +++ b/Aaru.Server.Database/Migrations/20211208215447_AddNesHeaders.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Migrations; #nullable disable -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { public partial class AddNesHeaders : Migration { diff --git a/Aaru.Server/Migrations/AaruServerContextModelSnapshot.cs b/Aaru.Server.Database/Migrations/AaruServerContextModelSnapshot.cs similarity index 99% rename from Aaru.Server/Migrations/AaruServerContextModelSnapshot.cs rename to Aaru.Server.Database/Migrations/AaruServerContextModelSnapshot.cs index 41a4123c..181d44e1 100644 --- a/Aaru.Server/Migrations/AaruServerContextModelSnapshot.cs +++ b/Aaru.Server.Database/Migrations/AaruServerContextModelSnapshot.cs @@ -1,15 +1,14 @@ // using System; -using Aaru.Server.Models; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace Aaru.Server.Migrations +namespace Aaru.Server.Database.Migrations { - [DbContext(typeof(AaruServerContext))] + [DbContext(typeof(DbContext))] partial class AaruServerContextModelSnapshot : ModelSnapshot { protected override void BuildModel(ModelBuilder modelBuilder) diff --git a/Aaru.Server/Models/BaseModel.cs b/Aaru.Server.Database/Models/BaseModel.cs similarity index 76% rename from Aaru.Server/Models/BaseModel.cs rename to Aaru.Server.Database/Models/BaseModel.cs index 9fe48ce4..aa0ecef6 100644 --- a/Aaru.Server/Models/BaseModel.cs +++ b/Aaru.Server.Database/Models/BaseModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public abstract class BaseModel { diff --git a/Aaru.Server/Models/BaseOperatingSystem.cs b/Aaru.Server.Database/Models/BaseOperatingSystem.cs similarity index 97% rename from Aaru.Server/Models/BaseOperatingSystem.cs rename to Aaru.Server.Database/Models/BaseOperatingSystem.cs index 71726519..b3da167b 100644 --- a/Aaru.Server/Models/BaseOperatingSystem.cs +++ b/Aaru.Server.Database/Models/BaseOperatingSystem.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public abstract class BaseOperatingSystem : BaseModel { diff --git a/Aaru.Server/Models/CdOffset.cs b/Aaru.Server.Database/Models/CdOffset.cs similarity index 98% rename from Aaru.Server/Models/CdOffset.cs rename to Aaru.Server.Database/Models/CdOffset.cs index 58aadf57..9188e5bc 100644 --- a/Aaru.Server/Models/CdOffset.cs +++ b/Aaru.Server.Database/Models/CdOffset.cs @@ -33,7 +33,7 @@ using System.ComponentModel; using Aaru.CommonTypes.Metadata; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class CompactDiscOffset : CdOffset { diff --git a/Aaru.Server/Models/ChsModel.cs b/Aaru.Server.Database/Models/ChsModel.cs similarity index 87% rename from Aaru.Server/Models/ChsModel.cs rename to Aaru.Server.Database/Models/ChsModel.cs index f25d4c2d..ee258eb8 100644 --- a/Aaru.Server/Models/ChsModel.cs +++ b/Aaru.Server.Database/Models/ChsModel.cs @@ -1,4 +1,4 @@ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class ChsModel { diff --git a/Aaru.Server/Models/Command.cs b/Aaru.Server.Database/Models/Command.cs similarity index 97% rename from Aaru.Server/Models/Command.cs rename to Aaru.Server.Database/Models/Command.cs index 853c06aa..46350dbf 100644 --- a/Aaru.Server/Models/Command.cs +++ b/Aaru.Server.Database/Models/Command.cs @@ -30,6 +30,6 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class Command : NameCountModel {} \ No newline at end of file diff --git a/Aaru.Server/Models/CompareModel.cs b/Aaru.Server.Database/Models/CompareModel.cs similarity index 91% rename from Aaru.Server/Models/CompareModel.cs rename to Aaru.Server.Database/Models/CompareModel.cs index 50692c70..726a3dbb 100644 --- a/Aaru.Server/Models/CompareModel.cs +++ b/Aaru.Server.Database/Models/CompareModel.cs @@ -1,4 +1,4 @@ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class CompareModel { diff --git a/Aaru.Server/Models/Device.cs b/Aaru.Server.Database/Models/Device.cs similarity index 99% rename from Aaru.Server/Models/Device.cs rename to Aaru.Server.Database/Models/Device.cs index f8da9c68..7718a014 100644 --- a/Aaru.Server/Models/Device.cs +++ b/Aaru.Server.Database/Models/Device.cs @@ -34,7 +34,7 @@ using System.ComponentModel; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Metadata; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class Device : DeviceReportV2 { diff --git a/Aaru.Server/Models/DeviceDetails.cs b/Aaru.Server.Database/Models/DeviceDetails.cs similarity index 95% rename from Aaru.Server/Models/DeviceDetails.cs rename to Aaru.Server.Database/Models/DeviceDetails.cs index d3754c35..f1edc1a0 100644 --- a/Aaru.Server/Models/DeviceDetails.cs +++ b/Aaru.Server.Database/Models/DeviceDetails.cs @@ -1,6 +1,6 @@ using Aaru.CommonTypes.Metadata; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class DeviceDetails { diff --git a/Aaru.Server/Models/DeviceItem.cs b/Aaru.Server.Database/Models/DeviceItem.cs similarity index 97% rename from Aaru.Server/Models/DeviceItem.cs rename to Aaru.Server.Database/Models/DeviceItem.cs index 1feef800..b847410a 100644 --- a/Aaru.Server/Models/DeviceItem.cs +++ b/Aaru.Server.Database/Models/DeviceItem.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class DeviceItem { diff --git a/Aaru.Server/Models/DeviceStat.cs b/Aaru.Server.Database/Models/DeviceStat.cs similarity index 97% rename from Aaru.Server/Models/DeviceStat.cs rename to Aaru.Server.Database/Models/DeviceStat.cs index 06088545..9db30b25 100644 --- a/Aaru.Server/Models/DeviceStat.cs +++ b/Aaru.Server.Database/Models/DeviceStat.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class DeviceStat : BaseModel { diff --git a/Aaru.Server/Models/ErrorViewModel.cs b/Aaru.Server.Database/Models/ErrorViewModel.cs similarity index 78% rename from Aaru.Server/Models/ErrorViewModel.cs rename to Aaru.Server.Database/Models/ErrorViewModel.cs index 31726820..9dc5a1a6 100644 --- a/Aaru.Server/Models/ErrorViewModel.cs +++ b/Aaru.Server.Database/Models/ErrorViewModel.cs @@ -1,4 +1,4 @@ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class ErrorViewModel { diff --git a/Aaru.Server/Models/Filesystem.cs b/Aaru.Server.Database/Models/Filesystem.cs similarity index 97% rename from Aaru.Server/Models/Filesystem.cs rename to Aaru.Server.Database/Models/Filesystem.cs index a684cf13..7c264027 100644 --- a/Aaru.Server/Models/Filesystem.cs +++ b/Aaru.Server.Database/Models/Filesystem.cs @@ -30,6 +30,6 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class Filesystem : NameCountModel {} \ No newline at end of file diff --git a/Aaru.Server/Models/Filter.cs b/Aaru.Server.Database/Models/Filter.cs similarity index 97% rename from Aaru.Server/Models/Filter.cs rename to Aaru.Server.Database/Models/Filter.cs index bfd4db6d..eaaca467 100644 --- a/Aaru.Server/Models/Filter.cs +++ b/Aaru.Server.Database/Models/Filter.cs @@ -30,6 +30,6 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class Filter : NameCountModel {} \ No newline at end of file diff --git a/Aaru.Server/Models/FindReportModel.cs b/Aaru.Server.Database/Models/FindReportModel.cs similarity index 88% rename from Aaru.Server/Models/FindReportModel.cs rename to Aaru.Server.Database/Models/FindReportModel.cs index ab9f1bbf..c7f41dc0 100644 --- a/Aaru.Server/Models/FindReportModel.cs +++ b/Aaru.Server.Database/Models/FindReportModel.cs @@ -1,4 +1,4 @@ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class FindReportModel : BaseModel { diff --git a/Aaru.Server/Models/FireWireModel.cs b/Aaru.Server.Database/Models/FireWireModel.cs similarity index 95% rename from Aaru.Server/Models/FireWireModel.cs rename to Aaru.Server.Database/Models/FireWireModel.cs index 6328b4ee..f498ff40 100644 --- a/Aaru.Server/Models/FireWireModel.cs +++ b/Aaru.Server.Database/Models/FireWireModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class FireWireModel { diff --git a/Aaru.Server/Models/IdHashModel.cs b/Aaru.Server.Database/Models/IdHashModel.cs similarity index 87% rename from Aaru.Server/Models/IdHashModel.cs rename to Aaru.Server.Database/Models/IdHashModel.cs index 97d0a3c5..5f04b88a 100644 --- a/Aaru.Server/Models/IdHashModel.cs +++ b/Aaru.Server.Database/Models/IdHashModel.cs @@ -1,4 +1,4 @@ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class IdHashModel : BaseModel { diff --git a/Aaru.Server/Models/IdHashModelForView.cs b/Aaru.Server.Database/Models/IdHashModelForView.cs similarity index 77% rename from Aaru.Server/Models/IdHashModelForView.cs rename to Aaru.Server.Database/Models/IdHashModelForView.cs index 77ecc877..05dbfc5f 100644 --- a/Aaru.Server/Models/IdHashModelForView.cs +++ b/Aaru.Server.Database/Models/IdHashModelForView.cs @@ -1,4 +1,4 @@ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class IdHashModelForView { diff --git a/Aaru.Server/Models/Media.cs b/Aaru.Server.Database/Models/Media.cs similarity index 98% rename from Aaru.Server/Models/Media.cs rename to Aaru.Server.Database/Models/Media.cs index 3f3cb875..7e6b598e 100644 --- a/Aaru.Server/Models/Media.cs +++ b/Aaru.Server.Database/Models/Media.cs @@ -34,7 +34,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations.Schema; using Aaru.CommonTypes; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class Media : BaseModel { diff --git a/Aaru.Server/Models/MediaFormat.cs b/Aaru.Server.Database/Models/MediaFormat.cs similarity index 97% rename from Aaru.Server/Models/MediaFormat.cs rename to Aaru.Server.Database/Models/MediaFormat.cs index 260afa76..6c0b992f 100644 --- a/Aaru.Server/Models/MediaFormat.cs +++ b/Aaru.Server.Database/Models/MediaFormat.cs @@ -30,6 +30,6 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class MediaFormat : NameCountModel {} \ No newline at end of file diff --git a/Aaru.Server/Models/MediaItem.cs b/Aaru.Server.Database/Models/MediaItem.cs similarity index 97% rename from Aaru.Server/Models/MediaItem.cs rename to Aaru.Server.Database/Models/MediaItem.cs index e1898308..f8ca3460 100644 --- a/Aaru.Server/Models/MediaItem.cs +++ b/Aaru.Server.Database/Models/MediaItem.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class MediaItem { diff --git a/Aaru.Server/Models/MmcModelForView.cs b/Aaru.Server.Database/Models/MmcModelForView.cs similarity index 89% rename from Aaru.Server/Models/MmcModelForView.cs rename to Aaru.Server.Database/Models/MmcModelForView.cs index 2303509e..7a2d2d18 100644 --- a/Aaru.Server/Models/MmcModelForView.cs +++ b/Aaru.Server.Database/Models/MmcModelForView.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class MmcModelForView : BaseModel { diff --git a/Aaru.Server/Models/NameCountModel.cs b/Aaru.Server.Database/Models/NameCountModel.cs similarity index 77% rename from Aaru.Server/Models/NameCountModel.cs rename to Aaru.Server.Database/Models/NameCountModel.cs index bf0e5a3f..51bdbb8c 100644 --- a/Aaru.Server/Models/NameCountModel.cs +++ b/Aaru.Server.Database/Models/NameCountModel.cs @@ -1,4 +1,4 @@ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public abstract class NameCountModel : BaseModel { diff --git a/Aaru.Server/Models/NesHeaderInfo.cs b/Aaru.Server.Database/Models/NesHeaderInfo.cs similarity index 97% rename from Aaru.Server/Models/NesHeaderInfo.cs rename to Aaru.Server.Database/Models/NesHeaderInfo.cs index 4e44fed9..bf1b366a 100644 --- a/Aaru.Server/Models/NesHeaderInfo.cs +++ b/Aaru.Server.Database/Models/NesHeaderInfo.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using Aaru.CommonTypes.Enums; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class NesHeaderInfo : BaseModel { diff --git a/Aaru.Server/Models/OperatingSystem.cs b/Aaru.Server.Database/Models/OperatingSystem.cs similarity index 97% rename from Aaru.Server/Models/OperatingSystem.cs rename to Aaru.Server.Database/Models/OperatingSystem.cs index 041efdd4..c06b727a 100644 --- a/Aaru.Server/Models/OperatingSystem.cs +++ b/Aaru.Server.Database/Models/OperatingSystem.cs @@ -30,6 +30,6 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class OperatingSystem : BaseOperatingSystem {} \ No newline at end of file diff --git a/Aaru.Server/Models/Partition.cs b/Aaru.Server.Database/Models/Partition.cs similarity index 97% rename from Aaru.Server/Models/Partition.cs rename to Aaru.Server.Database/Models/Partition.cs index a9b8b427..9afb1f85 100644 --- a/Aaru.Server/Models/Partition.cs +++ b/Aaru.Server.Database/Models/Partition.cs @@ -30,6 +30,6 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class Partition : NameCountModel {} \ No newline at end of file diff --git a/Aaru.Server/Models/RemoteApplication.cs b/Aaru.Server.Database/Models/RemoteApplication.cs similarity index 97% rename from Aaru.Server/Models/RemoteApplication.cs rename to Aaru.Server.Database/Models/RemoteApplication.cs index 3e63c465..f7389634 100644 --- a/Aaru.Server/Models/RemoteApplication.cs +++ b/Aaru.Server.Database/Models/RemoteApplication.cs @@ -30,6 +30,6 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class RemoteApplication : BaseOperatingSystem {} \ No newline at end of file diff --git a/Aaru.Server/Models/RemoteArchitecture.cs b/Aaru.Server.Database/Models/RemoteArchitecture.cs similarity index 97% rename from Aaru.Server/Models/RemoteArchitecture.cs rename to Aaru.Server.Database/Models/RemoteArchitecture.cs index 7a28d9d1..a72a65b0 100644 --- a/Aaru.Server/Models/RemoteArchitecture.cs +++ b/Aaru.Server.Database/Models/RemoteArchitecture.cs @@ -30,6 +30,6 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class RemoteArchitecture : NameCountModel {} \ No newline at end of file diff --git a/Aaru.Server/Models/RemoteOperatingSystem.cs b/Aaru.Server.Database/Models/RemoteOperatingSystem.cs similarity index 97% rename from Aaru.Server/Models/RemoteOperatingSystem.cs rename to Aaru.Server.Database/Models/RemoteOperatingSystem.cs index 17b7565b..d5fec0c9 100644 --- a/Aaru.Server/Models/RemoteOperatingSystem.cs +++ b/Aaru.Server.Database/Models/RemoteOperatingSystem.cs @@ -30,6 +30,6 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class RemoteOperatingSystem : BaseOperatingSystem {} \ No newline at end of file diff --git a/Aaru.Server/Models/SscModel.cs b/Aaru.Server.Database/Models/SscModel.cs similarity index 88% rename from Aaru.Server/Models/SscModel.cs rename to Aaru.Server.Database/Models/SscModel.cs index 5d435bac..464c1068 100644 --- a/Aaru.Server/Models/SscModel.cs +++ b/Aaru.Server.Database/Models/SscModel.cs @@ -1,4 +1,4 @@ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class SscModel { diff --git a/Aaru.Server/Models/TestedMediaDataModel.cs b/Aaru.Server.Database/Models/TestedMediaDataModel.cs similarity index 85% rename from Aaru.Server/Models/TestedMediaDataModel.cs rename to Aaru.Server.Database/Models/TestedMediaDataModel.cs index 3fbc3b54..89fd099b 100644 --- a/Aaru.Server/Models/TestedMediaDataModel.cs +++ b/Aaru.Server.Database/Models/TestedMediaDataModel.cs @@ -1,4 +1,4 @@ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class TestedMediaDataModel { diff --git a/Aaru.Server/Models/UploadedReport.cs b/Aaru.Server.Database/Models/UploadedReport.cs similarity index 98% rename from Aaru.Server/Models/UploadedReport.cs rename to Aaru.Server.Database/Models/UploadedReport.cs index ba221e68..a2fe9b77 100644 --- a/Aaru.Server/Models/UploadedReport.cs +++ b/Aaru.Server.Database/Models/UploadedReport.cs @@ -33,7 +33,7 @@ using System.ComponentModel; using Aaru.CommonTypes.Metadata; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class UploadedReport : DeviceReportV2 { diff --git a/Aaru.Server/Models/UploadedReportDetails.cs b/Aaru.Server.Database/Models/UploadedReportDetails.cs similarity index 94% rename from Aaru.Server/Models/UploadedReportDetails.cs rename to Aaru.Server.Database/Models/UploadedReportDetails.cs index 3502232f..a0b287e4 100644 --- a/Aaru.Server/Models/UploadedReportDetails.cs +++ b/Aaru.Server.Database/Models/UploadedReportDetails.cs @@ -1,6 +1,6 @@ using Aaru.CommonTypes.Metadata; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class UploadedReportDetails { diff --git a/Aaru.Server/Models/UsbModel.cs b/Aaru.Server.Database/Models/UsbModel.cs similarity index 89% rename from Aaru.Server/Models/UsbModel.cs rename to Aaru.Server.Database/Models/UsbModel.cs index 33d782a6..abad4149 100644 --- a/Aaru.Server/Models/UsbModel.cs +++ b/Aaru.Server.Database/Models/UsbModel.cs @@ -1,4 +1,4 @@ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class UsbModel { diff --git a/Aaru.Server/Models/UsbProduct.cs b/Aaru.Server.Database/Models/UsbProduct.cs similarity index 96% rename from Aaru.Server/Models/UsbProduct.cs rename to Aaru.Server.Database/Models/UsbProduct.cs index 69231709..292597e5 100644 --- a/Aaru.Server/Models/UsbProduct.cs +++ b/Aaru.Server.Database/Models/UsbProduct.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -using Newtonsoft.Json; +using System.Text.Json.Serialization; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class UsbProduct : BaseModel { diff --git a/Aaru.Server/Models/UsbProductModel.cs b/Aaru.Server.Database/Models/UsbProductModel.cs similarity index 91% rename from Aaru.Server/Models/UsbProductModel.cs rename to Aaru.Server.Database/Models/UsbProductModel.cs index 3619e90a..c0aa2816 100644 --- a/Aaru.Server/Models/UsbProductModel.cs +++ b/Aaru.Server.Database/Models/UsbProductModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class UsbProductModel { diff --git a/Aaru.Server/Models/UsbVendor.cs b/Aaru.Server.Database/Models/UsbVendor.cs similarity index 96% rename from Aaru.Server/Models/UsbVendor.cs rename to Aaru.Server.Database/Models/UsbVendor.cs index 684ef1ed..fba165a6 100644 --- a/Aaru.Server/Models/UsbVendor.cs +++ b/Aaru.Server.Database/Models/UsbVendor.cs @@ -32,9 +32,9 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -using Newtonsoft.Json; +using System.Text.Json.Serialization; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class UsbVendor : BaseModel { diff --git a/Aaru.Server/Models/UsbVendorModel.cs b/Aaru.Server.Database/Models/UsbVendorModel.cs similarity index 90% rename from Aaru.Server/Models/UsbVendorModel.cs rename to Aaru.Server.Database/Models/UsbVendorModel.cs index b13c6f71..ee4fefb7 100644 --- a/Aaru.Server/Models/UsbVendorModel.cs +++ b/Aaru.Server.Database/Models/UsbVendorModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class UsbVendorModel { diff --git a/Aaru.Server/Models/Version.cs b/Aaru.Server.Database/Models/Version.cs similarity index 97% rename from Aaru.Server/Models/Version.cs rename to Aaru.Server.Database/Models/Version.cs index 552b1c4d..7cb0b9b9 100644 --- a/Aaru.Server/Models/Version.cs +++ b/Aaru.Server.Database/Models/Version.cs @@ -30,6 +30,6 @@ // Copyright © 2011-2024 Natalia Portillo // ****************************************************************************/ -namespace Aaru.Server.Models; +namespace Aaru.Server.Database.Models; public class Version : NameCountModel {} \ No newline at end of file diff --git a/Aaru.Server.Task/Program.cs b/Aaru.Server.Task/Program.cs index 7ccb1f3c..3d571a3b 100644 --- a/Aaru.Server.Task/Program.cs +++ b/Aaru.Server.Task/Program.cs @@ -38,9 +38,10 @@ using System.Net; using System.Security.Cryptography; using System.Text.Json; using Aaru.CommonTypes.Enums; -using Aaru.Server.Models; +using Aaru.Server.Database.Models; using HtmlAgilityPack; using Microsoft.EntityFrameworkCore; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Task; @@ -53,7 +54,7 @@ class Program start = DateTime.UtcNow; System.Console.WriteLine("{0}: Connecting to database...", DateTime.UtcNow); - var ctx = new AaruServerContext(); + var ctx = new DbContext(); end = DateTime.UtcNow; System.Console.WriteLine("{0}: Took {1:F2} seconds", end, (end - start).TotalSeconds); diff --git a/Aaru.Server.sln b/Aaru.Server.sln index 00005d9a..684cb53d 100644 --- a/Aaru.Server.sln +++ b/Aaru.Server.sln @@ -22,6 +22,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Server.Api", "Aaru.Ser EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Server.New", "Aaru.Server.New\Aaru.Server.New.csproj", "{032D24BA-EC3B-4BD1-ADD6-9463E2DC5D7E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Server.Database", "Aaru.Server.Database\Aaru.Server.Database.csproj", "{FA830C89-B3C4-4139-B756-B6C0F35C0BB4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -44,6 +46,10 @@ Global {032D24BA-EC3B-4BD1-ADD6-9463E2DC5D7E}.Debug|Any CPU.Build.0 = Debug|Any CPU {032D24BA-EC3B-4BD1-ADD6-9463E2DC5D7E}.Release|Any CPU.ActiveCfg = Release|Any CPU {032D24BA-EC3B-4BD1-ADD6-9463E2DC5D7E}.Release|Any CPU.Build.0 = Release|Any CPU + {FA830C89-B3C4-4139-B756-B6C0F35C0BB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA830C89-B3C4-4139-B756-B6C0F35C0BB4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA830C89-B3C4-4139-B756-B6C0F35C0BB4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA830C89-B3C4-4139-B756-B6C0F35C0BB4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Aaru.Server/Aaru.Server.csproj b/Aaru.Server/Aaru.Server.csproj index 6b116880..e1985ffd 100644 --- a/Aaru.Server/Aaru.Server.csproj +++ b/Aaru.Server/Aaru.Server.csproj @@ -32,15 +32,9 @@ - - - - - - @@ -184,4 +178,8 @@ + + + + diff --git a/Aaru.Server/Areas/Admin/Controllers/AtasController.cs b/Aaru.Server/Areas/Admin/Controllers/AtasController.cs index 7a1725dc..08260b8c 100644 --- a/Aaru.Server/Areas/Admin/Controllers/AtasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/AtasController.cs @@ -1,8 +1,10 @@ using System.Reflection; using Aaru.CommonTypes.Structs.Devices.ATA; using Aaru.Server.Core; +using Aaru.Server.Database.Models; using Newtonsoft.Json; using Ata = Aaru.CommonTypes.Metadata.Ata; +using DbContext = Aaru.Server.Database.DbContext; using TestedMedia = Aaru.CommonTypes.Metadata.TestedMedia; namespace Aaru.Server.Areas.Admin.Controllers; @@ -11,9 +13,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class AtasController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public AtasController(AaruServerContext context) => _context = context; + public AtasController(DbContext context) => _context = context; // GET: Admin/Atas public IActionResult Index() => View(_context.Ata.AsEnumerable() diff --git a/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs b/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs index 54b60520..ef8d9aca 100644 --- a/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/BlockDescriptorsController.cs @@ -1,12 +1,14 @@ +using DbContext = Aaru.Server.Database.DbContext; + namespace Aaru.Server.Areas.Admin.Controllers; [Area("Admin")] [Authorize] public sealed class BlockDescriptorsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public BlockDescriptorsController(AaruServerContext context) => _context = context; + public BlockDescriptorsController(DbContext context) => _context = context; // GET: Admin/BlockDescriptors public async Task Index() => View(await _context.BlockDescriptor.OrderBy(b => b.BlockLength) diff --git a/Aaru.Server/Areas/Admin/Controllers/ChsController.cs b/Aaru.Server/Areas/Admin/Controllers/ChsController.cs index fb534d58..44dd77eb 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ChsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ChsController.cs @@ -1,5 +1,7 @@ using Aaru.CommonTypes.Metadata; +using Aaru.Server.Database.Models; using Newtonsoft.Json; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -7,9 +9,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class ChsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public ChsController(AaruServerContext context) => _context = context; + public ChsController(DbContext context) => _context = context; // GET: Admin/Chs public async Task Index() => View(await _context.Chs.OrderBy(c => c.Cylinders) diff --git a/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs b/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs index 5bf9ec0c..8f3d273e 100644 --- a/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/CommandsController.cs @@ -1,12 +1,14 @@ +using DbContext = Aaru.Server.Database.DbContext; + namespace Aaru.Server.Areas.Admin.Controllers; [Area("Admin")] [Authorize] public sealed class CommandsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public CommandsController(AaruServerContext context) => _context = context; + public CommandsController(DbContext context) => _context = context; // GET: Admin/Commands public async Task Index() => View(await _context.Commands.OrderBy(c => c.Name).ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs b/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs index 04e1e494..d4709e13 100644 --- a/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/CompactDiscOffsetsController.cs @@ -1,12 +1,15 @@ +using Aaru.Server.Database.Models; +using DbContext = Aaru.Server.Database.DbContext; + namespace Aaru.Server.Areas.Admin.Controllers; [Area("Admin")] [Authorize] public sealed class CompactDiscOffsetsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public CompactDiscOffsetsController(AaruServerContext context) => _context = context; + public CompactDiscOffsetsController(DbContext context) => _context = context; // GET: Admin/CompactDiscOffsets public async Task Index() => View(await _context.CdOffsets.OrderBy(o => o.Manufacturer) diff --git a/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs b/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs index 8d5935eb..795c2c6a 100644 --- a/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/DeviceStatsController.cs @@ -1,12 +1,15 @@ +using Aaru.Server.Database.Models; +using DbContext = Aaru.Server.Database.DbContext; + namespace Aaru.Server.Areas.Admin.Controllers; [Area("Admin")] [Authorize] public sealed class DeviceStatsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public DeviceStatsController(AaruServerContext context) => _context = context; + public DeviceStatsController(DbContext context) => _context = context; // GET: Admin/DeviceStats public async Task Index() => View(await _context.DeviceStats.OrderBy(d => d.Manufacturer) diff --git a/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs b/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs index c89a12d7..9bad8a29 100644 --- a/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/DevicesController.cs @@ -1,4 +1,6 @@ using Aaru.CommonTypes.Metadata; +using Aaru.Server.Database.Models; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -6,9 +8,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class DevicesController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public DevicesController(AaruServerContext context) => _context = context; + public DevicesController(DbContext context) => _context = context; // GET: Admin/Devices public async Task Index() => View(await _context.Devices.OrderBy(d => d.Manufacturer) diff --git a/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs b/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs index 1fdb98e7..84e9d93c 100644 --- a/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/FilesystemsController.cs @@ -1,12 +1,14 @@ +using DbContext = Aaru.Server.Database.DbContext; + namespace Aaru.Server.Areas.Admin.Controllers; [Area("Admin")] [Authorize] public sealed class FilesystemsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public FilesystemsController(AaruServerContext context) => _context = context; + public FilesystemsController(DbContext context) => _context = context; // GET: Admin/Filesystems public async Task Index() => View(await _context.Filesystems.OrderBy(f => f.Name).ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs b/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs index 3de1f2cd..ce5e5c0f 100644 --- a/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/FiltersController.cs @@ -1,12 +1,14 @@ +using DbContext = Aaru.Server.Database.DbContext; + namespace Aaru.Server.Areas.Admin.Controllers; [Area("Admin")] [Authorize] public sealed class FiltersController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public FiltersController(AaruServerContext context) => _context = context; + public FiltersController(DbContext context) => _context = context; // GET: Admin/Filters public async Task Index() => View(await _context.Filters.OrderBy(f => f.Name).ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs b/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs index bffd7e67..d10360c1 100644 --- a/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/FireWiresController.cs @@ -1,5 +1,7 @@ using Aaru.CommonTypes.Metadata; +using Aaru.Server.Database.Models; using Newtonsoft.Json; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -7,9 +9,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class FireWiresController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public FireWiresController(AaruServerContext context) => _context = context; + public FireWiresController(DbContext context) => _context = context; // GET: Admin/FireWires public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/GdRomSwapDiscCapabilitiesController.cs b/Aaru.Server/Areas/Admin/Controllers/GdRomSwapDiscCapabilitiesController.cs index a5614a21..dc980547 100644 --- a/Aaru.Server/Areas/Admin/Controllers/GdRomSwapDiscCapabilitiesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/GdRomSwapDiscCapabilitiesController.cs @@ -3,6 +3,8 @@ using System.Web; using Aaru.CommonTypes.Metadata; using Aaru.Decoders.CD; using Aaru.Helpers; +using Aaru.Server.Database.Models; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -10,9 +12,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class GdRomSwapDiscCapabilitiesController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public GdRomSwapDiscCapabilitiesController(AaruServerContext context) => _context = context; + public GdRomSwapDiscCapabilitiesController(DbContext context) => _context = context; // GET: Admin/GdRomSwapDiscCapabilities/Details/5 public async Task Details(int? id) diff --git a/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs b/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs index ca48d6ab..00686bd1 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MediaFormatsController.cs @@ -1,12 +1,15 @@ +using Aaru.Server.Database.Models; +using DbContext = Aaru.Server.Database.DbContext; + namespace Aaru.Server.Areas.Admin.Controllers; [Area("Admin")] [Authorize] public sealed class MediaFormatsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public MediaFormatsController(AaruServerContext context) => _context = context; + public MediaFormatsController(DbContext context) => _context = context; // GET: Admin/MediaFormats public async Task Index() => View(await _context.MediaFormats.OrderBy(mf => mf.Name).ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/MediasController.cs b/Aaru.Server/Areas/Admin/Controllers/MediasController.cs index c44d04f6..d59660f5 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MediasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MediasController.cs @@ -1,12 +1,15 @@ +using Aaru.Server.Database.Models; +using DbContext = Aaru.Server.Database.DbContext; + namespace Aaru.Server.Areas.Admin.Controllers; [Area("Admin")] [Authorize] public sealed class MediasController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public MediasController(AaruServerContext context) => _context = context; + public MediasController(DbContext context) => _context = context; // GET: Admin/Medias public IActionResult Index(bool? real) diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcController.cs index d66fbf6f..3b5fc67a 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MmcController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MmcController.cs @@ -1,4 +1,6 @@ using Aaru.CommonTypes.Metadata; +using Aaru.Server.Database.Models; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -6,9 +8,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class MmcController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public MmcController(AaruServerContext context) => _context = context; + public MmcController(DbContext context) => _context = context; // GET: Admin/Mmc public IActionResult Index() => View(_context.Mmc.Where(m => m.ModeSense2AData != null) diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs index 8f22707b..99b3d1d7 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MmcFeaturesController.cs @@ -1,4 +1,5 @@ using Aaru.CommonTypes.Metadata; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -6,9 +7,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class MmcFeaturesController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public MmcFeaturesController(AaruServerContext context) => _context = context; + public MmcFeaturesController(DbContext context) => _context = context; // GET: Admin/MmcFeatures public async Task Index() => View(await _context.MmcFeatures.ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs b/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs index 475e4f34..5f7a2680 100644 --- a/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/MmcSdsController.cs @@ -1,4 +1,5 @@ using Aaru.CommonTypes.Metadata; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -6,9 +7,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class MmcSdsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public MmcSdsController(AaruServerContext context) => _context = context; + public MmcSdsController(DbContext context) => _context = context; // GET: Admin/MmcSds public async Task Index() => View(await _context.MmcSd.ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs b/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs index 72d865c0..07016a84 100644 --- a/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/OperatingSystemsController.cs @@ -1,12 +1,14 @@ +using DbContext = Aaru.Server.Database.DbContext; + namespace Aaru.Server.Areas.Admin.Controllers; [Area("Admin")] [Authorize] public sealed class OperatingSystemsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public OperatingSystemsController(AaruServerContext context) => _context = context; + public OperatingSystemsController(DbContext context) => _context = context; // GET: Admin/OperatingSystems public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs b/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs index d3018ce8..c98d5a5e 100644 --- a/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/PartitionsController.cs @@ -1,12 +1,14 @@ +using DbContext = Aaru.Server.Database.DbContext; + namespace Aaru.Server.Areas.Admin.Controllers; [Area("Admin")] [Authorize] public sealed class PartitionsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public PartitionsController(AaruServerContext context) => _context = context; + public PartitionsController(DbContext context) => _context = context; // GET: Admin/Partitions public async Task Index() => View(await _context.Partitions.OrderBy(p => p.Name).ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs b/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs index 4231d2cc..5b25e46d 100644 --- a/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/PcmciasController.cs @@ -1,4 +1,5 @@ using Aaru.CommonTypes.Metadata; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -6,9 +7,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class PcmciasController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public PcmciasController(AaruServerContext context) => _context = context; + public PcmciasController(DbContext context) => _context = context; // GET: Admin/Pcmcias public async Task Index() => View(await _context.Pcmcia.ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs b/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs index f0736208..70010522 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ReportsController.cs @@ -1,5 +1,7 @@ using Aaru.CommonTypes.Metadata; +using Aaru.Server.Database.Models; using Microsoft.EntityFrameworkCore.ChangeTracking; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -7,9 +9,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class ReportsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public ReportsController(AaruServerContext context) => _context = context; + public ReportsController(DbContext context) => _context = context; // GET: Admin/Reports public async Task Index() => View(await _context.Reports.OrderBy(r => r.Manufacturer) diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs index 9812adaa..ec63fb02 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ScsiModesController.cs @@ -1,4 +1,5 @@ using Aaru.CommonTypes.Metadata; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -6,9 +7,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class ScsiModesController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public ScsiModesController(AaruServerContext context) => _context = context; + public ScsiModesController(DbContext context) => _context = context; // GET: Admin/ScsiModes public async Task Index() => View(await _context.ScsiMode.ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs index d5025f7c..ae2d2a2e 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ScsiPagesController.cs @@ -1,4 +1,5 @@ using Aaru.CommonTypes.Metadata; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -6,9 +7,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class ScsiPagesController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public ScsiPagesController(AaruServerContext context) => _context = context; + public ScsiPagesController(DbContext context) => _context = context; // GET: Admin/ScsiPages public async Task Index() => View(await _context.ScsiPage.ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs b/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs index dc89abd8..c81aea3a 100644 --- a/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/ScsisController.cs @@ -3,7 +3,9 @@ using Aaru.CommonTypes.Metadata; using Aaru.CommonTypes.Structs.Devices.SCSI; using Aaru.Helpers; using Aaru.Server.Core; +using Aaru.Server.Database.Models; using Newtonsoft.Json; +using DbContext = Aaru.Server.Database.DbContext; using TestedMedia = Aaru.CommonTypes.Metadata.TestedMedia; namespace Aaru.Server.Areas.Admin.Controllers; @@ -12,9 +14,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class ScsisController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public ScsisController(AaruServerContext context) => _context = context; + public ScsisController(DbContext context) => _context = context; // GET: Admin/Scsis public IActionResult Index() => View(_context.Scsi.AsEnumerable() diff --git a/Aaru.Server/Areas/Admin/Controllers/SscsController.cs b/Aaru.Server/Areas/Admin/Controllers/SscsController.cs index b37a2909..4027f567 100644 --- a/Aaru.Server/Areas/Admin/Controllers/SscsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/SscsController.cs @@ -1,5 +1,7 @@ using Aaru.CommonTypes.Metadata; +using Aaru.Server.Database.Models; using Newtonsoft.Json; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -7,9 +9,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class SscsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public SscsController(AaruServerContext context) => _context = context; + public SscsController(DbContext context) => _context = context; // GET: Admin/Sscs public async Task Index() => View(await _context.Ssc.OrderBy(s => s.MinBlockLength) diff --git a/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs b/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs index dd080aeb..02e269ab 100644 --- a/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/SupportedDensitiesController.cs @@ -1,4 +1,5 @@ using Aaru.CommonTypes.Metadata; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -6,9 +7,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class SupportedDensitiesController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public SupportedDensitiesController(AaruServerContext context) => _context = context; + public SupportedDensitiesController(DbContext context) => _context = context; // GET: Admin/SupportedDensities public async Task Index() => View(await _context.SupportedDensity.OrderBy(d => d.Organization) diff --git a/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs b/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs index 2b17bb30..7ddfee90 100644 --- a/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/TestedMediasController.cs @@ -7,7 +7,9 @@ using Aaru.Decoders.CD; using Aaru.Decoders.DVD; using Aaru.Decoders.SCSI; using Aaru.Helpers; +using Aaru.Server.Database.Models; using Cartridge = Aaru.Decoders.Bluray.Cartridge; +using DbContext = Aaru.Server.Database.DbContext; using DDS = Aaru.Decoders.Bluray.DDS; using DMI = Aaru.Decoders.Xbox.DMI; using MediaType = Aaru.CommonTypes.MediaType; @@ -19,9 +21,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class TestedMediasController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public TestedMediasController(AaruServerContext context) => _context = context; + public TestedMediasController(DbContext context) => _context = context; // GET: Admin/TestedMedias public async Task Index() => View(await _context.TestedMedia.OrderBy(m => m.Manufacturer) diff --git a/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs b/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs index 6a7f22ad..636ab5d0 100644 --- a/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/TestedSequentialMediasController.cs @@ -1,4 +1,5 @@ using Aaru.CommonTypes.Metadata; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -6,9 +7,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class TestedSequentialMediasController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public TestedSequentialMediasController(AaruServerContext context) => _context = context; + public TestedSequentialMediasController(DbContext context) => _context = context; // GET: Admin/TestedSequentialMedias public async Task Index() => View(await _context.TestedSequentialMedia.OrderBy(m => m.Manufacturer) diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs index 7c2eab00..a725ac74 100644 --- a/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/UsbProductsController.cs @@ -1,12 +1,15 @@ +using Aaru.Server.Database.Models; +using DbContext = Aaru.Server.Database.DbContext; + namespace Aaru.Server.Areas.Admin.Controllers; [Area("Admin")] [Authorize] public sealed class UsbProductsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public UsbProductsController(AaruServerContext context) => _context = context; + public UsbProductsController(DbContext context) => _context = context; // GET: Admin/UsbProducts public async Task Index() => View(await _context.UsbProducts.Include(u => u.Vendor) diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs index 7332ea20..06eb2364 100644 --- a/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/UsbVendorsController.cs @@ -1,12 +1,15 @@ +using Aaru.Server.Database.Models; +using DbContext = Aaru.Server.Database.DbContext; + namespace Aaru.Server.Areas.Admin.Controllers; [Area("Admin")] [Authorize] public sealed class UsbVendorsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public UsbVendorsController(AaruServerContext context) => _context = context; + public UsbVendorsController(DbContext context) => _context = context; // GET: Admin/UsbVendors public async Task Index() => diff --git a/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs b/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs index 7d6b5513..51e8d93e 100644 --- a/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/UsbsController.cs @@ -1,5 +1,7 @@ using Aaru.CommonTypes.Metadata; +using Aaru.Server.Database.Models; using Newtonsoft.Json; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Areas.Admin.Controllers; @@ -7,9 +9,9 @@ namespace Aaru.Server.Areas.Admin.Controllers; [Authorize] public sealed class UsbsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public UsbsController(AaruServerContext context) => _context = context; + public UsbsController(DbContext context) => _context = context; // GET: Admin/Usbs public async Task Index() => View(await _context.Usb.OrderBy(u => u.Manufacturer) diff --git a/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs b/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs index a665e2e8..56ca1546 100644 --- a/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs +++ b/Aaru.Server/Areas/Admin/Controllers/VersionsController.cs @@ -1,12 +1,14 @@ +using DbContext = Aaru.Server.Database.DbContext; + namespace Aaru.Server.Areas.Admin.Controllers; [Area("Admin")] [Authorize] public sealed class VersionsController : Controller { - readonly AaruServerContext _context; + readonly DbContext _context; - public VersionsController(AaruServerContext context) => _context = context; + public VersionsController(DbContext context) => _context = context; // GET: Admin/Versions public async Task Index() => View(await _context.Versions.OrderBy(v => v.Name).ToListAsync()); diff --git a/Aaru.Server/Areas/Admin/Views/Atas/Compare.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/Compare.cshtml index 098b21fc..6ed05734 100644 --- a/Aaru.Server/Areas/Admin/Views/Atas/Compare.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Atas/Compare.cshtml @@ -1,4 +1,4 @@ -@model CompareModel +@model Aaru.Server.Database.Models.CompareModel @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml index 4a81368f..ff74f30a 100644 --- a/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Atas/Consolidate.cshtml @@ -1,4 +1,5 @@ -@model IdHashModelForView +@using Aaru.Server.Database.Models +@model Aaru.Server.Database.Models.IdHashModelForView @{ ViewBag.Title = "Consolidate duplicate ATAs"; diff --git a/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml index bcce4190..6d8f224a 100644 --- a/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Chs/Consolidate.cshtml @@ -1,4 +1,5 @@ -@model ChsModelForView +@using Aaru.Server.Database.Models +@model Aaru.Server.Database.Models.ChsModelForView @{ ViewBag.Title = "Consolidate duplicate CHS"; diff --git a/Aaru.Server/Areas/Admin/Views/Commands/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Commands/Index.cshtml index 6204799d..d212e89c 100644 --- a/Aaru.Server/Areas/Admin/Views/Commands/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Commands/Index.cshtml @@ -1,4 +1,5 @@ -@model IEnumerable +@using Aaru.Server.Database.Models +@model IEnumerable @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml index d30da57d..1992930a 100644 --- a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml @@ -1,4 +1,4 @@ -@model CompactDiscOffset +@model Aaru.Server.Database.Models.CompactDiscOffset @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml index f280433f..d2476f34 100644 --- a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml +++ b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml @@ -1,4 +1,4 @@ -@model CompactDiscOffset +@model Aaru.Server.Database.Models.CompactDiscOffset @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml index eb2744c2..ff63a11c 100644 --- a/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml @@ -1,4 +1,5 @@ -@model IEnumerable +@using Aaru.Server.Database.Models +@model IEnumerable @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml index ea98d797..b56f8c9e 100644 --- a/Aaru.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml @@ -1,4 +1,4 @@ -@model DeviceStat +@model Aaru.Server.Database.Models.DeviceStat @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml index ddb4b4c7..e1d65783 100644 --- a/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml +++ b/Aaru.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml @@ -1,4 +1,4 @@ -@model DeviceStat +@model Aaru.Server.Database.Models.DeviceStat @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml b/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml index 96c638d5..a07c4c5b 100644 --- a/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/DeviceStats/Index.cshtml @@ -1,4 +1,5 @@ -@model IEnumerable +@using Aaru.Server.Database.Models +@model IEnumerable @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Delete.cshtml index e12142b2..25e8c2ac 100644 --- a/Aaru.Server/Areas/Admin/Views/Devices/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Devices/Delete.cshtml @@ -1,4 +1,4 @@ -@model Device +@model Aaru.Server.Database.Models.Device @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml index efb7d8f6..e3eb9dad 100644 --- a/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Devices/Details.cshtml @@ -1,5 +1,6 @@ @using Aaru.CommonTypes.Metadata -@model DeviceDetails +@using Aaru.Server.Database.Models +@model Aaru.Server.Database.Models.DeviceDetails @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml index 00314721..898c3015 100644 --- a/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Devices/Edit.cshtml @@ -1,5 +1,5 @@ @using Aaru.CommonTypes.Enums -@model Device +@model Aaru.Server.Database.Models.Device @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml index 4ce3b0d4..3cfa37ce 100644 --- a/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Devices/Find.cshtml @@ -1,4 +1,5 @@ -@model FindReportModel +@using Aaru.Server.Database.Models +@model Aaru.Server.Database.Models.FindReportModel @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Devices/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Devices/Index.cshtml index 0a07ae27..b2ccc7d3 100644 --- a/Aaru.Server/Areas/Admin/Views/Devices/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Devices/Index.cshtml @@ -1,4 +1,5 @@ -@model IEnumerable +@using Aaru.Server.Database.Models +@model IEnumerable @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Filesystems/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Filesystems/Index.cshtml index 77524204..1a56ccf2 100644 --- a/Aaru.Server/Areas/Admin/Views/Filesystems/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Filesystems/Index.cshtml @@ -1,4 +1,5 @@ -@model IEnumerable +@using Aaru.Server.Database.Models +@model IEnumerable @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Filters/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Filters/Index.cshtml index 6084517d..ece677ea 100644 --- a/Aaru.Server/Areas/Admin/Views/Filters/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Filters/Index.cshtml @@ -1,4 +1,5 @@ -@model IEnumerable +@using Aaru.Server.Database.Models +@model IEnumerable @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml index b2a58788..23bd8008 100644 --- a/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml +++ b/Aaru.Server/Areas/Admin/Views/FireWires/Consolidate.cshtml @@ -1,4 +1,5 @@ -@model FireWireModelForView +@using Aaru.Server.Database.Models +@model Aaru.Server.Database.Models.FireWireModelForView @{ ViewBag.Title = "Consolidate duplicate FireWire"; diff --git a/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/ViewData.cshtml b/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/ViewData.cshtml index a61b8646..151808cf 100644 --- a/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/ViewData.cshtml +++ b/Aaru.Server/Areas/Admin/Views/GdRomSwapDiscCapabilities/ViewData.cshtml @@ -1,4 +1,4 @@ -@model TestedMediaDataModel +@model Aaru.Server.Database.Models.TestedMediaDataModel @{ ViewBag.Title = $"{Model.DataName} data"; diff --git a/Aaru.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml index b2ec9a03..f35601a7 100644 --- a/Aaru.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml @@ -1,4 +1,4 @@ -@model MediaFormat +@model Aaru.Server.Database.Models.MediaFormat @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml b/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml index 387aa66b..3dd9e2e3 100644 --- a/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/MediaFormats/Index.cshtml @@ -1,4 +1,5 @@ -@model IEnumerable +@using Aaru.Server.Database.Models +@model IEnumerable @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Medias/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Medias/Delete.cshtml index 35ce7278..eb29d15d 100644 --- a/Aaru.Server/Areas/Admin/Views/Medias/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Medias/Delete.cshtml @@ -1,4 +1,4 @@ -@model Media +@model Aaru.Server.Database.Models.Media @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Medias/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Medias/Index.cshtml index 85f77bc8..9122ad59 100644 --- a/Aaru.Server/Areas/Admin/Views/Medias/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Medias/Index.cshtml @@ -1,4 +1,5 @@ -@model IEnumerable +@using Aaru.Server.Database.Models +@model IEnumerable @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml index 7a4f18ce..41ea95e5 100644 --- a/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Mmc/Index.cshtml @@ -1,4 +1,5 @@ -@model IEnumerable +@using Aaru.Server.Database.Models +@model IEnumerable @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml b/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml index 91829101..03a7ee22 100644 --- a/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml @@ -1,4 +1,4 @@ -@using OperatingSystem = Aaru.Server.Models.OperatingSystem +@using OperatingSystem = Aaru.Server.Database.Models.OperatingSystem @model IEnumerable @{ diff --git a/Aaru.Server/Areas/Admin/Views/Partitions/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Partitions/Index.cshtml index a65b6e7b..f5852150 100644 --- a/Aaru.Server/Areas/Admin/Views/Partitions/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Partitions/Index.cshtml @@ -1,4 +1,5 @@ -@model IEnumerable +@using Aaru.Server.Database.Models +@model IEnumerable @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Reports/Delete.cshtml b/Aaru.Server/Areas/Admin/Views/Reports/Delete.cshtml index e8c2f60f..549b3a2d 100644 --- a/Aaru.Server/Areas/Admin/Views/Reports/Delete.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Reports/Delete.cshtml @@ -1,4 +1,4 @@ -@model UploadedReport +@model Aaru.Server.Database.Models.UploadedReport @{ ViewData["Title"] = "Delete"; diff --git a/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml b/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml index 2a769abb..efe8af1e 100644 --- a/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Reports/Details.cshtml @@ -1,5 +1,5 @@ @using Aaru.CommonTypes.Metadata -@model UploadedReportDetails +@model Aaru.Server.Database.Models.UploadedReportDetails @{ ViewData["Title"] = "Details"; diff --git a/Aaru.Server/Areas/Admin/Views/Reports/Edit.cshtml b/Aaru.Server/Areas/Admin/Views/Reports/Edit.cshtml index bf59205b..0017a92a 100644 --- a/Aaru.Server/Areas/Admin/Views/Reports/Edit.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Reports/Edit.cshtml @@ -1,5 +1,5 @@ @using Aaru.CommonTypes.Enums -@model UploadedReport +@model Aaru.Server.Database.Models.UploadedReport @{ ViewData["Title"] = "Edit"; diff --git a/Aaru.Server/Areas/Admin/Views/Reports/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Reports/Index.cshtml index 1d500f6c..874caa6c 100644 --- a/Aaru.Server/Areas/Admin/Views/Reports/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Reports/Index.cshtml @@ -1,4 +1,5 @@ -@model IEnumerable +@using Aaru.Server.Database.Models +@model IEnumerable @{ ViewData["Title"] = "Index"; diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Compare.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Compare.cshtml index 2622b73c..32499b5d 100644 --- a/Aaru.Server/Areas/Admin/Views/Scsis/Compare.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Scsis/Compare.cshtml @@ -1,4 +1,4 @@ -@model CompareModel +@model Aaru.Server.Database.Models.CompareModel @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml index d228c564..247f6752 100644 --- a/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Scsis/Consolidate.cshtml @@ -1,4 +1,5 @@ -@model IdHashModelForView +@using Aaru.Server.Database.Models +@model Aaru.Server.Database.Models.IdHashModelForView @{ ViewBag.Title = "Consolidate duplicate SCSIs"; diff --git a/Aaru.Server/Areas/Admin/Views/Sscs/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Sscs/Consolidate.cshtml index 29f33968..c316f7fe 100644 --- a/Aaru.Server/Areas/Admin/Views/Sscs/Consolidate.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Sscs/Consolidate.cshtml @@ -1,4 +1,5 @@ -@model SscModelForView +@using Aaru.Server.Database.Models +@model Aaru.Server.Database.Models.SscModelForView @{ ViewBag.Title = "Consolidate duplicate CHS"; diff --git a/Aaru.Server/Areas/Admin/Views/TestedMedias/ViewData.cshtml b/Aaru.Server/Areas/Admin/Views/TestedMedias/ViewData.cshtml index 88cef1a5..f8710f89 100644 --- a/Aaru.Server/Areas/Admin/Views/TestedMedias/ViewData.cshtml +++ b/Aaru.Server/Areas/Admin/Views/TestedMedias/ViewData.cshtml @@ -1,4 +1,4 @@ -@model TestedMediaDataModel +@model Aaru.Server.Database.Models.TestedMediaDataModel @{ ViewBag.Title = $"{Model.DataName} data"; diff --git a/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml b/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml index 73d5c0d8..7ade9863 100644 --- a/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/UsbProducts/Index.cshtml @@ -1,4 +1,5 @@ -@model IEnumerable +@using Aaru.Server.Database.Models +@model IEnumerable @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/UsbVendors/Details.cshtml b/Aaru.Server/Areas/Admin/Views/UsbVendors/Details.cshtml index 86898cd5..eff8f54c 100644 --- a/Aaru.Server/Areas/Admin/Views/UsbVendors/Details.cshtml +++ b/Aaru.Server/Areas/Admin/Views/UsbVendors/Details.cshtml @@ -1,4 +1,5 @@ -@model UsbVendorModel +@using Aaru.Server.Database.Models +@model Aaru.Server.Database.Models.UsbVendorModel @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml b/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml index 1f6d23cf..cc15e9fa 100644 --- a/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/UsbVendors/Index.cshtml @@ -1,4 +1,5 @@ -@model IEnumerable +@using Aaru.Server.Database.Models +@model IEnumerable @{ Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml"; diff --git a/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml b/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml index 56216375..5ddfa0a1 100644 --- a/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Usbs/Consolidate.cshtml @@ -1,4 +1,5 @@ -@model UsbModelForView +@using Aaru.Server.Database.Models +@model Aaru.Server.Database.Models.UsbModelForView @{ ViewBag.Title = "Consolidate duplicate USB devices"; diff --git a/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml b/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml index d9571159..011e4f08 100644 --- a/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml +++ b/Aaru.Server/Areas/Admin/Views/Versions/Index.cshtml @@ -1,4 +1,4 @@ -@using Version = Aaru.Server.Models.Version +@using Version = Aaru.Server.Database.Models.Version @model IEnumerable @{ diff --git a/Aaru.Server/Areas/Admin/Views/_ViewImports.cshtml b/Aaru.Server/Areas/Admin/Views/_ViewImports.cshtml index afd2c947..531ee84a 100644 --- a/Aaru.Server/Areas/Admin/Views/_ViewImports.cshtml +++ b/Aaru.Server/Areas/Admin/Views/_ViewImports.cshtml @@ -1,5 +1,4 @@ @using Aaru.Server -@using Aaru.Server.Models @using Microsoft.ApplicationInsights.AspNetCore @inject JavaScriptSnippet JavaScriptSnippet @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/Aaru.Server/Controllers/ReportController.cs b/Aaru.Server/Controllers/ReportController.cs index a19b4646..406de106 100644 --- a/Aaru.Server/Controllers/ReportController.cs +++ b/Aaru.Server/Controllers/ReportController.cs @@ -35,8 +35,10 @@ using Aaru.Decoders.PCMCIA; using Aaru.Decoders.SCSI; using Aaru.Helpers; using Aaru.Server.Core; +using Aaru.Server.Database.Models; using Microsoft.AspNetCore.Routing; using Ata = Aaru.CommonTypes.Metadata.Ata; +using DbContext = Aaru.Server.Database.DbContext; using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry; using TestedMedia = Aaru.CommonTypes.Metadata.TestedMedia; using Tuple = Aaru.Decoders.PCMCIA.Tuple; @@ -45,9 +47,9 @@ namespace Aaru.Server.Controllers; public sealed class ReportController : Controller { - readonly AaruServerContext _ctx; + readonly DbContext _ctx; - public ReportController(AaruServerContext context) => _ctx = context; + public ReportController(DbContext context) => _ctx = context; public ActionResult Index() => RedirectToAction("View", "Report", diff --git a/Aaru.Server/Controllers/StatsController.cs b/Aaru.Server/Controllers/StatsController.cs index 86bec7f2..0bd3f644 100644 --- a/Aaru.Server/Controllers/StatsController.cs +++ b/Aaru.Server/Controllers/StatsController.cs @@ -38,20 +38,22 @@ using System.Xml.Serialization; using Aaru.CommonTypes.Interop; using Aaru.CommonTypes.Metadata; using Aaru.Server.Core; +using Aaru.Server.Database.Models; using Microsoft.AspNetCore.Hosting; -using OperatingSystem = Aaru.Server.Models.OperatingSystem; +using DbContext = Aaru.Server.Database.DbContext; +using OperatingSystem = Aaru.Server.Database.Models.OperatingSystem; using PlatformID = Aaru.CommonTypes.Interop.PlatformID; -using Version = Aaru.Server.Models.Version; +using Version = Aaru.Server.Database.Models.Version; namespace Aaru.Server.Controllers; /// Renders a page with statistics, list of media type, devices, etc public sealed class StatsController : Controller { - readonly AaruServerContext _ctx; + readonly DbContext _ctx; readonly IWebHostEnvironment _env; - public StatsController(IWebHostEnvironment environment, AaruServerContext context) + public StatsController(IWebHostEnvironment environment, DbContext context) { _env = environment; _ctx = context; diff --git a/Aaru.Server/Controllers/UpdateController.cs b/Aaru.Server/Controllers/UpdateController.cs index a061e5e3..28049522 100644 --- a/Aaru.Server/Controllers/UpdateController.cs +++ b/Aaru.Server/Controllers/UpdateController.cs @@ -35,15 +35,17 @@ using System.Net; using Aaru.CommonTypes.Metadata; using Aaru.Dto; using Aaru.Helpers; +using Aaru.Server.Database.Models; using Newtonsoft.Json; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Controllers; public sealed class UpdateController : Controller { - readonly AaruServerContext _ctx; + readonly DbContext _ctx; - public UpdateController(AaruServerContext ctx) => _ctx = ctx; + public UpdateController(DbContext ctx) => _ctx = ctx; /// Receives a report from Aaru.Core, verifies it's in the correct format and stores it on the server /// HTTP response diff --git a/Aaru.Server/Controllers/UploadReportController.cs b/Aaru.Server/Controllers/UploadReportController.cs index fa72ba3f..d253c005 100644 --- a/Aaru.Server/Controllers/UploadReportController.cs +++ b/Aaru.Server/Controllers/UploadReportController.cs @@ -36,21 +36,23 @@ using System.Net; using System.Text; using System.Xml.Serialization; using Aaru.CommonTypes.Metadata; +using Aaru.Server.Database.Models; using Cinchoo.PGP; using MailKit.Net.Smtp; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using MimeKit; using Newtonsoft.Json; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server.Controllers; public sealed class UploadReportController : Controller { - readonly AaruServerContext _ctx; + readonly DbContext _ctx; readonly IWebHostEnvironment _environment; - public UploadReportController(IWebHostEnvironment environment, AaruServerContext ctx) + public UploadReportController(IWebHostEnvironment environment, DbContext ctx) { _environment = environment; _ctx = ctx; diff --git a/Aaru.Server/Controllers/UploadStatsController.cs b/Aaru.Server/Controllers/UploadStatsController.cs index 971a2224..81f83c4c 100644 --- a/Aaru.Server/Controllers/UploadStatsController.cs +++ b/Aaru.Server/Controllers/UploadStatsController.cs @@ -36,18 +36,20 @@ using System.Net; using System.Xml.Serialization; using Aaru.CommonTypes.Metadata; using Aaru.Server.Core; +using Aaru.Server.Database.Models; using Microsoft.AspNetCore.Http; using Newtonsoft.Json; -using OperatingSystem = Aaru.Server.Models.OperatingSystem; -using Version = Aaru.Server.Models.Version; +using DbContext = Aaru.Server.Database.DbContext; +using OperatingSystem = Aaru.Server.Database.Models.OperatingSystem; +using Version = Aaru.Server.Database.Models.Version; namespace Aaru.Server.Controllers; public sealed class UploadStatsController : Controller { - readonly AaruServerContext _ctx; + readonly DbContext _ctx; - public UploadStatsController(AaruServerContext ctx) => _ctx = ctx; + public UploadStatsController(DbContext ctx) => _ctx = ctx; /// Receives statistics from Aaru.Core, processes them and adds them to a server-side global statistics XML /// HTTP response diff --git a/Aaru.Server/Core/StatsConverter.cs b/Aaru.Server/Core/StatsConverter.cs index a46e0956..2eef35c9 100644 --- a/Aaru.Server/Core/StatsConverter.cs +++ b/Aaru.Server/Core/StatsConverter.cs @@ -31,8 +31,10 @@ // ****************************************************************************/ using Aaru.CommonTypes.Metadata; -using OperatingSystem = Aaru.Server.Models.OperatingSystem; -using Version = Aaru.Server.Models.Version; +using Aaru.Server.Database.Models; +using DbContext = Aaru.Server.Database.DbContext; +using OperatingSystem = Aaru.Server.Database.Models.OperatingSystem; +using Version = Aaru.Server.Database.Models.Version; namespace Aaru.Server.Core; @@ -40,7 +42,7 @@ public static class StatsConverter { public static void Convert(Stats newStats) { - var ctx = new AaruServerContext(); + var ctx = new DbContext(); if(newStats.Commands?.Analyze > 0) { diff --git a/Aaru.Server/Globals.cs b/Aaru.Server/Globals.cs index 7cb09f46..868387a4 100644 --- a/Aaru.Server/Globals.cs +++ b/Aaru.Server/Globals.cs @@ -1,5 +1,4 @@ global using System; -global using Aaru.Server.Models; global using System.Collections.Generic; global using System.Linq; global using Microsoft.AspNetCore.Authorization; diff --git a/Aaru.Server/Program.cs b/Aaru.Server/Program.cs index 5249aaaf..7d59c1c2 100644 --- a/Aaru.Server/Program.cs +++ b/Aaru.Server/Program.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Prometheus; +using DbContext = Aaru.Server.Database.DbContext; using Version = Aaru.CommonTypes.Interop.Version; namespace Aaru.Server; @@ -85,20 +86,20 @@ public sealed class Program WebApplicationBuilder builder = WebApplication.CreateBuilder(args); - builder.Services.AddDbContext(options => options - .UseMySql(builder.Configuration - .GetConnectionString("DefaultConnection"), - new - MariaDbServerVersion(new System. - Version(10, 4, 0))) - .UseLazyLoadingProxies()); + builder.Services.AddDbContext(options => options + .UseMySql(builder.Configuration + .GetConnectionString("DefaultConnection"), + new MariaDbServerVersion(new System.Version(10, + 4, + 0))) + .UseLazyLoadingProxies()); builder.Services.AddDefaultIdentity(options => { options.SignIn.RequireConfirmedAccount = true; options.User.RequireUniqueEmail = true; }) - .AddEntityFrameworkStores(); + .AddEntityFrameworkStores(); builder.Services.AddApplicationInsightsTelemetry(); @@ -158,7 +159,7 @@ public sealed class Program { start = DateTime.Now; System.Console.WriteLine("\u001b[31;1mUpdating database with Entity Framework...\u001b[0m"); - AaruServerContext context = services.GetRequiredService(); + DbContext context = services.GetRequiredService(); context.Database.Migrate(); end = DateTime.Now; diff --git a/Aaru.Server/Seeder.cs b/Aaru.Server/Seeder.cs index 7bd4337b..fa813928 100644 --- a/Aaru.Server/Seeder.cs +++ b/Aaru.Server/Seeder.cs @@ -1,11 +1,12 @@ using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.DependencyInjection; +using DbContext = Aaru.Server.Database.DbContext; namespace Aaru.Server; public static class Seeder { - public static void Seed(AaruServerContext ctx, IServiceProvider serviceProvider) + public static void Seed(DbContext ctx, IServiceProvider serviceProvider) { var email = "claunia@claunia.com"; var randChars = new char[16]; diff --git a/Aaru.Server/Views/Shared/Error.cshtml b/Aaru.Server/Views/Shared/Error.cshtml index b009397c..da913ec1 100644 --- a/Aaru.Server/Views/Shared/Error.cshtml +++ b/Aaru.Server/Views/Shared/Error.cshtml @@ -1,4 +1,4 @@ -@model ErrorViewModel +@model Aaru.Server.Database.Models.ErrorViewModel @{ ViewData["Title"] = "Error"; } diff --git a/Aaru.Server/Views/Stats/Index.cshtml b/Aaru.Server/Views/Stats/Index.cshtml index 6ba7a0b6..22a06336 100644 --- a/Aaru.Server/Views/Stats/Index.cshtml +++ b/Aaru.Server/Views/Stats/Index.cshtml @@ -1,4 +1,5 @@ @using Aaru.CommonTypes.Metadata +@using Aaru.Server.Database.Models @{ // /*************************************************************************** // Aaru Data Preservation Suite diff --git a/Aaru.Server/Views/_ViewImports.cshtml b/Aaru.Server/Views/_ViewImports.cshtml index afd2c947..531ee84a 100644 --- a/Aaru.Server/Views/_ViewImports.cshtml +++ b/Aaru.Server/Views/_ViewImports.cshtml @@ -1,5 +1,4 @@ @using Aaru.Server -@using Aaru.Server.Models @using Microsoft.ApplicationInsights.AspNetCore @inject JavaScriptSnippet JavaScriptSnippet @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file