Skip to content

Complete platform hardening and learning workflows #4

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

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

Complete platform hardening and learning workflows #4

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: 2 additions & 0 deletions Backend/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const config = {
lemonSqueezyWebhookSecret: process.env.LEMONSQUEEZY_WEBHOOK_SECRET || "",
lemonSqueezyAmountToleranceMinor: Number(process.env.LEMONSQUEEZY_AMOUNT_TOLERANCE_MINOR || 100),
lemonSqueezyCheckoutTtlMinutes: Math.max(1, Number(process.env.LEMONSQUEEZY_CHECKOUT_TTL_MINUTES || 5)),
courseApprovalRequired: process.env.COURSE_APPROVAL_REQUIRED === "true",
couponCleanupIntervalMs: Number(process.env.COUPON_CLEANUP_INTERVAL_MS || 60000),
redisUrl: process.env.REDIS_URL || "",
cacheTtlSeconds: Number(process.env.CACHE_TTL_SECONDS || 30),
Expand All @@ -52,6 +53,7 @@ const config = {
s3MultipartPartBytes: Math.max(5, Number(process.env.S3_MULTIPART_PART_MB || 8)) * 1024 * 1024,
s3PresignExpiresSeconds: Math.min(3600, Math.max(60, Number(process.env.S3_PRESIGN_EXPIRES_SECONDS || 900))),
s3MultipartSessionTtlHours: Math.max(1, Number(process.env.S3_MULTIPART_SESSION_TTL_HOURS || 24)),
s3MaxUploadBytes: Math.max(1, Number(process.env.S3_MAX_UPLOAD_MB || 5000)) * 1024 * 1024,
};

if (!["s3", "local"].includes(config.mediaStorageProvider)) {
Expand Down
53 changes: 53 additions & 0 deletions Backend/controllers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,16 @@ const courseController = {
await recordAudit({ actor: req.user, action: "course.deleted", resourceType: "course", resourceId: req.params.id, request: req });
send(res, data);
}),
restore: asyncHandler(async (req, res) => {
const data = await courseService.restore(req.user, req.params.id);
await recordAudit({ actor: req.user, action: "course.restored", resourceType: "course", resourceId: req.params.id, request: req });
send(res, data);
}),
duplicate: asyncHandler(async (req, res) => {
const data = await courseService.duplicate(req.user, req.params.id);
await recordAudit({ actor: req.user, action: "course.duplicated", resourceType: "course", resourceId: data?._id, metadata: { sourceCourseId: req.params.id }, request: req });
send(res, data, 201);
}),
publish: asyncHandler(async (req, res) => {
const data = await courseService.publish(req.user, req.params.id, req.body.isPublished);
await recordAudit({ actor: req.user, action: "course.publish_changed", resourceType: "course", resourceId: req.params.id, metadata: { isPublished: req.body.isPublished }, request: req });
Expand All @@ -106,6 +116,18 @@ const courseController = {
const data = await courseService.instructorCourses(req.user.id, req.query);
send(res, data);
}),
requestReview: asyncHandler(async (req, res) => {
const data = await courseService.requestReview(req.user, req.params.id);
send(res, data);
}),
review: asyncHandler(async (req, res) => {
const data = await courseService.review(req.user, req.params.id, req.body.status, req.body.reason);
await recordAudit({ actor: req.user, action: "course.reviewed", resourceType: "course", resourceId: req.params.id, metadata: { status: req.body.status }, request: req });
send(res, data);
}),
versions: asyncHandler(async (req, res) => {
send(res, await courseService.versions(req.user, req.params.id));
}),
instructorDetails: asyncHandler(async (req, res) => {
const data = await courseService.instructorCourseDetails(req.user, req.params.id);
send(res, data);
Expand Down Expand Up @@ -159,6 +181,14 @@ const enrollmentController = {
const data = await enrollmentService.updateProgress(req.user, req.body);
send(res, data);
}),
bookmark: asyncHandler(async (req, res) => send(res, await enrollmentService.toggleBookmark(req.user, req.body))),
bookmarks: asyncHandler(async (req, res) => send(res, await enrollmentService.listBookmarks(req.user, req.query.courseId))),
saveNote: asyncHandler(async (req, res) => send(res, await enrollmentService.saveLessonNote(req.user, req.body))),
notes: asyncHandler(async (req, res) => send(res, await enrollmentService.listLessonNotes(req.user, req.query.courseId))),
quiz: asyncHandler(async (req, res) => send(res, await enrollmentService.submitQuiz(req.user, req.body))),
assignment: asyncHandler(async (req, res) => send(res, await enrollmentService.submitAssignment(req.user, req.body), 201)),
certificate: asyncHandler(async (req, res) => send(res, await enrollmentService.issueCertificate(req.user, req.params.courseId), 201)),
certificates: asyncHandler(async (req, res) => send(res, await enrollmentService.myCertificates(req.user.id))),
courseProgress: asyncHandler(async (req, res) => {
const data = await enrollmentService.getCourseProgress(req.user, req.params.id);
send(res, data);
Expand Down Expand Up @@ -186,6 +216,10 @@ const orderController = {
const data = await orderService.getMyOrder(req.user.id, req.params.id);
send(res, data);
}),
cancel: asyncHandler(async (req, res) => {
const data = await orderService.cancel(req.user.id, req.params.id);
send(res, data);
}),
list: asyncHandler(async (req, res) => {
const data = await orderService.listOrders(req.query);
send(res, data);
Expand All @@ -206,6 +240,25 @@ const orderController = {
const data = await orderService.replayWebhookDelivery(req.user, req.params.id, req);
send(res, data);
}),
reconciliation: asyncHandler(async (req, res) => {
const data = await orderService.listReconciliationCases(req.query.limit);
send(res, data);
}),
retryReconciliation: asyncHandler(async (req, res) => {
const data = await orderService.retryReconciliation(req.user, req.params.id, req);
send(res, data);
}),
resolveDispute: asyncHandler(async (req, res) => {
const data = await orderService.resolveDispute(req.user, req.params.id, req);
send(res, data);
}),
bookmark: asyncHandler(async (req, res) => send(res, await enrollmentService.toggleBookmark(req.user, req.body))),
bookmarks: asyncHandler(async (req, res) => send(res, await enrollmentService.listBookmarks(req.user, req.query.courseId))),
saveNote: asyncHandler(async (req, res) => send(res, await enrollmentService.saveLessonNote(req.user, req.body))),
notes: asyncHandler(async (req, res) => send(res, await enrollmentService.listLessonNotes(req.user, req.query.courseId))),
quiz: asyncHandler(async (req, res) => send(res, await enrollmentService.submitQuiz(req.user, req.body))),
certificate: asyncHandler(async (req, res) => send(res, await enrollmentService.issueCertificate(req.user, req.params.courseId), 201)),
certificates: asyncHandler(async (req, res) => send(res, await enrollmentService.myCertificates(req.user.id))),
};

const reviewController = {
Expand Down
12 changes: 8 additions & 4 deletions Backend/jobs/maintenance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const config = require("../config");
const { log } = require("../utils/logger");
const { expirePendingOrders, releaseExpiredCouponReservations } = require("../services");
const { expirePendingOrders, releaseExpiredCouponReservations, reconcilePaidOrders } = require("../services");
const uploadService = require("../services/upload");

let timer = null;
let running = false;
Expand All @@ -9,12 +10,15 @@ const runCouponCleanup = async () => {
if (running) return;
running = true;
try {
const [released, expired] = await Promise.all([
const [released, expired, reconciled, mediaCleaned, staleLocalUploads] = await Promise.all([
releaseExpiredCouponReservations(),
expirePendingOrders(),
reconcilePaidOrders(),
config.mediaStorageProvider === "s3" ? uploadService.cleanupExpiredS3MultipartUploads() : Promise.resolve(0),
uploadService.cleanupStaleLocalUploads(),
]);
if (released > 0 || expired > 0) {
log("info", "payment.cleanup_completed", { releasedCouponReservations: released, expiredOrders: expired });
if (released > 0 || expired > 0 || reconciled.failed > 0 || mediaCleaned > 0 || staleLocalUploads > 0) {
log("info", "maintenance.cleanup_completed", { releasedCouponReservations: released, expiredOrders: expired, reconciliation: reconciled, mediaCleaned, staleLocalUploads });
}
} catch (error) {
log("error", "coupon.cleanup_failed", {
Expand Down
37 changes: 32 additions & 5 deletions Backend/jobs/queue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const { Queue, Worker } = require("bullmq");
const Redis = require("ioredis");
const config = require("../config");
const { log } = require("../utils/logger");
const { releaseExpiredCouponReservations } = require("../services");
const { releaseExpiredCouponReservations, reconcilePaidOrders, orderService } = require("../services");

const QUEUE_NAME = "coursify-maintenance";
let queue;
Expand All @@ -17,9 +17,18 @@ const startQueueWorkers = async () => {
worker = new Worker(
QUEUE_NAME,
async (job) => {
if (job.name !== "coupon-cleanup") return;
const released = await releaseExpiredCouponReservations();
if (released > 0) log("info", "coupon.cleanup_completed", { released, source: "queue" });
if (job.name === "coupon-cleanup") {
const released = await releaseExpiredCouponReservations();
if (released > 0) log("info", "coupon.cleanup_completed", { released, source: "queue" });
return;
}
if (job.name === "payment-reconciliation") {
await reconcilePaidOrders();
return;
}
if (job.name === "payment-retry") {
await orderService.retryReconciliation(null, job.data.reconciliationId, {});
}
},
{ connection }
);
Expand All @@ -38,10 +47,28 @@ const startQueueWorkers = async () => {
removeOnComplete: 100,
removeOnFail: 100,
});
await queue.add("payment-reconciliation", {}, {
jobId: "payment-reconciliation",
repeat: { every: Math.max(Number(config.couponCleanupIntervalMs) || 60000, 10000) },
removeOnComplete: 100,
removeOnFail: 100,
});
log("info", "queue.started", { queue: QUEUE_NAME });
return true;
};

const enqueuePaymentRetry = async ({ reconciliationId, delayMs = 30000 }) => {
if (!queue || !reconciliationId) return false;
await queue.add("payment-retry", { reconciliationId: String(reconciliationId) }, {
jobId: `payment-retry:${String(reconciliationId)}`,
attempts: 5,
backoff: { type: "exponential", delay: Math.max(1000, Number(delayMs) || 30000) },
removeOnComplete: 100,
removeOnFail: 100,
});
return true;
};

const stopQueueWorkers = async () => {
await worker?.close();
await queue?.close();
Expand All @@ -51,4 +78,4 @@ const stopQueueWorkers = async () => {
connection = null;
};

module.exports = { startQueueWorkers, stopQueueWorkers };
module.exports = { startQueueWorkers, stopQueueWorkers, enqueuePaymentRetry };
Loading
Loading