Skip to content

Hao-Hsiang Song / topics-auction

Go to a project
Commit 200232b8 by Rex Zhou
Options

user services

parent 319e3660
Inline Side-by-side
Showing with 70 additions and 3 deletions
src/main/java/edu/uchicago/mpcs/topics/controller/AdminController.java
......@@ -34,7 +34,7 @@ public class AdminController {
@DeleteMapping("/remove")
public void removeUser(@RequestBody User user) //or change to item ID
{
adminService.deleteUser(user.getUserId());
adminService.deleteUser(user.getUserId().toString());
}
@PutMapping("/update")
......
src/main/java/edu/uchicago/mpcs/topics/controller/UserController.java
......@@ -7,6 +7,7 @@ import edu.uchicago.mpcs.topics.exceptions.UserNotFoundException;
import edu.uchicago.mpcs.topics.exceptions.UserAlreadyExistException;
import edu.uchicago.mpcs.topics.exceptions.UserNotFoundException;
import edu.uchicago.mpcs.topics.service.UserService;
import edu.uchicago.mpcs.topics.db.UserRepository;
import edu.uchicago.mpcs.topics.user.User;
import org.springframework.http.ResponseEntity;
import org.springframework.http.HttpHeaders;
......@@ -29,6 +30,7 @@ public class UserController {
@Autowired
private UserService userService;
private UserRepository userRepository;
/**
* Register new User.
......@@ -54,4 +56,13 @@ public class UserController {
userService.login(user.getEmail(), user.getPassword());
}
/**
* Get user.
*/
@GetMapping("/{userId}")
public User getUserById(@PathVariable String userId)
{
return userRepository.findById(userId).orElse(null);
}
}
src/main/java/edu/uchicago/mpcs/topics/db/UserRepositoryImpl.java
......@@ -61,18 +61,19 @@ public class UserRepositoryImpl implements UserRepository {
* Find user by user id.
*
* @param userId
* @throws UserAlreadyExistException
*/
@Override
public User findByUserId(String userId) {
User u = userRepository.findByUserId(userId);
return u;
}
/**
* User login.
*
* @param email, password
* @return
* @return user
*/
@Override
public User login(String email, String password) {
......
src/main/java/edu/uchicago/mpcs/topics/service/impl/UserServiceImpl.java
......@@ -63,6 +63,7 @@ public class UserServiceImpl implements UserService {
User u = userRepository.findByUserId(userId);
return u;
}
/**
* User login.
*
......
target/h2db.mv.db
No preview for this file type
target/h2db.trace.db
......@@ -439,3 +439,57 @@ create table order (order_id bigint not null, primary key (order_id)) [42001-197
>>>>>>> daa0dcbbc727e502a532efb87adada5664278475
org.h2.jdbc.JdbcSQLException: Syntax error in SQL statement "ALTER TABLE ORDER_ITEM ADD CONSTRAINT FKT6WV8M7ESHKSP5KP8W4B2D1DM FOREIGN KEY (ORDER_ID) REFERENCES ORDER[*] "; expected "identifier"; SQL statement:
alter table order_item add constraint FKt6wv8m7eshksp5kp8w4b2d1dm foreign key (order_id) references order [42001-197]
2018-11-30 01:49:44 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:45 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:47 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:49 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:50 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:51 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:52 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:52 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:52 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:53 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:53 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:53 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:54 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:54 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:54 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:54 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:55 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:55 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:55 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:56 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:56 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:56 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:57 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:57 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:57 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:58 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
2018-11-30 01:49:58 jdbc[3]: exception
org.h2.jdbc.JdbcSQLException: Data conversion error converting "3d40a423-6b2f-4f6a-a395-5e8f1222ad68" [22018-197]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment