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

Move model names to singular.

Browse Source
This commit is contained in:
Natalia Portillo
2018-08-06 21:27:14 +01:00
parent 728eb83d6b
commit 7446bd856d
35 changed files with 1969 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1721
Cicm.Database/Migrations/20180806201559_SingularizeModelNames.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

11
Cicm.Database/Migrations/20180806201559_SingularizeModelNames.cs Normal file
View File

@@ -0,0 +1,11 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace Cicm.Database.Migrations
{
public partial class SingularizeModelNames : Migration
{
protected override void Up(MigrationBuilder migrationBuilder) { }
protected override void Down(MigrationBuilder migrationBuilder) { }
}
}

159
Cicm.Database/Migrations/cicmContextModelSnapshot.cs
View File

@@ -16,7 +16,7 @@ namespace Cicm.Database.Migrations
modelBuilder.HasAnnotation("ProductVersion", "2.1.1-rtm-30846")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("Cicm.Database.Models.Admins", b =>
modelBuilder.Entity("Cicm.Database.Models.Admin", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -33,7 +33,7 @@ namespace Cicm.Database.Migrations
b.ToTable("admins");
});
modelBuilder.Entity("Cicm.Database.Models.BrowserTests", b =>
modelBuilder.Entity("Cicm.Database.Models.BrowserTest", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -114,7 +114,7 @@ namespace Cicm.Database.Migrations
b.ToTable("cicm_db");
});
modelBuilder.Entity("Cicm.Database.Models.Companies", b =>
modelBuilder.Entity("Cicm.Database.Models.Company", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -176,7 +176,7 @@ namespace Cicm.Database.Migrations
b.ToTable("companies");
});
modelBuilder.Entity("Cicm.Database.Models.CompanyDescriptions", b =>
modelBuilder.Entity("Cicm.Database.Models.CompanyDescription", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -193,7 +193,7 @@ namespace Cicm.Database.Migrations
b.ToTable("company_descriptions");
});
modelBuilder.Entity("Cicm.Database.Models.CompanyLogos", b =>
modelBuilder.Entity("Cicm.Database.Models.CompanyLogo", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -243,7 +243,7 @@ namespace Cicm.Database.Migrations
b.ToTable("forbidden");
});
modelBuilder.Entity("Cicm.Database.Models.Gpus", b =>
modelBuilder.Entity("Cicm.Database.Models.Gpu", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -306,7 +306,18 @@ namespace Cicm.Database.Migrations
b.ToTable("gpus_by_machine");
});
modelBuilder.Entity("Cicm.Database.Models.InstructionSetExtensions", b =>
modelBuilder.Entity("Cicm.Database.Models.InstructionSet", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
b.Property<string>("Name").IsRequired().HasColumnName("instruction_set").HasColumnType("varchar(45)");
b.HasKey("Id");
b.ToTable("instruction_sets");
});
modelBuilder.Entity("Cicm.Database.Models.InstructionSetExtension", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -334,18 +345,6 @@ namespace Cicm.Database.Migrations
b.ToTable("instruction_set_extensions_by_processor");
});
modelBuilder.Entity("Cicm.Database.Models.InstructionSets", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
b.Property<string>("InstructionSet").IsRequired().HasColumnName("instruction_set")
.HasColumnType("varchar(45)");
b.HasKey("Id");
b.ToTable("instruction_sets");
});
modelBuilder.Entity("Cicm.Database.Models.Iso31661Numeric", b =>
{
b.Property<short>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("smallint(3)");
@@ -388,24 +387,7 @@ namespace Cicm.Database.Migrations
b.ToTable("log");
});
modelBuilder.Entity("Cicm.Database.Models.MachineFamilies", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
b.Property<int>("CompanyId").HasColumnName("company").HasColumnType("int(11)");
b.Property<string>("Name").IsRequired().HasColumnName("name").HasColumnType("varchar(255)");
b.HasKey("Id");
b.HasIndex("CompanyId").HasName("idx_machine_families_company");
b.HasIndex("Name").HasName("idx_machine_families_name");
b.ToTable("machine_families");
});
modelBuilder.Entity("Cicm.Database.Models.Machines", b =>
modelBuilder.Entity("Cicm.Database.Models.Machine", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -440,6 +422,23 @@ namespace Cicm.Database.Migrations
b.ToTable("machines");
});
modelBuilder.Entity("Cicm.Database.Models.MachineFamily", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
b.Property<int>("CompanyId").HasColumnName("company").HasColumnType("int(11)");
b.Property<string>("Name").IsRequired().HasColumnName("name").HasColumnType("varchar(255)");
b.HasKey("Id");
b.HasIndex("CompanyId").HasName("idx_machine_families_company");
b.HasIndex("Name").HasName("idx_machine_families_name");
b.ToTable("machine_families");
});
modelBuilder.Entity("Cicm.Database.Models.MemoryByMachine", b =>
{
b.Property<long>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("bigint(20)");
@@ -471,7 +470,7 @@ namespace Cicm.Database.Migrations
b.ToTable("memory_by_machine");
});
modelBuilder.Entity("Cicm.Database.Models.MoneyDonations", b =>
modelBuilder.Entity("Cicm.Database.Models.MoneyDonation", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -514,7 +513,7 @@ namespace Cicm.Database.Migrations
b.ToTable("news");
});
modelBuilder.Entity("Cicm.Database.Models.OwnedComputers", b =>
modelBuilder.Entity("Cicm.Database.Models.OwnedComputer", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -608,7 +607,7 @@ namespace Cicm.Database.Migrations
b.ToTable("owned_computers");
});
modelBuilder.Entity("Cicm.Database.Models.OwnedConsoles", b =>
modelBuilder.Entity("Cicm.Database.Models.OwnedConsole", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -647,7 +646,7 @@ namespace Cicm.Database.Migrations
b.ToTable("owned_consoles");
});
modelBuilder.Entity("Cicm.Database.Models.Processors", b =>
modelBuilder.Entity("Cicm.Database.Models.Processor", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -778,7 +777,7 @@ namespace Cicm.Database.Migrations
b.ToTable("processors_by_machine");
});
modelBuilder.Entity("Cicm.Database.Models.Resolutions", b =>
modelBuilder.Entity("Cicm.Database.Models.Resolution", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -849,7 +848,7 @@ namespace Cicm.Database.Migrations
b.ToTable("sound_by_machine");
});
modelBuilder.Entity("Cicm.Database.Models.SoundSynths", b =>
modelBuilder.Entity("Cicm.Database.Models.SoundSynth", b =>
{
b.Property<int>("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -926,131 +925,131 @@ namespace Cicm.Database.Migrations
b.ToTable("storage_by_machine");
});
modelBuilder.Entity("Cicm.Database.Models.Companies", b =>
modelBuilder.Entity("Cicm.Database.Models.Company", b =>
{
b.HasOne("Cicm.Database.Models.Iso31661Numeric", "Country").WithMany("Companies")
.HasForeignKey("CountryId").HasConstraintName("fk_companies_country");
b.HasOne("Cicm.Database.Models.Companies", "SoldTo").WithMany("InverseSoldToNavigation")
b.HasOne("Cicm.Database.Models.Company", "SoldTo").WithMany("InverseSoldToNavigation")
.HasForeignKey("SoldToId").HasConstraintName("fk_companies_sold_to");
});
modelBuilder.Entity("Cicm.Database.Models.CompanyDescriptions",
modelBuilder.Entity("Cicm.Database.Models.CompanyDescription",
b =>
{
b.HasOne("Cicm.Database.Models.Companies", "Company").WithOne("Description")
.HasForeignKey("Cicm.Database.Models.CompanyDescriptions", "Id")
b.HasOne("Cicm.Database.Models.Company", "Company").WithOne("Description")
.HasForeignKey("Cicm.Database.Models.CompanyDescription", "Id")
.HasConstraintName("fk_company_id").OnDelete(DeleteBehavior.Cascade);
});
modelBuilder.Entity("Cicm.Database.Models.CompanyLogos",
modelBuilder.Entity("Cicm.Database.Models.CompanyLogo",
b =>
{
b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("CompanyLogos")
b.HasOne("Cicm.Database.Models.Company", "Company").WithMany("CompanyLogos")
.HasForeignKey("CompanyId").HasConstraintName("fk_company_logos_company1");
});
modelBuilder.Entity("Cicm.Database.Models.Gpus",
modelBuilder.Entity("Cicm.Database.Models.Gpu",
b =>
{
b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("Gpus")
b.HasOne("Cicm.Database.Models.Company", "Company").WithMany("Gpus")
.HasForeignKey("CompanyId").HasConstraintName("fk_gpus_company");
});
modelBuilder.Entity("Cicm.Database.Models.GpusByMachine", b =>
{
b.HasOne("Cicm.Database.Models.Gpus", "Gpu").WithMany("GpusByMachine").HasForeignKey("GpuId")
b.HasOne("Cicm.Database.Models.Gpu", "Gpu").WithMany("GpusByMachine").HasForeignKey("GpuId")
.HasConstraintName("fk_gpus_by_machine_gpu").OnDelete(DeleteBehavior.Cascade);
b.HasOne("Cicm.Database.Models.Machines", "Machine").WithMany("Gpus").HasForeignKey("MachineId")
b.HasOne("Cicm.Database.Models.Machine", "Machine").WithMany("Gpus").HasForeignKey("MachineId")
.HasConstraintName("fk_gpus_by_machine_machine").OnDelete(DeleteBehavior.Cascade);
});
modelBuilder.Entity("Cicm.Database.Models.InstructionSetExtensionsByProcessor", b =>
{
b.HasOne("Cicm.Database.Models.InstructionSetExtensions", "Extension")
b.HasOne("Cicm.Database.Models.InstructionSetExtension", "Extension")
.WithMany("InstructionSetExtensionsByProcessor").HasForeignKey("ExtensionId")
.HasConstraintName("fk_extension_extension_id");
b.HasOne("Cicm.Database.Models.Processors", "Processor").WithMany("InstructionSetExtensions")
b.HasOne("Cicm.Database.Models.Processor", "Processor").WithMany("InstructionSetExtensions")
.HasForeignKey("ProcessorId").HasConstraintName("fk_extension_processor_id");
});
modelBuilder.Entity("Cicm.Database.Models.MachineFamilies",
modelBuilder.Entity("Cicm.Database.Models.Machine", b =>
{
b.HasOne("Cicm.Database.Models.Company", "Company").WithMany("Machines").HasForeignKey("CompanyId")
.HasConstraintName("fk_machines_company");
b.HasOne("Cicm.Database.Models.MachineFamily", "Family").WithMany("Machines").HasForeignKey("FamilyId")
.HasConstraintName("fk_machines_family");
});
modelBuilder.Entity("Cicm.Database.Models.MachineFamily",
b =>
{
b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("MachineFamilies")
b.HasOne("Cicm.Database.Models.Company", "Company").WithMany("MachineFamilies")
.HasForeignKey("CompanyId").HasConstraintName("fk_machine_families_company")
.OnDelete(DeleteBehavior.Cascade);
});
modelBuilder.Entity("Cicm.Database.Models.Machines", b =>
{
b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("Machines").HasForeignKey("CompanyId")
.HasConstraintName("fk_machines_company");
b.HasOne("Cicm.Database.Models.MachineFamilies", "Family").WithMany("Machines")
.HasForeignKey("FamilyId").HasConstraintName("fk_machines_family");
});
modelBuilder.Entity("Cicm.Database.Models.MemoryByMachine",
b =>
{
b.HasOne("Cicm.Database.Models.Machines", "Machine").WithMany("Memory")
b.HasOne("Cicm.Database.Models.Machine", "Machine").WithMany("Memory")
.HasForeignKey("MachineId").HasConstraintName("fk_memory_by_machine_machine")
.OnDelete(DeleteBehavior.Cascade);
});
modelBuilder.Entity("Cicm.Database.Models.Processors", b =>
modelBuilder.Entity("Cicm.Database.Models.Processor", b =>
{
b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("Processors").HasForeignKey("CompanyId")
b.HasOne("Cicm.Database.Models.Company", "Company").WithMany("Processors").HasForeignKey("CompanyId")
.HasConstraintName("fk_processors_company");
b.HasOne("Cicm.Database.Models.InstructionSets", "InstructionSet").WithMany("Processors")
b.HasOne("Cicm.Database.Models.InstructionSet", "InstructionSet").WithMany("Processors")
.HasForeignKey("InstructionSetId").HasConstraintName("fk_processors_instruction_set");
});
modelBuilder.Entity("Cicm.Database.Models.ProcessorsByMachine", b =>
{
b.HasOne("Cicm.Database.Models.Machines", "Machine").WithMany("Processors").HasForeignKey("MachineId")
b.HasOne("Cicm.Database.Models.Machine", "Machine").WithMany("Processors").HasForeignKey("MachineId")
.HasConstraintName("fk_processors_by_machine_machine").OnDelete(DeleteBehavior.Cascade);
b.HasOne("Cicm.Database.Models.Processors", "Processor").WithMany("ProcessorsByMachine")
b.HasOne("Cicm.Database.Models.Processor", "Processor").WithMany("ProcessorsByMachine")
.HasForeignKey("ProcessorId").HasConstraintName("fk_processors_by_machine_processor")
.OnDelete(DeleteBehavior.Cascade);
});
modelBuilder.Entity("Cicm.Database.Models.ResolutionsByGpu", b =>
{
b.HasOne("Cicm.Database.Models.Gpus", "Gpu").WithMany("ResolutionsByGpu").HasForeignKey("GpuId")
b.HasOne("Cicm.Database.Models.Gpu", "Gpu").WithMany("ResolutionsByGpu").HasForeignKey("GpuId")
.HasConstraintName("fk_resolutions_by_gpu_gpu").OnDelete(DeleteBehavior.Cascade);
b.HasOne("Cicm.Database.Models.Resolutions", "Resolution").WithMany("ResolutionsByGpu")
b.HasOne("Cicm.Database.Models.Resolution", "Resolution").WithMany("ResolutionsByGpu")
.HasForeignKey("ResolutionId").HasConstraintName("fk_resolutions_by_gpu_resolution")
.OnDelete(DeleteBehavior.Cascade);
});
modelBuilder.Entity("Cicm.Database.Models.SoundByMachine", b =>
{
b.HasOne("Cicm.Database.Models.Machines", "Machine").WithMany("Sound").HasForeignKey("MachineId")
b.HasOne("Cicm.Database.Models.Machine", "Machine").WithMany("Sound").HasForeignKey("MachineId")
.HasConstraintName("fk_sound_by_machine_machine").OnDelete(DeleteBehavior.Cascade);
b.HasOne("Cicm.Database.Models.SoundSynths", "SoundSynth").WithMany("SoundByMachine")
b.HasOne("Cicm.Database.Models.SoundSynth", "SoundSynth").WithMany("SoundByMachine")
.HasForeignKey("SoundSynthId").HasConstraintName("fk_sound_by_machine_sound_synth")
.OnDelete(DeleteBehavior.Cascade);
});
modelBuilder.Entity("Cicm.Database.Models.SoundSynths",
modelBuilder.Entity("Cicm.Database.Models.SoundSynth",
b =>
{
b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("SoundSynths")
b.HasOne("Cicm.Database.Models.Company", "Company").WithMany("SoundSynths")
.HasForeignKey("CompanyId").HasConstraintName("fk_sound_synths_company");
});
modelBuilder.Entity("Cicm.Database.Models.StorageByMachine",
b =>
{
b.HasOne("Cicm.Database.Models.Machines", "Machine").WithMany("Storage")
b.HasOne("Cicm.Database.Models.Machine", "Machine").WithMany("Storage")
.HasForeignKey("MachineId").HasConstraintName("fk_storage_by_machine_machine")
.OnDelete(DeleteBehavior.Cascade);
});

2
Cicm.Database/Models/Admins.cs → Cicm.Database/Models/Admin.cs
View File

@@ -1,6 +1,6 @@
namespace Cicm.Database.Models
{
public class Admins
public class Admin
{
public int Id { get; set; }
public string User { get; set; }

2
Cicm.Database/Models/BrowserTests.cs → Cicm.Database/Models/BrowserTest.cs
View File

@@ -1,6 +1,6 @@
namespace Cicm.Database.Models
{
public class BrowserTests
public class BrowserTest
{
public int Id { get; set; }
public string UserAgent { get; set; }

45
Cicm.Database/Models/Companies.cs
View File

@@ -1,45 +0,0 @@
using System;
using System.Collections.Generic;
namespace Cicm.Database.Models
{
public class Companies
{
public Companies()
{
CompanyLogos = new HashSet<CompanyLogos>();
Gpus = new HashSet<Gpus>();
InverseSoldToNavigation = new HashSet<Companies>();
MachineFamilies = new HashSet<MachineFamilies>();
Machines = new HashSet<Machines>();
Processors = new HashSet<Processors>();
SoundSynths = new HashSet<SoundSynths>();
}
public int Id { get; set; }
public string Name { get; set; }
public DateTime? Founded { get; set; }
public string Website { get; set; }
public string Twitter { get; set; }
public string Facebook { get; set; }
public DateTime? Sold { get; set; }
public int? SoldToId { get; set; }
public string Address { get; set; }
public string City { get; set; }
public string Province { get; set; }
public string PostalCode { get; set; }
public short? CountryId { get; set; }
public CompanyStatus Status { get; set; }
public Iso31661Numeric Country { get; set; }
public Companies SoldTo { get; set; }
public CompanyDescriptions Description { get; set; }
public ICollection<CompanyLogos> CompanyLogos { get; set; }
public ICollection<Gpus> Gpus { get; set; }
public ICollection<Companies> InverseSoldToNavigation { get; set; }
public ICollection<MachineFamilies> MachineFamilies { get; set; }
public ICollection<Machines> Machines { get; set; }
public ICollection<Processors> Processors { get; set; }
public ICollection<SoundSynths> SoundSynths { get; set; }
}
}

45
Cicm.Database/Models/Company.cs Normal file
View File

@@ -0,0 +1,45 @@
using System;
using System.Collections.Generic;
namespace Cicm.Database.Models
{
public class Company
{
public Company()
{
CompanyLogos = new HashSet<CompanyLogo>();
Gpus = new HashSet<Gpu>();
InverseSoldToNavigation = new HashSet<Company>();
MachineFamilies = new HashSet<MachineFamily>();
Machines = new HashSet<Machine>();
Processors = new HashSet<Processor>();
SoundSynths = new HashSet<SoundSynth>();
}
public int Id { get; set; }
public string Name { get; set; }
public DateTime? Founded { get; set; }
public string Website { get; set; }
public string Twitter { get; set; }
public string Facebook { get; set; }
public DateTime? Sold { get; set; }
public int? SoldToId { get; set; }
public string Address { get; set; }
public string City { get; set; }
public string Province { get; set; }
public string PostalCode { get; set; }
public short? CountryId { get; set; }
public CompanyStatus Status { get; set; }
public Iso31661Numeric Country { get; set; }
public Company SoldTo { get; set; }
public CompanyDescription Description { get; set; }
public ICollection<CompanyLogo> CompanyLogos { get; set; }
public ICollection<Gpu> Gpus { get; set; }
public ICollection<Company> InverseSoldToNavigation { get; set; }
public ICollection<MachineFamily> MachineFamilies { get; set; }
public ICollection<Machine> Machines { get; set; }
public ICollection<Processor> Processors { get; set; }
public ICollection<SoundSynth> SoundSynths { get; set; }
}
}

4
Cicm.Database/Models/CompanyDescriptions.cs → Cicm.Database/Models/CompanyDescription.cs
View File

@@ -1,11 +1,11 @@
namespace Cicm.Database.Models
{
public class CompanyDescriptions
public class CompanyDescription
{
public int Id { get; set; }
public int CompanyId { get; set; }
public string Text { get; set; }
public Companies Company { get; set; }
public Company Company { get; set; }
}
}

4
Cicm.Database/Models/CompanyLogos.cs → Cicm.Database/Models/CompanyLogo.cs
View File

@@ -1,12 +1,12 @@
namespace Cicm.Database.Models
{
public class CompanyLogos
public class CompanyLogo
{
public int Id { get; set; }
public int CompanyId { get; set; }
public int? Year { get; set; }
public string Guid { get; set; }
public Companies Company { get; set; }
public Company Company { get; set; }
}
}

6
Cicm.Database/Models/Gpus.cs → Cicm.Database/Models/Gpu.cs
View File

@@ -3,9 +3,9 @@ using System.Collections.Generic;
namespace Cicm.Database.Models
{
public class Gpus
public class Gpu
{
public Gpus()
public Gpu()
{
GpusByMachine = new HashSet<GpusByMachine>();
ResolutionsByGpu = new HashSet<ResolutionsByGpu>();
@@ -22,7 +22,7 @@ namespace Cicm.Database.Models
public float? DieSize { get; set; }
public long? Transistors { get; set; }
public Companies Company { get; set; }
public Company Company { get; set; }
public ICollection<GpusByMachine> GpusByMachine { get; set; }
public ICollection<ResolutionsByGpu> ResolutionsByGpu { get; set; }
}

4
Cicm.Database/Models/GpusByMachine.cs
View File

@@ -6,7 +6,7 @@
public int MachineId { get; set; }
public long Id { get; set; }
public Gpus Gpu { get; set; }
public Machines Machine { get; set; }
public Gpu Gpu { get; set; }
public Machine Machine { get; set; }
}
}

17
Cicm.Database/Models/InstructionSet.cs Normal file
View File

@@ -0,0 +1,17 @@
using System.Collections.Generic;
namespace Cicm.Database.Models
{
public class InstructionSet
{
public InstructionSet()
{
Processors = new HashSet<Processor>();
}
public int Id { get; set; }
public string Name { get; set; }
public ICollection<Processor> Processors { get; set; }
}
}

4
Cicm.Database/Models/InstructionSetExtensions.cs → Cicm.Database/Models/InstructionSetExtension.cs
View File

@@ -2,9 +2,9 @@
namespace Cicm.Database.Models
{
public class InstructionSetExtensions
public class InstructionSetExtension
{
public InstructionSetExtensions()
public InstructionSetExtension()
{
InstructionSetExtensionsByProcessor = new HashSet<InstructionSetExtensionsByProcessor>();
}

4
Cicm.Database/Models/InstructionSetExtensionsByProcessor.cs
View File

@@ -6,7 +6,7 @@
public int ProcessorId { get; set; }
public int ExtensionId { get; set; }
public InstructionSetExtensions Extension { get; set; }
public Processors Processor { get; set; }
public InstructionSetExtension Extension { get; set; }
public Processor Processor { get; set; }
}
}

17
Cicm.Database/Models/InstructionSets.cs
View File

@@ -1,17 +0,0 @@
using System.Collections.Generic;
namespace Cicm.Database.Models
{
public class InstructionSets
{
public InstructionSets()
{
Processors = new HashSet<Processors>();
}
public int Id { get; set; }
public string InstructionSet { get; set; }
public ICollection<Processors> Processors { get; set; }
}
}

4
Cicm.Database/Models/Iso31661Numeric.cs
View File

@@ -6,12 +6,12 @@ namespace Cicm.Database.Models
{
public Iso31661Numeric()
{
Companies = new HashSet<Companies>();
Companies = new HashSet<Company>();
}
public short Id { get; set; }
public string Name { get; set; }
public ICollection<Companies> Companies { get; set; }
public ICollection<Company> Companies { get; set; }
}
}

8
Cicm.Database/Models/Machines.cs → Cicm.Database/Models/Machine.cs
View File

@@ -3,9 +3,9 @@ using System.Collections.Generic;
namespace Cicm.Database.Models
{
public class Machines
public class Machine
{
public Machines()
public Machine()
{
Gpus = new HashSet<GpusByMachine>();
Memory = new HashSet<MemoryByMachine>();
@@ -22,8 +22,8 @@ namespace Cicm.Database.Models
public int? FamilyId { get; set; }
public string Model { get; set; }
public Companies Company { get; set; }
public MachineFamilies Family { get; set; }
public Company Company { get; set; }
public MachineFamily Family { get; set; }
public ICollection<GpusByMachine> Gpus { get; set; }
public ICollection<MemoryByMachine> Memory { get; set; }
public ICollection<ProcessorsByMachine> Processors { get; set; }

10
Cicm.Database/Models/MachineFamilies.cs → Cicm.Database/Models/MachineFamily.cs
View File

@@ -2,18 +2,18 @@
namespace Cicm.Database.Models
{
public class MachineFamilies
public class MachineFamily
{
public MachineFamilies()
public MachineFamily()
{
Machines = new HashSet<Machines>();
Machines = new HashSet<Machine>();
}
public int Id { get; set; }
public int CompanyId { get; set; }
public string Name { get; set; }
public Companies Company { get; set; }
public ICollection<Machines> Machines { get; set; }
public Company Company { get; set; }
public ICollection<Machine> Machines { get; set; }
}
}

2
Cicm.Database/Models/MemoryByMachine.cs
View File

@@ -9,6 +9,6 @@
public double? Speed { get; set; }
public long Id { get; set; }
public Machines Machine { get; set; }
public Machine Machine { get; set; }
}
}

2
Cicm.Database/Models/MoneyDonations.cs → Cicm.Database/Models/MoneyDonation.cs
View File

@@ -1,6 +1,6 @@
namespace Cicm.Database.Models
{
public class MoneyDonations
public class MoneyDonation
{
public int Id { get; set; }
public string Donator { get; set; }

2
Cicm.Database/Models/OwnedComputers.cs → Cicm.Database/Models/OwnedComputer.cs
View File

@@ -1,6 +1,6 @@
namespace Cicm.Database.Models
{
public class OwnedComputers
public class OwnedComputer
{
public int Id { get; set; }
public int DbId { get; set; }

2
Cicm.Database/Models/OwnedConsoles.cs → Cicm.Database/Models/OwnedConsole.cs
View File

@@ -1,6 +1,6 @@
namespace Cicm.Database.Models
{
public class OwnedConsoles
public class OwnedConsole
{
public int Id { get; set; }
public int DbId { get; set; }

8
Cicm.Database/Models/Processors.cs → Cicm.Database/Models/Processor.cs
View File

@@ -3,9 +3,9 @@ using System.Collections.Generic;
namespace Cicm.Database.Models
{
public class Processors
public class Processor
{
public Processors()
public Processor()
{
InstructionSetExtensions = new HashSet<InstructionSetExtensionsByProcessor>();
ProcessorsByMachine = new HashSet<ProcessorsByMachine>();
@@ -38,8 +38,8 @@ namespace Cicm.Database.Models
public float? L2 { get; set; }
public float? L3 { get; set; }
public Companies Company { get; set; }
public InstructionSets InstructionSet { get; set; }
public Company Company { get; set; }
public InstructionSet InstructionSet { get; set; }
public ICollection<InstructionSetExtensionsByProcessor> InstructionSetExtensions { get; set; }
public ICollection<ProcessorsByMachine> ProcessorsByMachine { get; set; }
}

4
Cicm.Database/Models/ProcessorsByMachine.cs
View File

@@ -7,7 +7,7 @@
public float? Speed { get; set; }
public long Id { get; set; }
public Machines Machine { get; set; }
public Processors Processor { get; set; }
public Machine Machine { get; set; }
public Processor Processor { get; set; }
}
}

4
Cicm.Database/Models/Resolutions.cs → Cicm.Database/Models/Resolution.cs
View File

@@ -2,9 +2,9 @@
namespace Cicm.Database.Models
{
public class Resolutions
public class Resolution
{
public Resolutions()
public Resolution()
{
ResolutionsByGpu = new HashSet<ResolutionsByGpu>();
}

4
Cicm.Database/Models/ResolutionsByGpu.cs
View File

@@ -6,7 +6,7 @@
public int ResolutionId { get; set; }
public long Id { get; set; }
public Gpus Gpu { get; set; }
public Resolutions Resolution { get; set; }
public Gpu Gpu { get; set; }
public Resolution Resolution { get; set; }
}
}

4
Cicm.Database/Models/SoundByMachine.cs
View File

@@ -6,7 +6,7 @@
public int MachineId { get; set; }
public long Id { get; set; }
public Machines Machine { get; set; }
public SoundSynths SoundSynth { get; set; }
public Machine Machine { get; set; }
public SoundSynth SoundSynth { get; set; }
}
}

6
Cicm.Database/Models/SoundSynths.cs → Cicm.Database/Models/SoundSynth.cs
View File

@@ -3,9 +3,9 @@ using System.Collections.Generic;
namespace Cicm.Database.Models
{
public class SoundSynths
public class SoundSynth
{
public SoundSynths()
public SoundSynth()
{
SoundByMachine = new HashSet<SoundByMachine>();
}
@@ -22,7 +22,7 @@ namespace Cicm.Database.Models
public int? WhiteNoise { get; set; }
public int? Type { get; set; }
public Companies Company { get; set; }
public Company Company { get; set; }
public ICollection<SoundByMachine> SoundByMachine { get; set; }
}
}

2
Cicm.Database/Models/StorageByMachine.cs
View File

@@ -8,6 +8,6 @@
public long? Capacity { get; set; }
public long Id { get; set; }
public Machines Machine { get; set; }
public Machine Machine { get; set; }
}
}

69
Cicm.Database/Models/cicmContext.cs
View File

@@ -8,33 +8,33 @@ namespace Cicm.Database.Models
public cicmContext(DbContextOptions<cicmContext> options) : base(options) { }
public virtual DbSet<Admins> Admins { get; set; }
public virtual DbSet<BrowserTests> BrowserTests { get; set; }
public virtual DbSet<Admin> Admins { get; set; }
public virtual DbSet<BrowserTest> BrowserTests { get; set; }
public virtual DbSet<CicmDb> CicmDb { get; set; }
public virtual DbSet<Companies> Companies { get; set; }
public virtual DbSet<CompanyDescriptions> CompanyDescriptions { get; set; }
public virtual DbSet<CompanyLogos> CompanyLogos { get; set; }
public virtual DbSet<Company> Companies { get; set; }
public virtual DbSet<CompanyDescription> CompanyDescriptions { get; set; }
public virtual DbSet<CompanyLogo> CompanyLogos { get; set; }
public virtual DbSet<Forbidden> Forbidden { get; set; }
public virtual DbSet<Gpus> Gpus { get; set; }
public virtual DbSet<Gpu> Gpus { get; set; }
public virtual DbSet<GpusByMachine> GpusByMachine { get; set; }
public virtual DbSet<InstructionSetExtensions> InstructionSetExtensions { get; set; }
public virtual DbSet<InstructionSetExtension> InstructionSetExtensions { get; set; }
public virtual DbSet<InstructionSetExtensionsByProcessor> InstructionSetExtensionsByProcessor { get; set; }
public virtual DbSet<InstructionSets> InstructionSets { get; set; }
public virtual DbSet<InstructionSet> InstructionSets { get; set; }
public virtual DbSet<Iso31661Numeric> Iso31661Numeric { get; set; }
public virtual DbSet<Log> Log { get; set; }
public virtual DbSet<MachineFamilies> MachineFamilies { get; set; }
public virtual DbSet<Machines> Machines { get; set; }
public virtual DbSet<MachineFamily> MachineFamilies { get; set; }
public virtual DbSet<Machine> Machines { get; set; }
public virtual DbSet<MemoryByMachine> MemoryByMachine { get; set; }
public virtual DbSet<MoneyDonations> MoneyDonations { get; set; }
public virtual DbSet<MoneyDonation> MoneyDonations { get; set; }
public virtual DbSet<News> News { get; set; }
public virtual DbSet<OwnedComputers> OwnedComputers { get; set; }
public virtual DbSet<OwnedConsoles> OwnedConsoles { get; set; }
public virtual DbSet<Processors> Processors { get; set; }
public virtual DbSet<OwnedComputer> OwnedComputers { get; set; }
public virtual DbSet<OwnedConsole> OwnedConsoles { get; set; }
public virtual DbSet<Processor> Processors { get; set; }
public virtual DbSet<ProcessorsByMachine> ProcessorsByMachine { get; set; }
public virtual DbSet<Resolutions> Resolutions { get; set; }
public virtual DbSet<Resolution> Resolutions { get; set; }
public virtual DbSet<ResolutionsByGpu> ResolutionsByGpu { get; set; }
public virtual DbSet<SoundByMachine> SoundByMachine { get; set; }
public virtual DbSet<SoundSynths> SoundSynths { get; set; }
public virtual DbSet<SoundSynth> SoundSynths { get; set; }
public virtual DbSet<StorageByMachine> StorageByMachine { get; set; }
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
@@ -48,7 +48,7 @@ namespace Cicm.Database.Models
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<Admins>(entity =>
modelBuilder.Entity<Admin>(entity =>
{
entity.ToTable("admins");
@@ -63,7 +63,7 @@ namespace Cicm.Database.Models
.HasDefaultValueSql("''");
});
modelBuilder.Entity<BrowserTests>(entity =>
modelBuilder.Entity<BrowserTest>(entity =>
{
entity.ToTable("browser_tests");
@@ -138,7 +138,7 @@ namespace Cicm.Database.Models
entity.Property(e => e.Version).HasColumnName("version").HasColumnType("int(11)");
});
modelBuilder.Entity<Companies>(entity =>
modelBuilder.Entity<Company>(entity =>
{
entity.ToTable("companies");
@@ -204,7 +204,7 @@ namespace Cicm.Database.Models
.HasConstraintName("fk_companies_sold_to");
});
modelBuilder.Entity<CompanyDescriptions>(entity =>
modelBuilder.Entity<CompanyDescription>(entity =>
{
entity.ToTable("company_descriptions");
@@ -218,11 +218,11 @@ namespace Cicm.Database.Models
entity.Property(e => e.Text).HasColumnName("text").HasColumnType("text");
entity.HasOne(d => d.Company).WithOne(p => p.Description).HasForeignKey<CompanyDescriptions>(d => d.Id)
entity.HasOne(d => d.Company).WithOne(p => p.Description).HasForeignKey<CompanyDescription>(d => d.Id)
.HasConstraintName("fk_company_id");
});
modelBuilder.Entity<CompanyLogos>(entity =>
modelBuilder.Entity<CompanyLogo>(entity =>
{
entity.HasKey(e => new {e.Id, e.CompanyId, LogoGuid = e.Guid});
@@ -273,7 +273,7 @@ namespace Cicm.Database.Models
.HasDefaultValueSql("''");
});
modelBuilder.Entity<Gpus>(entity =>
modelBuilder.Entity<Gpu>(entity =>
{
entity.ToTable("gpus");
@@ -341,7 +341,7 @@ namespace Cicm.Database.Models
.HasConstraintName("fk_gpus_by_machine_machine");
});
modelBuilder.Entity<InstructionSetExtensions>(entity =>
modelBuilder.Entity<InstructionSetExtension>(entity =>
{
entity.ToTable("instruction_set_extensions");
@@ -375,14 +375,13 @@ namespace Cicm.Database.Models
.HasConstraintName("fk_extension_processor_id");
});
modelBuilder.Entity<InstructionSets>(entity =>
modelBuilder.Entity<InstructionSet>(entity =>
{
entity.ToTable("instruction_sets");
entity.Property(e => e.Id).HasColumnName("id").HasColumnType("int(11)");
entity.Property(e => e.InstructionSet).IsRequired().HasColumnName("instruction_set")
.HasColumnType("varchar(45)");
entity.Property(e => e.Name).IsRequired().HasColumnName("instruction_set").HasColumnType("varchar(45)");
});
modelBuilder.Entity<Iso31661Numeric>(entity =>
@@ -423,7 +422,7 @@ namespace Cicm.Database.Models
.HasDefaultValueSql("''");
});
modelBuilder.Entity<MachineFamilies>(entity =>
modelBuilder.Entity<MachineFamily>(entity =>
{
entity.ToTable("machine_families");
@@ -441,7 +440,7 @@ namespace Cicm.Database.Models
.HasConstraintName("fk_machine_families_company");
});
modelBuilder.Entity<Machines>(entity =>
modelBuilder.Entity<Machine>(entity =>
{
entity.ToTable("machines");
@@ -509,7 +508,7 @@ namespace Cicm.Database.Models
.HasConstraintName("fk_memory_by_machine_machine");
});
modelBuilder.Entity<MoneyDonations>(entity =>
modelBuilder.Entity<MoneyDonation>(entity =>
{
entity.ToTable("money_donations");
@@ -547,7 +546,7 @@ namespace Cicm.Database.Models
entity.Property(e => e.Type).HasColumnName("type").HasColumnType("int(11)").HasDefaultValueSql("'0'");
});
modelBuilder.Entity<OwnedComputers>(entity =>
modelBuilder.Entity<OwnedComputer>(entity =>
{
entity.ToTable("owned_computers");
@@ -628,7 +627,7 @@ namespace Cicm.Database.Models
entity.Property(e => e.Vram).HasColumnName("vram").HasColumnType("int(11)").HasDefaultValueSql("'0'");
});
modelBuilder.Entity<OwnedConsoles>(entity =>
modelBuilder.Entity<OwnedConsole>(entity =>
{
entity.ToTable("owned_consoles");
@@ -662,7 +661,7 @@ namespace Cicm.Database.Models
entity.Property(e => e.Trade).HasColumnName("trade").HasColumnType("int(11)").HasDefaultValueSql("'0'");
});
modelBuilder.Entity<Processors>(entity =>
modelBuilder.Entity<Processor>(entity =>
{
entity.ToTable("processors");
@@ -797,7 +796,7 @@ namespace Cicm.Database.Models
.HasConstraintName("fk_processors_by_machine_processor");
});
modelBuilder.Entity<Resolutions>(entity =>
modelBuilder.Entity<Resolution>(entity =>
{
entity.ToTable("resolutions");
@@ -874,7 +873,7 @@ namespace Cicm.Database.Models
.HasConstraintName("fk_sound_by_machine_sound_synth");
});
modelBuilder.Entity<SoundSynths>(entity =>
modelBuilder.Entity<SoundSynth>(entity =>
{
entity.ToTable("sound_synths");

4
cicm_web/Controllers/CompanyController.cs
View File

@@ -65,8 +65,8 @@ namespace cicm_web.Controllers
public IActionResult View(int id)
{
ViewBag.WebRootPath = hostingEnvironment.WebRootPath;
Companies company = _context.Companies.Where(c => c.Id == id).Include(c => c.Description)
.Include(c => c.Machines).Include(c => c.Country).FirstOrDefault();
Company company = _context.Companies.Where(c => c.Id == id).Include(c => c.Description)
.Include(c => c.Machines).Include(c => c.Country).FirstOrDefault();
if(company == null) return Index();

6
cicm_web/Views/Company/ByCountry.cshtml
View File

@@ -32,8 +32,8 @@
ViewData["Title"] = "Companies";
}
@using System.IO
@using Cicm.Database.Models
@model Cicm.Database.Models.Companies[]
@using Company = Cicm.Database.Models.Company
@model Cicm.Database.Models.Company[]
<p align="center">
@if(ViewBag.Iso3166 != null)
@@ -63,7 +63,7 @@
{
<p>
@Model.Count() companies found in the database.<br />
@foreach(Companies company in Model)
@foreach(Company company in Model)
{
<a asp-controller="Company"
asp-action="View"

6
cicm_web/Views/Company/ByLetter.cshtml
View File

@@ -31,8 +31,8 @@
ViewData["Title"] = "Companies";
}
@using Cicm.Database.Models
@model Cicm.Database.Models.Companies[]
@using Company = Cicm.Database.Models.Company
@model Cicm.Database.Models.Company[]
<p>Search results:</p>
<p align="center">
@@ -46,7 +46,7 @@
{
<p>
@Model.Count() companies found in the database.<br />
@foreach(Companies company in Model)
@foreach(Company company in Model)
{
<a asp-controller="Company"
asp-action="View"

6
cicm_web/Views/Company/Index.cshtml
View File

@@ -31,15 +31,15 @@
ViewData["Title"] = "Companies";
}
@using Cicm.Database.Models
@model Cicm.Database.Models.Companies[]
@using Company = Cicm.Database.Models.Company
@model Cicm.Database.Models.Company[]
<p align="center">
@if(Model.Any())
{
<p>
@Model.Count() companies found in the database.<br />
@foreach(Companies company in Model)
@foreach(Company company in Model)
{
<a asp-controller="Company"
asp-action="View"

9
cicm_web/Views/Company/View.cshtml
View File

@@ -34,7 +34,8 @@
@using System.IO
@using Cicm.Database
@using Cicm.Database.Models
@model Cicm.Database.Models.Companies
@using Machine = Cicm.Database.Models.Machine
@model Cicm.Database.Models.Company
@if(Model != null)
{
@@ -73,7 +74,7 @@
<div class="carousel-inner">
@foreach(CompanyLogos logo in ViewBag.Logos)
@foreach(CompanyLogo logo in ViewBag.Logos)
{
if(File.Exists(System.IO.Path.Combine(ViewBag.WebRootPath, "assets/logos", logo.Guid + ".svg")))
{
@@ -366,7 +367,7 @@
data-parent="#itemsAccordion"
id="collapseComputers">
<div class="card-body">
@foreach(Machines computer in Model.Machines.Where(t => t.Type == MachineType.Computer))
@foreach(Machine computer in Model.Machines.Where(t => t.Type == MachineType.Computer))
{
<a asp-controller="Machine"
asp-action="View"
@@ -408,7 +409,7 @@
data-parent="#itemsAccordion"
id="collapseConsoles">
<div class="card-body">
@foreach(Machines console in Model.Machines.Where(t => t.Type == MachineType.Console))
@foreach(Machine console in Model.Machines.Where(t => t.Type == MachineType.Console))
{
<a asp-controller="Machine"
asp-action="View"