From b464d2fb8163b21731000e463b2ad7982257ddba Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 19 May 2019 18:35:28 +0100 Subject: [PATCH] Add model contraints. --- .../20190519171846_DataAnnotations.cs | 30 +++++++++ .../Migrations/cicmContextModelSnapshot.cs | 67 +++++++++++-------- Cicm.Database/Models/BrowserTest.cs | 17 ++++- Cicm.Database/Models/Company.cs | 35 ++++++---- Cicm.Database/Models/CompanyDescription.cs | 1 + Cicm.Database/Models/Gpu.cs | 20 ++++-- Cicm.Database/Models/InstructionSet.cs | 3 + .../Models/InstructionSetExtension.cs | 3 + Cicm.Database/Models/Iso31661Numeric.cs | 6 +- Cicm.Database/Models/Machine.cs | 19 ++++-- Cicm.Database/Models/MachineFamily.cs | 7 +- Cicm.Database/Models/Processor.cs | 17 +++-- Cicm.Database/Models/Resolution.cs | 13 +++- Cicm.Database/Models/SoundSynth.cs | 15 ++++- Cicm.Database/Models/StorageByMachine.cs | 5 +- cicm_web/cicm_web.csproj | 2 +- 16 files changed, 188 insertions(+), 72 deletions(-) create mode 100644 Cicm.Database/Migrations/20190519171846_DataAnnotations.cs diff --git a/Cicm.Database/Migrations/20190519171846_DataAnnotations.cs b/Cicm.Database/Migrations/20190519171846_DataAnnotations.cs new file mode 100644 index 00000000..88f49250 --- /dev/null +++ b/Cicm.Database/Migrations/20190519171846_DataAnnotations.cs @@ -0,0 +1,30 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Cicm.Database.Migrations +{ + public partial class DataAnnotations : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AlterColumn( + name: "Text", + table: "CompanyDescriptions", + maxLength: 262144, + nullable: false, + oldClrType: typeof(string), + oldMaxLength: 262144, + oldNullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.AlterColumn( + name: "Text", + table: "CompanyDescriptions", + maxLength: 262144, + nullable: true, + oldClrType: typeof(string), + oldMaxLength: 262144); + } + } +} diff --git a/Cicm.Database/Migrations/cicmContextModelSnapshot.cs b/Cicm.Database/Migrations/cicmContextModelSnapshot.cs index 2933c81e..2295309f 100644 --- a/Cicm.Database/Migrations/cicmContextModelSnapshot.cs +++ b/Cicm.Database/Migrations/cicmContextModelSnapshot.cs @@ -24,7 +24,7 @@ namespace Cicm.Database.Migrations .HasDefaultValueSql("'0'"); b.Property("Browser").IsRequired().ValueGeneratedOnAdd().HasColumnName("browser") - .HasColumnType("varchar(64)").HasDefaultValueSql("''"); + .HasColumnType("varchar(64)").HasDefaultValueSql("''").HasMaxLength(64); b.Property("Colors").ValueGeneratedOnAdd().HasColumnName("colors").HasColumnType("tinyint(1)") .HasDefaultValueSql("'0'"); @@ -48,10 +48,10 @@ namespace Cicm.Database.Migrations .HasDefaultValueSql("'0'"); b.Property("Os").IsRequired().ValueGeneratedOnAdd().HasColumnName("os") - .HasColumnType("varchar(32)").HasDefaultValueSql("''"); + .HasColumnType("varchar(32)").HasDefaultValueSql("''").HasMaxLength(32); b.Property("Platform").IsRequired().ValueGeneratedOnAdd().HasColumnName("platform") - .HasColumnType("varchar(8)").HasDefaultValueSql("''"); + .HasColumnType("varchar(8)").HasDefaultValueSql("''").HasMaxLength(8); b.Property("Png").ValueGeneratedOnAdd().HasColumnName("png").HasColumnType("tinyint(1)") .HasDefaultValueSql("'0'"); @@ -63,10 +63,10 @@ namespace Cicm.Database.Migrations .HasDefaultValueSql("'0'"); b.Property("UserAgent").IsRequired().ValueGeneratedOnAdd().HasColumnName("user_agent") - .HasColumnType("varchar(128)").HasDefaultValueSql("''"); + .HasColumnType("varchar(128)").HasDefaultValueSql("''").HasMaxLength(128); b.Property("Version").IsRequired().ValueGeneratedOnAdd().HasColumnName("version") - .HasColumnType("varchar(16)").HasDefaultValueSql("''"); + .HasColumnType("varchar(16)").HasDefaultValueSql("''").HasMaxLength(16); b.HasKey("Id"); @@ -101,22 +101,23 @@ namespace Cicm.Database.Migrations { b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)"); - b.Property("Address").HasColumnName("address").HasColumnType("varchar(80)"); + b.Property("Address").HasColumnName("address").HasColumnType("varchar(80)").HasMaxLength(80); - b.Property("City").HasColumnName("city").HasColumnType("varchar(80)"); + b.Property("City").HasColumnName("city").HasColumnType("varchar(80)").HasMaxLength(80); b.Property("CountryId").HasColumnName("country").HasColumnType("smallint(3)"); - b.Property("Facebook").HasColumnName("facebook").HasColumnType("varchar(45)"); + b.Property("Facebook").HasColumnName("facebook").HasColumnType("varchar(45)").HasMaxLength(45); b.Property("Founded").HasColumnName("founded").HasColumnType("datetime"); b.Property("Name").IsRequired().ValueGeneratedOnAdd().HasColumnName("name") .HasColumnType("varchar(128)").HasDefaultValueSql("''"); - b.Property("PostalCode").HasColumnName("postal_code").HasColumnType("varchar(25)"); + b.Property("PostalCode").HasColumnName("postal_code").HasColumnType("varchar(25)") + .HasMaxLength(25); - b.Property("Province").HasColumnName("province").HasColumnType("varchar(80)"); + b.Property("Province").HasColumnName("province").HasColumnType("varchar(80)").HasMaxLength(80); b.Property("Sold").HasColumnName("sold").HasColumnType("datetime"); @@ -124,9 +125,9 @@ namespace Cicm.Database.Migrations b.Property("Status").HasColumnName("status").HasColumnType("int(11)"); - b.Property("Twitter").HasColumnName("twitter").HasColumnType("varchar(45)"); + b.Property("Twitter").HasColumnName("twitter").HasColumnType("varchar(45)").HasMaxLength(45); - b.Property("Website").HasColumnName("website").HasColumnType("varchar(255)"); + b.Property("Website").HasColumnName("website").HasColumnType("varchar(255)").HasMaxLength(255); b.HasKey("Id"); @@ -167,7 +168,7 @@ namespace Cicm.Database.Migrations b.Property("Html").HasMaxLength(262144); - b.Property("Text").HasMaxLength(262144); + b.Property("Text").IsRequired().HasMaxLength(262144); b.HasKey("Id"); @@ -238,14 +239,15 @@ namespace Cicm.Database.Migrations b.Property("Introduced").HasColumnName("introduced").HasColumnType("datetime"); - b.Property("ModelCode").HasColumnName("model_code").HasColumnType("varchar(45)"); + b.Property("ModelCode").HasColumnName("model_code").HasColumnType("varchar(45)") + .HasMaxLength(45); b.Property("Name").IsRequired().ValueGeneratedOnAdd().HasColumnName("name") - .HasColumnType("char(128)").HasDefaultValueSql("''"); + .HasColumnType("char(128)").HasDefaultValueSql("''").HasMaxLength(128); - b.Property("Package").HasColumnName("package").HasColumnType("varchar(45)"); + b.Property("Package").HasColumnName("package").HasColumnType("varchar(45)").HasMaxLength(45); - b.Property("Process").HasColumnName("process").HasColumnType("varchar(45)"); + b.Property("Process").HasColumnName("process").HasColumnType("varchar(45)").HasMaxLength(45); b.Property("ProcessNm").HasColumnName("process_nm"); @@ -295,7 +297,8 @@ namespace Cicm.Database.Migrations { b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)"); - b.Property("Name").IsRequired().HasColumnName("instruction_set").HasColumnType("varchar(45)"); + b.Property("Name").IsRequired().HasColumnName("instruction_set").HasColumnType("varchar(45)") + .HasMaxLength(45); b.HasKey("Id"); @@ -306,7 +309,8 @@ namespace Cicm.Database.Migrations { b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)"); - b.Property("Extension").IsRequired().HasColumnName("extension").HasColumnType("varchar(45)"); + b.Property("Extension").IsRequired().HasColumnName("extension").HasColumnType("varchar(45)") + .HasMaxLength(45); b.HasKey("Id"); @@ -334,7 +338,8 @@ namespace Cicm.Database.Migrations { b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("smallint(3)"); - b.Property("Name").IsRequired().HasColumnName("name").HasColumnType("varchar(64)"); + b.Property("Name").IsRequired().HasColumnName("name").HasColumnType("varchar(64)") + .HasMaxLength(64); b.HasKey("Id"); @@ -383,9 +388,10 @@ namespace Cicm.Database.Migrations b.Property("Introduced").HasColumnName("introduced").HasColumnType("datetime"); - b.Property("Model").HasColumnName("model").HasColumnType("varchar(50)"); + b.Property("Model").HasColumnName("model").HasColumnType("varchar(50)").HasMaxLength(50); - b.Property("Name").IsRequired().HasColumnName("name").HasColumnType("varchar(255)"); + b.Property("Name").IsRequired().HasColumnName("name").HasColumnType("varchar(255)") + .HasMaxLength(255); b.Property("Type").ValueGeneratedOnAdd().HasColumnName("type").HasColumnType("int(11)") .HasDefaultValueSql("'0'"); @@ -413,7 +419,8 @@ namespace Cicm.Database.Migrations b.Property("CompanyId").HasColumnName("company").HasColumnType("int(11)"); - b.Property("Name").IsRequired().HasColumnName("name").HasColumnType("varchar(255)"); + b.Property("Name").IsRequired().HasColumnName("name").HasColumnType("varchar(255)") + .HasMaxLength(255); b.HasKey("Id"); @@ -664,14 +671,15 @@ namespace Cicm.Database.Migrations b.Property("L3"); - b.Property("ModelCode").HasColumnName("model_code").HasColumnType("varchar(45)"); + b.Property("ModelCode").HasColumnName("model_code").HasColumnType("varchar(45)") + .HasMaxLength(45); b.Property("Name").IsRequired().ValueGeneratedOnAdd().HasColumnName("name") - .HasColumnType("char(50)").HasDefaultValueSql("''"); + .HasColumnType("char(50)").HasDefaultValueSql("''").HasMaxLength(50); - b.Property("Package").HasColumnName("package").HasColumnType("varchar(45)"); + b.Property("Package").HasColumnName("package").HasColumnType("varchar(45)").HasMaxLength(45); - b.Property("Process").HasColumnName("process").HasColumnType("varchar(45)"); + b.Property("Process").HasColumnName("process").HasColumnType("varchar(45)").HasMaxLength(45); b.Property("ProcessNm").HasColumnName("process_nm"); @@ -846,10 +854,11 @@ namespace Cicm.Database.Migrations b.Property("Introduced").HasColumnName("introduced").HasColumnType("datetime"); - b.Property("ModelCode").HasColumnName("model_code").HasColumnType("varchar(45)"); + b.Property("ModelCode").HasColumnName("model_code").HasColumnType("varchar(45)") + .HasMaxLength(45); b.Property("Name").IsRequired().ValueGeneratedOnAdd().HasColumnName("name") - .HasColumnType("char(50)").HasDefaultValueSql("''"); + .HasColumnType("char(50)").HasDefaultValueSql("''").HasMaxLength(50); b.Property("SquareWave").HasColumnName("square_wave").HasColumnType("int(11)"); diff --git a/Cicm.Database/Models/BrowserTest.cs b/Cicm.Database/Models/BrowserTest.cs index d56d2f3a..6978cc43 100644 --- a/Cicm.Database/Models/BrowserTest.cs +++ b/Cicm.Database/Models/BrowserTest.cs @@ -29,17 +29,28 @@ *******************************************************************************/ using System.ComponentModel; +using System.ComponentModel.DataAnnotations; namespace Cicm.Database.Models { public class BrowserTest : BaseModel { [DisplayName("User agent")] + [Required] + [StringLength(128)] public string UserAgent { get; set; } - public string Browser { get; set; } - public string Version { get; set; } + [Required] + [StringLength(64)] + public string Browser { get; set; } + [Required] + [StringLength(16)] + public string Version { get; set; } [DisplayName("Operating system")] - public string Os { get; set; } + [Required] + [StringLength(32)] + public string Os { get; set; } + [Required] + [StringLength(8)] public string Platform { get; set; } [DisplayName("GIF87")] public bool Gif87 { get; set; } diff --git a/Cicm.Database/Models/Company.cs b/Cicm.Database/Models/Company.cs index ea2fefe2..f486f96f 100644 --- a/Cicm.Database/Models/Company.cs +++ b/Cicm.Database/Models/Company.cs @@ -50,20 +50,31 @@ namespace Cicm.Database.Models SoundSynths = new HashSet(); } + [Required] public string Name { get; set; } [DisplayFormat(DataFormatString = "{0:d}")] - 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 DateTime? Founded { get; set; } + [Url] + [StringLength(255)] + public string Website { get; set; } + [StringLength(45)] + public string Twitter { get; set; } + [StringLength(45)] + public string Facebook { get; set; } + [DisplayFormat(DataFormatString = "{0:d}")] + public DateTime? Sold { get; set; } + public int? SoldToId { get; set; } + [StringLength(80)] + public string Address { get; set; } + [StringLength(80)] + public string City { get; set; } + [StringLength(80)] + public string Province { get; set; } + [StringLength(25)] + public string PostalCode { get; set; } + public short? CountryId { get; set; } + [Required] + public CompanyStatus Status { get; set; } public virtual Iso31661Numeric Country { get; set; } [DisplayName("Sold to")] diff --git a/Cicm.Database/Models/CompanyDescription.cs b/Cicm.Database/Models/CompanyDescription.cs index f5c2940c..adb04f7a 100644 --- a/Cicm.Database/Models/CompanyDescription.cs +++ b/Cicm.Database/Models/CompanyDescription.cs @@ -37,6 +37,7 @@ namespace Cicm.Database.Models { public int CompanyId { get; set; } [MaxLength(262144, ErrorMessage = "Description is too long")] + [Required] public string Text { get; set; } [MaxLength(262144, ErrorMessage = "Description is too long")] [DisplayName("HTML")] diff --git a/Cicm.Database/Models/Gpu.cs b/Cicm.Database/Models/Gpu.cs index 2ac96bd6..4f2010e5 100644 --- a/Cicm.Database/Models/Gpu.cs +++ b/Cicm.Database/Models/Gpu.cs @@ -32,6 +32,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; namespace Cicm.Database.Models @@ -44,17 +45,24 @@ namespace Cicm.Database.Models ResolutionsByGpu = new HashSet(); } - public string Name { get; set; } - public int? CompanyId { get; set; } + [Required] + [StringLength(128)] + public string Name { get; set; } + public int? CompanyId { get; set; } [DisplayName("Model code")] - public string ModelCode { get; set; } + [StringLength(45)] + public string ModelCode { get; set; } + [DisplayFormat(DataFormatString = "{0:d}")] public DateTime? Introduced { get; set; } - public string Package { get; set; } - public string Process { get; set; } + [StringLength(45)] + public string Package { get; set; } + [StringLength(45)] + public string Process { get; set; } [DisplayName("Process (nm)")] public float? ProcessNm { get; set; } [DisplayName("Die size (mm²)")] - public float? DieSize { get; set; } + public float? DieSize { get; set; } + [Range(1, long.MaxValue)] public long? Transistors { get; set; } public virtual Company Company { get; set; } diff --git a/Cicm.Database/Models/InstructionSet.cs b/Cicm.Database/Models/InstructionSet.cs index 9aa7ab17..b37f6db2 100644 --- a/Cicm.Database/Models/InstructionSet.cs +++ b/Cicm.Database/Models/InstructionSet.cs @@ -29,6 +29,7 @@ *******************************************************************************/ using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; namespace Cicm.Database.Models { @@ -39,6 +40,8 @@ namespace Cicm.Database.Models Processors = new HashSet(); } + [Required] + [StringLength(45)] public string Name { get; set; } public virtual ICollection Processors { get; set; } diff --git a/Cicm.Database/Models/InstructionSetExtension.cs b/Cicm.Database/Models/InstructionSetExtension.cs index 353d3adb..d3c09046 100644 --- a/Cicm.Database/Models/InstructionSetExtension.cs +++ b/Cicm.Database/Models/InstructionSetExtension.cs @@ -30,6 +30,7 @@ using System.Collections.Generic; using System.ComponentModel; +using System.ComponentModel.DataAnnotations; namespace Cicm.Database.Models { @@ -41,6 +42,8 @@ namespace Cicm.Database.Models } [DisplayName("Name")] + [Required] + [StringLength(45)] public string Extension { get; set; } public virtual ICollection InstructionSetExtensionsByProcessor diff --git a/Cicm.Database/Models/Iso31661Numeric.cs b/Cicm.Database/Models/Iso31661Numeric.cs index 4a3c2ba9..d060052f 100644 --- a/Cicm.Database/Models/Iso31661Numeric.cs +++ b/Cicm.Database/Models/Iso31661Numeric.cs @@ -29,6 +29,7 @@ *******************************************************************************/ using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; namespace Cicm.Database.Models { @@ -39,7 +40,10 @@ namespace Cicm.Database.Models Companies = new HashSet(); } - public short Id { get; set; } + [Required] + public short Id { get; set; } + [Required] + [StringLength(64)] public string Name { get; set; } public virtual ICollection Companies { get; set; } diff --git a/Cicm.Database/Models/Machine.cs b/Cicm.Database/Models/Machine.cs index 254bfed7..f952fe2d 100644 --- a/Cicm.Database/Models/Machine.cs +++ b/Cicm.Database/Models/Machine.cs @@ -31,6 +31,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; namespace Cicm.Database.Models @@ -46,12 +47,18 @@ namespace Cicm.Database.Models Storage = new HashSet(); } - public int CompanyId { get; set; } - public string Name { get; set; } - public MachineType Type { get; set; } - public DateTime? Introduced { get; set; } - public int? FamilyId { get; set; } - public string Model { get; set; } + [Required] + public int CompanyId { get; set; } + [Required] + [StringLength(255)] + public string Name { get; set; } + [Required] + public MachineType Type { get; set; } + [DisplayFormat(DataFormatString = "{0:d}")] + public DateTime? Introduced { get; set; } + public int? FamilyId { get; set; } + [StringLength(50)] + public string Model { get; set; } public virtual Company Company { get; set; } public virtual MachineFamily Family { get; set; } diff --git a/Cicm.Database/Models/MachineFamily.cs b/Cicm.Database/Models/MachineFamily.cs index b4349bbd..80ffce94 100644 --- a/Cicm.Database/Models/MachineFamily.cs +++ b/Cicm.Database/Models/MachineFamily.cs @@ -29,6 +29,7 @@ *******************************************************************************/ using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; namespace Cicm.Database.Models { @@ -39,8 +40,10 @@ namespace Cicm.Database.Models Machines = new HashSet(); } - public int CompanyId { get; set; } - public string Name { get; set; } + public int CompanyId { get; set; } + [Required] + [StringLength(255)] + public string Name { get; set; } public virtual Company Company { get; set; } public virtual ICollection Machines { get; set; } diff --git a/Cicm.Database/Models/Processor.cs b/Cicm.Database/Models/Processor.cs index fd29b1c9..f4dde635 100644 --- a/Cicm.Database/Models/Processor.cs +++ b/Cicm.Database/Models/Processor.cs @@ -32,6 +32,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; namespace Cicm.Database.Models @@ -44,15 +45,20 @@ namespace Cicm.Database.Models ProcessorsByMachine = new HashSet(); } - public string Name { get; set; } - public int? CompanyId { get; set; } + [Required] + [StringLength(50)] + public string Name { get; set; } + public int? CompanyId { get; set; } [DisplayName("Model code")] - public string ModelCode { get; set; } + [StringLength(45)] + public string ModelCode { get; set; } + [DisplayFormat(DataFormatString = "{0:d}")] public DateTime? Introduced { get; set; } [DisplayName("Instruction set")] public int? InstructionSetId { get; set; } [DisplayName("Nominal speed (MHz)")] - public double? Speed { get; set; } + public double? Speed { get; set; } + [StringLength(45)] public string Package { get; set; } [DisplayName("General Purpose Registers")] public int? Gprs { get; set; } @@ -65,7 +71,8 @@ namespace Cicm.Database.Models public int? Cores { get; set; } [DisplayName("Threads per core")] public int? ThreadsPerCore { get; set; } - public string Process { get; set; } + [StringLength(45)] + public string Process { get; set; } [DisplayName("Process (nm)")] public float? ProcessNm { get; set; } [DisplayName("Die size (mm²)")] diff --git a/Cicm.Database/Models/Resolution.cs b/Cicm.Database/Models/Resolution.cs index cfec5e82..cb40b4c5 100644 --- a/Cicm.Database/Models/Resolution.cs +++ b/Cicm.Database/Models/Resolution.cs @@ -30,6 +30,7 @@ using System.Collections.Generic; using System.ComponentModel; +using System.ComponentModel.DataAnnotations; namespace Cicm.Database.Models { @@ -40,9 +41,15 @@ namespace Cicm.Database.Models ResolutionsByGpu = new HashSet(); } - public int Width { get; set; } - public int Height { get; set; } - public long? Colors { get; set; } + [Required] + [Range(1, 131072)] + public int Width { get; set; } + [Required] + [Range(1, 131072)] + public int Height { get; set; } + [Range(2, 281474976710656)] + public long? Colors { get; set; } + [Range(2, 281474976710656)] public long? Palette { get; set; } [DisplayName("Character based")] public bool Chars { get; set; } diff --git a/Cicm.Database/Models/SoundSynth.cs b/Cicm.Database/Models/SoundSynth.cs index f9041d63..ce6e9d5e 100644 --- a/Cicm.Database/Models/SoundSynth.cs +++ b/Cicm.Database/Models/SoundSynth.cs @@ -31,6 +31,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; namespace Cicm.Database.Models @@ -42,20 +43,28 @@ namespace Cicm.Database.Models SoundByMachine = new HashSet(); } - public string Name { get; set; } - public int? CompanyId { get; set; } + [Required] + [StringLength(50)] + public string Name { get; set; } + public int? CompanyId { get; set; } [DisplayName("Model code")] - public string ModelCode { get; set; } + [StringLength(45)] + public string ModelCode { get; set; } + [DisplayFormat(DataFormatString = "{0:d}")] public DateTime? Introduced { get; set; } [DisplayName("PCM voices")] + [Range(1, int.MaxValue)] public int? Voices { get; set; } [DisplayName("Sample rate (Hz)")] public double? Frequency { get; set; } [DisplayName("Sample resolution")] + [Range(1, int.MaxValue)] public int? Depth { get; set; } [DisplayName("Square wave channels")] + [Range(1, int.MaxValue)] public int? SquareWave { get; set; } [DisplayName("White noise channels")] + [Range(1, int.MaxValue)] public int? WhiteNoise { get; set; } public int? Type { get; set; } diff --git a/Cicm.Database/Models/StorageByMachine.cs b/Cicm.Database/Models/StorageByMachine.cs index ad23ddd0..f1028adb 100644 --- a/Cicm.Database/Models/StorageByMachine.cs +++ b/Cicm.Database/Models/StorageByMachine.cs @@ -28,6 +28,8 @@ // Copyright © 2003-2018 Natalia Portillo *******************************************************************************/ +using System.ComponentModel.DataAnnotations; + namespace Cicm.Database.Models { public class StorageByMachine : BaseModel @@ -35,7 +37,8 @@ namespace Cicm.Database.Models public int MachineId { get; set; } public StorageType Type { get; set; } public StorageInterface Interface { get; set; } - public long? Capacity { get; set; } + [Range(1, long.MaxValue)] + public long? Capacity { get; set; } public virtual Machine Machine { get; set; } } diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj index a830fa28..0c83d650 100644 --- a/cicm_web/cicm_web.csproj +++ b/cicm_web/cicm_web.csproj @@ -2,7 +2,7 @@ netcoreapp2.2 - 3.0.99.492 + 3.0.99.496 Canary Islands Computer Museum Copyright © 2003-2018 Natalia Portillo Canary Islands Computer Museum Website