From 843496bb1c4ea215278f7afb4f843955987b415c Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sun, 19 May 2019 17:51:28 +0100
Subject: [PATCH] Use base model for primary key.

---
 Cicm.Database/Models/BaseModel.cs                        | 7 +++++++
 Cicm.Database/Models/BrowserTest.cs                      | 3 +--
 Cicm.Database/Models/Company.cs                          | 3 +--
 Cicm.Database/Models/CompanyDescription.cs               | 3 +--
 Cicm.Database/Models/CompanyLogo.cs                      | 3 +--
 Cicm.Database/Models/Forbidden.cs                        | 3 +--
 Cicm.Database/Models/Gpu.cs                              | 3 +--
 Cicm.Database/Models/GpusByMachine.cs                    | 7 +++----
 Cicm.Database/Models/InstructionSet.cs                   | 3 +--
 Cicm.Database/Models/InstructionSetExtension.cs          | 3 +--
 .../Models/InstructionSetExtensionsByProcessor.cs        | 3 +--
 Cicm.Database/Models/Log.cs                              | 3 +--
 Cicm.Database/Models/Machine.cs                          | 3 +--
 Cicm.Database/Models/MachineFamily.cs                    | 3 +--
 Cicm.Database/Models/MemoryByMachine.cs                  | 3 +--
 Cicm.Database/Models/MoneyDonation.cs                    | 3 +--
 Cicm.Database/Models/News.cs                             | 3 +--
 Cicm.Database/Models/OwnedComputer.cs                    | 3 +--
 Cicm.Database/Models/OwnedConsole.cs                     | 3 +--
 Cicm.Database/Models/Processor.cs                        | 3 +--
 Cicm.Database/Models/ProcessorsByMachine.cs              | 3 +--
 Cicm.Database/Models/Resolution.cs                       | 3 +--
 Cicm.Database/Models/ResolutionsByGpu.cs                 | 7 +++----
 Cicm.Database/Models/SoundByMachine.cs                   | 9 ++++-----
 Cicm.Database/Models/SoundSynth.cs                       | 3 +--
 Cicm.Database/Models/StorageByMachine.cs                 | 3 +--
 cicm_web/cicm_web.csproj                                 | 2 +-
 27 files changed, 40 insertions(+), 58 deletions(-)
 create mode 100644 Cicm.Database/Models/BaseModel.cs

diff --git a/Cicm.Database/Models/BaseModel.cs b/Cicm.Database/Models/BaseModel.cs
new file mode 100644
index 00000000..b978469e
--- /dev/null
+++ b/Cicm.Database/Models/BaseModel.cs
@@ -0,0 +1,7 @@
+namespace Cicm.Database.Models
+{
+    public class BaseModel<TKey>
+    {
+        public TKey Id { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Cicm.Database/Models/BrowserTest.cs b/Cicm.Database/Models/BrowserTest.cs
index b1984b94..d56d2f3a 100644
--- a/Cicm.Database/Models/BrowserTest.cs
+++ b/Cicm.Database/Models/BrowserTest.cs
@@ -32,9 +32,8 @@ using System.ComponentModel;
 
 namespace Cicm.Database.Models
 {
-    public class BrowserTest
+    public class BrowserTest : BaseModel<int>
     {
-        public int Id { get; set; }
         [DisplayName("User agent")]
         public string UserAgent { get; set; }
         public string Browser { get;   set; }
diff --git a/Cicm.Database/Models/Company.cs b/Cicm.Database/Models/Company.cs
index 7edbb36a..ea2fefe2 100644
--- a/Cicm.Database/Models/Company.cs
+++ b/Cicm.Database/Models/Company.cs
@@ -37,7 +37,7 @@ using System.Linq;
 
 namespace Cicm.Database.Models
 {
-    public class Company
+    public class Company : BaseModel<int>
     {
         public Company()
         {
@@ -50,7 +50,6 @@ namespace Cicm.Database.Models
             SoundSynths             = new HashSet<SoundSynth>();
         }
 
-        public int    Id   { get; set; }
         public string Name { get; set; }
         [DisplayFormat(DataFormatString = "{0:d}")]
         public DateTime? Founded { get;        set; }
diff --git a/Cicm.Database/Models/CompanyDescription.cs b/Cicm.Database/Models/CompanyDescription.cs
index 46fca809..f5c2940c 100644
--- a/Cicm.Database/Models/CompanyDescription.cs
+++ b/Cicm.Database/Models/CompanyDescription.cs
@@ -33,9 +33,8 @@ using System.ComponentModel.DataAnnotations;
 
 namespace Cicm.Database.Models
 {
-    public class CompanyDescription
+    public class CompanyDescription : BaseModel<int>
     {
-        public int Id        { get; set; }
         public int CompanyId { get; set; }
         [MaxLength(262144, ErrorMessage = "Description is too long")]
         public string Text { get; set; }
diff --git a/Cicm.Database/Models/CompanyLogo.cs b/Cicm.Database/Models/CompanyLogo.cs
index 0b461825..412d1ef6 100644
--- a/Cicm.Database/Models/CompanyLogo.cs
+++ b/Cicm.Database/Models/CompanyLogo.cs
@@ -32,9 +32,8 @@ using System;
 
 namespace Cicm.Database.Models
 {
-    public class CompanyLogo
+    public class CompanyLogo : BaseModel<int>
     {
-        public int  Id        { get; set; }
         public int  CompanyId { get; set; }
         public int? Year      { get; set; }
         public Guid Guid      { get; set; }
diff --git a/Cicm.Database/Models/Forbidden.cs b/Cicm.Database/Models/Forbidden.cs
index 6fc59ab8..714f4d8e 100644
--- a/Cicm.Database/Models/Forbidden.cs
+++ b/Cicm.Database/Models/Forbidden.cs
@@ -30,9 +30,8 @@
 
 namespace Cicm.Database.Models
 {
-    public class Forbidden
+    public class Forbidden : BaseModel<int>
     {
-        public int    Id      { get; set; }
         public string Browser { get; set; }
         public string Date    { get; set; }
         public string Ip      { get; set; }
diff --git a/Cicm.Database/Models/Gpu.cs b/Cicm.Database/Models/Gpu.cs
index ff4fc9cd..2ac96bd6 100644
--- a/Cicm.Database/Models/Gpu.cs
+++ b/Cicm.Database/Models/Gpu.cs
@@ -36,7 +36,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Cicm.Database.Models
 {
-    public class Gpu
+    public class Gpu : BaseModel<int>
     {
         public Gpu()
         {
@@ -44,7 +44,6 @@ namespace Cicm.Database.Models
             ResolutionsByGpu = new HashSet<ResolutionsByGpu>();
         }
 
-        public int    Id        { get; set; }
         public string Name      { get; set; }
         public int?   CompanyId { get; set; }
         [DisplayName("Model code")]
diff --git a/Cicm.Database/Models/GpusByMachine.cs b/Cicm.Database/Models/GpusByMachine.cs
index fb1b3fb5..0efac1cb 100644
--- a/Cicm.Database/Models/GpusByMachine.cs
+++ b/Cicm.Database/Models/GpusByMachine.cs
@@ -32,11 +32,10 @@ using System.ComponentModel;
 
 namespace Cicm.Database.Models
 {
-    public class GpusByMachine
+    public class GpusByMachine : BaseModel<long>
     {
-        public int  GpuId     { get; set; }
-        public int  MachineId { get; set; }
-        public long Id        { get; set; }
+        public int GpuId     { get; set; }
+        public int MachineId { get; set; }
 
         [DisplayName("GPU")]
         public virtual Gpu Gpu { get;         set; }
diff --git a/Cicm.Database/Models/InstructionSet.cs b/Cicm.Database/Models/InstructionSet.cs
index 08fca9a5..9aa7ab17 100644
--- a/Cicm.Database/Models/InstructionSet.cs
+++ b/Cicm.Database/Models/InstructionSet.cs
@@ -32,14 +32,13 @@ using System.Collections.Generic;
 
 namespace Cicm.Database.Models
 {
-    public class InstructionSet
+    public class InstructionSet : BaseModel<int>
     {
         public InstructionSet()
         {
             Processors = new HashSet<Processor>();
         }
 
-        public int    Id   { get; set; }
         public string Name { get; set; }
 
         public virtual ICollection<Processor> Processors { get; set; }
diff --git a/Cicm.Database/Models/InstructionSetExtension.cs b/Cicm.Database/Models/InstructionSetExtension.cs
index 3d726acb..353d3adb 100644
--- a/Cicm.Database/Models/InstructionSetExtension.cs
+++ b/Cicm.Database/Models/InstructionSetExtension.cs
@@ -33,14 +33,13 @@ using System.ComponentModel;
 
 namespace Cicm.Database.Models
 {
-    public class InstructionSetExtension
+    public class InstructionSetExtension : BaseModel<int>
     {
         public InstructionSetExtension()
         {
             InstructionSetExtensionsByProcessor = new HashSet<InstructionSetExtensionsByProcessor>();
         }
 
-        public int    Id        { get; set; }
         [DisplayName("Name")]
         public string Extension { get; set; }
 
diff --git a/Cicm.Database/Models/InstructionSetExtensionsByProcessor.cs b/Cicm.Database/Models/InstructionSetExtensionsByProcessor.cs
index 76a7e44b..3089253e 100644
--- a/Cicm.Database/Models/InstructionSetExtensionsByProcessor.cs
+++ b/Cicm.Database/Models/InstructionSetExtensionsByProcessor.cs
@@ -30,9 +30,8 @@
 
 namespace Cicm.Database.Models
 {
-    public class InstructionSetExtensionsByProcessor
+    public class InstructionSetExtensionsByProcessor : BaseModel<int>
     {
-        public int Id          { get; set; }
         public int ProcessorId { get; set; }
         public int ExtensionId { get; set; }
 
diff --git a/Cicm.Database/Models/Log.cs b/Cicm.Database/Models/Log.cs
index 70318d94..63204564 100644
--- a/Cicm.Database/Models/Log.cs
+++ b/Cicm.Database/Models/Log.cs
@@ -30,9 +30,8 @@
 
 namespace Cicm.Database.Models
 {
-    public class Log
+    public class Log : BaseModel<int>
     {
-        public int    Id      { get; set; }
         public string Browser { get; set; }
         public string Ip      { get; set; }
         public string Date    { get; set; }
diff --git a/Cicm.Database/Models/Machine.cs b/Cicm.Database/Models/Machine.cs
index b63af2f5..254bfed7 100644
--- a/Cicm.Database/Models/Machine.cs
+++ b/Cicm.Database/Models/Machine.cs
@@ -35,7 +35,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Cicm.Database.Models
 {
-    public class Machine
+    public class Machine : BaseModel<int>
     {
         public Machine()
         {
@@ -46,7 +46,6 @@ namespace Cicm.Database.Models
             Storage    = new HashSet<StorageByMachine>();
         }
 
-        public int         Id         { get; set; }
         public int         CompanyId  { get; set; }
         public string      Name       { get; set; }
         public MachineType Type       { get; set; }
diff --git a/Cicm.Database/Models/MachineFamily.cs b/Cicm.Database/Models/MachineFamily.cs
index 890b375a..b4349bbd 100644
--- a/Cicm.Database/Models/MachineFamily.cs
+++ b/Cicm.Database/Models/MachineFamily.cs
@@ -32,14 +32,13 @@ using System.Collections.Generic;
 
 namespace Cicm.Database.Models
 {
-    public class MachineFamily
+    public class MachineFamily : BaseModel<int>
     {
         public MachineFamily()
         {
             Machines = new HashSet<Machine>();
         }
 
-        public int    Id        { get; set; }
         public int    CompanyId { get; set; }
         public string Name      { get; set; }
 
diff --git a/Cicm.Database/Models/MemoryByMachine.cs b/Cicm.Database/Models/MemoryByMachine.cs
index 7fcbcf34..2700f053 100644
--- a/Cicm.Database/Models/MemoryByMachine.cs
+++ b/Cicm.Database/Models/MemoryByMachine.cs
@@ -32,7 +32,7 @@ using System.ComponentModel;
 
 namespace Cicm.Database.Models
 {
-    public class MemoryByMachine
+    public class MemoryByMachine : BaseModel<long>
     {
         public int         MachineId { get; set; }
         public MemoryType  Type      { get; set; }
@@ -40,7 +40,6 @@ namespace Cicm.Database.Models
         public long?       Size      { get; set; }
         [DisplayName("Speed (Hz)")]
         public double? Speed { get; set; }
-        public long Id { get;       set; }
 
         public virtual Machine Machine { get; set; }
     }
diff --git a/Cicm.Database/Models/MoneyDonation.cs b/Cicm.Database/Models/MoneyDonation.cs
index ddcadb2f..018ef337 100644
--- a/Cicm.Database/Models/MoneyDonation.cs
+++ b/Cicm.Database/Models/MoneyDonation.cs
@@ -30,9 +30,8 @@
 
 namespace Cicm.Database.Models
 {
-    public class MoneyDonation
+    public class MoneyDonation : BaseModel<int>
     {
-        public int     Id       { get; set; }
         public string  Donator  { get; set; }
         public decimal Quantity { get; set; }
     }
diff --git a/Cicm.Database/Models/News.cs b/Cicm.Database/Models/News.cs
index 8f3bbd76..d1bc9d63 100644
--- a/Cicm.Database/Models/News.cs
+++ b/Cicm.Database/Models/News.cs
@@ -33,9 +33,8 @@ using System.ComponentModel;
 
 namespace Cicm.Database.Models
 {
-    public class News
+    public class News : BaseModel<int>
     {
-        public int      Id   { get; set; }
         public DateTime Date { get; set; }
         public NewsType Type { get; set; }
         [DisplayName("Affected ID")]
diff --git a/Cicm.Database/Models/OwnedComputer.cs b/Cicm.Database/Models/OwnedComputer.cs
index 6c9f227c..37156c75 100644
--- a/Cicm.Database/Models/OwnedComputer.cs
+++ b/Cicm.Database/Models/OwnedComputer.cs
@@ -30,9 +30,8 @@
 
 namespace Cicm.Database.Models
 {
-    public class OwnedComputer
+    public class OwnedComputer : BaseModel<int>
     {
-        public int        Id      { get; set; }
         public int        DbId    { get; set; }
         public string     Date    { get; set; }
         public StatusType Status  { get; set; }
diff --git a/Cicm.Database/Models/OwnedConsole.cs b/Cicm.Database/Models/OwnedConsole.cs
index 74c3a63c..51cb17eb 100644
--- a/Cicm.Database/Models/OwnedConsole.cs
+++ b/Cicm.Database/Models/OwnedConsole.cs
@@ -30,9 +30,8 @@
 
 namespace Cicm.Database.Models
 {
-    public class OwnedConsole
+    public class OwnedConsole : BaseModel<int>
     {
-        public int        Id      { get; set; }
         public int        DbId    { get; set; }
         public string     Date    { get; set; }
         public StatusType Status  { get; set; }
diff --git a/Cicm.Database/Models/Processor.cs b/Cicm.Database/Models/Processor.cs
index bbdc331a..fd29b1c9 100644
--- a/Cicm.Database/Models/Processor.cs
+++ b/Cicm.Database/Models/Processor.cs
@@ -36,7 +36,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Cicm.Database.Models
 {
-    public class Processor
+    public class Processor : BaseModel<int>
     {
         public Processor()
         {
@@ -44,7 +44,6 @@ namespace Cicm.Database.Models
             ProcessorsByMachine      = new HashSet<ProcessorsByMachine>();
         }
 
-        public int    Id        { get; set; }
         public string Name      { get; set; }
         public int?   CompanyId { get; set; }
         [DisplayName("Model code")]
diff --git a/Cicm.Database/Models/ProcessorsByMachine.cs b/Cicm.Database/Models/ProcessorsByMachine.cs
index 1e8d59d5..c8b3e78f 100644
--- a/Cicm.Database/Models/ProcessorsByMachine.cs
+++ b/Cicm.Database/Models/ProcessorsByMachine.cs
@@ -32,13 +32,12 @@ using System.ComponentModel;
 
 namespace Cicm.Database.Models
 {
-    public class ProcessorsByMachine
+    public class ProcessorsByMachine : BaseModel<long>
     {
         public int ProcessorId { get; set; }
         public int MachineId   { get; set; }
         [DisplayName("Speed (MHz)")]
         public float? Speed { get; set; }
-        public long Id { get;      set; }
 
         public virtual Machine   Machine   { get; set; }
         public virtual Processor Processor { get; set; }
diff --git a/Cicm.Database/Models/Resolution.cs b/Cicm.Database/Models/Resolution.cs
index a1a82aa3..cfec5e82 100644
--- a/Cicm.Database/Models/Resolution.cs
+++ b/Cicm.Database/Models/Resolution.cs
@@ -33,14 +33,13 @@ using System.ComponentModel;
 
 namespace Cicm.Database.Models
 {
-    public class Resolution
+    public class Resolution : BaseModel<int>
     {
         public Resolution()
         {
             ResolutionsByGpu = new HashSet<ResolutionsByGpu>();
         }
 
-        public int   Id      { get; set; }
         public int   Width   { get; set; }
         public int   Height  { get; set; }
         public long? Colors  { get; set; }
diff --git a/Cicm.Database/Models/ResolutionsByGpu.cs b/Cicm.Database/Models/ResolutionsByGpu.cs
index 81df6dd7..44a7d41a 100644
--- a/Cicm.Database/Models/ResolutionsByGpu.cs
+++ b/Cicm.Database/Models/ResolutionsByGpu.cs
@@ -32,11 +32,10 @@ using System.ComponentModel;
 
 namespace Cicm.Database.Models
 {
-    public class ResolutionsByGpu
+    public class ResolutionsByGpu : BaseModel<long>
     {
-        public int  GpuId        { get; set; }
-        public int  ResolutionId { get; set; }
-        public long Id           { get; set; }
+        public int GpuId        { get; set; }
+        public int ResolutionId { get; set; }
 
         [DisplayName("GPU")]
         public virtual Gpu Gpu { get;               set; }
diff --git a/Cicm.Database/Models/SoundByMachine.cs b/Cicm.Database/Models/SoundByMachine.cs
index df180aed..56973f3a 100644
--- a/Cicm.Database/Models/SoundByMachine.cs
+++ b/Cicm.Database/Models/SoundByMachine.cs
@@ -32,13 +32,12 @@ using System.ComponentModel;
 
 namespace Cicm.Database.Models
 {
-    public class SoundByMachine
+    public class SoundByMachine : BaseModel<long>
     {
-        public int  SoundSynthId { get; set; }
-        public int  MachineId    { get; set; }
-        public long Id           { get; set; }
+        public int SoundSynthId { get; set; }
+        public int MachineId    { get; set; }
 
-        public virtual Machine    Machine    { get; set; }
+        public virtual Machine Machine { get; set; }
         [DisplayName("Sound synthetizer")]
         public virtual SoundSynth SoundSynth { get; set; }
     }
diff --git a/Cicm.Database/Models/SoundSynth.cs b/Cicm.Database/Models/SoundSynth.cs
index 2b2799b5..f9041d63 100644
--- a/Cicm.Database/Models/SoundSynth.cs
+++ b/Cicm.Database/Models/SoundSynth.cs
@@ -35,14 +35,13 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Cicm.Database.Models
 {
-    public class SoundSynth
+    public class SoundSynth : BaseModel<int>
     {
         public SoundSynth()
         {
             SoundByMachine = new HashSet<SoundByMachine>();
         }
 
-        public int    Id        { get; set; }
         public string Name      { get; set; }
         public int?   CompanyId { get; set; }
         [DisplayName("Model code")]
diff --git a/Cicm.Database/Models/StorageByMachine.cs b/Cicm.Database/Models/StorageByMachine.cs
index b95a5fe2..ad23ddd0 100644
--- a/Cicm.Database/Models/StorageByMachine.cs
+++ b/Cicm.Database/Models/StorageByMachine.cs
@@ -30,13 +30,12 @@
 
 namespace Cicm.Database.Models
 {
-    public class StorageByMachine
+    public class StorageByMachine : BaseModel<long>
     {
         public int              MachineId { get; set; }
         public StorageType      Type      { get; set; }
         public StorageInterface Interface { get; set; }
         public long?            Capacity  { get; set; }
-        public long             Id        { get; set; }
 
         public virtual Machine Machine { get; set; }
     }
diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj
index b2f24d0a..a830fa28 100644
--- a/cicm_web/cicm_web.csproj
+++ b/cicm_web/cicm_web.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>3.0.99.486</Version>
+    <Version>3.0.99.492</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>