diff --git a/backend/src/controllers/user.controller.js b/backend/src/controllers/user.controller.js index a862ccc..891b01b 100644 --- a/backend/src/controllers/user.controller.js +++ b/backend/src/controllers/user.controller.js @@ -99,7 +99,10 @@ export const userController = { getUsers: async (req, res) => { try { - const users = await User.find(); + const users = await User.find().populate( + "assignedIssues", + "title status" + ); res.json(users); } catch (error) { res.status(500).json({ error: error.message }); diff --git a/backend/src/models/Issue.model.js b/backend/src/models/Issue.model.js index efd1340..02959d0 100644 --- a/backend/src/models/Issue.model.js +++ b/backend/src/models/Issue.model.js @@ -3,7 +3,7 @@ import mongoose from "mongoose"; const issueSchema = new mongoose.Schema( { title: { type: String, required: true }, - description: { type: String, required: true }, + description: { type: String, required: false }, status: { type: String, enum: ["OPEN", "IN_PROGRESS", "CLOSED"], @@ -12,9 +12,13 @@ const issueSchema = new mongoose.Schema( assignedTo: { type: mongoose.Schema.Types.ObjectId, ref: "User", - required: true, + required: false, + }, + team: { + type: mongoose.Schema.Types.ObjectId, + ref: "Team", + required: false, }, - team: { type: mongoose.Schema.Types.ObjectId, ref: "Team", required: true }, }, { timestamps: true } ); diff --git a/backend/src/models/User.model.js b/backend/src/models/User.model.js index 46d15e0..7c151b2 100644 --- a/backend/src/models/User.model.js +++ b/backend/src/models/User.model.js @@ -15,6 +15,12 @@ const userSchema = new mongoose.Schema( ref: "Team", required: false, }, + assignedIssues: [ + { + type: mongoose.Schema.Types.ObjectId, + ref: "Issue", + }, + ], projects: [ { type: mongoose.Schema.Types.ObjectId,