feat: add filters to run case endpoint (#353)
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
import express from 'express';
|
import express from 'express';
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
import { DataTypes } from 'sequelize';
|
import { DataTypes, Op } from 'sequelize';
|
||||||
import defineProject from '../../models/projects.js';
|
import defineProject from '../../models/projects.js';
|
||||||
import defineFolder from '../../models/folders.js';
|
import defineFolder from '../../models/folders.js';
|
||||||
import defineCase from '../../models/cases.js';
|
import defineCase from '../../models/cases.js';
|
||||||
@@ -8,6 +8,7 @@ import defineTag from '../../models/tags.js';
|
|||||||
import defineRunCase from '../../models/runCases.js';
|
import defineRunCase from '../../models/runCases.js';
|
||||||
import authMiddleware from '../../middleware/auth.js';
|
import authMiddleware from '../../middleware/auth.js';
|
||||||
import visibilityMiddleware from '../../middleware/verifyVisible.js';
|
import visibilityMiddleware from '../../middleware/verifyVisible.js';
|
||||||
|
import { testRunCaseStatus } from '../../config/enums.js';
|
||||||
|
|
||||||
export default function (sequelize) {
|
export default function (sequelize) {
|
||||||
const Project = defineProject(sequelize, DataTypes);
|
const Project = defineProject(sequelize, DataTypes);
|
||||||
@@ -33,7 +34,7 @@ export default function (sequelize) {
|
|||||||
verifyProjectVisibleFromProjectId,
|
verifyProjectVisibleFromProjectId,
|
||||||
verifyProjectVisibleFromRunId,
|
verifyProjectVisibleFromRunId,
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const { projectId, runId } = req.query;
|
const { projectId, runId, status, tag } = req.query;
|
||||||
|
|
||||||
if (!projectId) {
|
if (!projectId) {
|
||||||
return res.status(400).json({ error: 'projectId is required' });
|
return res.status(400).json({ error: 'projectId is required' });
|
||||||
@@ -43,6 +44,23 @@ export default function (sequelize) {
|
|||||||
return res.status(400).json({ error: 'runId is required' });
|
return res.status(400).json({ error: 'runId is required' });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let errorMessage = null;
|
||||||
|
let statusFilter = undefined;
|
||||||
|
if (status) {
|
||||||
|
let statusIndex = testRunCaseStatus.indexOf(status.toLowerCase());
|
||||||
|
if (statusIndex === -1) {
|
||||||
|
errorMessage = `Invalid status filter: ${status}`;
|
||||||
|
} else {
|
||||||
|
statusFilter = { status: statusIndex };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let tagFilter = tag ? { name: tag } : undefined;
|
||||||
|
|
||||||
|
if (errorMessage) {
|
||||||
|
return res.status(400).json({ error: errorMessage });
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const cases = await Case.findAll({
|
const cases = await Case.findAll({
|
||||||
include: [
|
include: [
|
||||||
@@ -56,15 +74,17 @@ export default function (sequelize) {
|
|||||||
{
|
{
|
||||||
model: RunCase,
|
model: RunCase,
|
||||||
attributes: ['id', 'runId', 'status'],
|
attributes: ['id', 'runId', 'status'],
|
||||||
required: false,
|
// Must be 'true' when filtering by status, otherwise all cases are returned.
|
||||||
|
required: statusFilter ? true : false,
|
||||||
where: {
|
where: {
|
||||||
runId: runId,
|
[Op.and]: [{ runId: runId }, statusFilter],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
model: Tags,
|
model: Tags,
|
||||||
attributes: ['id', 'name'],
|
attributes: ['id', 'name'],
|
||||||
through: { attributes: [] },
|
through: { attributes: [] },
|
||||||
|
...(tagFilter ? { where: tagFilter } : {}),
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user