DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions Projects1 Releases Wiki Activity

removed unneccessary service class, wired methods to repo instead

Browse Source
This commit is contained in:
Fredrik Friis 2012-03-28 10:00:37 +09:00
parent 5baf4e2507
commit beb3fd3aeb
5 changed files with 7 additions and 88 deletions

19
src/main/java/se/su/dsv/scipro/admin/panels/ProjectIdeaStatisticsPanel.java

@ -9,7 +9,6 @@ import se.su.dsv.scipro.data.dataobjects.ProjectClass;
import se.su.dsv.scipro.match.dataobject.Match;
import se.su.dsv.scipro.springdata.repos.ProjectClassRepo;
import se.su.dsv.scipro.springdata.repos.ProjectIdeaRepo;
import se.su.dsv.scipro.springdata.services.ProjectClassService;
import se.su.dsv.scipro.springdata.services.ProjectIdeaService;
import java.util.ArrayList;
@ -24,17 +23,13 @@ public class ProjectIdeaStatisticsPanel extends Panel {
private static final long serialVersionUID = -8964934681195275340L;
// @SpringBean
// ProjectIdeaRepo projectIdeaRepo;
@SpringBean
private ProjectIdeaService projectIdeaService;
@SpringBean
private ProjectClassService projectClassService;
@SpringBean
private ProjectClassRepo projectClassRepo;
@SpringBean
private ProjectIdeaRepo projectIdeaRepo;
@SpringBean
private ProjectIdeaService projectIdeaService;
@SpringBean
private ProjectClassRepo projectClassRepo;
public ProjectIdeaStatisticsPanel(String id) {
super(id);
@ -45,8 +40,8 @@ public class ProjectIdeaStatisticsPanel extends Panel {
valueArray.add(s);
}
final ProjectClass bachelor = projectClassService.findByName(ProjectClass.BACHELOR);
final ProjectClass master = projectClassService.findByName(ProjectClass.MASTER);
final ProjectClass bachelor = projectClassRepo.findByName(ProjectClass.BACHELOR);
final ProjectClass master = projectClassRepo.findByName(ProjectClass.MASTER);
ListView listview = new ListView("listview", valueArray) {
protected void populateItem(ListItem item) {

31
src/main/java/se/su/dsv/scipro/springdata/serviceimpls/ProjectClassServiceImpl.java

@ -1,31 +0,0 @@
package se.su.dsv.scipro.springdata.serviceimpls;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import se.su.dsv.scipro.data.dataobjects.ProjectClass;
import se.su.dsv.scipro.springdata.repos.ProjectClassRepo;
import se.su.dsv.scipro.springdata.services.ProjectClassService;
/**
* @author: fred-fri
* date: 2012 03 26
*/
@Repository("projectClassService")
@Transactional(readOnly = true)
public class ProjectClassServiceImpl implements ProjectClassService {
@Qualifier("projectClassRepo")
@Autowired
private ProjectClassRepo projectClassRepo;
public ProjectClassServiceImpl(){
System.out.println("BLA BLA");
}
@Override
public ProjectClass findByName(String name) {
return projectClassRepo.findByName(name);
}
}

25
src/main/java/se/su/dsv/scipro/springdata/serviceimpls/ProjectIdeaServiceImpl.java

@ -7,13 +7,10 @@ import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import se.su.dsv.scipro.data.dataobjects.ProjectClass;
import se.su.dsv.scipro.match.dataobject.Match;
import se.su.dsv.scipro.match.dataobject.ProjectIdea;
import se.su.dsv.scipro.match.dataobject.QProjectIdea;
import se.su.dsv.scipro.springdata.repos.ProjectIdeaRepo;
import se.su.dsv.scipro.springdata.services.ProjectIdeaService;
import java.util.Date;
/**
* @author: fred-fri
* date: 2012 03 26
@ -30,27 +27,6 @@ public class ProjectIdeaServiceImpl implements ProjectIdeaService {
System.out.println("BLA BLA");
}
@Override
public Iterable<ProjectIdea> findProjectIdeasCreatedBefore(Date date) {
QProjectIdea qProjectIdea = QProjectIdea.projectIdea;
BooleanExpression projectIdeaWasCreatedBefore = qProjectIdea.dateCreated.before(date);
return projectIdeaRepo.findAll(projectIdeaWasCreatedBefore);
}
@Override
public Iterable<ProjectIdea> findProjectIdeaByMatchStatus(Match.Status status) {
QProjectIdea qProjectIdea = QProjectIdea.projectIdea;
BooleanExpression isMatchStatus = qProjectIdea.match.status.eq(status);
projectIdeaRepo.count(isMatchStatus);
return projectIdeaRepo.findAll(isMatchStatus);
}
@Override
public Long countProjectIdeaByMatchStatus(Match.Status status) {
@ -68,5 +44,4 @@ public class ProjectIdeaServiceImpl implements ProjectIdeaService {
return projectIdeaRepo.count(isMatchStatus.and(isProjectClass));
}
}

13
src/main/java/se/su/dsv/scipro/springdata/services/ProjectClassService.java

@ -1,13 +0,0 @@
package se.su.dsv.scipro.springdata.services;
import se.su.dsv.scipro.data.dataobjects.ProjectClass;
/**
* @author: fred-fri
* date: 2012 03 26
*/
public interface ProjectClassService {
public ProjectClass findByName(String name);
}

7
src/main/java/se/su/dsv/scipro/springdata/services/ProjectIdeaService.java

@ -2,9 +2,6 @@ package se.su.dsv.scipro.springdata.services;
import se.su.dsv.scipro.data.dataobjects.ProjectClass;
import se.su.dsv.scipro.match.dataobject.Match;
import se.su.dsv.scipro.match.dataobject.ProjectIdea;
import java.util.Date;
/**
* @author: fred-fri
@ -12,10 +9,6 @@ import java.util.Date;
*/
public interface ProjectIdeaService {
public Iterable<ProjectIdea> findProjectIdeasCreatedBefore(Date date);
public Iterable<ProjectIdea> findProjectIdeaByMatchStatus(Match.Status status);
public Long countProjectIdeaByMatchStatus(Match.Status status);
public Long countProjectIdeaByMatchStatusAndProjectClass(Match.Status status, ProjectClass projectClass);