Skip to content

Commit

Permalink
Alter db query for get project by Id
Browse files Browse the repository at this point in the history
Relates #11

Co-authored-by: Hannah Gooding <[email protected]>
  • Loading branch information
CampbellDocherty and hannahgooding committed May 28, 2020
1 parent bbe27d1 commit b7b7cc2
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 2 deletions.
23 changes: 23 additions & 0 deletions wip-app/src/pages/ProjectPage/ProjectPage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import React from "react";
import { projectPage } from "../../utils/get-fetch";

const ProjectPage = () => {
const [projectData, setProjectData] = React.useState([]);

React.useEffect(() => {
projectPage().then(setProjectData);
}, []);

const {
id,
user_id,
project_name,
project_description,
project_status,
} = projectData;
// SELECT (SELECT username FROM users WHERE projects.user_id=users.id), project_name, project_description, project_status, steps.step_name, steps.step_link, steps.date, feedback_text, feedback_tag, feedback.date
// FROM projects JOIN users ON projects.user_id=users.id JOIN steps ON projects.id=steps.project_id JOIN feedback ON steps.id=feedback.step_id
// WHERE projects.id = 1;
};

export default ProjectPage;
11 changes: 10 additions & 1 deletion wip-app/src/utils/get-fetch.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,13 @@ function getUserPageProjects() {
return getFetch(options);
}

export { feedPage, getUser, explorePage, getUserPageProjects };
function projectPage(projectid) {
const projectid = 1;
const options = {
endpoint: `project/${projectid}`,
errorMessage: "Project page error",
};
return getFetch(options);
}

export { feedPage, getUser, explorePage, getUserPageProjects, projectPage };
5 changes: 4 additions & 1 deletion wip-rest-api/src/model/projects-model.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ const db = require("../database/connection.js");

function getProjectFromDb(projectId) {
return db
.query("SELECT * FROM projects WHERE id=($1)", [projectId])
.query(
"SELECT (SELECT username FROM users WHERE projects.user_id=users.id), project_name, project_description, project_status, steps.id, steps.step_name, steps.step_link, steps.date FROM projects JOIN steps ON projects.id=steps.project_id WHERE projects.id=($1);",
[projectId]
)
.then((project) => project.rows[0]);
}

Expand Down

0 comments on commit b7b7cc2

Please sign in to comment.