Cretate delete project confirm dialog
This commit is contained in:
@@ -25,7 +25,7 @@ module.exports = {
|
||||
type: Sequelize.INTEGER,
|
||||
allowNull: false,
|
||||
references: {
|
||||
model: 'Projects',
|
||||
model: 'projects',
|
||||
key: 'id',
|
||||
onDelete: 'CASCADE',
|
||||
onUpdate: 'CASCADE',
|
||||
|
||||
@@ -29,7 +29,7 @@ module.exports = {
|
||||
type: Sequelize.INTEGER,
|
||||
allowNull: false,
|
||||
references: {
|
||||
model: 'Projects',
|
||||
model: 'projects',
|
||||
key: 'id',
|
||||
},
|
||||
onUpdate: 'CASCADE',
|
||||
|
||||
@@ -25,6 +25,7 @@ function defineFolder(sequelize, DataTypes) {
|
||||
|
||||
Folder.associate = (models) => {
|
||||
Folder.belongsTo(models.Project, { foreignKey: 'projectId', onDelete: 'CASCADE' });
|
||||
Folder.hasMany(models.Case, { foreignKey: 'folderId' });
|
||||
};
|
||||
|
||||
return Folder;
|
||||
|
||||
@@ -24,7 +24,9 @@ function defineProject(sequelize, DataTypes) {
|
||||
});
|
||||
|
||||
Project.associate = (models) => {
|
||||
Project.hasMany(models.Folder, { foreignKey: 'projectId' });
|
||||
Project.belongsTo(models.User, { foreignKey: 'userId', onDelete: 'CASCADE' });
|
||||
Project.hasMany(models.Folder, { foreignKey: 'projectId', onDelete: 'CASCADE' });
|
||||
Project.hasMany(models.Run, { foreignKey: 'projectId', onDelete: 'CASCADE' });
|
||||
};
|
||||
|
||||
return Project;
|
||||
|
||||
@@ -1,23 +1,37 @@
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const defineProject = require('../../models/projects');
|
||||
const defineFolder = require('../../models/folders');
|
||||
const defineRun = require('../../models/runs');
|
||||
const { DataTypes } = require('sequelize');
|
||||
|
||||
module.exports = function (sequelize) {
|
||||
const { verifySignedIn, verifyProjectOwner } = require('../../middleware/auth')(sequelize);
|
||||
const Project = defineProject(sequelize, DataTypes);
|
||||
const Folder = defineFolder(sequelize, DataTypes);
|
||||
const Run = defineRun(sequelize, DataTypes);
|
||||
|
||||
router.delete('/:projectId', verifySignedIn, verifyProjectOwner, async (req, res) => {
|
||||
const projectId = req.params.projectId;
|
||||
const t = await sequelize.transaction();
|
||||
|
||||
try {
|
||||
const project = await Project.findByPk(projectId);
|
||||
if (!project) {
|
||||
await t.rollback();
|
||||
return res.status(404).send('Project not found');
|
||||
}
|
||||
await project.destroy();
|
||||
|
||||
await Folder.destroy({ where: { projectId: projectId }, transaction: t });
|
||||
await Run.destroy({ where: { projectId: projectId }, transaction: t });
|
||||
|
||||
await project.destroy({ transaction: t });
|
||||
|
||||
await t.commit();
|
||||
res.status(204).send();
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
await t.rollback();
|
||||
res.status(500).send('Internal Server Error');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -7,7 +7,7 @@ module.exports = {
|
||||
const hashedPassword = await bcrypt.hash('password', 10);
|
||||
|
||||
// Add projects table records
|
||||
await queryInterface.bulkInsert('Users', [
|
||||
await queryInterface.bulkInsert('users', [
|
||||
{
|
||||
email: 'admin@testplat.com',
|
||||
password: hashedPassword,
|
||||
@@ -20,7 +20,7 @@ module.exports = {
|
||||
]);
|
||||
|
||||
// Add projects table records
|
||||
await queryInterface.bulkInsert('Projects', [
|
||||
await queryInterface.bulkInsert('projects', [
|
||||
{
|
||||
name: 'TestPlat Test',
|
||||
detail: "Test Plat's Manual test",
|
||||
|
||||
Reference in New Issue
Block a user