Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use new with objectId #607

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use new with objectId #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/backend/__tests__/auth/test-auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ describe('Test authentication ', () => {

let updatedData = await mongoose
.model(STEP_KEY)
.findOne({ _id: mongoose.Types.ObjectId(patientID) });
.findOne({ _id: new mongoose.Types.ObjectId(patientID) });
updatedData = updatedData.toObject();
updatedData._id = updatedData._id.toString();

Expand Down
6 changes: 3 additions & 3 deletions apps/backend/__tests__/mock-data/patients-mock-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports.POST_PATIENT_MINIMAL_REQUEST = {
};

module.exports.POST_IMMUTABLE_PATIENT_DATA = {
_id: mongoose.Types.ObjectId(),
_id: new mongoose.Types.ObjectId(),
lastEdited: new Date('2000-12-02T01:17:55.181Z'),
lastEditedBy: 'Tickle Me Elmo',
__v: 1,
Expand Down Expand Up @@ -76,8 +76,8 @@ module.exports.DEFAULT_STEP_DATA = {
};

module.exports.POST_IMMUTABLE_STEP_DATA = {
_id: mongoose.Types.ObjectId(),
patientId: mongoose.Types.ObjectId(),
_id: new mongoose.Types.ObjectId(),
patientId: new mongoose.Types.ObjectId(),
lastEdited: new Date('2000-12-02T01:17:55.181Z'),
lastEditedBy: 'Tickle Me Elmo',
__v: 1,
Expand Down
4 changes: 2 additions & 2 deletions apps/backend/__tests__/routes/patients/test-patients-id.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('PUT /patients/:id', () => {
// Query for ids must be done as an ObjectId
let updatedData = await mongoose
.model(STEP_KEY)
.findOne({ _id: mongoose.Types.ObjectId(patientID) });
.findOne({ _id: new mongoose.Types.ObjectId(patientID) });
updatedData = updatedData.toObject();
updatedData._id = updatedData._id.toString();

Expand Down Expand Up @@ -90,7 +90,7 @@ describe('PUT /patients/:id', () => {

let updatedData = await mongoose
.model(STEP_KEY)
.findOne({ _id: mongoose.Types.ObjectId(patientID) });
.findOne({ _id: new mongoose.Types.ObjectId(patientID) });
updatedData = updatedData.toObject();
updatedData._id = updatedData._id.toString();
expectStrictEqualWithTimestampOrdering(
Expand Down
2 changes: 1 addition & 1 deletion apps/backend/__tests__/routes/patients/test-put-patients-id.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ describe('PUT /patients/:id', () => {

const getPatientFromDB = async () => {
const result = await models.Patient.findOne({
_id: mongoose.Types.ObjectId(PATIENT_ID),
_id: new mongoose.Types.ObjectId(PATIENT_ID),
});
return result.toObject();
};
Expand Down
2 changes: 1 addition & 1 deletion apps/backend/__tests__/routes/roles/test-put-roles-roleid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ describe('PUT /roles/:roleid', () => {

const getRoleFromDB = async (roleId) => {
const result = await models.Role.findOne({
_id: mongoose.Types.ObjectId(roleId),
_id: new mongoose.Types.ObjectId(roleId),
});
return result.toObject();
};
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate-db-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const generatePatients = (numPatients) => {
const generatePatient = () => {
const patient = {};
patient.firstName = faker.name.firstName();
patient._id = mongoose.Types.ObjectId();
patient._id = new mongoose.Types.ObjectId();

if (getRandomInt(2)) patient.fathersName = faker.name.firstName();

Expand Down
Loading