add-new-event bug fix

src/main/java/com/example/calendar/controller/EventController.java

@@ -121,9 +121,13 @@ public class EventController {
 		//--
 	
 		
-		
-		
-		
+		Calendar c1 = calendarRepo.findByNameAndUser(calName, currUser);
+		if(c1 == null)
+		{
+			c1 = calendarRepo.findByNameAndUser(currUser.getActiveCalendar(), currUser);
+		}
+		event.setCalendar(c1);
+	
 		eventValidator.validate(event, bindingResult);
 		
         if (bindingResult.hasErrors()) {
@@ -131,12 +135,7 @@ public class EventController {
         }
     
 
-		Calendar c1 = calendarRepo.findByNameAndUser(calName, currUser);
-		if(c1 == null)
-		{
-			c1 = calendarRepo.findByNameAndUser(currUser.getActiveCalendar(), currUser);
-		}
-		event.setCalendar(c1);
+
 		eventRepo.save(event);
 
 		return "redirect:/calendar";

src/main/java/com/example/calendar/validator/EventValidator.java

@@ -75,6 +75,7 @@ public class EventValidator implements Validator {
         for (Event event : allUserEvents) {
 			if(e.getStartDate().equals(event.getStartDate()) && e.getStartTime().equals(event.getStartTime()))
 			{
+
 				errors.rejectValue("startDate", "DateTaken");
 				break;
 			}