diff --git a/src/services/projects.service.ts b/src/services/projects.service.ts index b09a90ded..a996f3824 100644 --- a/src/services/projects.service.ts +++ b/src/services/projects.service.ts @@ -5,14 +5,24 @@ import { constants } from "../constants"; const getAllProjects = async (req: Request) => { const orgId = req?.params?.orgId; - //Add logic to get All Projects from DB - return [orgId]; + const decodedToken = req.body.token_payload; + const { user_id = "", region = "" } = decodedToken; + + const project = await ProjectModel.find({ + org_id: orgId, + region, + owner: user_id, + }); + + if (!project) throw new NotFoundError(constants.HTTP_TEXTS.PROJECT_NOT_FOUND); + + return project; }; const getProject = async (req: Request) => { const orgId = req?.params?.orgId; const projectId = req?.params?.projectId; const decodedToken = req.body.token_payload; - const { user_id = "test-123", region = "NA" } = decodedToken; + const { user_id = "", region = "" } = decodedToken; // Find the project based on both orgId and projectId, region, owner const project = await ProjectModel.findOne({ org_id: orgId, @@ -36,7 +46,7 @@ const createProject = async (req: Request) => { const orgId = req?.params?.orgId; const { name, description } = req.body; const decodedToken = req.body.token_payload; - const { user_id = "test-123", region = "NA" } = decodedToken; + const { user_id = "", region = "" } = decodedToken; const projectData = { region, org_id: orgId, @@ -68,7 +78,7 @@ const updateProject = async (req: Request) => { const projectId = req?.params?.projectId; const updateData = req?.body; const decodedToken = req.body.token_payload; - const { user_id = "test-123", region = "NA" } = decodedToken; + const { user_id = "", region = "" } = decodedToken; // Find the project based on both orgId and projectId const project = await ProjectModel.findOne({ org_id: orgId,