plum-e2e 1.1.1 → 1.2.1

package/backend/package.json

@@ -1,9 +1,9 @@
 {
 	"name": "plum-backend",
-	"version": "1.0.0",
+	"version": "1.2.1",
 	"main": "index.js",
 	"scripts": {
-		"init": "node services/envService.js && node config/scripts/create-settings.js",
+		"init": "node services/envService.js",
 		"create-step": "node config/scripts/create-step.mjs",
 		"create-env": "node services/envService.js",
 		"test": "node config/scripts/run-tests.js"
@@ -15,14 +15,17 @@
 		"@playwright/test": "^1.50.1",
 		"@types/node": "^22.17.0",
 		"cross-env": "^7.0.3",
+		"prisma": "^6.19.3",
 		"ts-node": "^10.9.2",
 		"typescript": "^5.9.2"
 	},
 	"dependencies": {
 		"@clack/prompts": "^1.5.1",
 		"@cucumber/cucumber": "^11.2.0",
+		"@prisma/client": "^6.19.3",
 		"chai": "^4.3.6",
 		"chai-soft-assert": "^0.0.5",
+		"chokidar": "^5.0.0",
 		"cors": "^2.8.5",
 		"dotenv": "^16.4.7",
 		"express": "^4.21.2",

package/backend/prisma/migrations/20260614000000_init/migration.sql

@@ -0,0 +1,35 @@
+-- CreateTable
+CREATE TABLE "CronJob" (
+    "id" SERIAL NOT NULL,
+    "taskName" TEXT NOT NULL,
+    "cronExpression" TEXT NOT NULL,
+    "tags" TEXT NOT NULL,
+    "workers" INTEGER NOT NULL DEFAULT 1,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "CronJob_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "Report" (
+    "id" SERIAL NOT NULL,
+    "fileName" TEXT NOT NULL,
+    "status" TEXT NOT NULL,
+    "tags" TEXT NOT NULL,
+    "triggerType" TEXT NOT NULL DEFAULT 'manual-trigger',
+    "runners" INTEGER NOT NULL DEFAULT 1,
+    "cronJobId" INTEGER,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "Report_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "CronJob_taskName_key" ON "CronJob"("taskName");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Report_fileName_key" ON "Report"("fileName");
+
+-- AddForeignKey
+ALTER TABLE "Report" ADD CONSTRAINT "Report_cronJobId_fkey" FOREIGN KEY ("cronJobId") REFERENCES "CronJob"("id") ON DELETE SET NULL ON UPDATE CASCADE;

package/backend/prisma/migrations/20260614000001_add_project/migration.sql

@@ -0,0 +1,8 @@
+-- CreateTable
+CREATE TABLE "Project" (
+    "id" SERIAL NOT NULL,
+    "name" TEXT NOT NULL DEFAULT '',
+    "logoUrl" TEXT NOT NULL DEFAULT '',
+
+    CONSTRAINT "Project_pkey" PRIMARY KEY ("id")
+);

package/backend/prisma/migrations/migration_lock.toml

@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (i.e. Git)
+provider = "postgresql"

package/backend/prisma/schema.prisma

@@ -0,0 +1,53 @@
+/*
+This file is part of Plum.
+
+Plum is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Plum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Plum. If not, see https://www.gnu.org/licenses/.
+*/
+generator client {
+  provider = "prisma-client-js"
+}
+
+datasource db {
+  provider = "postgresql"
+  url      = env("DATABASE_URL")
+}
+
+model CronJob {
+  id             Int      @id @default(autoincrement())
+  taskName       String   @unique
+  cronExpression String
+  tags           String
+  workers        Int      @default(1)
+  createdAt      DateTime @default(now())
+  updatedAt      DateTime @updatedAt
+  reports        Report[]
+}
+
+model Report {
+  id          Int      @id @default(autoincrement())
+  fileName    String   @unique
+  status      String
+  tags        String
+  triggerType String   @default("manual-trigger")
+  runners     Int      @default(1)
+  cronJobId   Int?
+  cronJob     CronJob? @relation(fields: [cronJobId], references: [id], onDelete: SetNull)
+  createdAt   DateTime @default(now())
+}
+
+model Project {
+  id      Int    @id @default(autoincrement())
+  name    String @default("")
+  logoUrl String @default("")
+}

package/backend/routes/backup.routes.js

@@ -0,0 +1,50 @@
+/*
+ * This file is part of Plum.
+ *
+ * Plum is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Plum is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Plum. If not, see https://www.gnu.org/licenses/.
+ */
+
+const express = require('express');
+const router = express.Router();
+const backupService = require('../services/backupService');
+const cronService = require('../services/cronService');
+
+router.get('/export', async (req, res) => {
+	try {
+		const data = await backupService.exportAll();
+		const fileName = `plum-backup-${new Date().toISOString().slice(0, 10)}.json`;
+		res.setHeader('Content-Disposition', `attachment; filename="${fileName}"`);
+		res.setHeader('Content-Type', 'application/json');
+		res.json(data);
+	} catch (error) {
+		console.error('Export failed:', error);
+		res.status(500).json({ error: 'Export failed' });
+	}
+});
+
+router.post('/import', async (req, res) => {
+	try {
+		const { cronJobs, reports, project } = req.body;
+		if (!Array.isArray(cronJobs) && !Array.isArray(reports) && !project) {
+			return res.status(400).json({ error: 'Invalid backup format' });
+		}
+		await backupService.importAll({ cronJobs, reports, project }, cronService);
+		res.json({ message: 'Import successful' });
+	} catch (error) {
+		console.error('Import failed:', error);
+		res.status(500).json({ error: 'Import failed' });
+	}
+});
+
+module.exports = router;

package/backend/routes/cron.routes.js

@@ -19,14 +19,9 @@ const express = require('express');
 const router = express.Router();
 const cronService = require('../services/cronService');
 
-/* -----------------------------------------------------
- *                   Get Cron Jobs
- *  Description:
- * 		- Get all cron jobs from config/cron-jobs.json
- * ------------------------------------------------------ */
-router.get('/', (req, res) => {
+router.get('/', async (req, res) => {
 	try {
-		const cronJobs = cronService.getAllCronJobs();
+		const cronJobs = await cronService.getAllCronJobs();
 		res.json({ cronJobs });
 	} catch (error) {
 		console.error('Error fetching cron jobs:', error);
@@ -34,28 +29,13 @@ router.get('/', (req, res) => {
 	}
 });
 
-/* -----------------------------------------------------
- *                    Create Cron Job
- *  Description:
- * 		Add a new cron job to config/cron-jobs.json
- *  Params:
- * 		- cronExpression:
- * 			e.g. "* * * * *"
- * 			https://www.baeldung.com/cron-expressions
- * 		- taskName:
- * 			the unique identifier
- * 		- tags:
- * 			cucumber tag you want to run when cron job
- * 			is triggered.
- * ------------------------------------------------------ */
-router.post('/', (req, res) => {
+router.post('/', async (req, res) => {
 	try {
 		const { cronExpression, taskName, tags } = req.body;
 		if (!cronExpression || !taskName || !tags) {
 			return res.status(400).json({ error: 'Missing required fields' });
 		}
-
-		cronService.addCronJob(req.body);
+		await cronService.addCronJob(req.body);
 		res.json({
 			message: `Cron job ${taskName} added with tags: ${tags}`,
 			taskName,
@@ -67,56 +47,25 @@ router.post('/', (req, res) => {
 	}
 });
 
-/* -----------------------------------------------------
- *                    Edit Cron Job
- *  Description:
- * 		Edit an existing cron job from
- * 		config/cron-jobs.json
- *  Params:
- * 		- taskName:
- * 			the unique identifier
- * 		- cronExpression:
- * 			e.g. "* * * * *"
- * 			https://www.baeldung.com/cron-expressions
- * 		- tags:
- * 			cucumber tag you want to run when cron job
- * 			is triggered.
- * ------------------------------------------------------ */
-router.put('/:taskName', (req, res) => {
+router.put('/:taskName', async (req, res) => {
 	try {
 		const { taskName } = req.params;
 		const { cronExpression, tags } = req.body;
-
 		if (!cronExpression || !tags) {
 			return res.status(400).json({ error: 'Missing required fields' });
 		}
-
-		const updatedCronJob = cronService.updateCronJob(taskName, req.body); // Assuming this is a function to update the cron job
-		res.json({
-			message: `Cron job ${taskName} updated`,
-			taskName,
-			cronExpression,
-			tags: updatedCronJob.tags
-		});
+		await cronService.updateCronJob(taskName, req.body);
+		res.json({ message: `Cron job ${taskName} updated`, taskName, cronExpression, tags });
 	} catch (error) {
 		console.error('Error updating cron job:', error);
 		res.status(500).json({ error: 'Failed to update cron job' });
 	}
 });
 
-/* -----------------------------------------------------
- *                    Delete Cron Job
- *  Description:
- * 		Delete cron job from config/cron-jobs.json
- * 		by taskName
- *  Params:
- * 		- taskName:
- * 			the unique identifier
- * ------------------------------------------------------ */
-router.delete('/:taskName', (req, res) => {
+router.delete('/:taskName', async (req, res) => {
 	try {
 		const { taskName } = req.params;
-		cronService.removeCronJob(taskName);
+		await cronService.removeCronJob(taskName);
 		res.json({ message: `Cron job ${taskName} deleted` });
 	} catch (error) {
 		console.error('Error deleting cron job:', error);

package/backend/routes/reports.routes.js

@@ -19,14 +19,24 @@ const express = require('express');
 const router = express.Router();
 const reportService = require('../services/reportService');
 
-router.get('/', (req, res) => {
-	const reports = reportService.getAllReports();
-	res.json({ reports });
+router.get('/', async (req, res) => {
+	try {
+		const reports = await reportService.getAllReports();
+		res.json({ reports });
+	} catch (error) {
+		console.error('Error fetching reports:', error);
+		res.status(500).json({ error: 'Failed to fetch reports' });
+	}
 });
 
-router.get('/latest', (req, res) => {
-	const latestReport = reportService.getLatestReport();
-	res.json({ latestReport });
+router.get('/latest', async (req, res) => {
+	try {
+		const latestReport = await reportService.getLatestReport();
+		res.json({ latestReport });
+	} catch (error) {
+		console.error('Error fetching latest report:', error);
+		res.status(500).json({ error: 'Failed to fetch latest report' });
+	}
 });
 
 router.get('/:fileName/detail', (req, res) => {
@@ -35,4 +45,27 @@ router.get('/:fileName/detail', (req, res) => {
 	res.json(detail);
 });
 
+router.delete('/bulk', async (req, res) => {
+	const { fileNames } = req.body;
+	if (!Array.isArray(fileNames) || fileNames.length === 0)
+		return res.status(400).json({ error: 'fileNames array required' });
+	try {
+		await reportService.deleteReports(fileNames);
+		res.json({ deleted: fileNames.length });
+	} catch (error) {
+		console.error('Error deleting reports:', error);
+		res.status(500).json({ error: 'Failed to delete reports' });
+	}
+});
+
+router.delete('/:fileName', async (req, res) => {
+	try {
+		await reportService.deleteReport(req.params.fileName);
+		res.json({ deleted: req.params.fileName });
+	} catch (error) {
+		console.error('Error deleting report:', error);
+		res.status(500).json({ error: 'Failed to delete report' });
+	}
+});
+
 module.exports = router;

package/backend/routes/settings.routes.js

@@ -0,0 +1,43 @@
+/*
+ * This file is part of Plum.
+ *
+ * Plum is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Plum is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Plum. If not, see https://www.gnu.org/licenses/.
+ */
+
+const express = require('express');
+const router = express.Router();
+const settingsService = require('../services/settingsService');
+
+router.get('/project', async (req, res) => {
+	try {
+		const project = await settingsService.getProject();
+		res.json(project);
+	} catch (error) {
+		console.error('Error fetching project settings:', error);
+		res.status(500).json({ error: 'Failed to fetch project settings' });
+	}
+});
+
+router.post('/project', async (req, res) => {
+	try {
+		const { name, logoUrl } = req.body;
+		const project = await settingsService.updateProject({ name, logoUrl });
+		res.json(project);
+	} catch (error) {
+		console.error('Error updating project settings:', error);
+		res.status(500).json({ error: 'Failed to update project settings' });
+	}
+});
+
+module.exports = router;

package/backend/server.js

@@ -19,6 +19,7 @@ const http = require('http');
 const { Server } = require('socket.io');
 const app = require('./app');
 const socketHandler = require('./websockets/socketHandler.js');
+const cronService = require('./services/cronService');
 const server = http.createServer(app);
 const io = new Server(server, { cors: { origin: '*' } });
 const path = require('path');
@@ -35,5 +36,55 @@ if (!fs.existsSync(testsDir)) {
 console.log('📂 Loading tests from:', testsDir);
 
 socketHandler(io);
+cronService.setSocketIO(io);
 
-server.listen(3001, () => console.log('Backend running on port 3001'));
+async function start() {
+	await cronService.init();
+	server.listen(3001, async () => {
+		console.log('Backend running on port 3001');
+
+		// chokidar v5+ is ESM-only — use dynamic import to stay compatible with CJS
+		let chokidar;
+		try {
+			chokidar = (await import('chokidar')).default;
+		} catch {
+			console.warn('⚠️  chokidar unavailable — file watching disabled');
+			return;
+		}
+
+		const watchOpts = { usePolling: true, interval: 800, ignoreInitial: true };
+
+		// Watch tests/features/ — notify UI when feature files are added/changed/removed
+		const featuresDir = path.join(testsDir, 'features');
+		if (fs.existsSync(featuresDir)) {
+			let debounce = null;
+			chokidar.watch(featuresDir, watchOpts).on('all', (event, filePath) => {
+				clearTimeout(debounce);
+				debounce = setTimeout(() => {
+					console.log(
+						`📝 Tests changed (${event}: ${path.basename(filePath)}) — notifying clients`
+					);
+					io.emit('tests-changed');
+				}, 300);
+			});
+			console.log('👀 Watching for test file changes...');
+		}
+
+		// Watch reports/ — notify UI when a new report file lands
+		const reportsDir = path.resolve(process.cwd(), 'reports');
+		fs.mkdirSync(reportsDir, { recursive: true });
+		chokidar.watch(reportsDir, { ...watchOpts, interval: 1200 }).on('add', (filePath) => {
+			const name = path.basename(filePath);
+			if ((name.startsWith('PASS_') || name.startsWith('FAIL_')) && name.endsWith('.json')) {
+				console.log(`📊 New report: ${name} — notifying clients`);
+				io.emit('report-ready');
+			}
+		});
+		console.log('👀 Watching for new reports...');
+	});
+}
+
+start().catch((err) => {
+	console.error('Failed to start server:', err);
+	process.exit(1);
+});

package/backend/services/backupService.js

@@ -0,0 +1,88 @@
+/*
+ * This file is part of Plum.
+ *
+ * Plum is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Plum is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Plum. If not, see https://www.gnu.org/licenses/.
+ */
+
+const prisma = require('./prisma');
+
+const exportAll = async () => {
+	const [cronJobs, reports, project] = await Promise.all([
+		prisma.cronJob.findMany({ orderBy: { createdAt: 'asc' } }),
+		prisma.report.findMany({
+			orderBy: { createdAt: 'asc' },
+			include: { cronJob: { select: { taskName: true } } }
+		}),
+		prisma.project.findUnique({ where: { id: 1 } })
+	]);
+
+	// Annotate each report with the cronJob's taskName for portable restoration
+	const portableReports = reports.map(({ cronJob, cronJobId, ...r }) => ({
+		...r,
+		cronJobTaskName: cronJob?.taskName ?? null
+	}));
+
+	return {
+		version: '1',
+		exportedAt: new Date().toISOString(),
+		cronJobs: cronJobs.map(({ id, createdAt, updatedAt, reports: _, ...r }) => r),
+		reports: portableReports.map(({ id, createdAt, ...r }) => r),
+		project: project ? { name: project.name, logoUrl: project.logoUrl } : null
+	};
+};
+
+const importAll = async ({ cronJobs = [], reports = [], project = null }, cronService) => {
+	await prisma.$transaction(async (tx) => {
+		// Upsert cron jobs and build taskName → id map
+		const taskNameToId = {};
+		for (const job of cronJobs) {
+			const upserted = await tx.cronJob.upsert({
+				where: { taskName: job.taskName },
+				create: {
+					taskName: job.taskName,
+					cronExpression: job.cronExpression,
+					tags: job.tags,
+					workers: job.workers ?? 1
+				},
+				update: { cronExpression: job.cronExpression, tags: job.tags, workers: job.workers ?? 1 }
+			});
+			taskNameToId[job.taskName] = upserted.id;
+		}
+
+		// Upsert reports, resolving cronJobId from the taskName map
+		for (const report of reports) {
+			const { cronJobTaskName, ...data } = report;
+			const cronJobId = cronJobTaskName ? (taskNameToId[cronJobTaskName] ?? null) : null;
+			await tx.report.upsert({
+				where: { fileName: data.fileName },
+				create: { ...data, cronJobId },
+				update: { ...data, cronJobId }
+			});
+		}
+
+		// Restore project settings
+		if (project) {
+			await tx.project.upsert({
+				where: { id: 1 },
+				create: { id: 1, name: project.name ?? '', logoUrl: project.logoUrl ?? '' },
+				update: { name: project.name ?? '', logoUrl: project.logoUrl ?? '' }
+			});
+		}
+	});
+
+	// Re-schedule cron jobs after import
+	if (cronService) await cronService.reload();
+};
+
+module.exports = { exportAll, importAll };