handle deletion of categories that are used by some payments; formatted dates in datePicker

src/main/java/de/deadlocker8/budgetmaster/controller/CategoryController.java

@@ -3,6 +3,7 @@ package de.deadlocker8.budgetmaster.controller;
 import de.deadlocker8.budgetmaster.entities.Category;
 import de.deadlocker8.budgetmaster.entities.CategoryType;
 import de.deadlocker8.budgetmaster.repositories.CategoryRepository;
+import de.deadlocker8.budgetmaster.services.CategoryService;
 import de.deadlocker8.budgetmaster.services.HelpersService;
 import de.deadlocker8.budgetmaster.utils.Colors;
 import de.deadlocker8.budgetmaster.utils.ResourceNotFoundException;
@@ -24,6 +25,9 @@ public class CategoryController extends BaseController
 	@Autowired
 	private CategoryRepository categoryRepository;
 
+	@Autowired
+	private CategoryService categoryService;
+
 	@Autowired
 	private HelpersService helpers;
 
@@ -52,7 +56,7 @@ public class CategoryController extends BaseController
 	{
 		if(isDeletable(ID))
 		{
-			categoryRepository.delete(ID);
+			categoryService.deleteCategory(ID);
 		}
 
 		return "redirect:/categories";

src/main/java/de/deadlocker8/budgetmaster/controller/PaymentController.java

@@ -46,8 +46,7 @@ public class PaymentController extends BaseController
 			date = DateTime.parse(cookieDate, DateTimeFormat.forPattern("dd.MM.yy").withLocale(getSettings().getLanguage().getLocale()));
 		}
 
-		model.addAttribute("currentDate", helpers.getDateString(date));
-		model.addAttribute("currentDateFormatted", helpers.getDateStringWithMonthAndYear(date));
+		model.addAttribute("currentDate", date);
 		model.addAttribute("payments", getPaymentsForMonthAndYear(date.getMonthOfYear(), date.getYear()));
 		return "payments/payments";
 	}
@@ -75,7 +74,7 @@ public class PaymentController extends BaseController
 	}
 
 	@RequestMapping("/payments/{ID}/requestDelete")
-	public String requestDeletePayment(Model model, @PathVariable("ID") Integer ID)
+	public String requestDeletePayment(Model model, @PathVariable("ID") Integer ID, @CookieValue("currentDate") String cookieDate)
 	{
 		if(!isDeletable(ID))
 		{
@@ -83,17 +82,16 @@ public class PaymentController extends BaseController
 		}
 
 		DateTime date;
-		if(model.containsAttribute("date"))
+		if(cookieDate == null)
 		{
-			date = (DateTime)model.asMap().get("date");
+			date = DateTime.now();
 		}
 		else
 		{
-			date = DateTime.now();
+			date = DateTime.parse(cookieDate, DateTimeFormat.forPattern("dd.MM.yy").withLocale(getSettings().getLanguage().getLocale()));
 		}
 
-		model.addAttribute("currentDate", helpers.getDateString(date));
-		model.addAttribute("currentDateFormatted", helpers.getDateStringWithMonthAndYear(date));
+		model.addAttribute("currentDate", date);
 		model.addAttribute("payments", getPaymentsForMonthAndYear(date.getMonthOfYear(), date.getYear()));
 		model.addAttribute("currentPayment", paymentRepository.getOne(ID));
 		return "payments/payments";

src/main/java/de/deadlocker8/budgetmaster/entities/Category.java

@@ -3,12 +3,10 @@ package de.deadlocker8.budgetmaster.entities;
 import javafx.scene.paint.Color;
 import tools.ConvertTo;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.util.List;
 
 @Entity
 public class Category
@@ -16,12 +14,16 @@ public class Category
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	private Integer ID;
+
 	@NotNull
 	@Size(min = 1)
 	private String name;
 	private String color;
 	private CategoryType type;
 
+	@OneToMany(mappedBy = "category", fetch = FetchType.LAZY)
+	private List<Payment> referringPayments;
+
 	public Category(String name, String color, CategoryType type)
 	{
 		this.name = name;
@@ -73,6 +75,16 @@ public class Category
 		this.type = type;
 	}
 
+	public List<Payment> getReferringPayments()
+	{
+		return referringPayments;
+	}
+
+	public void setReferringPayments(List<Payment> referringPayments)
+	{
+		this.referringPayments = referringPayments;
+	}
+
 	public String getAppropriateTextColor()
 	{
 		return ConvertTo.toRGBHexWithoutOpacity(ConvertTo.getAppropriateTextColor(Color.web(color)));

src/main/java/de/deadlocker8/budgetmaster/services/CategoryService.java

@@ -2,6 +2,7 @@ package de.deadlocker8.budgetmaster.services;
 
 import de.deadlocker8.budgetmaster.entities.Category;
 import de.deadlocker8.budgetmaster.entities.CategoryType;
+import de.deadlocker8.budgetmaster.entities.Payment;
 import de.deadlocker8.budgetmaster.repositories.CategoryRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,10 +13,13 @@ import org.springframework.stereotype.Service;
 public class CategoryService
 {
 	private final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
+	private CategoryRepository categoryRepository;
 
 	@Autowired
 	public CategoryService(CategoryRepository categoryRepository)
 	{
+		this.categoryRepository = categoryRepository;
+
 		if(categoryRepository.findByType(CategoryType.NONE) == null)
 		{
 			categoryRepository.save(new Category("Keine Kategorie", "#FFFFFF", CategoryType.NONE));
@@ -28,4 +32,15 @@ public class CategoryService
 			LOGGER.debug("Created default category REST");
 		}
 	}
+
+	public void deleteCategory(int ID)
+	{
+		Category categoryToDelete = categoryRepository.findOne(ID);
+		for(Payment payment : categoryToDelete.getReferringPayments())
+		{
+			payment.setCategory(categoryRepository.findByType(CategoryType.NONE));
+		}
+
+		categoryRepository.delete(ID);
+	}
 }

src/main/resources/templates/datePicker.ftl

-<#macro datePicker fullDate formatteDate>
+<#macro datePicker fullDate>
      <div class="container">
          <div class="section center-align">
              <a href="/previousMonth" class="waves-effect grey-text text-darken-4"><i class="material-icons icon-chevron">chevron_left</i></a>
-             <a id="datePicker" class="waves-effect grey-text text-darken-4 headline-date">${formatteDate}</a>
+             <a id="datePicker" class="waves-effect grey-text text-darken-4 headline-date">${helpers.getDateStringWithMonthAndYear(fullDate)}</a>
              <a href="/nextMonth" class="waves-effect grey-text text-darken-4"><i class="material-icons icon-chevron">chevron_right</i></a>
          </div>
      </div>

src/main/resources/templates/payments/payments.ftl

@@ -12,7 +12,7 @@
         <main>
             <div class="card main-card">
                 <#import "../datePicker.ftl" as datePicker>
-                <@datePicker.datePicker currentDate currentDateFormatted/>
+                <@datePicker.datePicker currentDate/>
                 <div class="hide-on-small-only"><br></div>
                 <div class="container">
                     <div class="center-align"><a href="/payments/newPayment" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">add</i>${locale.getString("title.payment.new")}</a></div>
@@ -73,6 +73,6 @@
         <script src="/js/main.js"></script>
         <script src="/js/payments.js"></script>
         <script src="/js/datePicker.js"></script>
-        <script>document.cookie = "currentDate=${currentDate}";</script>
+        <script>document.cookie = "currentDate=${helpers.getDateString(currentDate)}";</script>
     </body>
 </html>
\ No newline at end of file