From 3bee2333f1c46f7573ac1847cc3581f4f677e169 Mon Sep 17 00:00:00 2001 From: ismail Date: Sun, 29 Jul 2018 13:44:28 +0200 Subject: [PATCH] moved the randomizer functions away from the global and into the databuilder files --- .../DataBuilder/GenerateDataBuilder.cs | 123 +++++++++++++++--- .../EHEC_Server/DatabaseAccess/Patient.cs | 3 + EHEC_Server/EHEC_Server/Global.asax.cs | 91 +++++++------ EHEC_Server/EHEC_Server/IService.cs | 6 + EHEC_Server/EHEC_Server/Service.svc.cs | 11 ++ EHEC_Server/EHEC_Server/Web.config | 4 +- .../cluster_dependencies/ClusterConverter.cs | 2 +- 7 files changed, 182 insertions(+), 58 deletions(-) diff --git a/EHEC_Server/EHEC_Server/DataBuilder/GenerateDataBuilder.cs b/EHEC_Server/EHEC_Server/DataBuilder/GenerateDataBuilder.cs index 365c67f..df4c9e5 100644 --- a/EHEC_Server/EHEC_Server/DataBuilder/GenerateDataBuilder.cs +++ b/EHEC_Server/EHEC_Server/DataBuilder/GenerateDataBuilder.cs @@ -2,10 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Web; +using System.ServiceModel; -namespace EHEC_Server.DataBuilder +namespace EHEC_Server { - public class GenerateDataBuilder + public partial class GenerateDataBuilder { //dieses file wird im moment nicht benötigt, da alles im global benutzt wird, bitte so belassen für den moment @@ -16,9 +17,19 @@ namespace EHEC_Server.DataBuilder private static List Exams = new List(); private static Random Rnd = new Random(); + private static List PatientUid = new List(new string[] + { + "djud73", "23jhgdh738","28hfc9","937hbnf9s","838fbnos","3886b10bd","nc3592bd0","3939uhdj","md8363gbd0","d93gd0sh" + }); + + private static List DoctorUid = new List(new string[] + { + "2123dd73", "2325438","2cqw","93123ff9s","cse6654","te5654hz","er343erg556","345tgww","345345tegv","te4tserz" + }); + private static List FirstNames = new List(new string[] { - "Michael", "Andreas", "Stefan", "Ivan","Adrien" + "Michael", "Andreas", "Stefan", "Ivan","Adrien" }); private static List LastNames = new List(new string[] @@ -26,25 +37,107 @@ namespace EHEC_Server.DataBuilder "Meister", "Schär", "Eberhard", "Zingg", "Howald", "Aebi", "Feldmann" }); + private static List Streets = new List(new string[] + { + "Rosenauweg", "Schessstrasse", "Hardstrasse", "Gehweg", "Bananastreet", "Moosweg", "Feldstrasse" + }); + + private static List Cities = new List(new string[] + { + "Meister", "Schär", "Eberhard", "Zingg", "Howald", "Aebi", "Feldmann" + }); + + private static List Regions = new List(new string[] + { + "Aargau", "Zurich", "Graubünden","Vallhalla", "Hell", "Heaven" + }); + + + private static List BirthDates = new List(new string[] + { + "2001-07-11 20:18:00.000", "1999-03-12 10:18:00.000","1980-01-21 00:18:00.000", + }); + private static List DoctorOrigins = new List(new string[] { "SanktMonika", "DisneyWorld", "Kantonsspital Baden", "Online Schulung" }); - private static List Street = new List(new string[] - { - "Rosenauweg", "Schessstrasse", "Hardstrasse", "Gehweg", "Bananastreet", "Moosweg", "Feldstrasse" - }); - private static List BirthDate = new List(new string[] + public static Patient CreateRandomPatients(Patient patients) { - "12991212", "20000112", - }); - - private static List City = new List(new string[] + using (EHEC_DBEntities ctx = new EHEC_DBEntities()) + { + Random p = new Random(); + for (int i = 0; i < 10; i++) + { + Patient patient = new Patient + { + PatientUid = PatientUid[p.Next(0, 10)].ToString(), + FirstName = FirstNames[p.Next(0, 5)].ToString(), + LastName = LastNames[p.Next(0, 7)].ToString(), + BirthDate = Convert.ToDateTime(BirthDates[p.Next(0, 3)].ToString()), + Street = Streets[p.Next(0, 7)].ToString(), + City = Cities[p.Next(0, 7)].ToString(), + Region = Regions[p.Next(0, 6)].ToString() + }; + //Global.GlobalInstance.DbAccess.Patients.Add(patient); + ctx.Patients.Add(patient); + ctx.SaveChanges(); + } + } + return patients; + } + public static Doctor CreateRandomDoctors(Doctor doctors) { - "Meister", "Schär", "Eberhard", "Zingg", "Howald", "Aebi", "Feldmann" - }); + using (EHEC_DBEntities ctx = new EHEC_DBEntities()) + { + Random d = new Random(); + for (int i = 0; i < 10; i++) + { + Doctor doctor = new Doctor + { + DoctorUid = DoctorUid[d.Next(0, 10)].ToString(), + FirstName = FirstNames[d.Next(0, 5)].ToString(), + LastName = LastNames[d.Next(0, 7)].ToString(), + DoctorOrigin = DoctorOrigins[d.Next(0, 4)].ToString(), + Region = Regions[d.Next(0, 6)].ToString() + }; + //Global.GlobalInstance.DbAccess.Doctors.Add(doctor); + ctx.Doctors.Add(doctor); + ctx.SaveChanges(); + } + } + return doctors; + } } -} \ No newline at end of file +} + + + + + + +//add patients +/* using (EHEC_DBEntities ctx = new EHEC_DBEntities()) + { + Random p = new Random(); + for (int i = 0; i < 10; i++) + { + Patient patient = new Patient + { + PatientUid = PatientUid[p.Next(0, 10)].ToString(), + FirstName = FirstNames[p.Next(0, 5)].ToString(), + LastName = LastNames[p.Next(0, 7)].ToString(), + BirthDate = Convert.ToDateTime(BirthDates[p.Next(0, 3)].ToString()), + Street = Streets[p.Next(0, 7)].ToString(), + City = Cities[p.Next(0, 7)].ToString(), + Region = Regions[p.Next(0, 6)].ToString() + }; + //Global.GlobalInstance.DbAccess.Patients.Add(patient); + ctx.Patients.Add(patient); + ctx.SaveChanges(); + } + } */ +//add doctors \ No newline at end of file diff --git a/EHEC_Server/EHEC_Server/DatabaseAccess/Patient.cs b/EHEC_Server/EHEC_Server/DatabaseAccess/Patient.cs index be705f1..716ba1a 100644 --- a/EHEC_Server/EHEC_Server/DatabaseAccess/Patient.cs +++ b/EHEC_Server/EHEC_Server/DatabaseAccess/Patient.cs @@ -41,5 +41,8 @@ namespace EHEC_Server return patient; } } + + + } } \ No newline at end of file diff --git a/EHEC_Server/EHEC_Server/Global.asax.cs b/EHEC_Server/EHEC_Server/Global.asax.cs index ca8ff25..f151f9f 100644 --- a/EHEC_Server/EHEC_Server/Global.asax.cs +++ b/EHEC_Server/EHEC_Server/Global.asax.cs @@ -9,7 +9,7 @@ using EHEC_Server.DataBuilder; namespace EHEC_Server { public partial class Global : System.Web.HttpApplication - { + {/* private static List FirstNames = new List(new string[] { "Michael", "Andreas", "Stefan", "Ivan","Adrien" @@ -45,7 +45,16 @@ namespace EHEC_Server { "SanktMonika", "DisneyWorld", "Kantonsspital Baden", "Online Schulung" }); + private static List PatientUid = new List(new string[] +{ + "djud73", "23jhgdh738","28hfc9","937hbnf9s","838fbnos","3886b10bd","nc3592bd0","3939uhdj","md8363gbd0","d93gd0sh" +}); + private static List DoctorUid = new List(new string[] + { + "2123dd73", "2325438","2cqw","93123ff9s","cse6654","te5654hz","er343erg556","345tgww","345345tegv","te4tserz" + }); + */ protected void Application_Start(object sender, EventArgs e) { @@ -58,45 +67,47 @@ namespace EHEC_Server //add patients - using (EHEC_DBEntities ctx = new EHEC_DBEntities()) - { - Random p = new Random(); - for (int i = 0; i < 10; i++) - { - Patient patient = new Patient - { - FirstName = FirstNames[p.Next(0,5)].ToString(), - LastName = LastNames [p.Next(0, 7)].ToString(), - BirthDate = Convert.ToDateTime(BirthDates [p.Next(0,3)].ToString()), - Street = Streets[p.Next(0, 7)].ToString(), - City = Cities[p.Next(0, 7)].ToString(), - Region = Regions[p.Next(0, 6)].ToString() - }; - //Global.GlobalInstance.DbAccess.Patients.Add(patient); - ctx.Patients.Add(patient); - ctx.SaveChanges(); - } - } - //add doctors - using (EHEC_DBEntities ctx = new EHEC_DBEntities()) - { - - Random d = new Random(); - for (int i = 0; i < 10; i++) - { - Doctor doctor = new Doctor - { - FirstName = FirstNames[d.Next(0, 5)].ToString(), - LastName = LastNames[d.Next(0, 7)].ToString(), - DoctorOrigin = DoctorOrigins[d.Next(0, 4)].ToString(), - Region = Regions[d.Next(0, 6)].ToString() - }; - //Global.GlobalInstance.DbAccess.Doctors.Add(doctor); - ctx.Doctors.Add(doctor); - ctx.SaveChanges(); - } - } + /* using (EHEC_DBEntities ctx = new EHEC_DBEntities()) + { + Random p = new Random(); + for (int i = 0; i < 10; i++) + { + Patient patient = new Patient + { + PatientUid = PatientUid[p.Next(0, 10)].ToString(), + FirstName = FirstNames[p.Next(0, 5)].ToString(), + LastName = LastNames[p.Next(0, 7)].ToString(), + BirthDate = Convert.ToDateTime(BirthDates[p.Next(0, 3)].ToString()), + Street = Streets[p.Next(0, 7)].ToString(), + City = Cities[p.Next(0, 7)].ToString(), + Region = Regions[p.Next(0, 6)].ToString() + }; + //Global.GlobalInstance.DbAccess.Patients.Add(patient); + ctx.Patients.Add(patient); + ctx.SaveChanges(); + } + } + //add doctors + using (EHEC_DBEntities ctx = new EHEC_DBEntities()) + { + Random d = new Random(); + for (int i = 0; i < 10; i++) + { + Doctor doctor = new Doctor + { + DoctorUid = DoctorUid[d.Next(0, 10)].ToString(), + FirstName = FirstNames[d.Next(0, 5)].ToString(), + LastName = LastNames[d.Next(0, 7)].ToString(), + DoctorOrigin = DoctorOrigins[d.Next(0, 4)].ToString(), + Region = Regions[d.Next(0, 6)].ToString() + }; + //Global.GlobalInstance.DbAccess.Doctors.Add(doctor); + ctx.Doctors.Add(doctor); + ctx.SaveChanges(); + } + } + */ } //all the following code was auto-generated by createing the global file and will be deleted later @@ -132,4 +143,4 @@ namespace EHEC_Server } -} \ No newline at end of file +} diff --git a/EHEC_Server/EHEC_Server/IService.cs b/EHEC_Server/EHEC_Server/IService.cs index cf9483e..80ef954 100644 --- a/EHEC_Server/EHEC_Server/IService.cs +++ b/EHEC_Server/EHEC_Server/IService.cs @@ -33,6 +33,12 @@ namespace EHEC_Server [OperationContract] List GetResults(); + [OperationContract] + Patient CreateRandomPatient(Patient patient); + + [OperationContract] + Doctor CreateRandomDoctor(Doctor doctor); + [OperationContract] String Ping(); } diff --git a/EHEC_Server/EHEC_Server/Service.svc.cs b/EHEC_Server/EHEC_Server/Service.svc.cs index 2d0afa9..b6d9b8b 100644 --- a/EHEC_Server/EHEC_Server/Service.svc.cs +++ b/EHEC_Server/EHEC_Server/Service.svc.cs @@ -6,6 +6,7 @@ using System.ServiceModel; using System.Text; using EHEC_Server.DataBuilder; + namespace EHEC_Server { // NOTE: You can use the "Rename" command on the "Refactor" menu to change the @@ -16,6 +17,7 @@ namespace EHEC_Server { Doctor dataaccess_doctor = new Doctor(); + private static List Doctors = new List(); Patient dataaccess_patient = new Patient(); Result dataaccess_result = new Result(); Origin dataaccess_origin = new Origin(); @@ -64,6 +66,15 @@ namespace EHEC_Server { return dataaccess_result.CreateResult(result); } + public Doctor CreateRandomDoctor(Doctor doctors) + { + return GenerateDataBuilder.CreateRandomDoctors(doctors); + } + + public Patient CreateRandomPatient(Patient patients) + { + return GenerateDataBuilder.CreateRandomPatients(patients); + } private readonly string ping = "pong"; public string Ping() diff --git a/EHEC_Server/EHEC_Server/Web.config b/EHEC_Server/EHEC_Server/Web.config index 3fd839c..057283c 100644 --- a/EHEC_Server/EHEC_Server/Web.config +++ b/EHEC_Server/EHEC_Server/Web.config @@ -30,8 +30,8 @@ - - + + diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs index b89f43e..1a74fb0 100644 --- a/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs +++ b/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs @@ -20,7 +20,7 @@ namespace EHEC_Server ContractResolver = new CamelCasePropertyNamesContractResolver() }; var Json = JObject.FromObject(GetCluster(), serializer); - System.IO.File.WriteAllText(@"C: \Users\novski\Desktop\cluster.json", JsonConvert.SerializeObject(Json)); + System.IO.File.WriteAllText(@"C: \Users\ism_c\Desktop\cluster.json", JsonConvert.SerializeObject(Json)); return Json; } private ClusterModel GetCluster()