update

2023-07-20 21:38:05 +03:00
parent 4bac59f322
commit 2f108bef4f
35 changed files with 1863 additions and 909 deletions
@@ -1,6 +1,7 @@
 namespace MyOffice.Web.Models.Item
 {
 	using System.ComponentModel.DataAnnotations;
+	using Data.Models.Accounts;
 	using MyOffice.Core.Extensions;
 	using MyOffice.Data.Models.Items;

@@ -9,24 +10,26 @@
 		public string? Id { get; set; }

 		public string CategoryId { get; set; } = null!;
-		public string Category { get; set; } = null!;
+		public string? Category { get; set; } = null!;
 		[Required]
 		public string? Name { get; set; }

 		public bool AllowDelete { get; set; }
+		public string? AccountId { get; set; }
 	}

 	public static class ItemViewModelExtensions
 	{
-		public static ItemViewModel ToModel(this Item input)
+		public static ItemViewModel ToModel(this Item input, Account? account = null)
 		{
 			return new ItemViewModel
 			{
-				Id = input.ItemGlobalId.ToShort(),
-				CategoryId = input.Category.Id.ToShort(),
-				Category = input.Category.Name,
+				Id = input.ItemGlobal.Id.ToShort(),
+				CategoryId = input.CategoryId.ToShort(),
+				Category = input.Category?.Name,
 				Name = input.ItemGlobal.Name,
-				AllowDelete = !input.Motions.Any(),
+				AllowDelete = input.Motions != null && !input.Motions.Any(),
+				AccountId = account?.Id.ToShort(),
 			};
 		}
 	}