From 52aa3e4f7e57d1cef311eb8cd37e7ae0445c8c57 Mon Sep 17 00:00:00 2001 From: make-github-pseudonymous-again <5165674+make-github-pseudonymous-again@users.noreply.github.com> Date: Fri, 10 May 2024 22:59:10 +0200 Subject: [PATCH] :recycle: refactor(`_dev/populate`): Update usage of faker. Fixes #697. --- imports/api/_dev/populate/appointments.ts | 6 +++--- imports/api/_dev/populate/consultations.ts | 6 +++--- imports/api/_dev/populate/patients.ts | 24 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/imports/api/_dev/populate/appointments.ts b/imports/api/_dev/populate/appointments.ts index ca7c77322..8a7bafa22 100644 --- a/imports/api/_dev/populate/appointments.ts +++ b/imports/api/_dev/populate/appointments.ts @@ -6,13 +6,13 @@ import scheduleAppointment from '../../endpoint/appointments/schedule'; import invoke from '../../endpoint/invoke'; export const newAppointmentFormData = makeTemplate({ - datetime: () => faker.date.past(20), + datetime: () => faker.date.past({years: 20}), duration: () => 1, reason: () => faker.lorem.sentence(), phone: () => faker.phone.number(), patient: { - firstname: () => faker.name.firstName(), - lastname: () => faker.name.lastName(), + firstname: () => faker.person.firstName(), + lastname: () => faker.person.lastName(), _id: () => '?', }, }); diff --git a/imports/api/_dev/populate/consultations.ts b/imports/api/_dev/populate/consultations.ts index bfe6351e9..ea95c138e 100644 --- a/imports/api/_dev/populate/consultations.ts +++ b/imports/api/_dev/populate/consultations.ts @@ -6,7 +6,7 @@ import insertConsultation from '../../endpoint/consultations/insert'; import invoke from '../../endpoint/invoke'; export const newConsultationFormData = makeTemplate({ - datetime: () => faker.date.past(20), + datetime: () => faker.date.past({years: 20}), reason: () => faker.lorem.sentence(), done: () => faker.lorem.paragraph(), todo: () => faker.lorem.paragraph(), @@ -15,9 +15,9 @@ export const newConsultationFormData = makeTemplate({ more: () => faker.lorem.paragraph(), currency: () => 'EUR', - price: () => faker.datatype.number(150), + price: () => faker.number.int(150), paid: () => 0, - book: () => `${faker.datatype.number(100)}`, + book: () => `${faker.number.int(100)}`, }); export const newConsultation = async (invocation, extra?) => { diff --git a/imports/api/_dev/populate/patients.ts b/imports/api/_dev/populate/patients.ts index 920099471..77f3d2624 100644 --- a/imports/api/_dev/populate/patients.ts +++ b/imports/api/_dev/populate/patients.ts @@ -16,11 +16,11 @@ import invoke from '../../endpoint/invoke'; const AGE_MAX = 130; export const newPatientFormData = makeTemplate({ - niss: () => faker.datatype.uuid(), - firstname: () => faker.name.firstName(), - lastname: () => faker.name.lastName(), + niss: () => faker.string.uuid(), + firstname: () => faker.person.firstName(), + lastname: () => faker.person.lastName(), - birthdate: () => format(faker.date.past(AGE_MAX), BIRTHDATE_FORMAT), + birthdate: () => format(faker.date.past({years: AGE_MAX}), BIRTHDATE_FORMAT), sex: () => faker.helpers.arrayElement(SEX_ALLOWED), photo: () => '', // Could use faker.image.dataUri but this would need to put the format in the database // because current database uses PNG by default and dataUri spits out SVG @@ -29,9 +29,9 @@ export const newPatientFormData = makeTemplate({ ongoing: () => faker.lorem.paragraph(), about: () => faker.lorem.paragraph(), - municipality: () => faker.address.city(), - streetandnumber: () => faker.address.streetAddress(), - zip: () => faker.address.zipCode(), + municipality: () => faker.location.city(), + streetandnumber: () => faker.location.streetAddress(), + zip: () => faker.location.zipCode(), phone: () => faker.phone.number(), insurances: () => @@ -41,17 +41,17 @@ export const newPatientFormData = makeTemplate({ displayName: faker.company.name(), name: '', }), - range(faker.datatype.number(2)), + range(faker.number.int(2)), ), ), doctors: () => list( map( () => ({ - displayName: `${faker.name.lastName()} ${faker.name.firstName()}`, + displayName: `${faker.person.lastName()} ${faker.person.firstName()}`, name: '', }), - range(faker.datatype.number(2)), + range(faker.number.int(2)), ), ), allergies: () => @@ -61,11 +61,11 @@ export const newPatientFormData = makeTemplate({ displayName: faker.commerce.product(), name: '', }), - range(faker.datatype.number(4)), + range(faker.number.int(4)), ), ), - noshow: () => faker.datatype.number(3), + noshow: () => faker.number.int(3), }); export const newPatient = async (invocation, extra?) => {