9.12 - 9.13

Author: dhatGuy

part9/patientor-backend/data/patients.json

@@ -0,0 +1,53 @@
+import { Patient } from "../src/types";
+import toNewPatient from "../src/util";
+
+const data = [
+  {
+    id: "d2773336-f723-11e9-8f0b-362b9e155667",
+    name: "John McClane",
+    dateOfBirth: "1986-07-09",
+    ssn: "090786-122X",
+    gender: "male",
+    occupation: "New york city cop",
+  },
+  {
+    id: "d2773598-f723-11e9-8f0b-362b9e155667",
+    name: "Martin Riggs",
+    dateOfBirth: "1979-01-30",
+    ssn: "300179-77A",
+    gender: "male",
+    occupation: "Cop",
+  },
+  {
+    id: "d27736ec-f723-11e9-8f0b-362b9e155667",
+    name: "Hans Gruber",
+    dateOfBirth: "1970-04-25",
+    ssn: "250470-555L",
+    gender: "male",
+    occupation: "Technician",
+  },
+  {
+    id: "d2773822-f723-11e9-8f0b-362b9e155667",
+    name: "Dana Scully",
+    dateOfBirth: "1974-01-05",
+    ssn: "050174-432N",
+    gender: "female",
+    occupation: "Forensic Pathologist",
+  },
+  {
+    id: "d2773c6e-f723-11e9-8f0b-362b9e155667",
+    name: "Matti Luukkainen",
+    dateOfBirth: "1971-04-09",
+    ssn: "090471-8890",
+    gender: "male",
+    occupation: "Digital evangelist",
+  },
+];
+
+const patients: Patient[] = data.map((obj) => {
+  const object = toNewPatient(obj) as Patient;
+  object.id = obj.id;
+  return object;
+});
+
+export default patients;

part9/patientor-backend/data/patients.ts

@@ -12,10 +12,12 @@
   "dependencies": {
     "@types/cors": "^2.8.12",
     "cors": "^2.8.5",
-    "express": "^4.17.2"
+    "express": "^4.17.2",
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
+    "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
     "eslint": "^8.7.0",

part9/patientor-backend/package.json

@@ -7,7 +7,7 @@ const app = express();
 app.use(cors());
 app.use(express.json());
 
-app.get("/ping", (_req, res) => {
+app.get("/api/ping", (_req, res) => {
   res.send("pong");
 });
 

part9/patientor-backend/src/index.ts

@@ -1,9 +1,23 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import Router from "express";
 import patientService from "../services/patientService";
 const router = Router();
 
-router.get("/", (_req, res) => {
-  res.send(patientService.getPatients());
-});
+router
+  .route("/")
+  .get((_req, res) => {
+    res.send(patientService.getPatients());
+  })
+  .post((req, res) => {
+    const { name, dateOfBirth, occupation, ssn, gender } = req.body;
+    const newPatient = patientService.addPatient({
+      name,
+      dateOfBirth,
+      occupation,
+      ssn,
+      gender,
+    });
+    res.json(newPatient);
+  });
 
 export default router;

part9/patientor-backend/src/routes/patient.ts

@@ -1,5 +1,5 @@
 import diagnoseData from "../../data/diagnoses.json";
-import { Diagnose } from "../../types";
+import { Diagnose } from "../types";
 
 const getDiagnoses = (): Diagnose[] => {
   return diagnoseData;

part9/patientor-backend/src/services/diagnoseService.ts

@@ -1,15 +1,26 @@
-import patientData from "../../data/patients.json";
-import { Patient } from "../../types";
+import { v4 as uuid } from "uuid";
+import patientData from "../../data/patients";
+import { NewPatient, Patient } from "../types";
 
 const patients: Patient[] = patientData;
 
 const getPatients = (): Omit<Patient, "ssn">[] => {
-  return patients.map(({ id, name, dateOfBirth, occupation }) => ({
+  return patients.map(({ id, name, dateOfBirth, occupation, gender }) => ({
     id,
     name,
+    gender,
     dateOfBirth,
     occupation,
   }));
 };
 
-export default { getPatients };
+const addPatient = (patient: NewPatient): Patient => {
+  const newPatient = {
+    id: uuid(),
+    ...patient,
+  };
+  patients.push(newPatient);
+  return newPatient;
+};
+
+export default { getPatients, addPatient };

part9/patientor-backend/src/services/patientService.ts

@@ -10,4 +10,13 @@ export interface Patient {
   dateOfBirth: string;
   ssn: string;
   occupation: string;
+  gender: string;
 }
+
+export enum Gender {
+  MALE = "male",
+  FEMALE = "female",
+  OTHER = "other",
+}
+
+export type NewPatient = Omit<Patient, "id">;

part9/patientor-backend/types.ts part9/patientor-backend/src/types.tspart9/patientor-backend/types.ts renamed to part9/patientor-backend/src/types.ts

@@ -0,0 +1,78 @@
+import { Gender, NewPatient } from "./types";
+
+const isString = (value: unknown): value is string =>
+  typeof value === "string" || value instanceof String;
+
+const parseName = (name: unknown): string => {
+  if (!name || !isString(name)) {
+    throw new Error("Incorrect or missing name");
+  }
+
+  return name;
+};
+
+const parseSsn = (ssn: unknown): string => {
+  if (!ssn || !isString(ssn)) {
+    throw new Error("Incorrect or missing ssn");
+  }
+
+  return ssn;
+};
+
+const parseOccupation = (occupation: unknown): string => {
+  if (!occupation || !isString(occupation)) {
+    throw new Error("Incorrect or missing occupation");
+  }
+
+  return occupation;
+};
+
+const isDate = (date: string): boolean => {
+  return Boolean(Date.parse(date));
+};
+
+const parseDOB = (date: unknown): string => {
+  if (!date || !isString(date) || !isDate(date)) {
+    throw new Error("Incorrect or missing date: " + date);
+  }
+  return date;
+};
+
+const isGender = (param: string): param is Gender =>
+  ["female", "male", "other"].includes(param);
+
+const parseGender = (gender: unknown): Gender => {
+  if (!gender || !isString(gender) || !isGender(gender)) {
+    throw new Error("Incorrect or missing gender: " + gender);
+  }
+  return gender;
+};
+
+type Fields = {
+  id: unknown;
+  name: unknown;
+  dateOfBirth: unknown;
+  ssn: unknown;
+  occupation: unknown;
+  gender: unknown;
+};
+
+const toNewPatient = ({
+  name,
+  gender,
+  dateOfBirth,
+  ssn,
+  occupation,
+}: Fields): NewPatient => {
+  const newPatient: NewPatient = {
+    name: parseName(name),
+    gender: parseGender(gender),
+    ssn: parseSsn(ssn),
+    dateOfBirth: parseDOB(dateOfBirth),
+    occupation: parseOccupation(occupation),
+  };
+
+  return newPatient;
+};
+
+export default toNewPatient;

part9/patientor-backend/src/util.ts

@@ -134,6 +134,11 @@
   resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1"
   integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==
 
+"@types/uuid@^8.3.4":
+  version "8.3.4"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
+  integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
+
 "@typescript-eslint/eslint-plugin@^5.10.0":
   version "5.10.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.0.tgz#e90afea96dff8620892ad216b0e4ccdf8ee32d3a"
@@ -1441,6 +1446,11 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
 v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"