mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: создана структура проекта, core, domain, infrastructure. Перенесены enum и task согласно архитектуры

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-04-13 16:58:30 +10:00
parent 0bbbac09fe
commit da83aff19c
160 changed files with 482 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PARR.DAL/Models/AgentHistory.cs
View File

@@ -1,4 +1,4 @@
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -8,7 +8,7 @@ namespace PARR.DAL.Models
/// История работы агентов
/// </summary>
[Table("AgentHistories")]
public class AgentHistory : IBase
public class AgentHistory : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Application.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -7,7 +7,7 @@ namespace PARR.DAL.Models
{
[Table("Applications")]
[Index(nameof(Name), nameof(ApplicationTypeId), IsUnique = true)]
public class Application : IBase
public class Application : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/ApplicationInHost.cs
View File

@@ -1,10 +1,10 @@
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models
{
[Table("ApplicationsInHost")]
public class ApplicationInHost : IBase
public class ApplicationInHost : IBaseEntity
{
public Guid Id { get; set; }
public DateTimeOffset DateCreated { get; set; }

4
PARR.DAL/Models/ApplicationType.cs
View File

@@ -1,10 +1,10 @@
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models
{
[Table("ApplicationTypes")]
public class ApplicationType : IBase
public class ApplicationType : IBaseEntity
{
public Guid Id { get; set; }
public DateTimeOffset DateCreated { get; set; }

4
PARR.DAL/Models/ApplicationsInWork.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Models.Base;
using PARR.DAL.Settings;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -8,7 +8,7 @@ namespace PARR.DAL.Models
{
[Table("ApplicationsInWorks")]
[Index(nameof(WorkId), nameof(ApplicationId), IsUnique = true)]
public class ApplicationsInWork : IBase
public class ApplicationsInWork : IBaseEntity
{
[Key]
public Guid Id { get; set; }

18
PARR.DAL/Models/Base/History/Base/IHistoryTable.cs
View File

@@ -1,18 +0,0 @@
namespace PARR.DAL.Models.Base.History.Base
{
/// <summary>
/// Таблица отслеживания изменений основной таблицы (таблица истории)
/// </summary>
public interface IHistoryTable : IBase
{
/// <summary>
/// Id записи в родительской таблице
/// </summary>
public Guid ParentId { get; set; }
/// <summary>
/// Дата добавления в историю
/// </summary>
public DateTimeOffset DateAddedToHistory { get; set; }
}
}

9
PARR.DAL/Models/Base/History/Base/IMyHistory.cs
View File

@@ -1,9 +0,0 @@
namespace PARR.DAL.Models.Base.History.Base
{
/// <summary>
/// По этому интерфейсу определям, что хотим вести историю.
/// В родительской таблице, по которой ведется история, указываются настройки истории.
/// </summary>
/// <typeparam name="HistoryTable">Таблица истории</typeparam>
public interface IMyHistory<HistoryTable> where HistoryTable : class { }
}

15
PARR.DAL/Models/Base/History/ITemplateGeneralProps.cs
View File

@@ -1,15 +0,0 @@
namespace PARR.DAL.Models.Base.History
{
public interface ITemplateGeneralProps
{
public string Name { get; set; }
public bool IsActiveTemplate { get; set; }
public bool IsActiveSchedule { get; set; }
public DateTimeOffset? LastRun { get; set; }
public DateTimeOffset NextRun { get; set; }
}
}

11
PARR.DAL/Models/Base/IBase.cs
View File

@@ -1,11 +0,0 @@
namespace PARR.DAL.Models.Base
{
public interface IBase: IBaseDateCreated, IBaseDateModified
{
Guid Id { get; set; }
//DateTimeOffset DateCreated { get; set; }
//DateTimeOffset? DateModified { get; set; }
}
}

7
PARR.DAL/Models/Base/IBaseDateCreated.cs
View File

@@ -1,7 +0,0 @@
namespace PARR.DAL.Models.Base
{
public interface IBaseDateCreated
{
DateTimeOffset DateCreated { get; set; }
}
}

7
PARR.DAL/Models/Base/IBaseDateModified.cs
View File

@@ -1,7 +0,0 @@
namespace PARR.DAL.Models.Base
{
public interface IBaseDateModified
{
DateTimeOffset? DateModified { get; set; }
}
}

7
PARR.DAL/Models/DistributionPeriod.cs
View File

@@ -1,7 +1,6 @@
using PARR.Constants;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.DAL.Context;
using PARR.DAL.Models.Job;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -11,7 +10,7 @@ namespace PARR.DAL.Models
/// Период автоматического распеделения РР
/// </summary>
[Table("DistributionPeriods", Schema = DataContextSettings.Schedule)]
public class DistributionPeriod : IBase
public class DistributionPeriod : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/EsppSchTypeConfig.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -11,7 +11,7 @@ namespace PARR.DAL.Models
/// </summary>
[Table("EsppSchTypeConfigs", Schema = DataContextSettings.Schedule)]
[Index(nameof(TypeScheduleId), nameof(TypeId), IsUnique = true)]
public class EsppSchTypeConfig : IBase
public class EsppSchTypeConfig : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/EsppSchTypeValue.cs
View File

@@ -1,5 +1,5 @@
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -9,7 +9,7 @@ namespace PARR.DAL.Models
/// Расписание ЕСПП: значения типов повторений
/// </summary>
[Table("EsppSchTypeValues", Schema = DataContextSettings.Schedule)]
public class EsppSchTypeValue : IBase
public class EsppSchTypeValue : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Host.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -8,7 +8,7 @@ namespace PARR.DAL.Models
[Table("Hosts")]
[Index(nameof(IP))]
[Index(nameof(Ek), IsUnique = true)]
public class Host : IBase
public class Host : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Job/Job.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -8,7 +8,7 @@ namespace PARR.DAL.Models.Job
{
[Table("Jobs", Schema = DataContextSettings.Job)]
[Comment("Таблица видов работ")]
public class Job : IBase
public class Job : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Job/JobFieldFilter.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.DAL.Models.Unit;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -9,7 +9,7 @@ namespace PARR.DAL.Models.Job
{
[Table("FieldFilters", Schema = DataContextSettings.Job)]
[Comment("Таблица описания критериев выборки аттрибутов ЭК")]
public class JobFieldFilter : IBase
public class JobFieldFilter : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Job/JobGroup.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.DAL.Models.Schedule;
using PARR.DAL.Models.Unit;
using PARR.DAL.Settings;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -11,7 +11,7 @@ namespace PARR.DAL.Models.Job
{
[Table("Groups", Schema = DataContextSettings.Job)]
[Comment("Таблица описания групп работ, для реализации зонтиков")]
public class JobGroup : IBase
public class JobGroup : IBaseEntity
{
[Key]
public Guid Id { get; set; }

6
PARR.DAL/Models/Job/JobGroupType.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Contracts;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using PARR.Domain.Enums;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -9,7 +9,7 @@ namespace PARR.DAL.Models.Job
{
[Table("GroupTypes", Schema = DataContextSettings.Job)]
[Comment("Таблица типов групп работ")]
public class JobGroupType : IBase
public class JobGroupType : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Job/JobUnitFilter.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -8,7 +8,7 @@ namespace PARR.DAL.Models.Job
{
[Table("UnitFilters", Schema = DataContextSettings.Job)]
[Comment("Таблица описания критериев выборки ЭК, описание полей в АСУ ЕСПП")]
public class JobUnitFilter : IBase
public class JobUnitFilter : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Order.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -10,7 +10,7 @@ namespace PARR.DAL.Models
/// </summary>
[Table("Orders")]
[Index(nameof(Number), IsUnique = true)]
public class Order : IBase
public class Order : IBaseEntity
{
[Key]
public Guid Id { get; set; }

2
PARR.DAL/Models/ParrComponent.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.EntityFrameworkCore;
using PARR.Constants;
using PARR.Domain.Enums;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

4
PARR.DAL/Models/Process.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -7,7 +7,7 @@ namespace PARR.DAL.Models
{
[Table("Processes")]
[Index(nameof(EsppId), IsUnique = true)]
public class Process : IBase
public class Process : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/RobotConfiguration.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -9,7 +9,7 @@ namespace PARR.DAL.Models
[Index(nameof(TemplateId), nameof(RobotCode), IsUnique = true)]
[Index(nameof(TemplateId), nameof(TaskStatusCode))]
[Index(nameof(TemplateId), nameof(RobotStatusCode))]
public class RobotConfiguration : IBase
public class RobotConfiguration : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/RobotHistory.cs
View File

@@ -1,10 +1,10 @@
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models
{
[Table("RobotHistories")]
public class RobotHistory : IBase
public class RobotHistory : IBaseEntity
{
public Guid Id { get; set; }

4
PARR.DAL/Models/Role.cs
View File

@@ -1,11 +1,11 @@
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models
{
[Table("Roles")]
public class Role : IBase
public class Role : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Schedule/ScheduleExcludeType.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.DAL.Models.Job;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -12,7 +12,7 @@ namespace PARR.DAL.Models.Schedule
/// </summary>
[Table("ExcludeTypes", Schema = DataContextSettings.Schedule)]
[Comment("Расписание регламентной работы - Тип исключения")]
public class ScheduleExcludeType : IBase
public class ScheduleExcludeType : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Schedule/ScheduleExcludeTypeCalendar.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.DAL.Models.Job;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -12,7 +12,7 @@ namespace PARR.DAL.Models.Schedule
/// </summary>
[Table("ExcludeTypeCalendars", Schema = DataContextSettings.Schedule)]
[Comment("Расписание регламентной работы, исключение - Календарь")]
public class ScheduleExcludeTypeCalendar : IBase
public class ScheduleExcludeTypeCalendar : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Subprocess.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -7,7 +7,7 @@ namespace PARR.DAL.Models
{
[Table("Subprocesses")]
[Index(nameof(EsppId), IsUnique = true)]
public class Subprocess : IBase
public class Subprocess : IBaseEntity
{
[Key]
public Guid Id { get; set; }

32
PARR.DAL/Models/TaskModels/TaskError.cs
View File

@@ -1,32 +0,0 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models.TaskModels
{
[Table("Errors", Schema = DataContextSettings.Task)]
[Comment("Таблица ошибок заданий")]
public class TaskError : IBase
{
[Key]
public Guid Id { get; set; }
public DateTimeOffset DateCreated { get; set; }
[NotMapped]
public DateTimeOffset? DateModified { get; set; }
public Guid TaskId { get; set; }
public int AttemptNumber { get; set; }
public required string ErrorMessage { get; set; }
public string? StackTrace { get; set; }
[ForeignKey(nameof(TaskId))]
public TaskItem? TaskItem { get; set; }
}
}

53
PARR.DAL/Models/TaskModels/TaskItem.cs
View File

@@ -1,53 +0,0 @@
using Microsoft.EntityFrameworkCore;
using PARR.Common.Domain;
using PARR.Constants;
using PARR.DAL.Context;
using PARR.DAL.Contracts;
using PARR.DAL.Models.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models.TaskModels
{
[Table("Tasks", Schema = DataContextSettings.Task)]
[Comment("Таблица заданий")]
public class TaskItem : IBase, IHistoryInitiator
{
[Key]
public Guid Id { get; set; }
public DateTimeOffset DateCreated { get; set; }
public DateTimeOffset? DateModified { get; set; }
public TaskTypeEnum TypeCode { get; set; }
public TaskItemStatusEnum StatusCode { get; set; }
public string? Payload { get; set; }
/// <summary>
/// Кол-во попыток
/// </summary>
public int RetryCount { get; set; }
/// <summary>
/// Дата завершения (устанавливается или когда Успех или когда Ошибка)
/// </summary>
public DateTimeOffset? ProcessedAt { get; set; }
public string? InitiatorIp { get; set; }
public ParrComponentsEnum? InitiatorParrComponentId { get; set; }
public string? InitiatorComment { get; set; }
[ForeignKey(nameof(TypeCode))]
public TaskType? TaskType { get; set; }
[ForeignKey(nameof(StatusCode))]
public TaskStatus? TaskStatus { get; set; }
public ICollection<TaskError> TaskErrors { get; set; } = new HashSet<TaskError>();
}
}

23
PARR.DAL/Models/TaskModels/TaskStatus.cs
View File

@@ -1,23 +0,0 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Contracts;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models.TaskModels
{
[Table("Statuses", Schema = DataContextSettings.Task)]
[Comment("Таблица статусов заданий")]
public class TaskStatus
{
[Key]
public TaskItemStatusEnum Code { get; set; }
public required string Name { get; set; }
public required string Description { get; set; }
public ICollection<TaskItem> Tasks { get; set; } = new HashSet<TaskItem>();
}
}

43
PARR.DAL/Models/TaskModels/TaskType.cs
View File

@@ -1,43 +0,0 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Contracts;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models.TaskModels
{
[Table("Types", Schema = DataContextSettings.Task)]
[Comment("Таблица типов заданий")]
public class TaskType
{
[Key]
public TaskTypeEnum Code { get; set; }
public required string Name { get; set; }
public required string Description { get; set; }
/// <summary>
/// Максимальное кол-во попыток
/// </summary>
public int MaxRetries { get; set; }
/// <summary>
/// Максимальное время выполнения
/// </summary>
public int MaxExecutionTimeMinutes { get; set; }
/// <summary>
/// Одновременно может быть только одна задача или несколько
/// </summary>
public bool IsSingleton { get; set; }
/// <summary>
/// Сколько дней хранить в БД
/// </summary>
public int RetentionDays { get; set; }
public ICollection<TaskItem> Tasks { get; set; } = new HashSet<TaskItem>();
}
}

10
PARR.DAL/Models/Template.cs
View File

@@ -1,9 +1,9 @@
using Microsoft.EntityFrameworkCore;
using PARR.Common.Domain;
using PARR.Constants;
using PARR.DAL.Models.Base;
using PARR.DAL.Models.Base.History;
using PARR.DAL.Models.Base.History.Base;
using PARR.Domain.Entities.Base;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Entities.Base.History.Base;
using PARR.Domain.Enums;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -11,7 +11,7 @@ namespace PARR.DAL.Models
{
[Table("Templates")]
[Index(nameof(Name), nameof(Index), IsUnique = true)]
public class Template : IBase, ITemplateGeneralProps, IHistoryInitiator, IMyHistory<TemplateHistory>
public class Template : IBaseEntity, ITemplateGeneralProps, IHistoryInitiator, IMyHistory<TemplateHistory>
{
[Key]
public Guid Id { get; set; }

12
PARR.DAL/Models/TemplateHistory.cs
View File

@@ -1,15 +1,15 @@
using PARR.Common.Domain;
using PARR.Constants;
using PARR.DAL.Models.Base;
using PARR.DAL.Models.Base.History;
using PARR.DAL.Models.Base.History.Base;
using PARR.Constants;
using PARR.Domain.Entities.Base;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Entities.Base.History.Base;
using PARR.Domain.Enums;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models
{
[Table("TemplateHistories")]
public class TemplateHistory : IBase, ITemplateGeneralProps, IHistoryInitiator, IHistoryTable
public class TemplateHistory : IBaseEntity, ITemplateGeneralProps, IHistoryInitiator, IHistoryTable
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Tnk.cs
View File

@@ -1,4 +1,4 @@
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -6,7 +6,7 @@ namespace PARR.DAL.Models
{
[Table("Tnks")]
//[Index(nameof(EsppId), IsUnique = true)]
public class Tnk : IBase
public class Tnk : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Unit/Unit.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -9,7 +9,7 @@ namespace PARR.DAL.Models.Unit
[Table("Units", Schema = DataContextSettings.Unit)]
[Comment("Таблица с ЭК")]
[Index(nameof(Name), IsUnique = true)]
public class Unit : IBase
public class Unit : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Unit/UnitField.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.DAL.Models.Job;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -14,7 +14,7 @@ namespace PARR.DAL.Models.Unit
[Comment("Справочник полей ЭК")]
[Index(nameof(AihitName))]
[Index(nameof(EsppName))]
public class UnitField : IBase
public class UnitField : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Unit/UnitFieldInUnitFieldValue.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models.Unit
@@ -8,7 +8,7 @@ namespace PARR.DAL.Models.Unit
[Table("FieldInFieldValues", Schema = DataContextSettings.Unit)]
[Comment("Значения полей ЭК")]
[PrimaryKey(nameof(FieldId), nameof(FieldValueId))]
public class UnitFieldInUnitFieldValue : IBaseDateCreated
public class UnitFieldInUnitFieldValue : IBaseEntityDateCreated
{
public Guid FieldId { get; set; }

4
PARR.DAL/Models/Unit/UnitFieldValue.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -9,7 +9,7 @@ namespace PARR.DAL.Models.Unit
[Table("FieldValues", Schema = DataContextSettings.Unit)]
[Comment("Значения полей ЭК")]
[Index(nameof(Value), IsUnique = true)]
public class UnitFieldValue : IBase
public class UnitFieldValue : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/Unit/UnitInValue.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models.Unit
@@ -12,7 +12,7 @@ namespace PARR.DAL.Models.Unit
[Index(nameof(FieldId), nameof(ValueId))]
[Index(nameof(UnitId), nameof(FieldId))]
[Index(nameof(FieldId), nameof(UnitId))]
public class UnitInValue : IBaseDateModified, IBaseDateCreated
public class UnitInValue : IBaseEntityDateModified, IBaseEntityDateCreated
{
public Guid UnitId { get; set; }

4
PARR.DAL/Models/User.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -7,7 +7,7 @@ namespace PARR.DAL.Models
{
[Table("Users")]
[Index(nameof(Ip), IsUnique = true)]
public class User : IBase
public class User : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/WeekendDay.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -8,7 +8,7 @@ namespace PARR.DAL.Models
{
[Table("WeekendDays", Schema = DataContextSettings.Schedule)]
[Index(nameof(Date), IsUnique = true)]
public class WeekendDay : IBase
public class WeekendDay : IBaseEntity
{
[Key]
public Guid Id { get; set; }

4
PARR.DAL/Models/WorkGroup.cs
View File

@@ -1,11 +1,11 @@
using PARR.DAL.Models.Base;
using PARR.Domain.Entities.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models
{
[Table("WorkGroups")]
public class WorkGroup : IBase
public class WorkGroup : IBaseEntity
{
[Key]
public Guid Id { get; set; }