fix: patient general data refactoring

database/inserts.sql

@@ -1,7 +1,3 @@
-INSERT INTO SEGURO (NOMBRE, ESTADO_ACTIVO) VALUES
-('Seguro Vida', TRUE),
-('Seguro Salud', TRUE);
-
 INSERT INTO USUARIO (EMAIL, TIPO) VALUES
 ('[email protected]', 'Administrador'),
 ('[email protected]', 'Doctor'),
@@ -25,7 +21,7 @@ INSERT INTO PACIENTE (
     TELEFONO_CONTACTO2,
     TIPO_SANGRE,
     DIRECCION,
-    ID_SEGURO,
+    SEGURO,
     FECHA_NACIMIENTO,
     TELEFONO
 ) VALUES
@@ -43,7 +39,7 @@ INSERT INTO PACIENTE (
     '987650123',
     'O+',
     'Calle Falsa 123, Ciudad',
-    1,
+    'El Roble',
     '1990-01-01',
     '1234567890'
 ),
@@ -61,7 +57,7 @@ INSERT INTO PACIENTE (
     '876540123',
     'A-',
     'Avenida Siempre Viva 456, Ciudad',
-    2,
+    'IGSS',
     '1992-02-02',
     '2345678901'
 );

database/tables.sql

@@ -3,13 +3,6 @@ CREATE TABLE USUARIO (
     TIPO VARCHAR(20) NOT NULL
 );
 
-
-CREATE TABLE SEGURO (
-    ID SERIAL PRIMARY KEY NOT NULL,
-    NOMBRE VARCHAR(50) NOT NULL,
-    ESTADO_ACTIVO BOOLEAN NOT NULL
-);
-
 CREATE TABLE PACIENTE (
     ID SERIAL PRIMARY KEY,
     CUI VARCHAR(24) UNIQUE NOT NULL,
@@ -25,11 +18,12 @@ CREATE TABLE PACIENTE (
     TELEFONO_CONTACTO2 VARCHAR(20),
     TIPO_SANGRE VARCHAR(3),
     DIRECCION VARCHAR(100),
-    ID_SEGURO INTEGER,
+    SEGURO VARCHAR(30),
     FECHA_NACIMIENTO DATE NOT NULL,
-    TELEFONO VARCHAR(20),
-    FOREIGN KEY (ID_SEGURO) REFERENCES SEGURO (ID)
+    TELEFONO VARCHAR(20)
 );
+COMMENT ON TABLE PACIENTE IS
+'This table is used to save general information about a patient.';
 
 CREATE TABLE DOCTOR (
     EMAIL VARCHAR(100) NOT NULL PRIMARY KEY
@@ -39,7 +33,7 @@ COMMENT ON TABLE DOCTOR IS
 
 
 CREATE TABLE ESTUDIANTE (
-    CARNET VARCHAR(20),
+    CARNET VARCHAR(20) PRIMARY KEY NOT NULL,
     CARRERA VARCHAR(50),
     ID_PACIENTE INTEGER NOT NULL UNIQUE,
     FOREIGN KEY (ID_PACIENTE) REFERENCES PACIENTE (ID)

flake.nix

@@ -3,9 +3,10 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    samcliPkgs.url = "github:nixos/nixpkgs/42c5e250a8a9162c3e962c78a4c393c5ac369093";
     systems.url = "github:nix-systems/default";
     devenv = {
-      url = "github:ElrohirGT/devenv/feat-add-custom-pg-hba-conf";
+      url = "github:cachix/devenv";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -20,6 +21,7 @@
     nixpkgs,
     systems,
     devenv,
+    samcliPkgs,
     ...
   } @ inputs: let
     forEachSystem = nixpkgs.lib.genAttrs (import systems);
@@ -78,16 +80,17 @@
 
     devShells = forEachSystem (system: let
       pkgs = import nixpkgs {inherit system;};
+      samcli = (import samcliPkgs {inherit system;}).aws-sam-cli;
       requiredPkgs = with pkgs; [
         jq
       ];
       frontendRequiredPkgs = with pkgs; [
         nodejs_20
         yarn-berry
       ];
-      backendRequiredPkgs = with pkgs; [
-        awscli2
-        aws-sam-cli
+      backendRequiredPkgs = [
+        pkgs.awscli2
+        samcli
       ];
       strFromDBFile = file: builtins.readFile ./database/${file};
       dbInitFile = builtins.concatStringsSep "\n" [(strFromDBFile "init.sql") (strFromDBFile "tables.sql") (strFromDBFile "inserts.sql")];
@@ -103,14 +106,14 @@
         inherit pkgs inputs;
         modules = [
           {
-            packages = with pkgs;
+            packages =
               [
                 # General
-                nodePackages.jsdoc
+                pkgs.nodePackages.jsdoc
 
                 # Database
-                postgresql
-                sqlfluff # SQL linter and formatter
+                pkgs.postgresql
+                pkgs.sqlfluff # SQL linter and formatter
               ]
               ++ requiredPkgs
               ++ frontendRequiredPkgs
@@ -127,7 +130,7 @@
               listen_addresses = postgresHost;
               port = postgresPort;
               initialScript = dbInitFile;
-              customPgHbaFile = ./pg_hba.conf;
+              hbaConf = builtins.readFile ./pg_hba.conf;
               settings = {
                 log_connections = true;
                 log_statement = "all";

sanitas_backend/layers/utils/utils/index.mjs

@@ -33,14 +33,14 @@ export function decodeJWT(jwt) {
  *
  * @property {string|null} tipo_sangre
  * @property {string|null} direccion
- * @property {number | null} id_seguro
+ * @property {string | null} seguro
  * @property {string} fecha_nacimiento
  * @property {string|null} telefono
  */
 
 /**
  * @typedef {Object} APIPatient
- * @property {number} id
+ * @property {number} patientId
  * @property {string} cui
  * @property {boolean} isWoman
  * @property {string|null} email
@@ -57,7 +57,7 @@ export function decodeJWT(jwt) {
  *
  * @property {string|null} bloodType
  * @property {string|null} address
- * @property {number | undefined} insuranceId
+ * @property {string | undefined} insurance
  * @property {string} birthdate
  * @property {string|null} phone
  */
@@ -83,7 +83,7 @@ export function decodeJWT(jwt) {
  */
 export function mapToAPIPatient(dbPatient) {
 	const {
-		id,
+		id: patientId,
 		cui,
 		es_mujer: isWoman,
 		correo: email,
@@ -100,13 +100,13 @@ export function mapToAPIPatient(dbPatient) {
 
 		tipo_sangre: bloodType,
 		direccion: address,
-		id_seguro: insuranceId,
+		seguro: insurance,
 		fecha_nacimiento: birthdate,
 		telefono: phone,
 	} = dbPatient;
 
 	return {
-		id,
+		patientId,
 		cui,
 		email,
 		isWoman,
@@ -123,7 +123,7 @@ export function mapToAPIPatient(dbPatient) {
 
 		bloodType,
 		address,
-		insuranceId,
+		insurance,
 		birthdate,
 		phone,
 	};
@@ -205,7 +205,7 @@ export function createResponse() {
 
 /**
  * @typedef {Object} APIStudentInfo
- * @property {string} patientId
+ * @property {string} idPatient
  * @property {string} carnet
  * @property {string} career
  */
@@ -216,29 +216,27 @@ export function createResponse() {
  * @returns {APIStudentInfo} The API formatted student information.
  */
 export function mapToAPIStudentInfo(dbStudentInfo) {
-	const { id_paciente: patientId, carnet, carrera: career } = dbStudentInfo;
+	const { id_paciente: idPatient, carnet, carrera: career } = dbStudentInfo;
 
 	return {
-		patientId,
+		idPatient,
 		carnet,
 		career,
 	};
 }
 
 /**
  * @typedef {Object} DBCollaborator
- * @property {number} id
  * @property {string} codigo
  * @property {string} area
  * @property {number} id_paciente
  */
 
 /**
  * @typedef {Object} APICollaborator
- * @property {number} id
- * @property {string} codigo
+ * @property {string} code
  * @property {string} area
- * @property {number} patientId
+ * @property {number} idPatient
  */
 
 /**
@@ -247,16 +245,24 @@ export function mapToAPIStudentInfo(dbStudentInfo) {
  * @returns {APICollaborator} The collaborator object the API must return.
  */
 export function mapToAPICollaboratorInfo(dbCollaborator) {
-	const { id, codigo: code, area, id_paciente: patientId } = dbCollaborator;
-
+	const { codigo: code, area, id_paciente: idPatient } = dbCollaborator;
 	return {
-		id,
 		code,
 		area,
-		patientId,
+		idPatient,
 	};
 }
 
+/**
+ * Maps an APICollaborator into a DBCollaborator
+ * @param {APICollaborator} apiCollaborator
+ * @returns {DBCollaborator}
+ */
+export function mapToDBCollaborator(apiCollaborator) {
+	const { code: codigo, area, idPatient: id_paciente } = apiCollaborator;
+	return { codigo, area, id_paciente };
+}
+
 /**
  * @typedef {Object} MedicalConditionData
  * @property {number} version - The version of the data format.

sanitas_backend/src/handlers/GetGeneralCollaboratorInfo/get-collaborator.integration.test.mjs

@@ -26,7 +26,7 @@ describe("Collaborator Handler", () => {
 		expect(collaborator).toBeDefined();
 		expect(collaborator.code).toBe("C001");
 		expect(collaborator.area).toBe("Administración");
-		expect(collaborator.patientId).toBe(2);
+		expect(collaborator.idPatient).toBe(2);
 	});
 
 	it("should return default data", async () => {

sanitas_backend/src/handlers/GetGeneralCollaboratorInfo/get-collaborator.mjs

@@ -1,6 +1,6 @@
 import { getPgClient } from "db-conn";
 import { logger, withRequest } from "logging";
-import { createResponse, mapToAPICollaboratorInfo } from "utils";
+import { createResponse, mapToAPICollaboratorInfo } from "utils/index.mjs";
 
 /**
  * Get the collaborator information endpoint handler.
@@ -52,7 +52,7 @@ export const getCollaboratorHandler = async (event, context) => {
 			return createResponse()
 				.setStatusCode(200)
 				.addCORSHeaders()
-				.setBody({ patientId: id, code: "", area: "" })
+				.setBody({ idPatient: id, code: "", area: "" })
 				.build();
 		}
 

sanitas_backend/src/handlers/GetGeneralPatientInfo/get-general-patient-info.integration.test.mjs

@@ -25,7 +25,7 @@ describe("Get patient integration tests", () => {
 
 		const user = response.data;
 		expect(user).toBeDefined();
-		expect(user.id).toBe(patientId);
+		expect(user.patientId).toBe(patientId);
 		expect(user.cui).toBe(cui);
 		expect(user.isWoman).toBe(false);
 		expect(user.names).toBe("Flabio André");

sanitas_backend/src/handlers/GetGeneralPatientInfo/get-general-patient-info.mjs

@@ -1,6 +1,6 @@
 import { getPgClient } from "db-conn";
 import { logger, withRequest } from "logging";
-import { mapToAPIPatient } from "utils";
+import { mapToAPIPatient } from "utils/index.mjs";
 
 /**
  * Get the general patient information endpoint handler.

sanitas_backend/src/handlers/GetGeneralStudentInfo/get-general-student-info-integration.test.mjs

@@ -26,7 +26,7 @@ describe("Student Handler", () => {
 		expect(user).toBeDefined();
 		expect(user.carnet).toBe("A01234567");
 		expect(user.career).toBe("Ingeniería en CC y TI");
-		expect(user.patientId).toBe(1);
+		expect(user.idPatient).toBe(1);
 	});
 
 	it("should not found a patiend", async () => {