From ffafd3cae2f608d96badd0f41664a72e66b00508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Ho=CC=88rler?= <i.hoerler@me.com>
Date: Wed, 11 Jul 2018 08:06:33 +0200
Subject: [PATCH] convert inhertied classes of db objects to partial classes of
 db objects so overwriting of db classes through entityframework does not take
 effect on our own work.

---
 .../DatabaseAccess/{DoctorAccess.cs => Doctor.cs}    |  4 ++--
 .../DatabaseAccess/{ExamAccess.cs => Exam.cs}        | 10 +++++-----
 .../DatabaseAccess/{OriginAccess.cs => Origin.cs}    | 10 +++++-----
 .../{Origin_ExamAccess.cs => Origin_Exam.cs}         | 10 +++++-----
 .../DatabaseAccess/{PatientAccess.cs => Patient.cs}  |  4 ++--
 .../DatabaseAccess/{ResultAccess.cs => Result.cs}    | 12 ++++++------
 EHEC_Server/EHEC_Server/Doctor.cs                    |  3 +--
 EHEC_Server/EHEC_Server/EHEC_Server.csproj           | 12 ++++++------
 EHEC_Server/EHEC_Server/Exam.cs                      |  4 ++--
 EHEC_Server/EHEC_Server/IService.cs                  |  3 +++
 EHEC_Server/EHEC_Server/Model.cs                     |  1 +
 EHEC_Server/EHEC_Server/Origin.cs                    |  4 ++--
 EHEC_Server/EHEC_Server/Origin_Exam.cs               |  4 ++--
 EHEC_Server/EHEC_Server/Patient.cs                   |  3 +--
 EHEC_Server/EHEC_Server/Result.cs                    |  9 ++++-----
 EHEC_Server/EHEC_Server/Service.svc.cs               |  7 +++++--
 16 files changed, 52 insertions(+), 48 deletions(-)
 rename EHEC_Server/EHEC_Server/DatabaseAccess/{DoctorAccess.cs => Doctor.cs} (91%)
 rename EHEC_Server/EHEC_Server/DatabaseAccess/{ExamAccess.cs => Exam.cs} (75%)
 rename EHEC_Server/EHEC_Server/DatabaseAccess/{OriginAccess.cs => Origin.cs} (73%)
 rename EHEC_Server/EHEC_Server/DatabaseAccess/{Origin_ExamAccess.cs => Origin_Exam.cs} (70%)
 rename EHEC_Server/EHEC_Server/DatabaseAccess/{PatientAccess.cs => Patient.cs} (91%)
 rename EHEC_Server/EHEC_Server/DatabaseAccess/{ResultAccess.cs => Result.cs} (69%)

diff --git a/EHEC_Server/EHEC_Server/DatabaseAccess/DoctorAccess.cs b/EHEC_Server/EHEC_Server/DatabaseAccess/Doctor.cs
similarity index 91%
rename from EHEC_Server/EHEC_Server/DatabaseAccess/DoctorAccess.cs
rename to EHEC_Server/EHEC_Server/DatabaseAccess/Doctor.cs
index 76b498e..2a229d7 100644
--- a/EHEC_Server/EHEC_Server/DatabaseAccess/DoctorAccess.cs
+++ b/EHEC_Server/EHEC_Server/DatabaseAccess/Doctor.cs
@@ -5,9 +5,9 @@ using System.Web;
 using System.ServiceModel;
 
 
-namespace EHEC_Server.DatabaseAccess
+namespace EHEC_Server
 {
-    public class DoctorAccess
+    public partial class Doctor
     {
         public Doctor CreateDoctor(Doctor doctor)
         {
diff --git a/EHEC_Server/EHEC_Server/DatabaseAccess/ExamAccess.cs b/EHEC_Server/EHEC_Server/DatabaseAccess/Exam.cs
similarity index 75%
rename from EHEC_Server/EHEC_Server/DatabaseAccess/ExamAccess.cs
rename to EHEC_Server/EHEC_Server/DatabaseAccess/Exam.cs
index 186b42c..8f6a275 100644
--- a/EHEC_Server/EHEC_Server/DatabaseAccess/ExamAccess.cs
+++ b/EHEC_Server/EHEC_Server/DatabaseAccess/Exam.cs
@@ -5,11 +5,11 @@ using System.Web;
 using System.ServiceModel;
 
 
-namespace EHEC_Server.DatabaseAccess
+namespace EHEC_Server
 {
-    public class ExamAccess
+    public partial class Exam
     {
-        public Exam CreateExam(Exam exam)
+        public Exam CreateExam(EHEC_Server.Exam exam)
         {
             try
             {
@@ -22,10 +22,10 @@ namespace EHEC_Server.DatabaseAccess
             }
             catch (Exception)
             {
-                return new Exam();
+                return new EHEC_Server.Exam();
             }
         }
-        public List<Exam> GetAllExams()
+        public List<EHEC_Server.Exam> GetAllExams()
         {
             using (EHEC_DBEntities ctx = new EHEC_DBEntities())
             {
diff --git a/EHEC_Server/EHEC_Server/DatabaseAccess/OriginAccess.cs b/EHEC_Server/EHEC_Server/DatabaseAccess/Origin.cs
similarity index 73%
rename from EHEC_Server/EHEC_Server/DatabaseAccess/OriginAccess.cs
rename to EHEC_Server/EHEC_Server/DatabaseAccess/Origin.cs
index 10df0e2..50e4c22 100644
--- a/EHEC_Server/EHEC_Server/DatabaseAccess/OriginAccess.cs
+++ b/EHEC_Server/EHEC_Server/DatabaseAccess/Origin.cs
@@ -4,11 +4,11 @@ using System.Linq;
 using System.Web;
 using System.ServiceModel;
 
-namespace EHEC_Server.DatabaseAccess
+namespace EHEC_Server
 {
-    public class OriginAccess
+    public partial class Origin
     {
-        public Origin CreateOrigin(Origin origin)
+        public Origin CreateOrigin(EHEC_Server.Origin origin)
         {
             try
             {
@@ -21,10 +21,10 @@ namespace EHEC_Server.DatabaseAccess
             }
             catch (Exception)
             {
-                return new Origin();
+                return new EHEC_Server.Origin();
             }
         }
-        public List<Origin> GetAllOrigins()
+        public List<EHEC_Server.Origin> GetAllOrigins()
         {
             using (EHEC_DBEntities ctx = new EHEC_DBEntities())
             {
diff --git a/EHEC_Server/EHEC_Server/DatabaseAccess/Origin_ExamAccess.cs b/EHEC_Server/EHEC_Server/DatabaseAccess/Origin_Exam.cs
similarity index 70%
rename from EHEC_Server/EHEC_Server/DatabaseAccess/Origin_ExamAccess.cs
rename to EHEC_Server/EHEC_Server/DatabaseAccess/Origin_Exam.cs
index 798c9d6..5c346d3 100644
--- a/EHEC_Server/EHEC_Server/DatabaseAccess/Origin_ExamAccess.cs
+++ b/EHEC_Server/EHEC_Server/DatabaseAccess/Origin_Exam.cs
@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 
-namespace EHEC_Server.DatabaseAccess
+namespace EHEC_Server
 {
-    public class Origin_ExamAccess
+    public partial class Origin_Exam
     {
-        public Origin_Exam CreateOrigin_Exam(Origin_Exam origin_exam)
+        public Origin_Exam CreateOrigin_Exam(EHEC_Server.Origin_Exam origin_exam)
         {
             try
             {
@@ -20,10 +20,10 @@ namespace EHEC_Server.DatabaseAccess
             }
             catch (Exception)
             {
-                return new Origin_Exam();
+                return new EHEC_Server.Origin_Exam();
             }
         }
-        public List<Origin_Exam> GetAllOrigin_Exams()
+        public List<EHEC_Server.Origin_Exam> GetAllOrigin_Exams()
         {
             using (EHEC_DBEntities ctx = new EHEC_DBEntities())
             {
diff --git a/EHEC_Server/EHEC_Server/DatabaseAccess/PatientAccess.cs b/EHEC_Server/EHEC_Server/DatabaseAccess/Patient.cs
similarity index 91%
rename from EHEC_Server/EHEC_Server/DatabaseAccess/PatientAccess.cs
rename to EHEC_Server/EHEC_Server/DatabaseAccess/Patient.cs
index 2dc4f36..2937ef5 100644
--- a/EHEC_Server/EHEC_Server/DatabaseAccess/PatientAccess.cs
+++ b/EHEC_Server/EHEC_Server/DatabaseAccess/Patient.cs
@@ -4,9 +4,9 @@ using System.Linq;
 using System.Web;
 using System.ServiceModel;
 
-namespace EHEC_Server.DatabaseAccess
+namespace EHEC_Server
 {
-    public class PatientAccess
+    public partial class Patient
     {
         public Patient CreatePatient(Patient patient)
         {
diff --git a/EHEC_Server/EHEC_Server/DatabaseAccess/ResultAccess.cs b/EHEC_Server/EHEC_Server/DatabaseAccess/Result.cs
similarity index 69%
rename from EHEC_Server/EHEC_Server/DatabaseAccess/ResultAccess.cs
rename to EHEC_Server/EHEC_Server/DatabaseAccess/Result.cs
index 228a23b..ec4c7e4 100644
--- a/EHEC_Server/EHEC_Server/DatabaseAccess/ResultAccess.cs
+++ b/EHEC_Server/EHEC_Server/DatabaseAccess/Result.cs
@@ -4,11 +4,11 @@ using System.Linq;
 using System.Web;
 using System.ServiceModel;
 
-namespace EHEC_Server.DatabaseAccess
+namespace EHEC_Server
 {
-    public class ResultAccess
+    public partial class Result
     {
-        public Result CreateResult(Result result)
+        public Result CreateResult(EHEC_Server.Result result)
         {
             try
             {
@@ -21,15 +21,15 @@ namespace EHEC_Server.DatabaseAccess
             }
             catch (Exception)
             {
-                return new Result();
+                return new EHEC_Server.Result();
             }
         }
-        public List<Result> GetAllResults()
+        public List<EHEC_Server.Result> GetAllResults()
         {
             using (EHEC_DBEntities ctx = new EHEC_DBEntities())
             {
                 ctx.Configuration.ProxyCreationEnabled = false;
-                List<Result> list = new List<Result>();
+                List<EHEC_Server.Result> list = new List<EHEC_Server.Result>();
                 return ctx.Results.ToList();
             }
         }
diff --git a/EHEC_Server/EHEC_Server/Doctor.cs b/EHEC_Server/EHEC_Server/Doctor.cs
index bb80a81..90a49b5 100644
--- a/EHEC_Server/EHEC_Server/Doctor.cs
+++ b/EHEC_Server/EHEC_Server/Doctor.cs
@@ -14,9 +14,8 @@ namespace EHEC_Server
 
 using System;
     using System.Collections.Generic;
-    using EHEC_Server.DatabaseAccess;
     
-public partial class Doctor : DoctorAccess
+public partial class Doctor
 {
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
diff --git a/EHEC_Server/EHEC_Server/EHEC_Server.csproj b/EHEC_Server/EHEC_Server/EHEC_Server.csproj
index 9000754..a430ec4 100644
--- a/EHEC_Server/EHEC_Server/EHEC_Server.csproj
+++ b/EHEC_Server/EHEC_Server/EHEC_Server.csproj
@@ -106,13 +106,13 @@
     <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DatabaseAccess\DoctorAccess.cs" />
-    <Compile Include="DatabaseAccess\OriginAccess.cs" />
-    <Compile Include="DatabaseAccess\Origin_ExamAccess.cs" />
-    <Compile Include="DatabaseAccess\PatientAccess.cs" />
-    <Compile Include="DatabaseAccess\ResultAccess.cs" />
+    <Compile Include="DatabaseAccess\Doctor.cs" />
+    <Compile Include="DatabaseAccess\Origin.cs" />
+    <Compile Include="DatabaseAccess\Origin_Exam.cs" />
+    <Compile Include="DatabaseAccess\Patient.cs" />
+    <Compile Include="DatabaseAccess\Result.cs" />
     <Compile Include="DataBuilder\DataSeeder.cs" />
-    <Compile Include="DatabaseAccess\ExamAccess.cs" />
+    <Compile Include="DatabaseAccess\Exam.cs" />
     <Compile Include="DataBuilder\GenerateDataBuilder.cs" />
     <Compile Include="Doctor.cs">
       <DependentUpon>Model.tt</DependentUpon>
diff --git a/EHEC_Server/EHEC_Server/Exam.cs b/EHEC_Server/EHEC_Server/Exam.cs
index f29d05f..a608b3f 100644
--- a/EHEC_Server/EHEC_Server/Exam.cs
+++ b/EHEC_Server/EHEC_Server/Exam.cs
@@ -14,8 +14,8 @@ namespace EHEC_Server
 
 using System;
     using System.Collections.Generic;
-    using EHEC_Server.DatabaseAccess;
-    public partial class Exam : ExamAccess
+    
+public partial class Exam
 {
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
diff --git a/EHEC_Server/EHEC_Server/IService.cs b/EHEC_Server/EHEC_Server/IService.cs
index 3a0d539..b34a01f 100644
--- a/EHEC_Server/EHEC_Server/IService.cs
+++ b/EHEC_Server/EHEC_Server/IService.cs
@@ -24,6 +24,9 @@ namespace EHEC_Server
         [OperationContract]
         Exam WriteExam(Exam exam);
 
+        [OperationContract]
+        Origin_Exam WriteOrigin_Exam(Origin_Exam origin_exam);
+
         [OperationContract]
         Result WriteResult(Result result);
 
diff --git a/EHEC_Server/EHEC_Server/Model.cs b/EHEC_Server/EHEC_Server/Model.cs
index 2d72622..c36263e 100644
--- a/EHEC_Server/EHEC_Server/Model.cs
+++ b/EHEC_Server/EHEC_Server/Model.cs
@@ -9,3 +9,4 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+
diff --git a/EHEC_Server/EHEC_Server/Origin.cs b/EHEC_Server/EHEC_Server/Origin.cs
index 266e446..0ebce63 100644
--- a/EHEC_Server/EHEC_Server/Origin.cs
+++ b/EHEC_Server/EHEC_Server/Origin.cs
@@ -14,8 +14,8 @@ namespace EHEC_Server
 
 using System;
     using System.Collections.Generic;
-    using EHEC_Server.DatabaseAccess;
-    public partial class Origin : OriginAccess
+    
+public partial class Origin
 {
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
diff --git a/EHEC_Server/EHEC_Server/Origin_Exam.cs b/EHEC_Server/EHEC_Server/Origin_Exam.cs
index 8cdc400..3dcb4f9 100644
--- a/EHEC_Server/EHEC_Server/Origin_Exam.cs
+++ b/EHEC_Server/EHEC_Server/Origin_Exam.cs
@@ -14,8 +14,8 @@ namespace EHEC_Server
 
 using System;
     using System.Collections.Generic;
-    using EHEC_Server.DatabaseAccess;
-    public partial class Origin_Exam : OriginAccess
+    
+public partial class Origin_Exam
 {
 
     public int Origin_ExamId { get; set; }
diff --git a/EHEC_Server/EHEC_Server/Patient.cs b/EHEC_Server/EHEC_Server/Patient.cs
index 744ca59..1db28bf 100644
--- a/EHEC_Server/EHEC_Server/Patient.cs
+++ b/EHEC_Server/EHEC_Server/Patient.cs
@@ -14,8 +14,7 @@ namespace EHEC_Server
 
 using System;
     using System.Collections.Generic;
-    using EHEC_Server.DatabaseAccess;
-    public partial class Patient : PatientAccess
+    public partial class Patient
 {
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
diff --git a/EHEC_Server/EHEC_Server/Result.cs b/EHEC_Server/EHEC_Server/Result.cs
index d8d08bc..a4ed96e 100644
--- a/EHEC_Server/EHEC_Server/Result.cs
+++ b/EHEC_Server/EHEC_Server/Result.cs
@@ -14,16 +14,15 @@ namespace EHEC_Server
 
 using System;
     using System.Collections.Generic;
-    using EHEC_Server.DatabaseAccess;
-
-    public partial class Result : ResultAccess
+    
+public partial class Result
 {
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
     public Result()
     {
 
-        this.Exam = new HashSet<Exam>();
+        this.Exams = new HashSet<Exam>();
 
     }
 
@@ -36,7 +35,7 @@ using System;
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
 
-    public virtual ICollection<Exam> Exam { get; set; }
+    public virtual ICollection<Exam> Exams { get; set; }
 
 }
 
diff --git a/EHEC_Server/EHEC_Server/Service.svc.cs b/EHEC_Server/EHEC_Server/Service.svc.cs
index 11c14c8..4cbc99e 100644
--- a/EHEC_Server/EHEC_Server/Service.svc.cs
+++ b/EHEC_Server/EHEC_Server/Service.svc.cs
@@ -5,7 +5,6 @@ using System.Runtime.Serialization;
 using System.ServiceModel;
 using System.Text;
 using EHEC_Server.DataBuilder;
-using EHEC_Server.DatabaseAccess;
 
 namespace EHEC_Server
 {
@@ -18,6 +17,7 @@ namespace EHEC_Server
         Patient dataaccess_patient = new Patient();
         Result dataaccess_result = new Result();
         Origin dataaccess_origin = new Origin();
+        Origin_Exam dataaccess_origin_exam = new Origin_Exam();
         Exam dataaccess_exam = new Exam();
 
         public List<Doctor> GetDoctors()
@@ -48,7 +48,10 @@ namespace EHEC_Server
         {
             return dataaccess_origin.CreateOrigin(origin);
         }
-
+        public Origin_Exam WriteOrigin_Exam(Origin_Exam origin_exam)
+        {
+            return dataaccess_origin_exam.CreateOrigin_Exam(origin_exam);
+        }
         public Exam WriteExam(Exam exam)
         {
             return dataaccess_exam.CreateExam(exam);