From e37c8604036b5ee9157dce59054d7399bf5c3312 Mon Sep 17 00:00:00 2001 From: ismail Date: Fri, 8 Jun 2018 14:54:36 +0200 Subject: [PATCH] Db - Changes in the Entites of the DB Model --- .../Model/EHEC_DB_Model.Context.cs | 2 - .../Model/EHEC_DB_Model.Designer.cs | 2 +- .../Web_Server_EHEC/Model/EHEC_DB_Model.edmx | 248 +++++------------- .../Model/EHEC_DB_Model.edmx.diagram | 14 +- .../Model/EHEC_DB_Model.edmx.sql | 149 ++++------- Web_Server_EHEC/Web_Server_EHEC/Model/Exam.cs | 4 + .../Web_Server_EHEC/Model/Origin.cs | 11 +- .../Web_Server_EHEC/Model/Patient.cs | 1 - .../Web_Server_EHEC/Model/Person.cs | 4 +- .../Web_Server_EHEC/Model/Result.cs | 2 +- .../Web_Server_EHEC/Model/Sickness.cs | 30 --- .../Web_Server_EHEC/Model/Status.cs | 29 -- .../Web_Server_EHEC/Web_Server_EHEC.csproj | 6 - 13 files changed, 145 insertions(+), 357 deletions(-) delete mode 100644 Web_Server_EHEC/Web_Server_EHEC/Model/Sickness.cs delete mode 100644 Web_Server_EHEC/Web_Server_EHEC/Model/Status.cs diff --git a/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.Context.cs b/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.Context.cs index f2c0d8d..9cffc40 100644 --- a/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.Context.cs +++ b/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.Context.cs @@ -26,10 +26,8 @@ namespace Web_Server_EHEC.Model } public virtual DbSet PersonSet { get; set; } - public virtual DbSet StatusSet { get; set; } public virtual DbSet OriginSet { get; set; } public virtual DbSet ExamSet { get; set; } public virtual DbSet ResultSet { get; set; } - public virtual DbSet SicknessSet { get; set; } } } diff --git a/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.Designer.cs b/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.Designer.cs index 166cddb..8b8eb1b 100644 --- a/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.Designer.cs +++ b/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.Designer.cs @@ -1,4 +1,4 @@ -// T4 code generation is enabled for model 'C:\Users\ism_c\source\repos\Web_Server_EHEC\Web_Server_EHEC\Model\EHEC_DB_Model.edmx'. +// T4 code generation is enabled for model 'C:\Users\ism_c\source\repos\oop_II-6\Web_Server_EHEC\Web_Server_EHEC\Model\EHEC_DB_Model.edmx'. // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model // is open in the designer. diff --git a/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.edmx b/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.edmx index 6209cdc..7bc866a 100644 --- a/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.edmx +++ b/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.edmx @@ -7,21 +7,11 @@ - - - - - - - - - - - + @@ -30,22 +20,18 @@ - - - - - - - - + + + + @@ -55,12 +41,8 @@ - - - - - - + + @@ -78,6 +60,8 @@ + + @@ -88,23 +72,6 @@ - - - - - - - - - - - - - - - - - @@ -112,30 +79,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -160,18 +111,6 @@ - - - - - - - - - - - - @@ -184,20 +123,6 @@ - - - - - - - - - - - - - - @@ -212,25 +137,29 @@ + + + + + + + + + + + + + + - - - - - - - - - - @@ -239,14 +168,14 @@ - - - - + + + + @@ -259,26 +188,20 @@ - - - - - - - - - + + + - - + + @@ -289,6 +212,10 @@ + + + + @@ -296,39 +223,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -345,14 +246,22 @@ - - - - + + + + + + + + + + + + @@ -366,12 +275,8 @@ - - - - - - + + @@ -380,11 +285,10 @@ - - - - - + + + + @@ -404,6 +308,8 @@ + + @@ -416,22 +322,6 @@ - - - - - - - - - - - - - - - - @@ -440,14 +330,6 @@ - - - - - - - - diff --git a/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.edmx.diagram b/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.edmx.diagram index 679e869..535acb0 100644 --- a/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.edmx.diagram +++ b/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.edmx.diagram @@ -5,22 +5,18 @@ - + - - - - + + + - - - - + diff --git a/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.edmx.sql b/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.edmx.sql index 9352278..49a7df4 100644 --- a/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.edmx.sql +++ b/Web_Server_EHEC/Web_Server_EHEC/Model/EHEC_DB_Model.edmx.sql @@ -2,8 +2,8 @@ -- -------------------------------------------------- -- Entity Designer DDL Script for SQL Server 2005, 2008, 2012 and Azure -- -------------------------------------------------- --- Date Created: 06/06/2018 19:01:05 --- Generated from EDMX file: C:\Users\ism_c\source\repos\Web_Server_EHEC\Web_Server_EHEC\Model\EHEC_DB_Model.edmx +-- Date Created: 06/08/2018 14:41:29 +-- Generated from EDMX file: C:\Users\ism_c\source\repos\oop_II-6\Web_Server_EHEC\Web_Server_EHEC\Model\EHEC_DB_Model.edmx -- -------------------------------------------------- SET QUOTED_IDENTIFIER OFF; @@ -17,11 +17,44 @@ GO -- Dropping existing FOREIGN KEY constraints -- -------------------------------------------------- +IF OBJECT_ID(N'[dbo].[FK_ResultExam]', 'F') IS NOT NULL + ALTER TABLE [dbo].[ExamSet] DROP CONSTRAINT [FK_ResultExam]; +GO +IF OBJECT_ID(N'[dbo].[FK_DoctorExam]', 'F') IS NOT NULL + ALTER TABLE [dbo].[ExamSet] DROP CONSTRAINT [FK_DoctorExam]; +GO +IF OBJECT_ID(N'[dbo].[FK_PatientExam]', 'F') IS NOT NULL + ALTER TABLE [dbo].[PersonSet_Patient] DROP CONSTRAINT [FK_PatientExam]; +GO +IF OBJECT_ID(N'[dbo].[FK_Patient_inherits_Person]', 'F') IS NOT NULL + ALTER TABLE [dbo].[PersonSet_Patient] DROP CONSTRAINT [FK_Patient_inherits_Person]; +GO +IF OBJECT_ID(N'[dbo].[FK_Doctor_inherits_Person]', 'F') IS NOT NULL + ALTER TABLE [dbo].[PersonSet_Doctor] DROP CONSTRAINT [FK_Doctor_inherits_Person]; +GO -- -------------------------------------------------- -- Dropping existing tables -- -------------------------------------------------- +IF OBJECT_ID(N'[dbo].[PersonSet]', 'U') IS NOT NULL + DROP TABLE [dbo].[PersonSet]; +GO +IF OBJECT_ID(N'[dbo].[OriginSet]', 'U') IS NOT NULL + DROP TABLE [dbo].[OriginSet]; +GO +IF OBJECT_ID(N'[dbo].[ExamSet]', 'U') IS NOT NULL + DROP TABLE [dbo].[ExamSet]; +GO +IF OBJECT_ID(N'[dbo].[ResultSet]', 'U') IS NOT NULL + DROP TABLE [dbo].[ResultSet]; +GO +IF OBJECT_ID(N'[dbo].[PersonSet_Patient]', 'U') IS NOT NULL + DROP TABLE [dbo].[PersonSet_Patient]; +GO +IF OBJECT_ID(N'[dbo].[PersonSet_Doctor]', 'U') IS NOT NULL + DROP TABLE [dbo].[PersonSet_Doctor]; +GO -- -------------------------------------------------- -- Creating all tables @@ -32,13 +65,9 @@ CREATE TABLE [dbo].[PersonSet] ( [PersonId] int IDENTITY(1,1) NOT NULL, [Firstname] nvarchar(max) NOT NULL, [Lastname] nvarchar(max) NOT NULL, - [Birthdate] nvarchar(max) NOT NULL -); -GO - --- Creating table 'StatusSet' -CREATE TABLE [dbo].[StatusSet] ( - [StatusId] int IDENTITY(1,1) NOT NULL + [Birthdate] nvarchar(max) NOT NULL, + [Street] nvarchar(max) NOT NULL, + [Place] nvarchar(max) NOT NULL ); GO @@ -56,6 +85,8 @@ GO CREATE TABLE [dbo].[ExamSet] ( [ExamId] int IDENTITY(1,1) NOT NULL, [DoctorId] int NOT NULL, + [SicknessStatus] nvarchar(max) NOT NULL, + [SicknessDesignation] nvarchar(max) NOT NULL, [Result_ResultId] int NOT NULL ); GO @@ -68,11 +99,10 @@ CREATE TABLE [dbo].[ResultSet] ( ); GO --- Creating table 'SicknessSet' -CREATE TABLE [dbo].[SicknessSet] ( - [SicknessId] int IDENTITY(1,1) NOT NULL, - [Designation] nvarchar(max) NOT NULL, - [Status_StatusId] int NOT NULL +-- Creating table 'PersonSet_Doctor' +CREATE TABLE [dbo].[PersonSet_Doctor] ( + [DoctorId] int IDENTITY(1,1) NOT NULL, + [PersonId] int NOT NULL ); GO @@ -80,18 +110,10 @@ GO CREATE TABLE [dbo].[PersonSet_Patient] ( [PatientId] int IDENTITY(1,1) NOT NULL, [PersonId] int NOT NULL, - [Status_StatusId] int NOT NULL, [Exam_ExamId] int NOT NULL ); GO --- Creating table 'PersonSet_Doctor' -CREATE TABLE [dbo].[PersonSet_Doctor] ( - [DoctorId] int IDENTITY(1,1) NOT NULL, - [PersonId] int NOT NULL -); -GO - -- -------------------------------------------------- -- Creating all PRIMARY KEY constraints -- -------------------------------------------------- @@ -102,12 +124,6 @@ ADD CONSTRAINT [PK_PersonSet] PRIMARY KEY CLUSTERED ([PersonId] ASC); GO --- Creating primary key on [StatusId] in table 'StatusSet' -ALTER TABLE [dbo].[StatusSet] -ADD CONSTRAINT [PK_StatusSet] - PRIMARY KEY CLUSTERED ([StatusId] ASC); -GO - -- Creating primary key on [OriginId] in table 'OriginSet' ALTER TABLE [dbo].[OriginSet] ADD CONSTRAINT [PK_OriginSet] @@ -126,10 +142,10 @@ ADD CONSTRAINT [PK_ResultSet] PRIMARY KEY CLUSTERED ([ResultId] ASC); GO --- Creating primary key on [SicknessId] in table 'SicknessSet' -ALTER TABLE [dbo].[SicknessSet] -ADD CONSTRAINT [PK_SicknessSet] - PRIMARY KEY CLUSTERED ([SicknessId] ASC); +-- Creating primary key on [PersonId] in table 'PersonSet_Doctor' +ALTER TABLE [dbo].[PersonSet_Doctor] +ADD CONSTRAINT [PK_PersonSet_Doctor] + PRIMARY KEY CLUSTERED ([PersonId] ASC); GO -- Creating primary key on [PersonId] in table 'PersonSet_Patient' @@ -138,46 +154,10 @@ ADD CONSTRAINT [PK_PersonSet_Patient] PRIMARY KEY CLUSTERED ([PersonId] ASC); GO --- Creating primary key on [PersonId] in table 'PersonSet_Doctor' -ALTER TABLE [dbo].[PersonSet_Doctor] -ADD CONSTRAINT [PK_PersonSet_Doctor] - PRIMARY KEY CLUSTERED ([PersonId] ASC); -GO - -- -------------------------------------------------- -- Creating all FOREIGN KEY constraints -- -------------------------------------------------- --- Creating foreign key on [Status_StatusId] in table 'PersonSet_Patient' -ALTER TABLE [dbo].[PersonSet_Patient] -ADD CONSTRAINT [FK_PatientStatus] - FOREIGN KEY ([Status_StatusId]) - REFERENCES [dbo].[StatusSet] - ([StatusId]) - ON DELETE NO ACTION ON UPDATE NO ACTION; -GO - --- Creating non-clustered index for FOREIGN KEY 'FK_PatientStatus' -CREATE INDEX [IX_FK_PatientStatus] -ON [dbo].[PersonSet_Patient] - ([Status_StatusId]); -GO - --- Creating foreign key on [SicknessId] in table 'OriginSet' -ALTER TABLE [dbo].[OriginSet] -ADD CONSTRAINT [FK_SicknessOrigin] - FOREIGN KEY ([SicknessId]) - REFERENCES [dbo].[SicknessSet] - ([SicknessId]) - ON DELETE NO ACTION ON UPDATE NO ACTION; -GO - --- Creating non-clustered index for FOREIGN KEY 'FK_SicknessOrigin' -CREATE INDEX [IX_FK_SicknessOrigin] -ON [dbo].[OriginSet] - ([SicknessId]); -GO - -- Creating foreign key on [Result_ResultId] in table 'ExamSet' ALTER TABLE [dbo].[ExamSet] ADD CONSTRAINT [FK_ResultExam] @@ -208,21 +188,6 @@ ON [dbo].[ExamSet] ([DoctorId]); GO --- Creating foreign key on [Status_StatusId] in table 'SicknessSet' -ALTER TABLE [dbo].[SicknessSet] -ADD CONSTRAINT [FK_StatusSickness] - FOREIGN KEY ([Status_StatusId]) - REFERENCES [dbo].[StatusSet] - ([StatusId]) - ON DELETE NO ACTION ON UPDATE NO ACTION; -GO - --- Creating non-clustered index for FOREIGN KEY 'FK_StatusSickness' -CREATE INDEX [IX_FK_StatusSickness] -ON [dbo].[SicknessSet] - ([Status_StatusId]); -GO - -- Creating foreign key on [Exam_ExamId] in table 'PersonSet_Patient' ALTER TABLE [dbo].[PersonSet_Patient] ADD CONSTRAINT [FK_PatientExam] @@ -238,15 +203,6 @@ ON [dbo].[PersonSet_Patient] ([Exam_ExamId]); GO --- Creating foreign key on [PersonId] in table 'PersonSet_Patient' -ALTER TABLE [dbo].[PersonSet_Patient] -ADD CONSTRAINT [FK_Patient_inherits_Person] - FOREIGN KEY ([PersonId]) - REFERENCES [dbo].[PersonSet] - ([PersonId]) - ON DELETE CASCADE ON UPDATE NO ACTION; -GO - -- Creating foreign key on [PersonId] in table 'PersonSet_Doctor' ALTER TABLE [dbo].[PersonSet_Doctor] ADD CONSTRAINT [FK_Doctor_inherits_Person] @@ -256,6 +212,15 @@ ADD CONSTRAINT [FK_Doctor_inherits_Person] ON DELETE CASCADE ON UPDATE NO ACTION; GO +-- Creating foreign key on [PersonId] in table 'PersonSet_Patient' +ALTER TABLE [dbo].[PersonSet_Patient] +ADD CONSTRAINT [FK_Patient_inherits_Person] + FOREIGN KEY ([PersonId]) + REFERENCES [dbo].[PersonSet] + ([PersonId]) + ON DELETE CASCADE ON UPDATE NO ACTION; +GO + -- -------------------------------------------------- -- Script has ended -- -------------------------------------------------- \ No newline at end of file diff --git a/Web_Server_EHEC/Web_Server_EHEC/Model/Exam.cs b/Web_Server_EHEC/Web_Server_EHEC/Model/Exam.cs index 76ed500..e173e36 100644 --- a/Web_Server_EHEC/Web_Server_EHEC/Model/Exam.cs +++ b/Web_Server_EHEC/Web_Server_EHEC/Model/Exam.cs @@ -22,10 +22,14 @@ namespace Web_Server_EHEC.Model public int ExamId { get; set; } public int DoctorId { get; set; } + public bool SicknessStatus { get; set; } + public string SicknessDesignation { get; set; } + public int OriginOriginId { get; set; } public virtual Result Result { get; set; } public virtual Doctor Doctor { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection Patient { get; set; } + public virtual Origin Origin { get; set; } } } diff --git a/Web_Server_EHEC/Web_Server_EHEC/Model/Origin.cs b/Web_Server_EHEC/Web_Server_EHEC/Model/Origin.cs index e3d77c1..7b1c363 100644 --- a/Web_Server_EHEC/Web_Server_EHEC/Model/Origin.cs +++ b/Web_Server_EHEC/Web_Server_EHEC/Model/Origin.cs @@ -14,12 +14,19 @@ namespace Web_Server_EHEC.Model public partial class Origin { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public Origin() + { + this.Exam = new HashSet(); + } + public int OriginId { get; set; } public int SicknessId { get; set; } public string Name { get; set; } - public string City { get; set; } public string Street { get; set; } + public string City { get; set; } - public virtual Sickness Sickness { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection Exam { get; set; } } } diff --git a/Web_Server_EHEC/Web_Server_EHEC/Model/Patient.cs b/Web_Server_EHEC/Web_Server_EHEC/Model/Patient.cs index 97f2fa8..38b313d 100644 --- a/Web_Server_EHEC/Web_Server_EHEC/Model/Patient.cs +++ b/Web_Server_EHEC/Web_Server_EHEC/Model/Patient.cs @@ -16,7 +16,6 @@ namespace Web_Server_EHEC.Model { public int PatientId { get; set; } - public virtual Status Status { get; set; } public virtual Exam Exam { get; set; } } } diff --git a/Web_Server_EHEC/Web_Server_EHEC/Model/Person.cs b/Web_Server_EHEC/Web_Server_EHEC/Model/Person.cs index aa3070a..8f64752 100644 --- a/Web_Server_EHEC/Web_Server_EHEC/Model/Person.cs +++ b/Web_Server_EHEC/Web_Server_EHEC/Model/Person.cs @@ -17,6 +17,8 @@ namespace Web_Server_EHEC.Model public int PersonId { get; set; } public string Firstname { get; set; } public string Lastname { get; set; } - public string Birthdate { get; set; } + public System.DateTime Birthdate { get; set; } + public string Street { get; set; } + public string City { get; set; } } } diff --git a/Web_Server_EHEC/Web_Server_EHEC/Model/Result.cs b/Web_Server_EHEC/Web_Server_EHEC/Model/Result.cs index 468ed2f..b61bbda 100644 --- a/Web_Server_EHEC/Web_Server_EHEC/Model/Result.cs +++ b/Web_Server_EHEC/Web_Server_EHEC/Model/Result.cs @@ -21,8 +21,8 @@ namespace Web_Server_EHEC.Model } public int ResultId { get; set; } - public string Description { get; set; } public string Name { get; set; } + public string Description { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection Exam { get; set; } diff --git a/Web_Server_EHEC/Web_Server_EHEC/Model/Sickness.cs b/Web_Server_EHEC/Web_Server_EHEC/Model/Sickness.cs deleted file mode 100644 index 69d768b..0000000 --- a/Web_Server_EHEC/Web_Server_EHEC/Model/Sickness.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Web_Server_EHEC.Model -{ - using System; - using System.Collections.Generic; - - public partial class Sickness - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public Sickness() - { - this.Origin = new HashSet(); - } - - public int SicknessId { get; set; } - public string Designation { get; set; } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Origin { get; set; } - public virtual Status Status { get; set; } - } -} diff --git a/Web_Server_EHEC/Web_Server_EHEC/Model/Status.cs b/Web_Server_EHEC/Web_Server_EHEC/Model/Status.cs deleted file mode 100644 index 6ff16cc..0000000 --- a/Web_Server_EHEC/Web_Server_EHEC/Model/Status.cs +++ /dev/null @@ -1,29 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Web_Server_EHEC.Model -{ - using System; - using System.Collections.Generic; - - public partial class Status - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public Status() - { - this.Patient = new HashSet(); - } - - public int StatusId { get; set; } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Patient { get; set; } - public virtual Sickness Sickness { get; set; } - } -} diff --git a/Web_Server_EHEC/Web_Server_EHEC/Web_Server_EHEC.csproj b/Web_Server_EHEC/Web_Server_EHEC/Web_Server_EHEC.csproj index c32c32c..5f191cd 100644 --- a/Web_Server_EHEC/Web_Server_EHEC/Web_Server_EHEC.csproj +++ b/Web_Server_EHEC/Web_Server_EHEC/Web_Server_EHEC.csproj @@ -142,12 +142,6 @@ EHEC_DB_Model.tt - - EHEC_DB_Model.tt - - - EHEC_DB_Model.tt - Service.svc