[UPDATE] Piccolo refactor numero donazioni in donorCategory

Backend/src/main/java/com/github/francisfire/anavis/controller/AuthCredentialsController.java

@@ -22,6 +22,7 @@
 import com.github.francisfire.anavis.services.DonorServices;
 import com.github.francisfire.anavis.services.OfficeServices;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -64,17 +65,7 @@ public Set<AuthCredentials> getAuthCredentials() {
 	@PreAuthorize("permitAll")
 	@PostMapping("/donor")
 	public boolean addDonorCredentials(@RequestBody UserAndDonor userAndDonor) {
-		int leftDonationsInYear = 4;
-		switch (userAndDonor.donor.getCategory()) {
-		case MAN:
-		case NONFERTILEWOMAN:
-			leftDonationsInYear = 4;
-			break;
-		case FERTILEWOMAN:
-			leftDonationsInYear = 2;
-			break;
-		}
-		userAndDonor.donor.setLeftDonationsInYear(leftDonationsInYear);
+		userAndDonor.donor.setLeftDonationsInYear(userAndDonor.donor.getCategory().getDonationPerYear());
 		userAndDonor.donor.setCanDonate(true);
 		return (donorServices.addDonor(userAndDonor.donor))
 				? authCredentialsServices.addCredentials(userAndDonor.authCredentials)
@@ -105,26 +96,18 @@ public boolean removeCredentials(@PathVariable("mail") String mail) {
 	@Setter
 	@Getter
 	@NoArgsConstructor
+	@AllArgsConstructor
 	static class UserAndDonor {
 		private Donor donor;
 		private AuthCredentials authCredentials;
-
-		public UserAndDonor(Donor donor, AuthCredentials authCredentials) {
-			this.donor = donor;
-			this.authCredentials = authCredentials;
-		}
 	}
 
 	@Setter
 	@Getter
 	@NoArgsConstructor
+	@AllArgsConstructor
 	static class UserAndOffice {
 		private Office office;
 		private AuthCredentials authCredentials;
-
-		public UserAndOffice(Office office, AuthCredentials authCredentials) {
-			this.office = office;
-			this.authCredentials = authCredentials;
-		}
 	}
 }

Backend/src/main/java/com/github/francisfire/anavis/models/Donor.java

@@ -5,6 +5,7 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -68,24 +69,19 @@ public void resetLeftDonationsInYear() {
 	public void setLastDonation(Date lastDonation) {
 		if (this.lastDonation == null || lastDonation.after(this.lastDonation)) {
 			this.lastDonation = lastDonation;
-			switch (category) {
-			case MAN:
-			case NONFERTILEWOMAN:
-				if (leftDonationsInYear == 4) {
-					firstDonationInYear = lastDonation;
-				}
-				break;
-			case FERTILEWOMAN:
-				if (leftDonationsInYear == 2) {
-					firstDonationInYear = lastDonation;
-				}
-				break;
+			if (leftDonationsInYear == category.getDonationPerYear()) {
+				firstDonationInYear = lastDonation;
 			}
 			leftDonationsInYear--;
 		}
 	}
 
+	@AllArgsConstructor
 	public enum DonorCategory {
-		MAN, FERTILEWOMAN, NONFERTILEWOMAN
+
+		MAN(4), FERTILEWOMAN(2), NONFERTILEWOMAN(4);
+
+		@Getter
+		private int donationPerYear;
 	}
 }