From 244480d13ae439363e6f132b903defc02a5c4ed3 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Thu, 14 Jul 2016 09:22:11 +0200
Subject: [PATCH] bugfix data repositories
---
src/main/java/org/hbp/mip/controllers/AppsApi.java | 2 +-
src/main/java/org/hbp/mip/controllers/ExperimentApi.java | 4 ++--
.../java/org/hbp/mip/repositories/ExperimentRepository.java | 4 ++--
src/main/java/org/hbp/mip/repositories/VoteRepository.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/hbp/mip/controllers/AppsApi.java b/src/main/java/org/hbp/mip/controllers/AppsApi.java
index 2134a9087..cdfafeb61 100644
--- a/src/main/java/org/hbp/mip/controllers/AppsApi.java
+++ b/src/main/java/org/hbp/mip/controllers/AppsApi.java
@@ -57,7 +57,7 @@ public class AppsApi {
User user = mipApplication.getUser();
App app = appRepository.findOne(id);
- Vote vote = voteRepository.find(user, app).iterator().next();
+ Vote vote = voteRepository.findByUserAndApp(user, app).iterator().next();
if (vote != null) {
vote.setValue(value);
diff --git a/src/main/java/org/hbp/mip/controllers/ExperimentApi.java b/src/main/java/org/hbp/mip/controllers/ExperimentApi.java
index c25f493e7..558b7edaa 100644
--- a/src/main/java/org/hbp/mip/controllers/ExperimentApi.java
+++ b/src/main/java/org/hbp/mip/controllers/ExperimentApi.java
@@ -214,10 +214,10 @@ public class ExperimentApi {
User user = mipApplication.getUser();
Iterable<Experiment> experiments = null;
- Iterable<Experiment> myExperiments = experimentRepository.findByUser(user);
+ Iterable<Experiment> myExperiments = experimentRepository.findByCreatedBy(user);
if(!mine)
{
- Iterable<Experiment> sharedExperiments = experimentRepository.findShared(true);
+ Iterable<Experiment> sharedExperiments = experimentRepository.findByShared(true);
experiments = Iterables.concat(myExperiments, sharedExperiments);
}
diff --git a/src/main/java/org/hbp/mip/repositories/ExperimentRepository.java b/src/main/java/org/hbp/mip/repositories/ExperimentRepository.java
index 17d8d5fb4..3815879be 100644
--- a/src/main/java/org/hbp/mip/repositories/ExperimentRepository.java
+++ b/src/main/java/org/hbp/mip/repositories/ExperimentRepository.java
@@ -11,6 +11,6 @@ import java.util.UUID;
*/
public interface ExperimentRepository extends CrudRepository<Experiment, UUID> {
- Iterable<Experiment> findByUser(User user);
- Iterable<Experiment> findShared(Boolean shared);
+ Iterable<Experiment> findByCreatedBy(User user);
+ Iterable<Experiment> findByShared(Boolean shared);
}
diff --git a/src/main/java/org/hbp/mip/repositories/VoteRepository.java b/src/main/java/org/hbp/mip/repositories/VoteRepository.java
index 45e44fa1c..78d760b9c 100644
--- a/src/main/java/org/hbp/mip/repositories/VoteRepository.java
+++ b/src/main/java/org/hbp/mip/repositories/VoteRepository.java
@@ -10,5 +10,5 @@ import org.springframework.data.repository.CrudRepository;
*/
public interface VoteRepository extends CrudRepository<Vote, Long> {
- Iterable<Vote> find(User user, App app);
+ Iterable<Vote> findByUserAndApp(User user, App app);
}
--
GitLab