Skip to content

Commit

Permalink
chore: run linter and prettier author: William Lam<williamntlam@gmail…
Browse files Browse the repository at this point in the history
….com>
  • Loading branch information
williamntlam committed Oct 16, 2024
1 parent d05aebf commit d914072
Show file tree
Hide file tree
Showing 16 changed files with 26 additions and 44 deletions.
2 changes: 1 addition & 1 deletion server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ app.use(
httpOnly: true,
secure: false,
},
})
}),
);
app.use(passport.authenticate("session"));

Expand Down
8 changes: 4 additions & 4 deletions server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Blueprint",
"license": "MIT",
"dependencies": {
"@aws-sdk/client-s3": "^3.670.0",
"@aws-sdk/client-s3": "^3.673.0",
"@supabase/supabase-js": "^2.45.4",
"compression": "^1.7.4",
"connect-sqlite3": "^0.9.13",
Expand Down
20 changes: 1 addition & 19 deletions server/src/configs/sequelize.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,10 @@ const sequelize = new Sequelize(process.env.SUPABASE_DATABASE_URI, {
timestamps: false,
freezeTableName: true,
},
logging: console.log, // Enable query logging
});

// Authenticate the connection
sequelize
.authenticate()
.then(() => {
console.log("Connection to Supabase has been established successfully.");
})
.catch((err) => {
console.error("Unable to connect to Supabase:", err);
});

// Sync the models with the database (this creates the table automatically)
// sequelize
// .sync()
// .then(() => {
// console.log("Tables have been created");
// })
// .catch((error) => {
// console.error("Error creating tables:", error);
// });
sequelize.authenticate().then(() => {});

module.exports = {
sequelize,
Expand Down
4 changes: 2 additions & 2 deletions server/src/models/client.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@ const Client = sequelize.define(
async beforeValidate(instance) {
// Check if employer contact exists
const jobLeadExists = await JobLead.findByPk(
instance.job_lead_placement
instance.job_lead_placement,
);
if (!jobLeadExists && instance.job_lead_placement !== -1) {
throw new Error("Job lead placement does not exist");
}
},
},
}
},
);

module.exports = Client;
2 changes: 1 addition & 1 deletion server/src/models/client_timeline_entry.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const ClientTimelineEntry = sequelize.define(
{
timestamps: false,
tableName: "client_timeline_entries",
}
},
);

module.exports = ClientTimelineEntry;
2 changes: 1 addition & 1 deletion server/src/models/employer.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ const Employer = sequelize.define(
}
},
},
}
},
);

module.exports = Employer;
2 changes: 1 addition & 1 deletion server/src/models/employer_contact.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const EmployerContact = sequelize.define(
}
},
},
}
},
);

module.exports = EmployerContact;
2 changes: 1 addition & 1 deletion server/src/models/employer_timeline_entry.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const EmployerTimelineEntry = sequelize.define(
{
timestamps: false,
tableName: "employer_timeline_entries",
}
},
);

module.exports = EmployerTimelineEntry;
4 changes: 2 additions & 2 deletions server/src/models/employer_to_employer_contact.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ const EmployerToEmployerContact = sequelize.define(
}

const employerContactExists = await EmployerContact.findByPk(
instance.employer_contact
instance.employer_contact,
);
if (!employerContactExists) {
throw new Error("Employer contact does not exist");
}
},
},
}
},
);

module.exports = EmployerToEmployerContact;
2 changes: 1 addition & 1 deletion server/src/models/employer_to_job_lead.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const EmployerToJobLead = sequelize.define(
}
},
},
}
},
);

module.exports = EmployerToJobLead;
2 changes: 1 addition & 1 deletion server/src/models/job_lead.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const JobLead = sequelize.define(
}
},
},
}
},
);

module.exports = JobLead;
2 changes: 1 addition & 1 deletion server/src/models/job_lead_timeline_entry.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const JobLeadTimelineEntry = sequelize.define(
{
timestamps: false,
tableName: "job_lead_timeline_entries",
}
},
);

module.exports = JobLeadTimelineEntry;
2 changes: 1 addition & 1 deletion server/test/controllers/addClients.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const mockAddClients = require("../mocks/mockAddObject");
beforeEach(() => {
mock("../../src/models/client.model", mockAddClients);
addClientsRequestHandler = mock.reRequire(
"../../src/controllers/client/addClients"
"../../src/controllers/client/addClients",
);
});

Expand Down
4 changes: 2 additions & 2 deletions server/test/controllers/getAllJobLeads.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe("getAllJobLeads test suite", () => {
count: vi.fn().mockResolvedValue(10),
});
getAllJobLeadsRequestHandler = mock.reRequire(
"../../src/controllers/job_lead/getAllJobLeads"
"../../src/controllers/job_lead/getAllJobLeads",
);

const spy = vi.spyOn(mockGetManyClients, "findOne");
Expand All @@ -62,7 +62,7 @@ describe("getAllJobLeads test suite", () => {
it("Calls findAll", async () => {
mock("../../src/models/job_lead.model", mockGetManyClients);
getAllJobLeadsRequestHandler = mock.reRequire(
"../../src/controllers/job_lead/getAllJobLeads"
"../../src/controllers/job_lead/getAllJobLeads",
);
mock("../../src/models/client.model", {
...mockGetManyClients,
Expand Down
10 changes: 5 additions & 5 deletions server/test/controllers/updateJobLead.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe("updateJobLead test suite", () => {
};

updateJobLeadRequestHandler = mock.reRequire(
"../../src/controllers/job_lead/updateJobLead"
"../../src/controllers/job_lead/updateJobLead",
);
await updateJobLeadRequestHandler(mockReq, mockRes);
expect(mockRes.statusCode).toBe(404);
Expand All @@ -65,7 +65,7 @@ describe("updateJobLead test suite", () => {
};

updateJobLeadRequestHandler = mock.reRequire(
"../../src/controllers/job_lead/updateJobLead"
"../../src/controllers/job_lead/updateJobLead",
);
await updateJobLeadRequestHandler(mockReq, mockRes);
expect(mockRes.statusCode).toBe(401);
Expand Down Expand Up @@ -96,7 +96,7 @@ describe("updateJobLead test suite", () => {
};

updateJobLeadRequestHandler = mock.reRequire(
"../../src/controllers/job_lead/updateJobLead"
"../../src/controllers/job_lead/updateJobLead",
);
await updateJobLeadRequestHandler(mockReq, mockRes);
expect(mockRes.statusCode).toBe(400);
Expand Down Expand Up @@ -128,7 +128,7 @@ describe("updateJobLead test suite", () => {
};

updateJobLeadRequestHandler = mock.reRequire(
"../../src/controllers/job_lead/updateJobLead"
"../../src/controllers/job_lead/updateJobLead",
);
await updateJobLeadRequestHandler(mockReq, mockRes);
expect(mockRes.statusCode).toBe(403);
Expand Down Expand Up @@ -160,7 +160,7 @@ describe("updateJobLead test suite", () => {
});

updateJobLeadRequestHandler = mock.reRequire(
"../../src/controllers/job_lead/updateJobLead"
"../../src/controllers/job_lead/updateJobLead",
);
await updateJobLeadRequestHandler(mockReq, mockRes);
expect(mockRes.statusCode).toBe(200);
Expand Down

0 comments on commit d914072

Please sign in to comment.