From e9484f948292612420ecd305b414874c7d88b63f Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Wed, 17 Apr 2024 23:12:10 +0400
Subject: [PATCH 1/8] =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0.=20?=
 =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=20=D0=BA=D0=BB=D0=B0=D1=81?=
 =?UTF-8?q?=D1=81=D1=8B-=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9?=
 =?UTF-8?q?=D1=81=D1=8B=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Polyclinic/PolyclinicDataModels/Models/.gitkeep       |  0
 .../PolyclinicDataModels/Models/ICourseModel.cs       | 11 +++++++++++
 .../PolyclinicDataModels/Models/IDiagnosisModel.cs    |  8 ++++++++
 .../PolyclinicDataModels/Models/ISymptomModel.cs      | 10 ++++++++++
 4 files changed, 29 insertions(+)
 delete mode 100644 Polyclinic/PolyclinicDataModels/Models/.gitkeep
 create mode 100644 Polyclinic/PolyclinicDataModels/Models/ICourseModel.cs
 create mode 100644 Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs
 create mode 100644 Polyclinic/PolyclinicDataModels/Models/ISymptomModel.cs

diff --git a/Polyclinic/PolyclinicDataModels/Models/.gitkeep b/Polyclinic/PolyclinicDataModels/Models/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/Polyclinic/PolyclinicDataModels/Models/ICourseModel.cs b/Polyclinic/PolyclinicDataModels/Models/ICourseModel.cs
new file mode 100644
index 0000000..acd5ed7
--- /dev/null
+++ b/Polyclinic/PolyclinicDataModels/Models/ICourseModel.cs
@@ -0,0 +1,11 @@
+namespace PolyclinicDataModels.Models
+{
+    public interface ICourseModel
+    {
+        int DaysCount { get; }
+        int PillsPerDay { get; }
+        string Comment { get; }
+        Dictionary<int, IDiagnosisModel> CourseDiagnosis { get; }
+        Dictionary<int, IRecipeModel> CourseRecipes { get; }
+    }
+}
diff --git a/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs b/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs
new file mode 100644
index 0000000..d46440b
--- /dev/null
+++ b/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs
@@ -0,0 +1,8 @@
+namespace PolyclinicDataModels.Models
+{
+    public interface IDiagnosisModel
+    {
+        string Name { get; }
+        string Comment { get; }
+    }
+}
diff --git a/Polyclinic/PolyclinicDataModels/Models/ISymptomModel.cs b/Polyclinic/PolyclinicDataModels/Models/ISymptomModel.cs
new file mode 100644
index 0000000..64a9988
--- /dev/null
+++ b/Polyclinic/PolyclinicDataModels/Models/ISymptomModel.cs
@@ -0,0 +1,10 @@
+namespace PolyclinicDataModels.Models
+{
+    public interface ISymptomModel : IId
+    {
+        string Name { get; }
+        string Comment { get; }
+        Dictionary<int, IDiagnosisModel> SymptomDiagnosis { get; }
+        Dictionary<int, IRecipeModel> SymptomRecipes { get; }
+    }
+}

From 8c26c64dfe98a09a95ea2affaac09ad2dea184d4 Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Wed, 17 Apr 2024 23:21:57 +0400
Subject: [PATCH 2/8] =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0.=20?=
 =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BC?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F-=D0=B8=D1=81=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D0=B5=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PolyclinicDataModels/Models/IDiagnosisModel.cs       | 1 +
 Polyclinic/PolyclinicDataModels/Models/IExecutorModel.cs | 9 +++++++++
 .../PolyclinicDataModels/PolyclinicDataModels.csproj     | 4 ----
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 Polyclinic/PolyclinicDataModels/Models/IExecutorModel.cs

diff --git a/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs b/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs
index d46440b..484e6e9 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs
@@ -4,5 +4,6 @@
     {
         string Name { get; }
         string Comment { get; }
+        string ExecutorId { get; }
     }
 }
diff --git a/Polyclinic/PolyclinicDataModels/Models/IExecutorModel.cs b/Polyclinic/PolyclinicDataModels/Models/IExecutorModel.cs
new file mode 100644
index 0000000..8806f42
--- /dev/null
+++ b/Polyclinic/PolyclinicDataModels/Models/IExecutorModel.cs
@@ -0,0 +1,9 @@
+namespace PolyclinicDataModels.Models
+{
+    public interface IExecutorModel
+    {
+        string FIO {  get; }
+        string Email { get; }
+        string Password { get; }
+    }
+}
diff --git a/Polyclinic/PolyclinicDataModels/PolyclinicDataModels.csproj b/Polyclinic/PolyclinicDataModels/PolyclinicDataModels.csproj
index 962b8f6..27ac386 100644
--- a/Polyclinic/PolyclinicDataModels/PolyclinicDataModels.csproj
+++ b/Polyclinic/PolyclinicDataModels/PolyclinicDataModels.csproj
@@ -6,8 +6,4 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="Models\" />
-  </ItemGroup>
-
 </Project>

From 296a2845ecb928c4fcb9db765546e33471a89057 Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Wed, 17 Apr 2024 23:33:33 +0400
Subject: [PATCH 3/8] =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0.=20?=
 =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=B9,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B1=D0=B8=D0=BD=D0=B4=D0=B8=D0=BD=D0=B3=20=D0=BC=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PolyclinicContracts/BindingModels/.gitkeep     |  0
 .../BindingModels/CourseBindingModel.cs            | 14 ++++++++++++++
 .../BindingModels/DiagnosisBindingModel.cs         | 12 ++++++++++++
 .../BindingModels/ExecutorBindingModel.cs          | 12 ++++++++++++
 .../BindingModels/SymptomBindingModel.cs           | 13 +++++++++++++
 .../PolyclinicContracts/PolyclinicContracts.csproj |  5 ++++-
 .../PolyclinicDataModels/Models/ICourseModel.cs    |  2 +-
 .../PolyclinicDataModels/Models/IDiagnosisModel.cs |  4 ++--
 .../PolyclinicDataModels/Models/IExecutorModel.cs  |  2 +-
 9 files changed, 59 insertions(+), 5 deletions(-)
 delete mode 100644 Polyclinic/PolyclinicContracts/BindingModels/.gitkeep
 create mode 100644 Polyclinic/PolyclinicContracts/BindingModels/CourseBindingModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/BindingModels/DiagnosisBindingModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/BindingModels/ExecutorBindingModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/BindingModels/SymptomBindingModel.cs

diff --git a/Polyclinic/PolyclinicContracts/BindingModels/.gitkeep b/Polyclinic/PolyclinicContracts/BindingModels/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/CourseBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/CourseBindingModel.cs
new file mode 100644
index 0000000..611bfe5
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BindingModels/CourseBindingModel.cs
@@ -0,0 +1,14 @@
+using PolyclinicDataModels.Models;
+
+namespace PolyclinicContracts.BindingModels
+{
+    public class CourseBindingModel : ICourseModel
+    {
+        public int DaysCount { get; set; }
+        public int PillsPerDay { get; set; }
+        public string Comment { get; set; } = string.Empty;
+        public Dictionary<int, IDiagnosisModel> CourseDiagnosis { get; set; } = new();
+        public Dictionary<int, IRecipeModel> CourseRecipes { get; set; } = new();
+        public int Id { get; set; }
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/DiagnosisBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/DiagnosisBindingModel.cs
new file mode 100644
index 0000000..9d936df
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BindingModels/DiagnosisBindingModel.cs
@@ -0,0 +1,12 @@
+using PolyclinicDataModels.Models;
+
+namespace PolyclinicContracts.BindingModels
+{
+    public class DiagnosisBindingModel : IDiagnosisModel
+    {
+        public string Name { get; set; } = string.Empty;
+        public string Comment { get; set; } = string.Empty;
+        public int ExecutorId { get; set; }
+        public int Id { get; set; }
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/ExecutorBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/ExecutorBindingModel.cs
new file mode 100644
index 0000000..f97a6fe
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BindingModels/ExecutorBindingModel.cs
@@ -0,0 +1,12 @@
+using PolyclinicDataModels.Models;
+
+namespace PolyclinicContracts.BindingModels
+{
+    public class ExecutorBindingModel : IExecutorModel
+    {
+        public string FIO { get; set; } = string.Empty;
+        public string Email { get; set; } = string.Empty;
+        public string Password { get; set; } = string.Empty;
+        public int Id { get; set; }
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/BindingModels/SymptomBindingModel.cs b/Polyclinic/PolyclinicContracts/BindingModels/SymptomBindingModel.cs
new file mode 100644
index 0000000..bc4c191
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BindingModels/SymptomBindingModel.cs
@@ -0,0 +1,13 @@
+using PolyclinicDataModels.Models;
+
+namespace PolyclinicContracts.BindingModels
+{
+    public class SymptomBindingModel : ISymptomModel
+    {
+        public string Name { get; set; } = string.Empty;
+        public string Comment { get; set; } = string.Empty;
+        public Dictionary<int, IDiagnosisModel> SymptomDiagnosis { get; set; } = new();
+        public Dictionary<int, IRecipeModel> SymptomRecipes { get; set; } = new();
+        public int Id { get; set; }
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
index d7f6b16..8eca715 100644
--- a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
+++ b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
@@ -7,11 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="BindingModels\" />
     <Folder Include="StoragesContracts\" />
     <Folder Include="SearchModels\" />
     <Folder Include="ViewModels\" />
     <Folder Include="BusinessLogicsContracts\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\PolyclinicDataModels\PolyclinicDataModels.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/Polyclinic/PolyclinicDataModels/Models/ICourseModel.cs b/Polyclinic/PolyclinicDataModels/Models/ICourseModel.cs
index acd5ed7..f018879 100644
--- a/Polyclinic/PolyclinicDataModels/Models/ICourseModel.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/ICourseModel.cs
@@ -1,6 +1,6 @@
 namespace PolyclinicDataModels.Models
 {
-    public interface ICourseModel
+    public interface ICourseModel : IId
     {
         int DaysCount { get; }
         int PillsPerDay { get; }
diff --git a/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs b/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs
index 484e6e9..7e23ea8 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IDiagnosisModel.cs
@@ -1,9 +1,9 @@
 namespace PolyclinicDataModels.Models
 {
-    public interface IDiagnosisModel
+    public interface IDiagnosisModel : IId
     {
         string Name { get; }
         string Comment { get; }
-        string ExecutorId { get; }
+        int ExecutorId { get; }
     }
 }
diff --git a/Polyclinic/PolyclinicDataModels/Models/IExecutorModel.cs b/Polyclinic/PolyclinicDataModels/Models/IExecutorModel.cs
index 8806f42..44b0365 100644
--- a/Polyclinic/PolyclinicDataModels/Models/IExecutorModel.cs
+++ b/Polyclinic/PolyclinicDataModels/Models/IExecutorModel.cs
@@ -1,6 +1,6 @@
 namespace PolyclinicDataModels.Models
 {
-    public interface IExecutorModel
+    public interface IExecutorModel : IId
     {
         string FIO {  get; }
         string Email { get; }

From ab31efdf506da35c4a2405fe2cb359c55a4ecb27 Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Wed, 17 Apr 2024 23:36:39 +0400
Subject: [PATCH 4/8] =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0.=20?=
 =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=20search=20=D0=BC=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj   | 1 -
 Polyclinic/PolyclinicContracts/SearchModels/.gitkeep        | 0
 .../PolyclinicContracts/SearchModels/CourseSearchModel.cs   | 6 ++++++
 .../SearchModels/DiagnosisSearchModel.cs                    | 6 ++++++
 .../PolyclinicContracts/SearchModels/ExecutorSearchModel.cs | 6 ++++++
 .../PolyclinicContracts/SearchModels/SymptomSearchModel.cs  | 6 ++++++
 6 files changed, 24 insertions(+), 1 deletion(-)
 delete mode 100644 Polyclinic/PolyclinicContracts/SearchModels/.gitkeep
 create mode 100644 Polyclinic/PolyclinicContracts/SearchModels/CourseSearchModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/SearchModels/DiagnosisSearchModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/SearchModels/ExecutorSearchModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/SearchModels/SymptomSearchModel.cs

diff --git a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
index 8eca715..acf6006 100644
--- a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
+++ b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <Folder Include="StoragesContracts\" />
-    <Folder Include="SearchModels\" />
     <Folder Include="ViewModels\" />
     <Folder Include="BusinessLogicsContracts\" />
   </ItemGroup>
diff --git a/Polyclinic/PolyclinicContracts/SearchModels/.gitkeep b/Polyclinic/PolyclinicContracts/SearchModels/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/Polyclinic/PolyclinicContracts/SearchModels/CourseSearchModel.cs b/Polyclinic/PolyclinicContracts/SearchModels/CourseSearchModel.cs
new file mode 100644
index 0000000..efdf047
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/SearchModels/CourseSearchModel.cs
@@ -0,0 +1,6 @@
+namespace PolyclinicContracts.SearchModels
+{
+    public class CourseSearchModel
+    {
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/SearchModels/DiagnosisSearchModel.cs b/Polyclinic/PolyclinicContracts/SearchModels/DiagnosisSearchModel.cs
new file mode 100644
index 0000000..d6ebf86
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/SearchModels/DiagnosisSearchModel.cs
@@ -0,0 +1,6 @@
+namespace PolyclinicContracts.SearchModels
+{
+    public class DiagnosisSearchModel
+    {
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/SearchModels/ExecutorSearchModel.cs b/Polyclinic/PolyclinicContracts/SearchModels/ExecutorSearchModel.cs
new file mode 100644
index 0000000..31c1a5c
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/SearchModels/ExecutorSearchModel.cs
@@ -0,0 +1,6 @@
+namespace PolyclinicContracts.SearchModels
+{
+    public class ExecutorSearchModel
+    {
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/SearchModels/SymptomSearchModel.cs b/Polyclinic/PolyclinicContracts/SearchModels/SymptomSearchModel.cs
new file mode 100644
index 0000000..5c9f521
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/SearchModels/SymptomSearchModel.cs
@@ -0,0 +1,6 @@
+namespace PolyclinicContracts.SearchModels
+{
+    public class SymptomSearchModel
+    {
+    }
+}

From 89a7a7364b16ffec759c14720a254dc4f75e4c21 Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Wed, 17 Apr 2024 23:43:41 +0400
Subject: [PATCH 5/8] =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0.=20?=
 =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D0=BB=20?=
 =?UTF-8?q?search=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PolyclinicContracts/SearchModels/CourseSearchModel.cs      | 1 +
 .../PolyclinicContracts/SearchModels/DiagnosisSearchModel.cs   | 2 ++
 .../PolyclinicContracts/SearchModels/ExecutorSearchModel.cs    | 3 +++
 .../PolyclinicContracts/SearchModels/SymptomSearchModel.cs     | 1 +
 4 files changed, 7 insertions(+)

diff --git a/Polyclinic/PolyclinicContracts/SearchModels/CourseSearchModel.cs b/Polyclinic/PolyclinicContracts/SearchModels/CourseSearchModel.cs
index efdf047..7cb5772 100644
--- a/Polyclinic/PolyclinicContracts/SearchModels/CourseSearchModel.cs
+++ b/Polyclinic/PolyclinicContracts/SearchModels/CourseSearchModel.cs
@@ -2,5 +2,6 @@
 {
     public class CourseSearchModel
     {
+        public int? Id { get; set; }
     }
 }
diff --git a/Polyclinic/PolyclinicContracts/SearchModels/DiagnosisSearchModel.cs b/Polyclinic/PolyclinicContracts/SearchModels/DiagnosisSearchModel.cs
index d6ebf86..812bfa3 100644
--- a/Polyclinic/PolyclinicContracts/SearchModels/DiagnosisSearchModel.cs
+++ b/Polyclinic/PolyclinicContracts/SearchModels/DiagnosisSearchModel.cs
@@ -2,5 +2,7 @@
 {
     public class DiagnosisSearchModel
     {
+        public int? Id { get; set; }
+        public int? ExecutorId { get; set; }
     }
 }
diff --git a/Polyclinic/PolyclinicContracts/SearchModels/ExecutorSearchModel.cs b/Polyclinic/PolyclinicContracts/SearchModels/ExecutorSearchModel.cs
index 31c1a5c..872b783 100644
--- a/Polyclinic/PolyclinicContracts/SearchModels/ExecutorSearchModel.cs
+++ b/Polyclinic/PolyclinicContracts/SearchModels/ExecutorSearchModel.cs
@@ -2,5 +2,8 @@
 {
     public class ExecutorSearchModel
     {
+        public int? Id { get; set; }
+        public string? Email { get; set; }
+        public string? Password { get; set; }
     }
 }
diff --git a/Polyclinic/PolyclinicContracts/SearchModels/SymptomSearchModel.cs b/Polyclinic/PolyclinicContracts/SearchModels/SymptomSearchModel.cs
index 5c9f521..156f028 100644
--- a/Polyclinic/PolyclinicContracts/SearchModels/SymptomSearchModel.cs
+++ b/Polyclinic/PolyclinicContracts/SearchModels/SymptomSearchModel.cs
@@ -2,5 +2,6 @@
 {
     public class SymptomSearchModel
     {
+        public int? Id { get; set; }
     }
 }

From ed6cd3be2e5079ab17ad012ed41bd0aca7226e24 Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Thu, 18 Apr 2024 00:10:00 +0400
Subject: [PATCH 6/8] =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0.=20?=
 =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=20view=20=D0=BC=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PolyclinicContracts.csproj                 |  1 -
 .../PolyclinicContracts/ViewModels/.gitkeep    |  0
 .../ViewModels/CourseViewModel.cs              | 18 ++++++++++++++++++
 .../ViewModels/DiagnosisViewModel.cs           | 15 +++++++++++++++
 .../ViewModels/ExecutorViewModel.cs            | 15 +++++++++++++++
 .../ViewModels/SymptomViewModel.cs             | 16 ++++++++++++++++
 6 files changed, 64 insertions(+), 1 deletion(-)
 delete mode 100644 Polyclinic/PolyclinicContracts/ViewModels/.gitkeep
 create mode 100644 Polyclinic/PolyclinicContracts/ViewModels/CourseViewModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/ViewModels/DiagnosisViewModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/ViewModels/ExecutorViewModel.cs
 create mode 100644 Polyclinic/PolyclinicContracts/ViewModels/SymptomViewModel.cs

diff --git a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
index acf6006..7432a2a 100644
--- a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
+++ b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <Folder Include="StoragesContracts\" />
-    <Folder Include="ViewModels\" />
     <Folder Include="BusinessLogicsContracts\" />
   </ItemGroup>
 
diff --git a/Polyclinic/PolyclinicContracts/ViewModels/.gitkeep b/Polyclinic/PolyclinicContracts/ViewModels/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/Polyclinic/PolyclinicContracts/ViewModels/CourseViewModel.cs b/Polyclinic/PolyclinicContracts/ViewModels/CourseViewModel.cs
new file mode 100644
index 0000000..a80cf78
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/ViewModels/CourseViewModel.cs
@@ -0,0 +1,18 @@
+using PolyclinicDataModels.Models;
+using System.ComponentModel;
+
+namespace PolyclinicContracts.ViewModels
+{
+    public class CourseViewModel : ICourseModel
+    {
+        [DisplayName("Количество дней курса")]
+        public int DaysCount { get; set; }
+        [DisplayName("Препарата в день")]
+        public int PillsPerDay { get; set; }
+        [DisplayName("Комментарий")]
+        public string Comment { get; set; } = string.Empty;
+        public Dictionary<int, IDiagnosisModel> CourseDiagnosis { get; set; } = new();
+        public Dictionary<int, IRecipeModel> CourseRecipes { get; set; } = new();
+        public int Id { get; set; }
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/ViewModels/DiagnosisViewModel.cs b/Polyclinic/PolyclinicContracts/ViewModels/DiagnosisViewModel.cs
new file mode 100644
index 0000000..10f4d44
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/ViewModels/DiagnosisViewModel.cs
@@ -0,0 +1,15 @@
+using PolyclinicDataModels.Models;
+using System.ComponentModel;
+
+namespace PolyclinicContracts.ViewModels
+{
+    public class DiagnosisViewModel : IDiagnosisModel
+    {
+        [DisplayName("Название")]
+        public string Name { get; set; } = string.Empty;
+        [DisplayName("Комментарий")]
+        public string Comment { get; set; } = string.Empty;
+        public int ExecutorId { get; set; }
+        public int Id { get; set; }
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/ViewModels/ExecutorViewModel.cs b/Polyclinic/PolyclinicContracts/ViewModels/ExecutorViewModel.cs
new file mode 100644
index 0000000..04f492c
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/ViewModels/ExecutorViewModel.cs
@@ -0,0 +1,15 @@
+using PolyclinicDataModels.Models;
+using System.ComponentModel;
+
+namespace PolyclinicContracts.ViewModels
+{
+    public class ExecutorViewModel : IExecutorModel
+    {
+        [DisplayName("ФИО исполнителя")]
+        public string FIO { get; set; } = string.Empty;
+        [DisplayName("Email исполнителя")]
+        public string Email { get; set; } = string.Empty;
+        public string Password { get; set; } = string.Empty;
+        public int Id { get; set; }
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/ViewModels/SymptomViewModel.cs b/Polyclinic/PolyclinicContracts/ViewModels/SymptomViewModel.cs
new file mode 100644
index 0000000..20879c8
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/ViewModels/SymptomViewModel.cs
@@ -0,0 +1,16 @@
+using PolyclinicDataModels.Models;
+using System.ComponentModel;
+
+namespace PolyclinicContracts.ViewModels
+{
+    public class SymptomViewModel : ISymptomModel
+    {
+        [DisplayName("Название")]
+        public string Name { get; set; } = string.Empty;
+        [DisplayName("Комментарий")]
+        public string Comment { get; set; } = string.Empty;
+        public Dictionary<int, IDiagnosisModel> SymptomDiagnosis { get; set; } = new();
+        public Dictionary<int, IRecipeModel> SymptomRecipes { get; set; } = new();
+        public int Id { get; set; }
+    }
+}

From b9e024917a12a8713b210df16906c0a8e4a714fb Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Thu, 18 Apr 2024 00:15:01 +0400
Subject: [PATCH 7/8] =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0.=20?=
 =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=20=D0=BA=D0=BE=D0=BD=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BA=D1=82=D1=8B=20=D1=85=D1=80=D0=B0=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PolyclinicContracts.csproj                   |  1 -
 .../StoragesContracts/.gitkeep                   |  0
 .../StoragesContracts/ICourseStorage.cs          | 16 ++++++++++++++++
 .../StoragesContracts/IDiagnosisStorage.cs       | 16 ++++++++++++++++
 .../StoragesContracts/IExecutorStorage.cs        | 16 ++++++++++++++++
 .../StoragesContracts/ISymptomStorage.cs         | 16 ++++++++++++++++
 6 files changed, 64 insertions(+), 1 deletion(-)
 delete mode 100644 Polyclinic/PolyclinicContracts/StoragesContracts/.gitkeep
 create mode 100644 Polyclinic/PolyclinicContracts/StoragesContracts/ICourseStorage.cs
 create mode 100644 Polyclinic/PolyclinicContracts/StoragesContracts/IDiagnosisStorage.cs
 create mode 100644 Polyclinic/PolyclinicContracts/StoragesContracts/IExecutorStorage.cs
 create mode 100644 Polyclinic/PolyclinicContracts/StoragesContracts/ISymptomStorage.cs

diff --git a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
index 7432a2a..6a2d93a 100644
--- a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
+++ b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="StoragesContracts\" />
     <Folder Include="BusinessLogicsContracts\" />
   </ItemGroup>
 
diff --git a/Polyclinic/PolyclinicContracts/StoragesContracts/.gitkeep b/Polyclinic/PolyclinicContracts/StoragesContracts/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/Polyclinic/PolyclinicContracts/StoragesContracts/ICourseStorage.cs b/Polyclinic/PolyclinicContracts/StoragesContracts/ICourseStorage.cs
new file mode 100644
index 0000000..5a8ddb3
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/StoragesContracts/ICourseStorage.cs
@@ -0,0 +1,16 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+
+namespace PolyclinicContracts.StoragesContracts
+{
+    public interface ICourseStorage
+    {
+        List<CourseViewModel> GetFullList();
+        List<CourseViewModel> GetFilteredList(CourseSearchModel model);
+        CourseViewModel? GetElement(CourseSearchModel model);
+        CourseViewModel? Insert(CourseBindingModel model);
+        CourseViewModel? Update(CourseBindingModel model);
+        CourseViewModel? Delete(CourseBindingModel model);
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/StoragesContracts/IDiagnosisStorage.cs b/Polyclinic/PolyclinicContracts/StoragesContracts/IDiagnosisStorage.cs
new file mode 100644
index 0000000..9c1015b
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/StoragesContracts/IDiagnosisStorage.cs
@@ -0,0 +1,16 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+
+namespace PolyclinicContracts.StoragesContracts
+{
+    public interface IDiagnosisStorage
+    {
+        List<DiagnosisViewModel> GetFullList();
+        List<DiagnosisViewModel> GetFilteredList(DiagnosisSearchModel model);
+        DiagnosisViewModel? GetElement(DiagnosisSearchModel model);
+        DiagnosisViewModel? Insert(DiagnosisBindingModel model);
+        DiagnosisViewModel? Update(DiagnosisBindingModel model);
+        DiagnosisViewModel? Delete(DiagnosisBindingModel model);
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/StoragesContracts/IExecutorStorage.cs b/Polyclinic/PolyclinicContracts/StoragesContracts/IExecutorStorage.cs
new file mode 100644
index 0000000..331af33
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/StoragesContracts/IExecutorStorage.cs
@@ -0,0 +1,16 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+
+namespace PolyclinicContracts.StoragesContracts
+{
+    public interface IExecutorStorage
+    {
+        List<ExecutorViewModel> GetFullList();
+        List<ExecutorViewModel> GetFilteredList(ExecutorSearchModel model);
+        ExecutorViewModel? GetElement(ExecutorSearchModel model);
+        ExecutorViewModel? Insert(ExecutorBindingModel model);
+        ExecutorViewModel? Update(ExecutorBindingModel model);
+        ExecutorViewModel? Delete(ExecutorBindingModel model);
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/StoragesContracts/ISymptomStorage.cs b/Polyclinic/PolyclinicContracts/StoragesContracts/ISymptomStorage.cs
new file mode 100644
index 0000000..c0d4e69
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/StoragesContracts/ISymptomStorage.cs
@@ -0,0 +1,16 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+
+namespace PolyclinicContracts.StoragesContracts
+{
+    public interface ISymptomStorage
+    {
+        List<SymptomViewModel> GetFullList();
+        List<SymptomViewModel> GetFilteredList(SymptomSearchModel model);
+        SymptomViewModel? GetElement(SymptomSearchModel model);
+        SymptomViewModel? Insert(SymptomBindingModel model);
+        SymptomViewModel? Update(SymptomBindingModel model);
+        SymptomViewModel? Delete(SymptomBindingModel model);
+    }
+}

From 070780cadb6815efe0fc4515fb60a6c3895cde3c Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Thu, 18 Apr 2024 00:18:38 +0400
Subject: [PATCH 8/8] =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0.=20?=
 =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=20=D0=BA=D0=BE=D0=BD=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BA=D1=82=D1=8B=20=D0=B1=D0=B8=D0=B7=D0=BD=D0=B5?=
 =?UTF-8?q?=D1=81-=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessLogicsContracts/.gitkeep              |  0
 .../BusinessLogicsContracts/ICourseLogic.cs       | 15 +++++++++++++++
 .../BusinessLogicsContracts/IDiagnosisLogic.cs    | 15 +++++++++++++++
 .../BusinessLogicsContracts/IExecutorLogic.cs     | 15 +++++++++++++++
 .../BusinessLogicsContracts/ISymptomLogic.cs      | 15 +++++++++++++++
 .../PolyclinicContracts.csproj                    |  4 ----
 6 files changed, 60 insertions(+), 4 deletions(-)
 delete mode 100644 Polyclinic/PolyclinicContracts/BusinessLogicsContracts/.gitkeep
 create mode 100644 Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ICourseLogic.cs
 create mode 100644 Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IDiagnosisLogic.cs
 create mode 100644 Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IExecutorLogic.cs
 create mode 100644 Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ISymptomLogic.cs

diff --git a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/.gitkeep b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ICourseLogic.cs b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ICourseLogic.cs
new file mode 100644
index 0000000..1b9fc2c
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ICourseLogic.cs
@@ -0,0 +1,15 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+
+namespace PolyclinicContracts.BusinessLogicsContracts
+{
+    public interface ICourseLogic
+    {
+        List<CourseViewModel>? ReadList(CourseSearchModel? model);
+        CourseViewModel? ReadElement(CourseSearchModel model);
+        bool Create(CourseBindingModel model);
+        bool Update(CourseBindingModel model);
+        bool Delete(CourseBindingModel model);
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IDiagnosisLogic.cs b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IDiagnosisLogic.cs
new file mode 100644
index 0000000..cce64f3
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IDiagnosisLogic.cs
@@ -0,0 +1,15 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+
+namespace PolyclinicContracts.BusinessLogicsContracts
+{
+    public interface IDiagnosisLogic
+    {
+        List<DiagnosisViewModel>? ReadList(DiagnosisSearchModel? model);
+        DiagnosisViewModel? ReadElement(DiagnosisSearchModel model);
+        bool Create(DiagnosisBindingModel model);
+        bool Update(DiagnosisBindingModel model);
+        bool Delete(DiagnosisBindingModel model);
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IExecutorLogic.cs b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IExecutorLogic.cs
new file mode 100644
index 0000000..59e4d22
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IExecutorLogic.cs
@@ -0,0 +1,15 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+
+namespace PolyclinicContracts.BusinessLogicsContracts
+{
+    public interface IExecutorLogic
+    {
+        List<ExecutorViewModel>? ReadList(ExecutorSearchModel? model);
+        ExecutorViewModel? ReadElement(ExecutorSearchModel model);
+        bool Create(ExecutorBindingModel model);
+        bool Update(ExecutorBindingModel model);
+        bool Delete(ExecutorBindingModel model);
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ISymptomLogic.cs b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ISymptomLogic.cs
new file mode 100644
index 0000000..6f0f2af
--- /dev/null
+++ b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/ISymptomLogic.cs
@@ -0,0 +1,15 @@
+using PolyclinicContracts.BindingModels;
+using PolyclinicContracts.SearchModels;
+using PolyclinicContracts.ViewModels;
+
+namespace PolyclinicContracts.BusinessLogicsContracts
+{
+    public interface ISymptomLogic
+    {
+        List<SymptomViewModel>? ReadList(SymptomSearchModel? model);
+        SymptomViewModel? ReadElement(SymptomSearchModel model);
+        bool Create(SymptomBindingModel model);
+        bool Update(SymptomBindingModel model);
+        bool Delete(SymptomBindingModel model);
+    }
+}
diff --git a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
index 6a2d93a..5a9101d 100644
--- a/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
+++ b/Polyclinic/PolyclinicContracts/PolyclinicContracts.csproj
@@ -6,10 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="BusinessLogicsContracts\" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\PolyclinicDataModels\PolyclinicDataModels.csproj" />
   </ItemGroup>