From d8354955910f384489dd309e7b60740725458a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Ho=CC=88rler?= <i.hoerler@me.com>
Date: Wed, 18 Jul 2018 19:19:47 +0200
Subject: [PATCH] refactor ClusterConverter and Model

---
 .../cluster_dependencies/ClusterConverter.cs  |  9 ++++----
 .../Models/ClusterPatient.cs                  | 21 ++++++++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs
index 3a55b13..e2b023f 100644
--- a/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs
+++ b/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs
@@ -10,11 +10,12 @@ namespace EHEC_Server
     {
         public void WriteJson()
         {
-            ClusterPatient clusterp = new ClusterPatient();
-            List<ClusterPatient> clusterPatientList = new List<ClusterPatient>();
-            clusterPatientList = clusterp.GetClusterPatients();
+            ClusterPatient p = new ClusterPatient();
+            List<ClusterPatient> clusterPatientsList = new List<ClusterPatient>();
+            clusterPatientsList = p.GetClusterPatients();
+            //clusterPatient =
             
-            var json = JsonConverter.Serialize(clusterPatientList);
+            var json = JsonConverter.Serialize(clusterPatientsList);
             System.IO.File.WriteAllText(@"C:\Users\novski\Desktop\cluster.json", json); 
         }
         private List<ClusterPatient> GetCluster()
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs
index 7bc0496..88cb040 100644
--- a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs
+++ b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterPatient.cs
@@ -8,28 +8,33 @@ namespace EHEC_Server
     
     public class ClusterPatient
     {
-        public List<Patient> Patients { get; set; }
-        public List<ClusterPatient> ClusterPatients { get; set; }
-        public int Id { get; set; }
-        public string Name { get; set; }
+        private int Id { get; set; }
+        private string Name { get; set; }
+        private string Nodetype { get; set; }
+
+        public ClusterPatient() { }
 
         public List<ClusterPatient> GetClusterPatients()
         {
-            Patient p = new Patient();
-            Patients = p.GetAllPatients();
+            Patient patient = new Patient();
+            List<Patient> patients = new List<Patient>();
+            patients = patient.GetAllPatients();
+            List<ClusterPatient> ClusterPatients = new List<ClusterPatient>();
 
-            foreach (Patient element in Patients)
+            foreach (Patient element in patients)
             {
                 ClusterPatient clusterPatient = new ClusterPatient
                 {
                     Id = element.PatientId,
+                    Nodetype = "patient",
                     Name = element.FirstName + " " + element.LastName
                 };
                 ClusterPatients.Add(clusterPatient);
             }
             return ClusterPatients;
         }
-                
+
+
     }
     
 }
\ No newline at end of file