feat(tags): add tags to test cases (#299)
This commit is contained in:
@@ -2,6 +2,8 @@ import express from 'express';
|
||||
const router = express.Router();
|
||||
import { DataTypes, Op } from 'sequelize';
|
||||
import defineCase from '../../models/cases.js';
|
||||
import defineTag from '../../models/tags.js';
|
||||
|
||||
import authMiddleware from '../../middleware/auth.js';
|
||||
import visibilityMiddleware from '../../middleware/verifyVisible.js';
|
||||
|
||||
@@ -9,6 +11,10 @@ export default function (sequelize) {
|
||||
const { verifySignedIn } = authMiddleware(sequelize);
|
||||
const { verifyProjectVisibleFromFolderId } = visibilityMiddleware(sequelize);
|
||||
const Case = defineCase(sequelize, DataTypes);
|
||||
const Tags = defineTag(sequelize, DataTypes);
|
||||
|
||||
Case.belongsToMany(Tags, { through: 'caseTags', foreignKey: 'caseId', otherKey: 'tagId' });
|
||||
Tags.belongsToMany(Case, { through: 'caseTags', foreignKey: 'tagId', otherKey: 'caseId' });
|
||||
|
||||
router.get('/', verifySignedIn, verifyProjectVisibleFromFolderId, async (req, res) => {
|
||||
const { folderId, title, priority, type } = req.query;
|
||||
@@ -56,6 +62,13 @@ export default function (sequelize) {
|
||||
|
||||
const cases = await Case.findAll({
|
||||
where: whereClause,
|
||||
include: [
|
||||
{
|
||||
model: Tags,
|
||||
attributes: ['id', 'name'],
|
||||
through: { attributes: [] },
|
||||
},
|
||||
],
|
||||
});
|
||||
res.json(cases);
|
||||
} catch (error) {
|
||||
|
||||
@@ -24,11 +24,20 @@ vi.mock('../../middleware/verifyVisible.js', () => ({
|
||||
// mock defineCase
|
||||
const mockCase = {
|
||||
findAll: vi.fn(),
|
||||
belongsToMany: vi.fn(),
|
||||
};
|
||||
|
||||
vi.mock('../../models/cases.js', () => ({
|
||||
default: () => mockCase,
|
||||
}));
|
||||
|
||||
const mockTags = {
|
||||
belongsToMany: vi.fn(),
|
||||
};
|
||||
vi.mock('../../models/tags.js', () => ({
|
||||
default: () => mockTags,
|
||||
}));
|
||||
|
||||
describe('GET /cases', () => {
|
||||
let app;
|
||||
const sequelize = new Sequelize({
|
||||
@@ -54,7 +63,16 @@ describe('GET /cases', () => {
|
||||
mockCase.findAll.mockResolvedValue([{ id: 1 }]);
|
||||
const res = await request(app).get('/cases?folderId=1');
|
||||
expect(res.status).toBe(200);
|
||||
expect(mockCase.findAll).toHaveBeenCalledWith({ where: { folderId: '1' } });
|
||||
expect(mockCase.findAll).toHaveBeenCalledWith({
|
||||
where: { folderId: '1' },
|
||||
include: [
|
||||
{
|
||||
model: mockTags,
|
||||
attributes: ['id', 'name'],
|
||||
through: { attributes: [] },
|
||||
},
|
||||
],
|
||||
});
|
||||
expect(res.body).toEqual([{ id: 1 }]);
|
||||
});
|
||||
|
||||
@@ -69,6 +87,13 @@ describe('GET /cases', () => {
|
||||
priority: { [Op.in]: [1, 2] },
|
||||
type: { [Op.in]: [3] },
|
||||
},
|
||||
include: [
|
||||
{
|
||||
model: mockTags,
|
||||
attributes: ['id', 'name'],
|
||||
through: { attributes: [] },
|
||||
},
|
||||
],
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -4,6 +4,7 @@ import { DataTypes } from 'sequelize';
|
||||
import defineProject from '../../models/projects.js';
|
||||
import defineFolder from '../../models/folders.js';
|
||||
import defineCase from '../../models/cases.js';
|
||||
import defineTag from '../../models/tags.js';
|
||||
import defineRunCase from '../../models/runCases.js';
|
||||
import authMiddleware from '../../middleware/auth.js';
|
||||
import visibilityMiddleware from '../../middleware/verifyVisible.js';
|
||||
@@ -13,11 +14,14 @@ export default function (sequelize) {
|
||||
const Folder = defineFolder(sequelize, DataTypes);
|
||||
const Case = defineCase(sequelize, DataTypes);
|
||||
const RunCase = defineRunCase(sequelize, DataTypes);
|
||||
const Tags = defineTag(sequelize, DataTypes);
|
||||
Project.hasMany(Folder, { foreignKey: 'projectId' });
|
||||
Folder.hasMany(Case, { foreignKey: 'folderId' });
|
||||
Folder.belongsTo(Project, { foreignKey: 'projectId' });
|
||||
Case.belongsTo(Folder, { foreignKey: 'folderId' });
|
||||
Case.hasMany(RunCase, { foreignKey: 'caseId' });
|
||||
Case.belongsToMany(Tags, { through: 'caseTags', foreignKey: 'caseId', otherKey: 'tagId' });
|
||||
Tags.belongsToMany(Case, { through: 'caseTags', foreignKey: 'tagId', otherKey: 'caseId' });
|
||||
RunCase.belongsTo(Case, { foreignKey: 'caseId' });
|
||||
const { verifySignedIn } = authMiddleware(sequelize);
|
||||
const { verifyProjectVisibleFromProjectId } = visibilityMiddleware(sequelize);
|
||||
@@ -43,6 +47,11 @@ export default function (sequelize) {
|
||||
model: RunCase,
|
||||
attributes: ['id', 'runId', 'status'],
|
||||
},
|
||||
{
|
||||
model: Tags,
|
||||
attributes: ['id', 'name'],
|
||||
through: { attributes: [] },
|
||||
},
|
||||
],
|
||||
});
|
||||
res.json(cases);
|
||||
|
||||
@@ -3,6 +3,7 @@ const router = express.Router();
|
||||
import { DataTypes } from 'sequelize';
|
||||
import defineCase from '../../models/cases.js';
|
||||
import defineStep from '../../models/steps.js';
|
||||
import defineTag from '../../models/tags.js';
|
||||
import defineAttachment from '../../models/attachments.js';
|
||||
import authMiddleware from '../../middleware/auth.js';
|
||||
import visibilityMiddleware from '../../middleware/verifyVisible.js';
|
||||
@@ -10,11 +11,14 @@ import visibilityMiddleware from '../../middleware/verifyVisible.js';
|
||||
export default function (sequelize) {
|
||||
const Case = defineCase(sequelize, DataTypes);
|
||||
const Step = defineStep(sequelize, DataTypes);
|
||||
const Tags = defineTag(sequelize, DataTypes);
|
||||
const Attachment = defineAttachment(sequelize, DataTypes);
|
||||
Case.belongsToMany(Step, { through: 'caseSteps' });
|
||||
Step.belongsToMany(Case, { through: 'caseSteps' });
|
||||
Case.belongsToMany(Attachment, { through: 'caseAttachments' });
|
||||
Attachment.belongsToMany(Case, { through: 'caseAttachments' });
|
||||
Case.belongsToMany(Tags, { through: 'caseTags', foreignKey: 'caseId', otherKey: 'tagId' });
|
||||
Tags.belongsToMany(Case, { through: 'caseTags', foreignKey: 'tagId', otherKey: 'caseId' });
|
||||
const { verifySignedIn } = authMiddleware(sequelize);
|
||||
const { verifyProjectVisibleFromCaseId } = visibilityMiddleware(sequelize);
|
||||
|
||||
@@ -35,6 +39,11 @@ export default function (sequelize) {
|
||||
{
|
||||
model: Attachment,
|
||||
},
|
||||
{
|
||||
model: Tags,
|
||||
attributes: ['id', 'name'],
|
||||
through: { attributes: [] },
|
||||
},
|
||||
],
|
||||
});
|
||||
return res.json(testcase);
|
||||
|
||||
Reference in New Issue
Block a user