From 7bf1380c0c59c44d0ba51f6c1e996c4f39873c6a Mon Sep 17 00:00:00 2001
From: Florian <florian.thierry@netapsys.fr>
Date: Sun, 13 May 2018 15:11:43 +0200
Subject: [PATCH] Update the categories controller

---
 .../codiki/core/entities/dto/CategoryDTO.java    | 16 +++++++++++++++-
 .../core/repositories/CategoryRepository.java    |  6 +++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/codiki/core/entities/dto/CategoryDTO.java b/src/main/java/org/codiki/core/entities/dto/CategoryDTO.java
index 6509298..addcf10 100644
--- a/src/main/java/org/codiki/core/entities/dto/CategoryDTO.java
+++ b/src/main/java/org/codiki/core/entities/dto/CategoryDTO.java
@@ -1,11 +1,16 @@
 package org.codiki.core.entities.dto;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.codiki.core.entities.persistence.Category;
 
 public class CategoryDTO {
 	private Long id;
 	
 	private String name;
+	
+	private List<CategoryDTO> listSubCategories;
 
 	public CategoryDTO() {
 		super();
@@ -15,6 +20,8 @@ public class CategoryDTO {
 		this();
 		id = pCategory.getId();
 		name = pCategory.getName();
+		listSubCategories = pCategory.getListSubCategories().stream().map(CategoryDTO::new)
+				.collect(Collectors.toList());
 	}
 	
 	public Long getId() {
@@ -32,5 +39,12 @@ public class CategoryDTO {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
+	public List<CategoryDTO> getListSubCategories() {
+		return listSubCategories;
+	}
+
+	public void setListSubCategories(List<CategoryDTO> listSubCategories) {
+		this.listSubCategories = listSubCategories;
+	}
 }
diff --git a/src/main/java/org/codiki/core/repositories/CategoryRepository.java b/src/main/java/org/codiki/core/repositories/CategoryRepository.java
index 104c8b2..b6fc9a4 100644
--- a/src/main/java/org/codiki/core/repositories/CategoryRepository.java
+++ b/src/main/java/org/codiki/core/repositories/CategoryRepository.java
@@ -1,10 +1,14 @@
 package org.codiki.core.repositories;
 
+import java.util.List;
+
 import org.codiki.core.entities.persistence.Category;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface CategoryRepository extends CrudRepository<Category, Long> {
-
+	@Query("SELECT c FROM Category c JOIN FETCH c.listSubCategories")
+	List<Category> findAllWithSubCategories();
 }