feat(frontend, backend): connect rxdb

.github/workflows/pr-check.yml

@@ -15,7 +15,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.15.0
       - uses: nrwl/nx-set-shas@v2
       - run: npm ci
 

apps/backend/src/app/app.module.ts

@@ -10,6 +10,7 @@ import configuration, {
 import { HealthModule } from '@supervision/health';
 import { UsersModule } from '@supervision/users';
 import { PatientsModule } from '@supervision/patients';
+import { DateOfBirthScalar } from './patients/graphql/date-of-birth.scalar';
 
 @Module({
   imports: [
@@ -24,6 +25,7 @@ import { PatientsModule } from '@supervision/patients';
     GraphQLModule.forRoot<ApolloDriverConfig>({
       driver: ApolloDriver,
       autoSchemaFile: true,
+      resolvers: { DateOfBirth: DateOfBirthScalar },
     }),
     HealthModule,
     UsersModule,

apps/backend/src/app/patients/database/patient.entity.ts

@@ -32,13 +32,13 @@ export enum Gender {
 
 @Entity({ name: 'patient' })
 export class PatientEntity extends BaseEntity {
-  @Column('varchar', { length: 40 })
+  @Column('varchar', { length: 40, nullable: true })
   firstName: string;
 
-  @Column('varchar', { length: 40 })
+  @Column('varchar', { length: 40, nullable: true })
   lastName: string;
 
-  @Column('date')
+  @Column('date', { nullable: true })
   dateOfBirth: Date;
 
   @Column('enum', {

apps/backend/src/app/patients/dto/create-patient.input.ts

@@ -7,13 +7,13 @@ import {
 @InputType()
 export class CreatePatientInput {
   // TODO: add field descriptions
-  @Field(() => String, { nullable: false })
+  @Field(() => String, { nullable: true })
   firstName: string;
 
-  @Field(() => String, { nullable: false })
+  @Field(() => String, { nullable: true })
   lastName: string;
 
-  @Field(() => Date, { nullable: false })
+  @Field(() => Date, { nullable: true })
   dateOfBirth: Date;
 
   @Field(() => Gender, { nullable: true })
@@ -25,7 +25,7 @@ export class CreatePatientInput {
   @Field(() => String, { nullable: true })
   school: string;
 
-  @Field(() => String, { nullable: true })
+  @Field(() => Number, { nullable: true })
   yearLevel: number;
 
   @Field(() => Date, { nullable: true })

apps/backend/src/app/patients/dto/set-patient-input.ts

@@ -0,0 +1,15 @@
+import { InputType, Field, PartialType } from '@nestjs/graphql';
+import { UpdatePatientInput } from './update-patient.input';
+
+@InputType()
+export class SetPatientInput extends PartialType(UpdatePatientInput) {
+  // TODO: add field descriptions
+  @Field(() => String, { nullable: false })
+  id: string;
+
+  @Field({ nullable: true })
+  deletedAt: Date;
+
+  @Field({ nullable: true })
+  updatedAt: Date;
+}

apps/backend/src/app/patients/graphql/date-of-birth.scalar.ts

@@ -0,0 +1,21 @@
+import { GraphQLScalarType, Kind } from 'graphql';
+
+export const DateOfBirthScalar = new GraphQLScalarType({
+  name: 'DateOfBirth',
+  description: 'Date custom scalar type',
+  parseValue(value: string | number | Date) {
+    return new Date(value); // value from the client
+  },
+  serialize(value: string | number | Date) {
+    if (value instanceof Date) {
+      return value.toISOString(); // value sent to the client
+    }
+    return new Date(value).toISOString();
+  },
+  parseLiteral(ast) {
+    if (ast.kind === Kind.INT) {
+      return new Date(ast.value); // ast value is always in string format
+    }
+    return null;
+  },
+});

apps/backend/src/app/patients/graphql/patient.model.ts

@@ -2,6 +2,7 @@ import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
 import { BaseModel } from '@supervision/shared';
 import { ConsultModel } from '@supervision/consults/graphql/consult.model';
 import { Ethnicity, Gender } from '@supervision/patients';
+import { DateOfBirthScalar } from './date-of-birth.scalar';
 
 registerEnumType(Ethnicity, {
   name: 'Ethnicity',
@@ -13,13 +14,13 @@ registerEnumType(Gender, {
 
 @ObjectType({ description: 'patient' })
 export class PatientModel extends BaseModel {
-  @Field({ nullable: false })
+  @Field({ nullable: true })
   firstName: string;
 
-  @Field({ nullable: false })
+  @Field({ nullable: true })
   lastName: string;
 
-  @Field({ nullable: false })
+  @Field(() => DateOfBirthScalar, { nullable: true })
   dateOfBirth: Date;
 
   @Field(() => Gender, { nullable: true })

apps/backend/src/app/patients/graphql/patient.resolver.ts

@@ -5,6 +5,7 @@ import { PatientService } from '@supervision/patients/patients.service';
 import { CreatePatientInput } from '../dto/create-patient.input';
 import { PatientEntity } from '../database';
 import { UpdatePatientInput } from '../dto/update-patient.input';
+import { SetPatientInput } from '../dto/set-patient-input';
 
 @Resolver(() => PatientModel)
 export class PatientResolver implements IReplicationResolver<PatientModel> {
@@ -38,6 +39,18 @@ export class PatientResolver implements IReplicationResolver<PatientModel> {
     );
   }
 
+  @Mutation(() => PatientModel, { nullable: true })
+  async setPatients(
+    @Args({
+      name: 'setPatientsInput',
+      type: () => [SetPatientInput],
+      nullable: true,
+    })
+    setPatientsInput: SetPatientInput[]
+  ): Promise<PatientModel | null> {
+    return await this.patientService.set(setPatientsInput);
+  }
+
   @Query(() => PatientModel)
   async patient(@Args('id') id: string): Promise<PatientModel> {
     return await this.patientService.findOne(id);

apps/backend/src/app/patients/patients.module.ts

@@ -3,9 +3,13 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { PatientEntity } from '@supervision/patients/database';
 import { PatientResolver } from '@supervision/patients/graphql';
 import { PatientService } from '@supervision/patients/patients.service';
+import { ConsultEntity } from '@supervision/consults';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([PatientEntity])],
+  imports: [
+    TypeOrmModule.forFeature([PatientEntity]),
+    TypeOrmModule.forFeature([ConsultEntity]),
+  ],
   exports: [TypeOrmModule],
   providers: [PatientService, PatientResolver],
 })

apps/backend/src/app/patients/patients.service.ts

@@ -3,6 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { PatientEntity } from '@supervision/patients';
 import { Repository, SelectQueryBuilder } from 'typeorm';
 import { CreatePatientInput } from './dto/create-patient.input';
+import { SetPatientInput } from './dto/set-patient-input';
 import { UpdatePatientInput } from './dto/update-patient.input';
 
 @Injectable()
@@ -31,6 +32,11 @@ export class PatientService {
     return await this.patientsRepository.save(patient);
   }
 
+  async set(patients: SetPatientInput[]): Promise<PatientEntity> {
+    const newPatients = await this.patientsRepository.save(patients);
+    return newPatients[newPatients.length - 1];
+  }
+
   async findOne(id: string): Promise<PatientEntity> {
     return await this.patientsRepository.findOneBy({ id: id });
   }

apps/backend/src/app/shared/database/base.entity.ts

@@ -16,7 +16,7 @@ export abstract class BaseEntity {
   @CreateDateColumn({ type: 'timestamptz' })
   createdAt: Date;
 
-  @DeleteDateColumn({ type: 'timestamptz' })
+  @DeleteDateColumn({ type: 'timestamptz', nullable: true })
   deletedAt: Date;
 
   @UpdateDateColumn({ type: 'timestamptz' })

apps/backend/src/app/users/users.service.ts

@@ -20,7 +20,12 @@ export class UserService {
     limit: number
   ): Promise<UserEntity[]> {
     let query: SelectQueryBuilder<UserEntity>;
-    if (minUpdatedAt === undefined || lastId === undefined) {
+    if (
+      minUpdatedAt === undefined ||
+      lastId === undefined ||
+      minUpdatedAt?.getTime() === 0 ||
+      lastId === ''
+    ) {
       query = this.usersRepository.createQueryBuilder('user');
     } else {
       query = this.usersRepository

apps/frontend/src/app/hooks/usePatients/index.ts

@@ -0,0 +1 @@
+export * from './usePatients';

apps/frontend/src/app/hooks/usePatients/usePatients.tsx

@@ -0,0 +1,40 @@
+import { IPatient } from '@patients';
+import { uuid } from 'uuidv4';
+import { useState, useEffect, useCallback } from 'react';
+import { RxDatabase } from 'rxdb';
+import { patientDatabase } from 'database';
+
+export const usePatients = () => {
+  const [patientsDb, setPatientsDb] = useState<RxDatabase>();
+  const [patients, setPatients] = useState<IPatient[]>([]);
+
+  const newPatient = useCallback(() => {
+    const newPatient = {
+      id: uuid(),
+    };
+    patientsDb?.['patients'].insert(newPatient);
+    return newPatient.id;
+  }, [patientsDb]);
+
+  const updatePatient = (patient: IPatient) =>
+    patientsDb?.['patients'].atomicUpsert(patient);
+
+  useEffect(() => {
+    if (!patientsDb) {
+      patientDatabase
+        .get()
+        ?.then((db: RxDatabase | null) => {
+          db && setPatientsDb(db);
+          db && db['patients'].find().$.subscribe(setPatients);
+          return () => db?.['patients'].find().$.unsubscribe();
+        })
+        .catch((error: Error) => {
+          console.error(error);
+        });
+    }
+  }, [patientsDb]);
+
+  return { patients, newPatient, updatePatient };
+};
+
+export default usePatients;

apps/frontend/src/app/patients/ethnicity-select/ethnicity-select.tsx

@@ -6,7 +6,7 @@ type EthnicitySelectProps = {
   onChange: (value: string | null) => void;
 };
 
-enum Ethnicities {
+export enum Ethnicities {
   'NZ European' = 'nz european',
   'Other European' = 'other european',
   'NZ Maori' = 'nz maori',

apps/frontend/src/app/patients/gender-select/gender-select.tsx

@@ -6,7 +6,7 @@ type GenderSelectProps = {
   onChange: (value: string | null) => void;
 };
 
-enum Gender {
+export enum Gender {
   'Female' = 'female',
   'Male' = 'male',
   'Other' = 'other',