Merge pull request #437 from UNC-Libraries/fix-failed-deposit-emails

bbpennel · bbpennel · commit fe913abde86b · 2015-12-29T14:53:12.000-05:00
DepositStatusFactory#getState returns DepositState, not String.
diff --git a/deposit/src/main/java/edu/unc/lib/deposit/work/DepositEmailHandler.java b/deposit/src/main/java/edu/unc/lib/deposit/work/DepositEmailHandler.java
@@ -125,10 +125,17 @@ public DepositEmailHandler() {
 	}
 
 	public void sendDepositResults(String depositUUID) {
-		if (this.getDepositStatusFactory().getState(depositUUID).equals(DepositState.failed.name())) {
+		DepositState state = this.getDepositStatusFactory().getState(depositUUID); 
+		
+		switch (state) {
+		case failed:
 			sendFailed(depositUUID);
-		} else {
+			break;
+		case finished:
 			sendCompleted(depositUUID);
+			break;
+		default:
+			LOG.error("Don't know how to send deposit results email for state {}, for deposit {}", state, depositUUID);
 		}
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -125,10 +125,17 @@ public DepositEmailHandler() {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`public void sendDepositResults(String depositUUID) {`
`128`		`- if (this.getDepositStatusFactory().getState(depositUUID).equals(DepositState.failed.name())) {`
	`128`	`+ DepositState state = this.getDepositStatusFactory().getState(depositUUID);`
	`129`	`+`
	`130`	`+ switch (state) {`
	`131`	`+ case failed:`
`129`	`132`	`sendFailed(depositUUID);`
`130`		`- } else {`
	`133`	`+ break;`
	`134`	`+ case finished:`
`131`	`135`	`sendCompleted(depositUUID);`
	`136`	`+ break;`
	`137`	`+ default:`
	`138`	`+ LOG.error("Don't know how to send deposit results email for state {}, for deposit {}", state, depositUUID);`
`132`	`139`	`}`
`133`	`140`	`}`
`134`	`141`