Separate the Case get endpoint into cases/index and cases/show
This commit is contained in:
@@ -51,9 +51,11 @@ app.use("/folders", foldersDeleteRoute);
|
|||||||
|
|
||||||
// "/cases"
|
// "/cases"
|
||||||
const casesIndexRoute = require("./routes/cases/index")(sequelize);
|
const casesIndexRoute = require("./routes/cases/index")(sequelize);
|
||||||
|
const casesShowRoute = require("./routes/cases/show")(sequelize);
|
||||||
const casesNewRoute = require("./routes/cases/new")(sequelize);
|
const casesNewRoute = require("./routes/cases/new")(sequelize);
|
||||||
const casesEditRoute = require("./routes/cases/edit")(sequelize);
|
const casesEditRoute = require("./routes/cases/edit")(sequelize);
|
||||||
app.use("/cases", casesIndexRoute);
|
app.use("/cases", casesIndexRoute);
|
||||||
|
app.use("/cases", casesShowRoute);
|
||||||
app.use("/cases", casesNewRoute);
|
app.use("/cases", casesNewRoute);
|
||||||
app.use("/cases", casesEditRoute);
|
app.use("/cases", casesEditRoute);
|
||||||
|
|
||||||
|
|||||||
@@ -1,40 +1,16 @@
|
|||||||
const express = require("express");
|
const express = require("express");
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
const defineCase = require("../../models/cases");
|
const defineCase = require("../../models/cases");
|
||||||
const defineStep = require("../../models/steps");
|
|
||||||
const defineAttachment = require("../../models/attachments");
|
|
||||||
const { DataTypes } = require("sequelize");
|
const { DataTypes } = require("sequelize");
|
||||||
|
|
||||||
module.exports = function (sequelize) {
|
module.exports = function (sequelize) {
|
||||||
const Case = defineCase(sequelize, DataTypes);
|
const Case = defineCase(sequelize, DataTypes);
|
||||||
const Step = defineStep(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" });
|
|
||||||
|
|
||||||
router.get("/", async (req, res) => {
|
router.get("/", async (req, res) => {
|
||||||
const { caseId, folderId } = req.query;
|
const { folderId } = req.query;
|
||||||
|
|
||||||
if (!caseId && !folderId) {
|
if (!folderId) {
|
||||||
return res.status(400).json({ error: "caseId or folderId is required" });
|
return res.status(400).json({ error: "folderId is required" });
|
||||||
}
|
|
||||||
|
|
||||||
if (caseId) {
|
|
||||||
// Include steps if requested using caseId
|
|
||||||
const testcase = await Case.findByPk(caseId, {
|
|
||||||
include: [
|
|
||||||
{
|
|
||||||
model: Step,
|
|
||||||
through: { attributes: ["stepNo"] },
|
|
||||||
},
|
|
||||||
{
|
|
||||||
model: Attachment,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
});
|
|
||||||
return res.json(testcase);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
44
backend/routes/cases/show.js
Normal file
44
backend/routes/cases/show.js
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
const express = require("express");
|
||||||
|
const router = express.Router();
|
||||||
|
const defineCase = require("../../models/cases");
|
||||||
|
const defineStep = require("../../models/steps");
|
||||||
|
const defineAttachment = require("../../models/attachments");
|
||||||
|
const { DataTypes } = require("sequelize");
|
||||||
|
|
||||||
|
module.exports = function (sequelize) {
|
||||||
|
const Case = defineCase(sequelize, DataTypes);
|
||||||
|
const Step = defineStep(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" });
|
||||||
|
|
||||||
|
router.get("/:caseId", async (req, res) => {
|
||||||
|
const caseId = req.params.caseId;
|
||||||
|
|
||||||
|
if (!caseId) {
|
||||||
|
return res.status(400).json({ error: "caseId is required" });
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const testcase = await Case.findByPk(caseId, {
|
||||||
|
include: [
|
||||||
|
{
|
||||||
|
model: Step,
|
||||||
|
through: { attributes: ["stepNo"] },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
model: Attachment,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
return res.json(testcase);
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error);
|
||||||
|
res.status(500).send("Internal Server Error");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return router;
|
||||||
|
};
|
||||||
@@ -5,7 +5,7 @@ const apiServer = Config.apiServer;
|
|||||||
* fetch case
|
* fetch case
|
||||||
*/
|
*/
|
||||||
async function fetchCase(caseId: number) {
|
async function fetchCase(caseId: number) {
|
||||||
const url = `${apiServer}/cases?caseId=${caseId}`;
|
const url = `${apiServer}/cases/${caseId}`;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(url, {
|
const response = await fetch(url, {
|
||||||
|
|||||||
Reference in New Issue
Block a user