Cambios varios para login de usuario

* Login de diferentes usuarios completado. * Cambiado esquema de BBDD, campos texto a character varying. * Cambiada relación entre paciente y medico de cabecera. * Movida clase UserType a paquete common ya que se utiliza en el EJB. * Datos de prueba para realizar logins, el password es admin para todos (hashMD5).
2019-12-06 02:17:07 +01:00
parent 32ce0a7eb6
commit 547af98a78
12 changed files with 192 additions and 159 deletions
--- a/2.database/01.CreateTables.sql
+++ b/2.database/01.CreateTables.sql
@@ -11,213 +11,213 @@ DROP TABLE myhealth.SpecialistDoctor;
 DROP TABLE myhealth.Visit;
 */

-- Table: MyHealth.Administrator
+-- Table: myhealth.administrator

-- DROP TABLE MyHealth.Administrator;
+-- DROP TABLE myhealth.administrator;

-CREATE TABLE MyHealth.Administrator
+CREATE TABLE myhealth.administrator
 (
-    email character varying(50) COLLATE pg_catalog.default NOT NULL,
-    password character varying(100) COLLATE pg_catalog.default,
-    CONSTRAINT Administrator_pkey PRIMARY KEY (email)
+    email character varying(50) COLLATE pg_catalog."default" NOT NULL,
+    password character varying(100) COLLATE pg_catalog."default",
+    CONSTRAINT administrator_pkey PRIMARY KEY (email)
 )
 WITH (
    OIDS = FALSE
 )
 TABLESPACE pg_default;

-ALTER TABLE MyHealth.Administrator
+ALTER TABLE myhealth.administrator
    OWNER to "USER";
    
-- Table: MyHealth.FamilyDoctor
+-- Table: myhealth.familydoctor

-- DROP TABLE MyHealth.FamilyDoctor;
+-- DROP TABLE myhealth.familydoctor;

-CREATE TABLE MyHealth.FamilyDoctor
+CREATE TABLE myhealth.familydoctor
 (
-    id integer NOT NULL GENERATED ALWAYS AS IDENTITY,
-    password character(50) COLLATE pg_catalog.default,
-    nif character(50) COLLATE pg_catalog.default,
-    surname character varying(100) COLLATE pg_catalog.default,
-    email character varying(120) COLLATE pg_catalog.default,
-    name character varying(100) COLLATE pg_catalog.default,
-    PrimaryHealthCareCenterId character varying(50) COLLATE pg_catalog.default,
-    CONSTRAINT FamilyDoctor_pkey PRIMARY KEY (id)
+    id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
+    password character(50) COLLATE pg_catalog."default",
+    nif character(50) COLLATE pg_catalog."default",
+    surname character varying(100) COLLATE pg_catalog."default",
+    email character varying(120) COLLATE pg_catalog."default",
+    name character varying(100) COLLATE pg_catalog."default",
+    primaryhealthcarecenterid character varying(50) COLLATE pg_catalog."default",
+    CONSTRAINT familydoctor_pkey PRIMARY KEY (id)
 )
 WITH (
    OIDS = FALSE
 )
 TABLESPACE pg_default;

-ALTER TABLE MyHealth.FamilyDoctor
+ALTER TABLE myhealth.familydoctor
    OWNER to "USER";
-    
-- Table: MyHealth.MedicalSpecialty

-- DROP TABLE MyHealth.MedicalSpecialty;
+-- Table: myhealth.medicalspecialty

-CREATE TABLE MyHealth.MedicalSpecialty
+-- DROP TABLE myhealth.medicalspecialty;
+
+CREATE TABLE myhealth.medicalspecialty
 (
-    name text COLLATE pg_catalog.default NOT NULL,
-    description text COLLATE pg_catalog.default,
-    CONSTRAINT MedicalSpecialty_pkey PRIMARY KEY (name)
+    name character varying(50) COLLATE pg_catalog."default" NOT NULL,
+    description character varying(1000) COLLATE pg_catalog."default",
+    CONSTRAINT medicalspecialty_pkey PRIMARY KEY (name)
 )
 WITH (
    OIDS = FALSE
 )
 TABLESPACE pg_default;

-ALTER TABLE MyHealth.MedicalSpecialty
-    OWNER to "USER";
-    
-- Table: MyHealth.MedicalTest
+ALTER TABLE myhealth.medicalspecialty
+    OWNER to postgres;

-- DROP TABLE MyHealth.MedicalTest;
+-- Table: myhealth.medicaltest

-CREATE TABLE MyHealth.MedicalTest
+-- DROP TABLE myhealth.medicaltest;
+
+CREATE TABLE myhealth.medicaltest
 (
-    id integer NOT NULL GENERATED ALWAYS AS IDENTITY,
+    id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
    date date,
-    time abstime,
-    result text COLLATE pg_catalog.default,
-    highResImage bytea,
+    "time" abstime,
+    result text COLLATE pg_catalog."default",
+    highresimage bytea,
    type integer,
-    PatientId character varying(50) COLLATE pg_catalog.default NOT NULL,
-    SpecialistDoctorId character varying(50) COLLATE pg_catalog.default NOT NULL,
-    CONSTRAINT MedicalTest_pkey PRIMARY KEY (id)
+    patientid character varying(50) COLLATE pg_catalog."default" NOT NULL,
+    specialistdoctorid character varying(50) COLLATE pg_catalog."default" NOT NULL,
+    CONSTRAINT medicaltest_pkey PRIMARY KEY (id)
 )
 WITH (
    OIDS = FALSE
 )
 TABLESPACE pg_default;

-ALTER TABLE MyHealth.MedicalTest
+ALTER TABLE myhealth.medicaltest
    OWNER to "USER";
    
-- Table: MyHealth.Patient
+-- Table: myhealth.patient

-- DROP TABLE MyHealth.Patient;
+-- DROP TABLE myhealth.patient;

-CREATE TABLE MyHealth.Patient
+CREATE TABLE myhealth.patient
 (
-    id integer NOT NULL GENERATED ALWAYS AS IDENTITY,
-    password character(50) COLLATE pg_catalog.default,
-    nif character(50) COLLATE pg_catalog.default,
-    surname character varying(100) COLLATE pg_catalog.default,
-    email character varying(120) COLLATE pg_catalog.default,
-    name character varying(100) COLLATE pg_catalog.default,
-    FamilyDoctorId character varying(50) COLLATE pg_catalog.default,
-    CONSTRAINT Patient_pkey PRIMARY KEY (id)
+    id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
+    password character varying COLLATE pg_catalog."default",
+    nif character varying COLLATE pg_catalog."default",
+    surname character varying(100) COLLATE pg_catalog."default",
+    email character varying(120) COLLATE pg_catalog."default",
+    name character varying(100) COLLATE pg_catalog."default",
+    familydoctorid integer,
+    CONSTRAINT patient_pkey PRIMARY KEY (id)
 )
 WITH (
    OIDS = FALSE
 )
 TABLESPACE pg_default;

-ALTER TABLE MyHealth.Patient
+ALTER TABLE myhealth.patient
    OWNER to "USER";
-    
-- Table: MyHealth.PrimaryHealthCareCenter

-- DROP TABLE MyHealth.PrimaryHealthCareCenter;
+-- Table: myhealth.primaryhealthcarecenter

-CREATE TABLE MyHealth.PrimaryHealthCareCenter
+-- DROP TABLE myhealth.primaryhealthcarecenter;
+
+CREATE TABLE myhealth.primaryhealthcarecenter
 (
-    name character varying(50) COLLATE pg_catalog.default NOT NULL,
-    location character varying(256) COLLATE pg_catalog.default,
-    CONSTRAINT PrimaryHealthCareCenter_pkey PRIMARY KEY (name)
+    name character varying(50) COLLATE pg_catalog."default" NOT NULL,
+    location character varying(256) COLLATE pg_catalog."default",
+    CONSTRAINT primaryhealthcarecenter_pkey PRIMARY KEY (name)
 )
 WITH (
    OIDS = FALSE
 )
 TABLESPACE pg_default;

-ALTER TABLE MyHealth.PrimaryHealthCareCenter
+ALTER TABLE myhealth.primaryhealthcarecenter
    OWNER to "USER";
    
-- Table: MyHealth.Question
+-- Table: myhealth.question

-- DROP TABLE MyHealth.Question;
+-- DROP TABLE myhealth.question;

-CREATE TABLE MyHealth.Question
+CREATE TABLE myhealth.question
 (
-    id integer NOT NULL GENERATED ALWAYS AS IDENTITY,
-    title character varying(512) COLLATE pg_catalog.default NOT NULL,
-    message character varying(8000) COLLATE pg_catalog.default NOT NULL,
+    id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
+    title character varying(512) COLLATE pg_catalog."default" NOT NULL,
+    message character varying(8000) COLLATE pg_catalog."default" NOT NULL,
    status integer,
-    PatientId character varying(50) COLLATE pg_catalog.default NOT NULL,
-    CONSTRAINT Question_pkey PRIMARY KEY (id)
+    patientid character varying(50) COLLATE pg_catalog."default" NOT NULL,
+    CONSTRAINT question_pkey PRIMARY KEY (id)
 )
 WITH (
    OIDS = FALSE
 )
 TABLESPACE pg_default;

-ALTER TABLE MyHealth.Question
+ALTER TABLE myhealth.question
    OWNER to "USER";
-    
-- Table: MyHealth.Response

-- DROP TABLE MyHealth.Response;
+-- Table: myhealth.response

-CREATE TABLE MyHealth.Response
+-- DROP TABLE myhealth.response;
+
+CREATE TABLE myhealth.response
 (
-    id integer NOT NULL GENERATED ALWAYS AS IDENTITY,
-    response character varying(8000) COLLATE pg_catalog.default,
-    QuestionId integer NOT NULL,
-    CONSTRAINT Response_pkey PRIMARY KEY (id)
+    id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
+    response character varying(8000) COLLATE pg_catalog."default",
+    questionid integer NOT NULL,
+    CONSTRAINT response_pkey PRIMARY KEY (id)
 )
 WITH (
    OIDS = FALSE
 )
 TABLESPACE pg_default;

-ALTER TABLE MyHealth.Response
+ALTER TABLE myhealth.response
    OWNER to "USER";
-    
-- Table: MyHealth.SpecialistDoctor

-- DROP TABLE MyHealth.SpecialistDoctor;
+-- Table: myhealth.specialistdoctor

-CREATE TABLE MyHealth.SpecialistDoctor
+-- DROP TABLE myhealth.specialistdoctor;
+
+CREATE TABLE myhealth.specialistdoctor
 (
-    id integer NOT NULL GENERATED ALWAYS AS IDENTITY,
-    password character(50) COLLATE pg_catalog.default,
-    nif character(50) COLLATE pg_catalog.default,
-    surname character varying(100) COLLATE pg_catalog.default,
-    email character varying(120) COLLATE pg_catalog.default,
-    name character varying(100) COLLATE pg_catalog.default,
-    MedicalSpecialtyId character varying(50) COLLATE pg_catalog.default,
-    CONSTRAINT SpecialistDoctor_pkey PRIMARY KEY (id)
+    id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
+    password character varying COLLATE pg_catalog."default",
+    nif character varying COLLATE pg_catalog."default",
+    surname character varying(100) COLLATE pg_catalog."default",
+    email character varying(120) COLLATE pg_catalog."default",
+    name character varying(100) COLLATE pg_catalog."default",
+    medicalspecialtyid character varying(50) COLLATE pg_catalog."default",
+    CONSTRAINT specialistdoctor_pkey PRIMARY KEY (id)
 )
 WITH (
    OIDS = FALSE
 )
 TABLESPACE pg_default;

-ALTER TABLE MyHealth.SpecialistDoctor
+ALTER TABLE myhealth.specialistdoctor
    OWNER to "USER";
-    
-- Table: MyHealth.Visit

-- DROP TABLE MyHealth.Visit;
+-- Table: myhealth.visit

-CREATE TABLE MyHealth.Visit
+-- DROP TABLE myhealth.visit;
+
+CREATE TABLE myhealth.visit
 (
-    id integer NOT NULL GENERATED ALWAYS AS IDENTITY,
+    id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
    date date NOT NULL,
-    time abstime NOT NULL,
-    observations character varying(4000) COLLATE pg_catalog.default,
-    result text COLLATE pg_catalog.default,
-    PatientId character varying(50) COLLATE pg_catalog.default NOT NULL,
-    FamilyDoctorId character varying(50) COLLATE pg_catalog.default NOT NULL,
-    CONSTRAINT Visit_pkey PRIMARY KEY (id)
+    "time" abstime NOT NULL,
+    observations character varying(4000) COLLATE pg_catalog."default",
+    result text COLLATE pg_catalog."default",
+    patientid character varying(50) COLLATE pg_catalog."default" NOT NULL,
+    familydoctorid character varying(50) COLLATE pg_catalog."default" NOT NULL,
+    CONSTRAINT visit_pkey PRIMARY KEY (id)
 )
 WITH (
    OIDS = FALSE
 )
 TABLESPACE pg_default;

-ALTER TABLE MyHealth.Visit
+ALTER TABLE myhealth.visit
    OWNER to "USER";
-    
+
--- a/Datos_prueba.sql
+++ b/Datos_prueba.sql
@@ -1,3 +1,7 @@
+--Inserta usuarios administradores (contraseña Hash MD5 'admin' para todos)
+insert into myhealth.administrator (email, password) values ('admin@example.com', '21232F297A57A5A743894A0E4A801FC3')
+insert into myhealth.administrator (email, password) values ('marcos@example.com', '21232F297A57A5A743894A0E4A801FC3')
+
 -- Inserta Especialidades médicas

 insert into MyHealth.MedicalSpecialty(name, description)
@@ -30,3 +34,4 @@ insert into MyHealth.MedicalSpecialty(name, description)
 values ('Oncología','Especialidad médica de Oncología');
 insert into MyHealth.MedicalSpecialty(name, description)
 values ('Pediatría','Especialidad médica de Pediatría');
+