Commit e598ca8f by Hao-Hsiang Song

fixed

parent 55471997
Showing with 17 additions and 63 deletions
......@@ -44,7 +44,7 @@ public class Application {
userDB.save(new User("wawa", "rex", "wawa", "rex@gmail.com", true));
userDB.save(new User("wawa", "haoh", "wawa", "hao@gmail.com", true));
userDB.save(new User("wawa", "nella", "wawa", "nella@gmail.com", true));
userDB.save(new User("wawa", "bright", "wawa", "bright@gmail.com", true));
userDB.save(new User("wawa", "bright", "wawa", "bright@gmail.com", false));
};
}
......@@ -56,13 +56,13 @@ public class Application {
// item
itemRepository.save(new Item("iphone", "it's an iphone", 1L,
333.33, 55555.55, "bit.ly/dd.png", 2L,
33.33, 550.55, "https://encrypted-tbn3.gstatic.com/shopping?q=tbn:ANd9GcSqIeuWzEOhS5w1aXzgW9wVkXJgK2fkSScWXZp1WlsorpiGmizGn_qOPZf5JMEXKN6ldEh9FXo&usqp=CAE", 2L,
true, null, null ));
itemRepository.save(new Item("iphone x", "it's an iphone x", 1L,
333.33, 55555.55, "bit.ly/dd.png", 2L,
itemRepository.save(new Item("tesla", "model x", 1L,
399.99, 155555.55, "https://www.tesla.com/sites/default/files/images/homepage/20180710/mx/homepage-modelx.jpg?20181117", 2L,
true, null, null ));
itemRepository.save(new Item("iphone c", "it's an iphone c", 1L,
333.33, 55555.55, "bit.ly/dd.png", 2L,
itemRepository.save(new Item("ipad", "ipad new", 1L,
99.99, 444.55, "https://store.storeimages.cdn-apple.com/4981/as-images.apple.com/is/image/AppleInc/aos/published/images/i/pa/ipad/hero/ipad-hero-unselected-201803_GEO_US?wid=490&hei=674&fmt=jpeg&qlt=95&op_usm=0.5,0.5&.v=1539023642155", 2L,
true, null, null ));
......
......@@ -49,8 +49,8 @@ public class UserController {
* User Login.
*/
@PostMapping("/login")
public void login(@RequestBody User user) {
userService.login(user.getEmail(), user.getPassword());
public boolean login(@RequestBody User user) {
return userService.login(user.getEmail(), user.getPassword());
}
/**
......
......@@ -7,7 +7,6 @@ import edu.uchicago.mpcs.topics.controller.ItemController;
import edu.uchicago.mpcs.topics.db.BidRepository;
import edu.uchicago.mpcs.topics.db.ItemRepository;
import edu.uchicago.mpcs.topics.db.UserRepository;
import edu.uchicago.mpcs.topics.user.User;
import org.springframework.stereotype.Service;
import java.io.UnsupportedEncodingException;
......@@ -49,15 +48,15 @@ public class BidService
//send email to seller for the first bid;
if (itemToUpdate.getStatus() != Status.HASBID)
{
User seller = userRepository.findById(itemToUpdate.getSellerId()).orElseThrow(NullPointerException::new);
mailService.sendEmailFirstBid(seller.getEmail());
// User seller = userRepository.findById(itemToUpdate.getSellerId()).orElseThrow(NullPointerException::new);
// mailService.sendEmailFirstBid(seller.getEmail());
}
//send email to previous bidder
User currentBidder = userRepository.findById(itemToUpdate.getCurrentBidderID()).orElseThrow(NullPointerException::new);
mailService.sendEmailOutBid(currentBidder.getEmail());
// User currentBidder = userRepository.findById(itemToUpdate.getCurrentBidderID()).orElseThrow(NullPointerException::new);
//
// mailService.sendEmailOutBid(currentBidder.getEmail());
//Assign highest bidder and set status
itemToUpdate.setCurrentBidderID(bid.getUserId());
......
......@@ -5,8 +5,6 @@ import edu.uchicago.mpcs.topics.auction.ShoppingCart;
import edu.uchicago.mpcs.topics.auction.Status;
import edu.uchicago.mpcs.topics.db.ItemRepository;
import edu.uchicago.mpcs.topics.db.ShoppingCartRepository;
import org.apache.tomcat.jni.Local;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.Duration;
......@@ -40,15 +38,15 @@ public class TimerService
this.itemId = item.getItemId();
LocalDateTime currentTime = LocalDateTime.now();
LocalDateTime startTime = LocalDateTime.parse(item.getStartTime());
// LocalDateTime startTime = LocalDateTime.parse(item.getStartTime());
if (item.getStartTime() != null)
{
setStatus(Status.INACTIVE);
Duration durationStart = Duration.between(currentTime, startTime);
ScheduledExecutorService startTimer = Executors.newSingleThreadScheduledExecutor();
startTimer.schedule(this::timeStart, durationStart.getSeconds(), TimeUnit.SECONDS);
// Duration durationStart = Duration.between(currentTime, startTime);
// ScheduledExecutorService startTimer = Executors.newSingleThreadScheduledExecutor();
// startTimer.schedule(this::timeStart, durationStart.getSeconds(), TimeUnit.SECONDS);
// System.out.println(durationStart.getSeconds());
}
......
spring.data.rest.base-path=/api
spring.h2.console.enabled=true
#spring.jpa.hibernate.ddl-auto = update
#spring.datasource.url=jdbc:h2:file:./target/h2db;DB_CLOSE_ON_EXIT=FALSE;AUTO_RECONNECT=TRUE
#spring.datasource.driver-class-name=org.h2.Driver
spring.mail.host=smtp.gmail.com
spring.mail.port=587
spring.mail.username=topicsauction@gmail.com
spring.mail.password=mpcs1234
spring.mail.properties.mail.smtp.auth=true
spring.mail.properties.mail.smtp.starttls.enable=true
spring.mail.properties.mail.smtp.starttls.required=true
spring.mail.scheduler.persistence.enabled=false
spring.mail.scheduler.persistence.redis.embedded=false
spring.mail.scheduler.persistence.redis.enabled=false
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
table {
border-collapse: collapse;
}
td, th {
border: 1px solid #999;
padding: 0.5rem;
text-align: left;
}
\ No newline at end of file
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head lang="en">
<meta charset="UTF-8"/>
<title>ReactJS + Spring Data REST</title>
<link rel="stylesheet" href="/main.css" />
</head>
<body>
<div id="react"></div>
<script src="built/bundle.js"></script>
</body>
</html>
\ No newline at end of file
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