improve test coverage

This commit is contained in:
Alex Holliday committed 2025-11-24 22:49:55 +00:00
1 parent d5f1032bdf
commit 1e26fb1e3b
15 files changed
+388 -71

No files matched your search

+13 -2
View File
@@ -1,11 +1,14 @@
import { Request, Response, NextFunction } from "express";
import InviteService from "@/services/business/InviteService.js";
import ApiError from "@/utils/ApiError.js";
import { EmailService, InviteService } from "@/services/index.js";
import { config } from "@/config/index.js";
class InviteController {
private emailService: EmailService;
private inviteService: InviteService;
constructor(inviteService: InviteService) {
constructor(inviteService: InviteService, emailService: EmailService) {
this.inviteService = inviteService;
this.emailService = emailService;
}
create = async (req: Request, res: Response, next: NextFunction) => {
@@ -36,6 +39,14 @@ class InviteController {
teamId,
teamRoleId
);
try {
this.emailService.sendGeneric(email, "You're invited!", {
text: `You have been invited to join Checkmate. Use this link to accept the invite: ${config.ORIGIN}/register/${invite}`,
});
} catch (error) {
console.error("Failed to send invite email:", error);
}
res.status(201).json({ message: "OK", data: invite });
} catch (error: any) {
next(error);
+3 -5
View File
@@ -49,11 +49,9 @@ class RecoveryController implements IRecoveryController {
const recoveryToken = await this.recoveryService.create(user._id);
// Don't wait for email to be sent
this.emailService
.sendGeneric(
user.email,
"Password Recovery",
`Your recovery link is: ${config.ORIGIN}/recovery/${recoveryToken}`
)
.sendGeneric(user.email, "Password Recovery", {
text: `Your recovery link is: ${config.ORIGIN}/recovery/${recoveryToken}`,
})
.catch((error) => {
logger.error(error);
});
@@ -143,12 +143,14 @@ class TeamMemberController implements ITeamMemberController {
}
const teamMemberId = req.params.id;
if (!req.params.id) {
if (!teamMemberId) {
throw new ApiError("No team member ID", 400);
}
const deleted = await this.teamMemberService.delete(orgId, req.params.id);
console.log(teamMemberId);
const deleted = await this.teamMemberService.delete(orgId, teamMemberId);
invalidateCachesForUser(teamMemberId);
if (!deleted) {
throw new ApiError("Failed to delete team member", 500);
}
@@ -24,27 +24,6 @@ teamMembershipSchema.post<ITeamMembership>("save", async function (doc) {
invalidateCachesForUser(doc.userId.toString());
});
teamMembershipSchema.post<ITeamMembership>(
"deleteOne",
{ document: true, query: false },
async function (doc) {
invalidateCachesForUser(doc.userId.toString());
}
);
teamMembershipSchema.post("findOneAndDelete", function (doc: ITeamMembership) {
if (!doc) return;
invalidateCachesForUser(doc.userId.toString());
});
teamMembershipSchema.post(
"findOneAndUpdate",
async function (doc: ITeamMembership) {
if (!doc) return;
invalidateCachesForUser(doc.userId.toString());
}
);
export const TeamMembership = mongoose.model<ITeamMembership>(
"TeamMembership",
teamMembershipSchema
+4 -1
View File
@@ -24,7 +24,10 @@ export const initControllers = (services: any) => {
services.authService,
services.inviteService
);
controllers.inviteController = new InviteController(services.inviteService);
controllers.inviteController = new InviteController(
services.inviteService,
services.emailService
);
controllers.maintenanceController = new MaintenanceController(
services.maintenanceService
);
@@ -69,6 +69,16 @@ class InviteService implements IInviteService {
throw new ApiError("User is already a team member", 409);
}
// Check if inivite already exists
const existingInvite = await Invite.findOne({
email,
teamId,
});
if (existingInvite) {
throw new ApiError("An invite already exists for this email", 409);
}
const token = crypto.randomBytes(32).toString("hex");
const tokenHash = crypto.createHash("sha256").update(token).digest("hex");
@@ -10,6 +10,7 @@ import {
IOrgMembership,
} from "@/db/models/index.js";
import ApiError from "@/utils/ApiError.js";
import { invalidateCachesForUser } from "@/middleware/AddUserContext.js";
const SERVICE_NAME = "TeamMemberService";
export interface ITeamMemberService {
@@ -117,11 +118,21 @@ class TeamMemberService implements ITeamMemberService {
throw new ApiError("Role not found", 404);
}
const teamMembership = await TeamMembership.findOneAndUpdate(
const updated = await TeamMembership.findOneAndUpdate(
{ orgId: orgId, _id: teamMembershipId },
{ roleId: roleId },
{ new: true }
)
);
if (!updated) {
throw new ApiError("Team membership not found", 404);
}
invalidateCachesForUser(updated.userId.toString());
const teamMembership = await TeamMembership.findOne({
orgId: orgId,
_id: teamMembershipId,
})
.populate<IUser>("userId", "firstName lastName email")
.populate<IRole>("roleId", "name scope permissions");
@@ -140,6 +151,7 @@ class TeamMemberService implements ITeamMemberService {
if (!tm) {
throw new ApiError("Team member not found", 404);
}
invalidateCachesForUser(tm.userId.toString());
await TeamMembership.findOneAndDelete({ _id: teamMemberId, orgId: orgId });
return true;
};
@@ -33,7 +33,7 @@ export interface IEmailService extends IMessageService {
sendGeneric: (
to: string,
subject: string,
content: string
content: { text?: string; html?: string }
) => Promise<boolean>;
testTransport: (transport: IEmailTransport) => Promise<boolean>;
rebuildTransport: (transport: IEmailTransport) => Promise<boolean>;
@@ -186,7 +186,11 @@ class EmailService implements IEmailService {
);
};
sendGeneric = async (to: string, subject: string, content: string) => {
sendGeneric = async (
to: string,
subject: string,
content: { text?: string; html?: string }
) => {
try {
if (this.transporter === null) {
this.transporter = await this.buildTransport();
@@ -196,7 +200,8 @@ class EmailService implements IEmailService {
from: `"Checkmate" <${this.from}>`,
to: to,
subject: subject,
text: content,
text: content.text,
html: content.html,
});
return true;
} catch (error) {