From e2ebb77d85a30df697893d08a47479ab222347a7 Mon Sep 17 00:00:00 2001
From: Eneko Nieto <eneko@baturamobile.com>
Date: Mon, 4 Jan 2021 16:14:54 +0100
Subject: [PATCH] Cambios en los repositorios

---
 build.gradle.kts                                       |  2 +-
 .../eu/fosil/okupamicoche/entities/Repository.kt       | 10 ----------
 .../kotlin/eu/fosil/okupamicoche/entities/Travel.kt    | 10 +++++-----
 .../okupamicoche/repositories/TravelRepository.kt      |  6 ++++++
 .../fosil/okupamicoche/repositories/UserRepository.kt  |  6 ++++++
 .../okupamicoche/spring/OkupaMiCocheApplication.kt     |  4 ++++
 .../okupamicoche/spring/controller/RestController.kt   |  6 ++++--
 .../fosil/okupamicoche/spring/jpa/TravelRepository.kt  |  7 -------
 .../eu/fosil/okupamicoche/spring/jpa/UserRepository.kt |  7 -------
 .../fosil/okupamicoche/usecases/travel/CreateTravel.kt |  4 ++--
 .../fosil/okupamicoche/usecases/travel/DeleteTravel.kt |  4 ++--
 .../fosil/okupamicoche/usecases/travel/EditTravel.kt   |  4 ++--
 .../eu/fosil/okupamicoche/usecases/user/CreateUser.kt  |  4 ++--
 .../eu/fosil/okupamicoche/usecases/user/DeleteUser.kt  |  4 ++--
 .../eu/fosil/okupamicoche/usecases/user/EditUser.kt    |  4 ++--
 .../eu/fosil/okupamicoche/usecases/user/ListUsers.kt   |  6 +++---
 16 files changed, 41 insertions(+), 47 deletions(-)
 delete mode 100644 src/main/kotlin/eu/fosil/okupamicoche/entities/Repository.kt
 create mode 100644 src/main/kotlin/eu/fosil/okupamicoche/repositories/TravelRepository.kt
 create mode 100644 src/main/kotlin/eu/fosil/okupamicoche/repositories/UserRepository.kt
 delete mode 100644 src/main/kotlin/eu/fosil/okupamicoche/spring/jpa/TravelRepository.kt
 delete mode 100644 src/main/kotlin/eu/fosil/okupamicoche/spring/jpa/UserRepository.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 4422625..4b8d8d9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,7 @@ repositories {
 
 dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-	implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server")
+//	implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server")
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
 	implementation("org.jetbrains.kotlin:kotlin-reflect")
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/entities/Repository.kt b/src/main/kotlin/eu/fosil/okupamicoche/entities/Repository.kt
deleted file mode 100644
index 7342a22..0000000
--- a/src/main/kotlin/eu/fosil/okupamicoche/entities/Repository.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package eu.fosil.okupamicoche.entities
-
-import java.util.*
-
-interface Repository<DATA, ID> {
-    fun save(data: DATA)
-    fun delete(data: DATA)
-    fun findAll(): List<DATA>
-    fun findById(id: ID): Optional<DATA>
-}
\ No newline at end of file
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/entities/Travel.kt b/src/main/kotlin/eu/fosil/okupamicoche/entities/Travel.kt
index d2ae0ec..ef998fc 100644
--- a/src/main/kotlin/eu/fosil/okupamicoche/entities/Travel.kt
+++ b/src/main/kotlin/eu/fosil/okupamicoche/entities/Travel.kt
@@ -1,17 +1,17 @@
 package eu.fosil.okupamicoche.entities
 
-import javax.persistence.Entity
-import javax.persistence.GeneratedValue
-import javax.persistence.Id
+import javax.persistence.*
 
 @Entity
 class Travel(
     @Id @GeneratedValue var id: Long? = null,
+    @OneToOne
     var driver: User,
+    @OneToMany
     var travelers: List<User>,
     var departureDate: String,
-    var from: String,
-    var to: String,
+    var origin: String,
+    var destination: String,
     var availablePlaces: Int,
     var description: String? = null,
     var matrixRoomId: String
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/repositories/TravelRepository.kt b/src/main/kotlin/eu/fosil/okupamicoche/repositories/TravelRepository.kt
new file mode 100644
index 0000000..359a516
--- /dev/null
+++ b/src/main/kotlin/eu/fosil/okupamicoche/repositories/TravelRepository.kt
@@ -0,0 +1,6 @@
+package eu.fosil.okupamicoche.repositories
+
+import eu.fosil.okupamicoche.entities.Travel
+import org.springframework.data.repository.CrudRepository
+
+interface TravelRepository : CrudRepository<Travel, Long>
\ No newline at end of file
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/repositories/UserRepository.kt b/src/main/kotlin/eu/fosil/okupamicoche/repositories/UserRepository.kt
new file mode 100644
index 0000000..f17cdae
--- /dev/null
+++ b/src/main/kotlin/eu/fosil/okupamicoche/repositories/UserRepository.kt
@@ -0,0 +1,6 @@
+package eu.fosil.okupamicoche.repositories
+
+import eu.fosil.okupamicoche.entities.User
+import org.springframework.data.repository.CrudRepository
+
+interface UserRepository : CrudRepository<User, Long>
\ No newline at end of file
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/spring/OkupaMiCocheApplication.kt b/src/main/kotlin/eu/fosil/okupamicoche/spring/OkupaMiCocheApplication.kt
index db341ff..18bab4c 100644
--- a/src/main/kotlin/eu/fosil/okupamicoche/spring/OkupaMiCocheApplication.kt
+++ b/src/main/kotlin/eu/fosil/okupamicoche/spring/OkupaMiCocheApplication.kt
@@ -1,9 +1,13 @@
 package eu.fosil.okupamicoche.spring
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.autoconfigure.domain.EntityScan
 import org.springframework.boot.runApplication
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories
 
 @SpringBootApplication
+@EnableJpaRepositories("eu.fosil.okupamicoche.*")
+@EntityScan("eu.fosil.okupamicoche.*")
 class OkupaMiCocheApplication
 
 fun main(args: Array<String>) {
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/spring/controller/RestController.kt b/src/main/kotlin/eu/fosil/okupamicoche/spring/controller/RestController.kt
index 3e4d906..9484322 100644
--- a/src/main/kotlin/eu/fosil/okupamicoche/spring/controller/RestController.kt
+++ b/src/main/kotlin/eu/fosil/okupamicoche/spring/controller/RestController.kt
@@ -1,11 +1,13 @@
 package eu.fosil.okupamicoche.spring.controller
 
 import eu.fosil.okupamicoche.entities.User
-import eu.fosil.okupamicoche.spring.jpa.UserRepository
+import eu.fosil.okupamicoche.repositories.UserRepository
 import eu.fosil.okupamicoche.usecases.user.CreateUser
 import eu.fosil.okupamicoche.usecases.user.DeleteUser
 import eu.fosil.okupamicoche.usecases.user.EditUser
 import eu.fosil.okupamicoche.usecases.user.ListUsers
+import org.springframework.validation.annotation.Validated
+import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 
@@ -14,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController
 class RestController(private val userRepository: UserRepository) {
 
     @RequestMapping("/user/create")
-    fun createUser(user: User) {
+    fun createUser(@RequestBody @Validated user: User) {
         CreateUser(userRepository).createUser(user)
     }
 
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/spring/jpa/TravelRepository.kt b/src/main/kotlin/eu/fosil/okupamicoche/spring/jpa/TravelRepository.kt
deleted file mode 100644
index e219b18..0000000
--- a/src/main/kotlin/eu/fosil/okupamicoche/spring/jpa/TravelRepository.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package eu.fosil.okupamicoche.spring.jpa
-
-import eu.fosil.okupamicoche.entities.Travel
-import org.springframework.data.repository.CrudRepository
-import org.springframework.data.repository.Repository
-
-interface TravelRepository : Repository<Travel, Long>, CrudRepository<Travel, Long>
\ No newline at end of file
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/spring/jpa/UserRepository.kt b/src/main/kotlin/eu/fosil/okupamicoche/spring/jpa/UserRepository.kt
deleted file mode 100644
index 6351100..0000000
--- a/src/main/kotlin/eu/fosil/okupamicoche/spring/jpa/UserRepository.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package eu.fosil.okupamicoche.spring.jpa
-
-import eu.fosil.okupamicoche.entities.Repository
-import eu.fosil.okupamicoche.entities.User
-import org.springframework.data.repository.CrudRepository
-
-interface UserRepository : Repository<User, Long>, CrudRepository<User, Long>
\ No newline at end of file
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/usecases/travel/CreateTravel.kt b/src/main/kotlin/eu/fosil/okupamicoche/usecases/travel/CreateTravel.kt
index 7ecdab3..075c447 100644
--- a/src/main/kotlin/eu/fosil/okupamicoche/usecases/travel/CreateTravel.kt
+++ b/src/main/kotlin/eu/fosil/okupamicoche/usecases/travel/CreateTravel.kt
@@ -1,9 +1,9 @@
 package eu.fosil.okupamicoche.usecases.travel
 
-import eu.fosil.okupamicoche.entities.Repository
 import eu.fosil.okupamicoche.entities.Travel
+import eu.fosil.okupamicoche.repositories.TravelRepository
 
-class CreateTravel(private val travelRepository: Repository<Travel, Long>) {
+class CreateTravel(private val travelRepository: TravelRepository) {
     fun createTravel(travel: Travel) {
         travelRepository.save(travel)
     }
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/usecases/travel/DeleteTravel.kt b/src/main/kotlin/eu/fosil/okupamicoche/usecases/travel/DeleteTravel.kt
index 00e8590..9041034 100644
--- a/src/main/kotlin/eu/fosil/okupamicoche/usecases/travel/DeleteTravel.kt
+++ b/src/main/kotlin/eu/fosil/okupamicoche/usecases/travel/DeleteTravel.kt
@@ -1,9 +1,9 @@
 package eu.fosil.okupamicoche.usecases.travel
 
-import eu.fosil.okupamicoche.entities.Repository
 import eu.fosil.okupamicoche.entities.Travel
+import eu.fosil.okupamicoche.repositories.TravelRepository
 
-class DeleteTravel(private val travelRepository: Repository<Travel, Long>) {
+class DeleteTravel(private val travelRepository: TravelRepository) {
     fun deleteTravel(travel: Travel) {
         travelRepository.delete(travel)
     }
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/usecases/travel/EditTravel.kt b/src/main/kotlin/eu/fosil/okupamicoche/usecases/travel/EditTravel.kt
index 9fc6a1d..b38fe06 100644
--- a/src/main/kotlin/eu/fosil/okupamicoche/usecases/travel/EditTravel.kt
+++ b/src/main/kotlin/eu/fosil/okupamicoche/usecases/travel/EditTravel.kt
@@ -1,9 +1,9 @@
 package eu.fosil.okupamicoche.usecases.travel
 
-import eu.fosil.okupamicoche.entities.Repository
 import eu.fosil.okupamicoche.entities.Travel
+import eu.fosil.okupamicoche.repositories.TravelRepository
 
-class EditTravel(private val travelRepository: Repository<Travel, Long>) {
+class EditTravel(private val travelRepository: TravelRepository) {
     fun editTravel(travel: Travel) {
         travelRepository.save(travel)
     }
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/CreateUser.kt b/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/CreateUser.kt
index ddaf99e..202ee4f 100644
--- a/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/CreateUser.kt
+++ b/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/CreateUser.kt
@@ -1,9 +1,9 @@
 package eu.fosil.okupamicoche.usecases.user
 
-import eu.fosil.okupamicoche.entities.Repository
 import eu.fosil.okupamicoche.entities.User
+import eu.fosil.okupamicoche.repositories.UserRepository
 
-class CreateUser(private val userRepository: Repository<User, Long>) {
+class CreateUser(private val userRepository: UserRepository) {
     fun createUser(user: User) {
         userRepository.save(user)
     }
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/DeleteUser.kt b/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/DeleteUser.kt
index 233120c..cd8ff8d 100644
--- a/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/DeleteUser.kt
+++ b/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/DeleteUser.kt
@@ -1,9 +1,9 @@
 package eu.fosil.okupamicoche.usecases.user
 
-import eu.fosil.okupamicoche.entities.Repository
 import eu.fosil.okupamicoche.entities.User
+import eu.fosil.okupamicoche.repositories.UserRepository
 
-class DeleteUser(private val userRepository: Repository<User, Long>) {
+class DeleteUser(private val userRepository: UserRepository) {
     fun deleteUser(user: User) {
         userRepository.delete(user)
         // cancelarViajes()
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/EditUser.kt b/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/EditUser.kt
index f157d7c..9690578 100644
--- a/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/EditUser.kt
+++ b/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/EditUser.kt
@@ -1,9 +1,9 @@
 package eu.fosil.okupamicoche.usecases.user
 
-import eu.fosil.okupamicoche.entities.Repository
 import eu.fosil.okupamicoche.entities.User
+import eu.fosil.okupamicoche.repositories.UserRepository
 
-class EditUser(private val userRepository: Repository<User, Long>) {
+class EditUser(private val userRepository: UserRepository) {
     fun editUser(user: User) {
         userRepository.save(user)
     }
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/ListUsers.kt b/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/ListUsers.kt
index e699282..b521b20 100644
--- a/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/ListUsers.kt
+++ b/src/main/kotlin/eu/fosil/okupamicoche/usecases/user/ListUsers.kt
@@ -1,10 +1,10 @@
 package eu.fosil.okupamicoche.usecases.user
 
-import eu.fosil.okupamicoche.entities.Repository
 import eu.fosil.okupamicoche.entities.User
+import eu.fosil.okupamicoche.repositories.UserRepository
 
-class ListUsers(private val userRepository: Repository<User, Long>) {
+class ListUsers(private val userRepository: UserRepository) {
     fun listUsers(): List<User> {
-        return userRepository.findAll()
+        return userRepository.findAll().toList()
     }
 }
\ No newline at end of file