DMC/scipro
7
0
Fork 0
Code Issues26 Pull Requests3 Actions Projects1 Wiki Activity

removed unnecessary one-to-many relationship milestone phase -> milestone activities.

Browse Source
This commit is contained in:
Emil Siverhall 2013-11-07 14:53:34 +01:00
parent 8a649c90c6
commit a2cabad87e
3 changed files with 0 additions and 25 deletions
core/src/main/java/se/su/dsv/scipro/milestones/dataobjects
MileStonePhase.java
view/src/test/java/se/su/dsv/scipro
admin/panels/settings
MileStoneActivityAdminPanelTest.java
milestones/panels
MileStoneOverviewPanelTest.java

19
core/src/main/java/se/su/dsv/scipro/milestones/dataobjects/MileStonePhase.java

@ -3,13 +3,6 @@ package se.su.dsv.scipro.milestones.dataobjects;
import se.su.dsv.scipro.data.dataobjects.LazyDeletableDomainObject;
import javax.persistence.*;
import java.util.ArrayList;
import java.util.List;
/**
* @author: emil-siv
* Date: 2013-05-23
*/
@Entity
@Table(name = "milestone_phase")
@ -30,10 +23,6 @@ public class MileStonePhase extends LazyDeletableDomainObject {
@Basic(optional = true)
private String description;
@OneToMany(mappedBy = "mileStonePhase", cascade = CascadeType.ALL)
@OrderBy("sortOrder")
private List<MileStoneActivity> mileStoneActivities = new ArrayList<MileStoneActivity>();
@Column(name = "sortOrder")
private int sortOrder;
@ -62,14 +51,6 @@ public class MileStonePhase extends LazyDeletableDomainObject {
this.description = description;
}
public List<MileStoneActivity> getMileStoneActivities() {
return mileStoneActivities;
}
public void setMileStoneActivities(List<MileStoneActivity> mileStoneActivities) {
this.mileStoneActivities = mileStoneActivities;
}
@Override
public String toString() {
return title;

1
view/src/test/java/se/su/dsv/scipro/admin/panels/settings/MileStoneActivityAdminPanelTest.java

@ -31,7 +31,6 @@ public class MileStoneActivityAdminPanelTest extends SciProTest {
activityList = Arrays.asList(new MileStoneActivity(MileStoneActivity.Type.PROJECT, "Create final seminar", "Description"));
phase = new MileStonePhase("This is a title", "This is a description");
phase.setMileStoneActivities(activityList);
phaseList = Arrays.asList(phase);
when(mileStonePhaseService.findAll(isA(Sort.class))).thenReturn(phaseList);

5
view/src/test/java/se/su/dsv/scipro/milestones/panels/MileStoneOverviewPanelTest.java

@ -22,10 +22,6 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.when;
/**
* @author: emil-siv
* Date: 2013-09-05
*/
public class MileStoneOverviewPanelTest extends SciProTest {
private MileStoneOverviewPanel panel;
@ -41,7 +37,6 @@ public class MileStoneOverviewPanelTest extends SciProTest {
MileStoneActivity studentActivity = new MileStoneActivity(MileStoneActivity.Type.STUDENT);
activityList = Arrays.asList(projectActivity, studentActivity);
MileStonePhase phase = new MileStonePhase("This is a title", "This is a description");
phase.setMileStoneActivities(activityList);
phaseList = Arrays.asList(phase);
MileStone mileStone = new MileStone(project, new MileStoneActivity());