Skip to content

Refactored to use Immutable Date #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulrayner merged 1 commit into from
Nov 3, 2016
Merged

Refactored to use Immutable Date #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/warranty/Claim.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package warranty;

import java.util.Date;
import warranty.util.ImmutableDate;

public class Claim {

public Claim(int id, double amount, Date date) {
public Claim(int id, double amount, ImmutableDate date) {
super();
this.amount = amount;
this.date = date;
}
public int id;
public double amount;
public Date date = new Date();
public ImmutableDate date;
public ProductReplacementEvent productReplacement;
public CustomerReimbursementEvent customerReimbursement;
}
9 changes: 1 addition & 8 deletions src/warranty/ClaimsAdjudicationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
package warranty;

import warranty.Contract.Status;

public class ClaimsAdjudicationService {

public void Adjudicate(Contract contract, Claim newClaim) {

if ((newClaim.amount < contract.limitOfLiability() &&
contract.status(newClaim.date) == Status.ACTIVE)) {

contract.add(newClaim);
}
contract.add(newClaim);
}
}
90 changes: 36 additions & 54 deletions src/warranty/Contract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,58 @@
package warranty;

import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.Collections;
import java.util.List;

import warranty.Claim;

public class Contract {

public Contract(int id, double purchasePrice, TermsAndConditions termsAndConditions) {
private final int id;
public final double purchasePrice;
private TermsAndConditions termsAndConditions;
private List<Claim> claims;

public Contract(int id, double purchasePrice,
TermsAndConditions termsAndConditions) {
this.id = id;
this.purchasePrice = purchasePrice;
this.termsAndConditions = termsAndConditions;
this.claims = new ArrayList<Claim>();
}

public final int id;
public double purchasePrice;
public TermsAndConditions termsAndConditions;

public Status status(Date date)
{
if (termsAndConditions.isActive(date))
{
return Status.ACTIVE;
}
if (termsAndConditions.isPending(date))
{
return Status.PENDING;
}
if (termsAndConditions.isExpired(date))
{
return Status.EXPIRED;
public void add(Claim newClaim) {
if (newClaim.amount < limitOfLiability()
&& this.termsAndConditions.isActive(newClaim.date)) {
claims.add(newClaim);
} else {
throw new ContractException(
"Contract is not active or amount is less than LOL");
}
return Status.INVALID;
}

public enum Status { PENDING, ACTIVE, EXPIRED, INVALID }

private List<Claim> Claims = new ArrayList<Claim>();

public void add(Claim Claim)
{
Claims.add(Claim);
}
public List<Claim> getClaims() {
return Collections.unmodifiableList(claims);
}

public void remove(Claim Claim) {
claims.remove(Claim);
}

public void extendAnnualSubscription() {
this.termsAndConditions = this.termsAndConditions.annuallyExtended();
}

public List<Claim> getClaims()
{
return Claims;
}
public TermsAndConditions termsAndConditions() {
return termsAndConditions;
}

public void remove(Claim Claim)
{
Claims.remove(Claim);
}

public void extendAnnualSubscription() throws ParseException
{
this.termsAndConditions = this.termsAndConditions.annuallyExtended();
}

public double limitOfLiability()
{
public double limitOfLiability() {
double claimTotal = 0;
List<Claim> claims = new ArrayList<Claim>();
claims.addAll(this.getClaims());

for (Claim claim:claims)
{

for (Claim claim : getClaims()) {
claimTotal += claim.amount;
}

return (this.purchasePrice - claimTotal) * 0.8;
}
}

}
7 changes: 7 additions & 0 deletions src/warranty/ContractException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package warranty;

public class ContractException extends RuntimeException {
public ContractException(String message){
super(message);
}
}
95 changes: 34 additions & 61 deletions src/warranty/TermsAndConditions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,44 @@
package warranty;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;

import warranty.util.ImmutableDate;

public class TermsAndConditions {

public TermsAndConditions(Date effectiveDate, Date expirationDate,
Date purchaseDate, int inStoreGuaranteeDays) {
public final ImmutableDate effectiveDate;
public final ImmutableDate expirationDate;
public final ImmutableDate purchaseDate;
public final int inStoreGuaranteeDays;

public TermsAndConditions(ImmutableDate effectiveDate,
ImmutableDate expirationDate, ImmutableDate purchaseDate,
int inStoreGuaranteeDays) {
super();
this.effectiveDate = effectiveDate;
this.expirationDate = expirationDate;
this.purchaseDate = purchaseDate;
this.inStoreGuaranteeDays = inStoreGuaranteeDays;
}


public boolean isPending(ImmutableDate date) {
return (date.compareTo(effectiveDate) < 0);
}

public boolean isExpired(ImmutableDate date) {
return (date.compareTo(expirationDate) > 0);
}

public boolean isActive(ImmutableDate date) {
return (date.compareTo(effectiveDate) >= 0)
&& (date.compareTo(expirationDate) <= 0);
}

public TermsAndConditions annuallyExtended() {
return new TermsAndConditions(this.effectiveDate, expirationDate.add(
Calendar.YEAR, 1), this.purchaseDate, this.inStoreGuaranteeDays);
}

@Override
public int hashCode() {
final int prime = 31;
Expand All @@ -26,10 +49,10 @@ public int hashCode() {
+ ((expirationDate == null) ? 0 : expirationDate.hashCode());
result = prime * result + inStoreGuaranteeDays;
result = prime * result
+ ((purchaseDate() == null) ? 0 : purchaseDate().hashCode());
+ ((purchaseDate == null) ? 0 : purchaseDate.hashCode());
return result;
}

@Override
public boolean equals(Object obj) {
if (this == obj)
Expand All @@ -51,62 +74,12 @@ public boolean equals(Object obj) {
return false;
if (inStoreGuaranteeDays != other.inStoreGuaranteeDays)
return false;
if (purchaseDate() == null) {
if (other.purchaseDate() != null)
if (purchaseDate == null) {
if (other.purchaseDate != null)
return false;
} else if (!purchaseDate().equals(other.purchaseDate()))
} else if (!purchaseDate.equals(other.purchaseDate))
return false;
return true;
}

private Date effectiveDate;
private Date expirationDate;
private Date purchaseDate;
private int inStoreGuaranteeDays;

public int inStoreGuaranteeDays() {
return inStoreGuaranteeDays;
}
public Date purchaseDate() {
return purchaseDate;
}
public Date effectiveDate() {
return effectiveDate;
}
public Date ExpirationDate() {
return expirationDate;
}

public boolean isPending(Date date)
{
return (date.compareTo(effectiveDate) < 0);
}

public boolean isExpired(Date date)
{
return (date.compareTo(expirationDate) > 0);
}

public boolean isActive(Date date)
{
return (date.compareTo(effectiveDate) >= 0) &&
(date.compareTo(expirationDate) <= 0);
}

public TermsAndConditions annuallyExtended() throws ParseException
{
return new TermsAndConditions(this.effectiveDate,
increaseDateByOneYear(expirationDate),
this.purchaseDate,
this.inStoreGuaranteeDays);
}

private Date increaseDateByOneYear(Date date) throws ParseException {
SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
Calendar cal = Calendar.getInstance();
cal.setTime(expirationDate);
cal.add(Calendar.YEAR, 1); // Add 1 year to current date
String newDate = dateFormat.format(cal.getTime());
return dateFormat.parse(newDate);
}
}
Loading