Use base model.

This commit is contained in:
2019-12-03 21:08:14 +00:00
parent 9b916b64df
commit e380126937
15 changed files with 24 additions and 67 deletions

View File

@@ -0,0 +1,10 @@
using System.ComponentModel.DataAnnotations;
namespace DiscImageChef.Server.Models
{
public class BaseModel<T>
{
[Key]
public T Id { get; set; }
}
}

View File

@@ -30,15 +30,10 @@
// Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/
using System.ComponentModel.DataAnnotations;
namespace DiscImageChef.Server.Models
{
public class Command
public class Command : BaseModel<int>
{
[Key]
public int Id { get; set; }
public string Name { get; set; }
public long Count { get; set; }
}

View File

@@ -30,15 +30,10 @@
// Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/
using System.ComponentModel.DataAnnotations;
namespace DiscImageChef.Server.Models
{
public class DeviceStat
public class DeviceStat : BaseModel<int>
{
[Key]
public int Id { get; set; }
public string Manufacturer { get; set; }
public string Model { get; set; }
public string Revision { get; set; }

View File

@@ -30,15 +30,10 @@
// Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/
using System.ComponentModel.DataAnnotations;
namespace DiscImageChef.Server.Models
{
public class Filesystem
public class Filesystem : BaseModel<int>
{
[Key]
public int Id { get; set; }
public string Name { get; set; }
public long Count { get; set; }
}

View File

@@ -30,15 +30,10 @@
// Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/
using System.ComponentModel.DataAnnotations;
namespace DiscImageChef.Server.Models
{
public class Filter
public class Filter : BaseModel<int>
{
[Key]
public int Id { get; set; }
public string Name { get; set; }
public long Count { get; set; }
}

View File

@@ -2,9 +2,8 @@ using System.Collections.Generic;
namespace DiscImageChef.Server.Models
{
public class FindReportModel
public class FindReportModel : BaseModel<int>
{
public int Id { get; set; }
public string Manufacturer { get; set; }
public string Model { get; set; }
public string Revision { get; set; }

View File

@@ -1,6 +1,6 @@
namespace DiscImageChef.Server.Models
{
public class IdHashModel
public class IdHashModel : BaseModel<int>
{
public IdHashModel(int id, string hash)
{
@@ -8,7 +8,6 @@ namespace DiscImageChef.Server.Models
Hash = hash;
}
public int Id { get; set; }
public string Hash { get; set; }
public string Description { get; set; }
public int[] Duplicates { get; set; }

View File

@@ -32,19 +32,16 @@
using System;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using DiscImageChef.CommonTypes;
namespace DiscImageChef.Server.Models
{
public class Media
public class Media : BaseModel<int>
{
[NotMapped]
(string type, string subType) _mediaType;
[Key]
public int Id { get; set; }
public string Type { get; set; }
public bool Real { get; set; }
public long Count { get; set; }

View File

@@ -30,15 +30,10 @@
// Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/
using System.ComponentModel.DataAnnotations;
namespace DiscImageChef.Server.Models
{
public class MediaFormat
public class MediaFormat : BaseModel<int>
{
[Key]
public int Id { get; set; }
public string Name { get; set; }
public long Count { get; set; }
}

View File

@@ -3,9 +3,8 @@ using System.ComponentModel.DataAnnotations;
namespace DiscImageChef.Server.Models
{
public class MmcModelForView
public class MmcModelForView : BaseModel<int>
{
public int Id { get; set; }
[DisplayFormat(NullDisplayText = "none"), DisplayName("MMC FEATURES ID")]
public int? FeaturesId { get; set; }
[DisplayName("Response length (bytes)")]

View File

@@ -30,15 +30,10 @@
// Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/
using System.ComponentModel.DataAnnotations;
namespace DiscImageChef.Server.Models
{
public class OperatingSystem
public class OperatingSystem : BaseModel<int>
{
[Key]
public int Id { get; set; }
public string Name { get; set; }
public string Version { get; set; }
public long Count { get; set; }

View File

@@ -30,15 +30,10 @@
// Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/
using System.ComponentModel.DataAnnotations;
namespace DiscImageChef.Server.Models
{
public class Partition
public class Partition : BaseModel<int>
{
[Key]
public int Id { get; set; }
public string Name { get; set; }
public long Count { get; set; }
}

View File

@@ -31,12 +31,11 @@
// ****************************************************************************/
using System;
using System.ComponentModel.DataAnnotations;
using Newtonsoft.Json;
namespace DiscImageChef.Server.Models
{
public class UsbProduct
public class UsbProduct : BaseModel<int>
{
public UsbProduct() { }
@@ -48,9 +47,6 @@ namespace DiscImageChef.Server.Models
Vendor = vendor;
}
[Key]
public int Id { get; set; }
public ushort ProductId { get; set; }
public string Product { get; set; }
public DateTime AddedWhen { get; set; }

View File

@@ -38,7 +38,7 @@ using Newtonsoft.Json;
namespace DiscImageChef.Server.Models
{
public class UsbVendor
public class UsbVendor : BaseModel<int>
{
public UsbVendor() { }
@@ -49,9 +49,6 @@ namespace DiscImageChef.Server.Models
AddedWhen = ModifiedWhen = DateTime.UtcNow;
}
[Key]
public int Id { get; set; }
[DisplayName("Manufacturer ID"), DisplayFormat(DataFormatString = "0x{0:X4}")]
public ushort VendorId { get; set; }
[DisplayName("Manufacturer")]

View File

@@ -30,15 +30,10 @@
// Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/
using System.ComponentModel.DataAnnotations;
namespace DiscImageChef.Server.Models
{
public class Version
public class Version : BaseModel<int>
{
[Key]
public int Id { get; set; }
public string Value { get; set; }
public long Count { get; set; }
}