Fix user detailed routes

Author: Kento75

backend/app/controller/common/controllerCommon.js

@@ -21,6 +21,7 @@ class controllerCommon {
 
     findSuccess(res) {
         return (result) => {
+            console.log(result)
             res.status(200); // Found
             res.json(result);
         }

backend/app/controller/userController.js

@@ -32,6 +32,7 @@ class UserController {
      */
     findById(req, res) {
       let userId = req.params.userId;
+      console.log(userId)
         this.userDao.findById(userId)
             .then(this.common.findSuccess(res))
             .catch(this.common.findError(res));

backend/app/dao/userDao.js

@@ -35,7 +35,7 @@ class UserDao {
      * @return entity
      */
     findById(userId) {
-        let sqlRequest = "SELECT id, username, password, firstName, lastName, age, imageURL, comment FROM User WHERE id like '%'||$userId||'%' ";
+        let sqlRequest = "SELECT id, username, password, firstName, lastName, age, imageURL, comment FROM User WHERE id=$userId";
         let sqlParams = {$userId: userId};
         return this.common.findOne(sqlRequest, sqlParams).then(rows =>{
             let users = [];

frontend/src/actions/userActions/userActions.js

@@ -66,6 +66,6 @@ function getUserDetailed(userId) {
     };
 
     function request(userId) { return { type: userConstants.DETAILED_REQUEST, userId } }
-    function success(userId) { return { type: userConstants.DETAILED_SUCCESS, userId } }
+    function success(userDetailed) { return { type: userConstants.DETAILED_SUCCESS, userDetailed } }
     function failure(error) { return { type: userConstants.DETAILED_FAILURE, error } }
 }

frontend/src/containers/UserDetailedPage/UserDetailedPage.jsx

@@ -3,11 +3,13 @@ import { connect } from "react-redux";
 import { userActions } from "../../actions";
 
 class UserDetailedPage extends Component {
-//  componentDidMount() {
-//    this.props.dispatch(userActions.getUserDetailed(this.props.match.params.id));
-//  }
+  componentDidMount() {
+    this.props.dispatch(userActions.getUserDetailed(this.props.match.params.id));
+
+  }
   render() {
     const {userDetailed} = this.props;
+    console.log(this.props)
     return (
       <div>
         {userDetailed}
@@ -17,10 +19,11 @@ class UserDetailedPage extends Component {
 }
 
 function mapStateToProps(state) {
-  const { userDetailed, authentication } = state;
+  const { users, userDetailed, authentication } = state;
   const { user } = authentication;
   return {
     user,
+    users,
     userDetailed
   };
 }

frontend/src/reducers/usersReducer/usersReducer.js

@@ -21,7 +21,7 @@ export function users(state = {}, action) {
       };
     case userConstants.DETAILED_SUCCESS:
       return {
-        userId: action.userId
+        userDetailed: action.userDetailed
       };
     case userConstants.DETAILED_FAILURE:
       return {

frontend/src/services/userService/userService.js

@@ -40,26 +40,22 @@ function getAll() {
     };
 
     return fetch('http://localhost:7777/user/all', requestOptions).then(handleResponse);
-//    return fetch('http://localhost:3000/users', requestOptions).then(handleResponse);
 }
 
 function getUserDetailed(userId) {
     const requestOptions = {
         method: 'GET',
-        headers: authHeader(),
-        body: JSON.stringify({ userId })
+        headers: authHeader()
     };
 
-    return fetch('http://localhost:7777/user/:userId', requestOptions).then(handleResponse);
-//    return fetch('http://localhost:3000/users/:userId', requestOptions).then(handleResponse);
+    return fetch(`http://localhost:7777/user/find/${userId}`, requestOptions).then(handleResponse);
 }
 
 function handleResponse(response) {
     return response.text().then(text => {
         const data = text && JSON.parse(text);
         if (!response.ok) {
             if (response.status === 21) {
-                // auto logout if 401 response returned from api
                 logout();
                 Location.reload(true);
             }