clean up after review

SORMAS-Foundation · Sep 16, 2024 · 1d09aa6 · 1d09aa6
1 parent 8d7ab41
commit 1d09aa6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 39 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/disease/DiseaseBurdenDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/disease/DiseaseBurdenDto.java
@@ -93,8 +93,8 @@ public class DiseaseBurdenDto implements Serializable {
 	private String otherCount;
 
 
-	private Date to;
-	private Date from;
+	private Date toDate;
+	private Date fromDate;
 
 	public DiseaseBurdenDto(
 			RegionDto regionDto,
@@ -152,8 +152,8 @@ public DiseaseBurdenDto(
 		this.caseDeathCount = caseDeathCount;
 		this.lastReportedDistrictName = lastReportedDistrictName;
 		this.outbreakDistrict = outbreakDistrict;
-		this.from= from;
-		this.to=to;
+		this.fromDate = from;
+		this.toDate =to;
 	}
 
 	public DiseaseBurdenDto(
@@ -366,94 +366,70 @@ public void setTotal(String total) {
 		this.total = total;
 	}
 
-
-	public Date getTo() {
-		return to;
+	public Date getToDate() {
+		return toDate;
 	}
 
-
-	public void setTo(Date to) {
-		this.to = to;
+	public void setToDate(Date toDate) {
+		this.toDate = toDate;
 	}
 
-
-	public Date getFrom() {
-		return from;
+	public Date getFromDate() {
+		return fromDate;
 	}
 
-
-	public void setFrom(Date from) {
-		this.from = from;
+	public void setFromDate(Date fromDate) {
+		this.fromDate = fromDate;
 	}
 
-
-
 	public String getTotalCount() {
 		return totalCount;
 	}
 
-
 	public void setTotalCount(String totalCount) {
 		this.totalCount = totalCount;
 	}
 
-
 	public String getDeathsCount() {
 		return deathsCount;
 	}
 
-
 	public void setDeathsCount(String deathsCount) {
 		this.deathsCount = deathsCount;
 	}
 
-
 	public String getRecoveredCount() {
 		return recoveredCount;
 	}
 
-
 	public void setRecoveredCount(String recoveredCount) {
 		this.recoveredCount = recoveredCount;
 	}
 
-
-
-
-
 	public String getActiveCount() {
 		return activeCount;
 	}
 
-
 	public void setActiveCount(String activeCount) {
 		this.activeCount = activeCount;
 	}
 
-
 	public String getOther() {
 		return other;
 	}
 
-
 	public void setOther(String other) {
 		this.other = other;
 	}
 
-
-
-
-
 	public String getOtherCount() {
 		return otherCount;
 	}
 
-
 	public void setOtherCount(String otherCount) {
 		this.otherCount = otherCount;
 	}
 
-
 	@Override
 	public String toString() {
 		return "DiseaseBurdenDto [disease=" + disease + ", total=" + total + ", caseCount=" + caseCount
@@ -462,6 +438,6 @@ public String toString() {
 				+ lastReportedDistrictName + ", caseClassification=" + caseClassification + ", cfr=" + cfr
 				+ ", lastReportedDistrict=" + lastReportedDistrict + ", outbreakDistrict=" + outbreakDistrict
 				+ ", deaths=" + deaths + ", region=" + region + ", recovered=" + recovered + ", activeCases="
-				+ activeCases + ", to=" + to + ", from=" + from + "]";
+				+ activeCases + ", toDate=" + toDate + ", fromDate=" + fromDate + "]";
 	}
 }
diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/disease/DiseaseFacadeEjbTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/disease/DiseaseFacadeEjbTest.java
@@ -64,8 +64,8 @@ public void testGetDiseaseForDashboard() {
         assertEquals(0L, result.getCaseDeathCount());
         assertEquals("", result.getLastReportedDistrictName());
         assertEquals("", result.getOutbreakDistrict());
-        assertEquals(fromDate, result.getFrom());
-        assertEquals(toDate, result.getTo());
+        assertEquals(fromDate, result.getFromDate());
+        assertEquals(toDate, result.getToDate());
     }
 
     @Test