localhorst
/
e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Mark lost delivery as delivered. #spaghetticode

This commit is contained in:
CodeSteak 2020-06-21 18:25:33 +02:00
parent 62df2346c3
commit 33118ddb2f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
delivery/src/main/java/org/hso/ecommerce/supplier/data/Delivery.java
View File

@ -13,7 +13,10 @@ public class Delivery {
private String name;
private String address;
// Why is this a string and creationTime a Date?!
private String estimatedArrival;
private Date creationTime;
private String uuid;
@ -29,6 +32,9 @@ public class Delivery {
public static Delivery lostDelivery(String uuid) {
Delivery delivery = new Delivery("", "");
delivery.uuid = uuid;
delivery.creationTime = addDays(new Date(), -1);
SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy");
delivery.estimatedArrival = formatter.format(addDays((Date) delivery.creationTime.clone(), 1));
return delivery;
}
@ -37,6 +43,7 @@ public class Delivery {
long timeNow = now.getTime();
long creationTime = this.creationTime.getTime();
// Wow, that's how calculate date diffs.
long diff = timeNow - creationTime;
double hour = (((diff / 1000.0) / 3600.0));
@ -54,8 +61,7 @@ public class Delivery {
return estimatedArrival;
}
private Date addDays(Date date, int days)
{
private static Date addDays(Date date, int days) {
Calendar cal = Calendar.getInstance();
cal.setTime(date);
cal.add(Calendar.DATE, days);