Skip to content

Commit

Permalink
#158: Make usage of activity id consistent
Browse files Browse the repository at this point in the history 
Signed-off-by: Lars <[email protected]>
  • Loading branch information
Lars committed Apr 28, 2019
1 parent 0ce9307 commit 3ae9f4c
Show file tree
Hide file tree
Showing 19 changed files with 253 additions and 253 deletions.
4 changes: 2 additions & 2 deletions ...ase/datamanager/src/main/java/de/lgblaumeiser/ptm/analysis/analyzer/ActivityComputer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ protected String indexGetter(final Activity activity) {

@Override
protected Collection<String> getHeadlineActivityElements() {
return asList("Activity", "Project Id", "Project Activity");
return asList("Activity", "Project Id", "Activity Id");
}

@Override
Expand All @@ -41,7 +41,7 @@ protected Collection<String> getFootlineActivityElements() {

@Override
protected Collection<String> getKeyItems(final Activity activity) {
return asList(activity.getActivityName(), activity.getProjectId(), activity.getProjectActivity());
return asList(activity.getActivityName(), activity.getProjectId(), activity.getActivityId());
}

@Override
Expand Down
30 changes: 15 additions & 15 deletions codebase/datamanager/src/main/java/de/lgblaumeiser/ptm/datamanager/model/Activity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ public static class ActivityBuilder {
private String user;
private String activityName;
private String projectId;
private String projectActivity;
private String activityId;
private boolean hidden = false;

private ActivityBuilder(final Activity activity) {
id = activity.getId();
user = activity.getUser();
activityName = activity.getActivityName();
projectId = activity.getProjectId();
projectActivity = activity.getProjectActivity();
activityId = activity.getActivityId();
hidden = activity.isHidden();
}

Expand All @@ -55,8 +55,8 @@ public ActivityBuilder setProjectId(final String projectId) {
return this;
}

public ActivityBuilder setProjectActivity(final String projectActivity) {
this.projectActivity = projectActivity;
public ActivityBuilder setActivityId(final String activityId) {
this.activityId = activityId;
return this;
}

Expand All @@ -71,14 +71,14 @@ public ActivityBuilder setHidden(final boolean hidden) {
*/
public Activity build() {
checkData();
return new Activity(id, user, activityName, projectId, projectActivity, hidden);
return new Activity(id, user, activityName, projectId, activityId, hidden);
}

private void checkData() {
assertState(stringHasContent(user));
assertState(stringHasContent(activityName));
assertState(stringHasContent(projectId));
assertState(stringHasContent(projectActivity));
assertState(stringHasContent(activityId));
}
}

Expand All @@ -102,8 +102,8 @@ public ActivityBuilder changeActivity() {
}

private String activityName;
private String projectActivity;
private String projectId;
private String activityId;
private boolean hidden = false;
private String user;
private Long id = valueOf(-1);
Expand Down Expand Up @@ -133,8 +133,8 @@ public String getProjectId() {
/**
* @return Project sub category of the activities type. Non null
*/
public String getProjectActivity() {
return projectActivity;
public String getActivityId() {
return activityId;
}

/**
Expand All @@ -153,32 +153,32 @@ public String getUser() {

@Override
public String toString() {
return format("Activity: Project Id: %s, Project Category: %s, Name: %s, Hidden: %b, User: %s, Id: %d",
projectId, projectActivity, activityName, hidden, user, id);
return format("Activity: Project Id: %s, Activity Id: %s, Activity Name: %s, Hidden: %b, User: %s, Id: %d",
projectId, activityId, activityName, hidden, user, id);
}

@Override
public boolean equals(final Object obj) {
if (obj instanceof Activity) {
Activity act = (Activity) obj;
return id == act.id && hidden == act.isHidden() && activityName.equals(act.activityName)
&& projectId.equals(act.projectId) && projectActivity.equals(act.projectActivity)
&& projectId.equals(act.projectId) && activityId.equals(act.activityId)
&& user.equals(act.user);
}
return false;
}

@Override
public int hashCode() {
return hash(id, activityName, projectId, projectActivity, user);
return hash(id, activityName, projectId, activityId, user);
}

private Activity(final Long id, final String user, final String activityName, final String projectId,
final String projectActivity, final boolean hidden) {
final String activityId, final boolean hidden) {
this.id = id;
this.activityName = activityName;
this.projectId = projectId;
this.projectActivity = projectActivity;
this.activityId = activityId;
this.hidden = hidden;
this.user = user;
}
Expand Down
6 changes: 3 additions & 3 deletions ...datamanager/src/test/java/de/lgblaumeiser/ptm/analysis/analyzer/AbstractComputerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,19 @@ public abstract class AbstractComputerTest {
private static final Activity ACTIVITY1 = newActivity()
.setActivityName(ACTIVITYNAME1)
.setProjectId(PROJECTID1)
.setProjectActivity(PROJECTSUBCAT)
.setActivityId(PROJECTSUBCAT)
.setUser(USERNAME)
.build();
private static final Activity ACTIVITY2 = newActivity()
.setActivityName(ACTIVITYNAME2)
.setProjectId(PROJECTID2)
.setProjectActivity(PROJECTSUBCAT)
.setActivityId(PROJECTSUBCAT)
.setUser(USERNAME)
.build();
private static final Activity ACTIVITY3 = newActivity()
.setActivityName(ACTIVITYNAME3)
.setProjectId(PROJECTID1)
.setProjectActivity(PROJECTSUBCAT)
.setActivityId(PROJECTSUBCAT)
.setUser(USERNAME)
.build();

Expand Down
30 changes: 15 additions & 15 deletions codebase/datamanager/src/test/java/de/lgblaumeiser/ptm/datamanager/model/ActivityTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ public class ActivityTest {
private final static String ACTIVITY_1_1 = "ActivityId11";
private final static String ACTIVITY_1_2 = "ActivityId12";
private final static String PRJID_1 = "ID1";
private final static String PRJACT_1 = "Cat1";
private final static String ACTID_1 = "Cat1";
private final static String ACTIVITY_2 = "ActivityId11";
private final static String PRJID_2 = "ID2";
private final static String PRJACT_2 = "Cat2";
private final static String ACTID_2 = "Cat2";
private final static String USERNAME = "UserX";
private final static String USERNAME2 = "UserY";

Expand All @@ -38,12 +38,12 @@ public final void testNewActivityPositive() {
Activity newActivity = newActivity()
.setActivityName(ACTIVITY_1_1)
.setProjectId(PRJID_1)
.setProjectActivity(PRJACT_1)
.setActivityId(ACTID_1)
.setUser(USERNAME)
.build();
assertEquals(ACTIVITY_1_1, newActivity.getActivityName());
assertEquals(PRJID_1, newActivity.getProjectId());
assertEquals(PRJACT_1, newActivity.getProjectActivity());
assertEquals(ACTID_1, newActivity.getActivityId());
assertEquals(USERNAME, newActivity.getUser());
}

Expand All @@ -52,7 +52,7 @@ public final void testWithBlankName() {
Activity newActivity = newActivity()
.setActivityName(emptyString())
.setProjectId(PRJID_1)
.setProjectActivity(PRJACT_1)
.setActivityId(ACTID_1)
.setUser(USERNAME)
.build();
}
Expand All @@ -62,7 +62,7 @@ public final void testWithBlankProject() {
Activity newActivity = newActivity()
.setActivityName(ACTIVITY_1_1)
.setProjectId(emptyString())
.setProjectActivity(PRJACT_1)
.setActivityId(ACTID_1)
.setUser(USERNAME)
.build();
}
Expand All @@ -72,7 +72,7 @@ public final void testWithBlankProjectAct() {
Activity newActivity = newActivity()
.setActivityName(ACTIVITY_1_1)
.setProjectId(PRJID_1)
.setProjectActivity(emptyString())
.setActivityId(emptyString())
.setUser(USERNAME)
.build();
}
Expand All @@ -82,7 +82,7 @@ public final void testWithoutUser() {
Activity newActivity = newActivity()
.setActivityName(ACTIVITY_1_1)
.setProjectId(PRJID_1)
.setProjectActivity(PRJACT_1)
.setActivityId(ACTID_1)
.build();
}

Expand All @@ -91,7 +91,7 @@ public final void testWithWrongUser() {
Activity newActivity = newActivity()
.setActivityName(ACTIVITY_1_1)
.setProjectId(PRJID_1)
.setProjectActivity(PRJACT_1)
.setActivityId(ACTID_1)
.setUser(emptyString())
.build();
}
Expand All @@ -104,37 +104,37 @@ public final void testEquals() {
Activity newActivity1 = newActivity()
.setActivityName(ACTIVITY_1_1)
.setProjectId(PRJID_1)
.setProjectActivity(PRJACT_1)
.setActivityId(ACTID_1)
.setUser(USERNAME)
.build();
Activity newActivity2 = newActivity()
.setActivityName(ACTIVITY_1_2)
.setProjectId(PRJID_1)
.setProjectActivity(PRJACT_1)
.setActivityId(ACTID_1)
.setUser(USERNAME)
.build();
Activity newActivity3 = newActivity()
.setActivityName(ACTIVITY_2)
.setProjectId(PRJID_2)
.setProjectActivity(PRJACT_2)
.setActivityId(ACTID_2)
.setUser(USERNAME)
.build();
Activity newActivity4 = newActivity()
.setActivityName(ACTIVITY_1_1)
.setProjectId(PRJID_1)
.setProjectActivity(PRJACT_1)
.setActivityId(ACTID_1)
.setUser(USERNAME)
.build();
Activity newActivity5 = newActivity()
.setActivityName(ACTIVITY_1_1)
.setProjectId(PRJID_1)
.setProjectActivity(PRJACT_1)
.setActivityId(ACTID_1)
.setUser(USERNAME2)
.build();
Activity newActivity6 = newActivity()
.setActivityName(ACTIVITY_1_1)
.setProjectId(PRJID_1)
.setProjectActivity(PRJACT_2)
.setActivityId(ACTID_2)
.setUser(USERNAME)
.build();

Expand Down
4 changes: 2 additions & 2 deletions ...datamanager/src/test/java/de/lgblaumeiser/ptm/datamanager/service/BookingServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ public class BookingServiceTest {
private static final Activity ACTIVITY1 = newActivity()
.setActivityName("a")
.setProjectId("b")
.setProjectActivity("c")
.setActivityId("c")
.setUser(USERNAME)
.build();
private static final Activity ACTIVITY2 = newActivity()
.setActivityName("a1")
.setProjectId("b1")
.setProjectActivity("c1")
.setActivityId("c1")
.setUser(USERNAME)
.build();
private static final User USER = newUser()
Expand Down
8 changes: 4 additions & 4 deletions ...datamanager/src/test/java/de/lgblaumeiser/ptm/store/filesystem/FileStoreActivityTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void setUp() {
.newActivity()
.setActivityName(TESTNAME)
.setProjectId(TESTINDEX)
.setProjectActivity(TESTSUB)
.setActivityId(TESTSUB)
.setUser(USERNAME)
.build();

Expand All @@ -55,7 +55,7 @@ public void testStore() {
assertTrue(stubAccess.getStorageContent().contains(TESTNAME));
assertTrue(stubAccess.getStorageContent().contains("projectId"));
assertTrue(stubAccess.getStorageContent().contains(TESTINDEX));
assertTrue(stubAccess.getStorageContent().contains("projectActivity"));
assertTrue(stubAccess.getStorageContent().contains("activityId"));
assertTrue(stubAccess.getStorageContent().contains(TESTSUB));
assertTrue(stubAccess.getStorageContent().contains("id"));
Long id = testData.getId();
Expand All @@ -71,7 +71,7 @@ public void testRetrieveAll() {
Activity foundObj = getOnlyFromCollection(foundObjs);
assertEquals(TESTNAME, foundObj.getActivityName());
assertEquals(TESTINDEX, foundObj.getProjectId());
assertEquals(TESTSUB, foundObj.getProjectActivity());
assertEquals(TESTSUB, foundObj.getActivityId());
}

@Test
Expand All @@ -81,7 +81,7 @@ public void testRetrieveById() {
Activity foundObj = testee.retrieveById(id).get();
assertEquals(TESTNAME, foundObj.getActivityName());
assertEquals(TESTINDEX, foundObj.getProjectId());
assertEquals(TESTSUB, foundObj.getProjectActivity());
assertEquals(TESTSUB, foundObj.getActivityId());
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion codebase/ptm_backend/src/main/java/de/lgblaumeiser/ptm/html/OverviewController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ private String createPage(final Model model, final String username, final LocalD
private int compareActivities(Activity a1, Activity a2) {
int actcompare = a1.getProjectId().compareToIgnoreCase(a2.getProjectId());
if (actcompare == 0) {
actcompare = a1.getProjectActivity().compareToIgnoreCase(a2.getProjectActivity());
actcompare = a1.getActivityId().compareToIgnoreCase(a2.getActivityId());
}
return actcompare;
}
Expand Down
8 changes: 4 additions & 4 deletions codebase/ptm_backend/src/main/java/de/lgblaumeiser/ptm/rest/ActivityRestController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ Collection<Activity> getActivities(final Principal principal) {
private int compareActivities(Activity a1, Activity a2) {
int actcompare = a1.getProjectId().compareToIgnoreCase(a2.getProjectId());
if (actcompare == 0) {
actcompare = a1.getProjectActivity().compareToIgnoreCase(a2.getProjectActivity());
actcompare = a1.getActivityId().compareToIgnoreCase(a2.getActivityId());
}
return actcompare;
}

public static class ActivityBody {
public String activityName;
public String projectId;
public String projectActivity;
public String activityId;
public boolean hidden;
}

Expand All @@ -78,7 +78,7 @@ ResponseEntity<?> addActivity(final Principal principal, @RequestBody final Acti
.setUser(principal.getName())
.setActivityName(activityData.activityName)
.setProjectId(activityData.projectId)
.setProjectActivity(activityData.projectActivity)
.setActivityId(activityData.activityId)
.setHidden(activityData.hidden)
.build());
URI location = ServletUriComponentsBuilder
Expand Down Expand Up @@ -118,7 +118,7 @@ ResponseEntity<?> changeActivity(final Principal principal, @PathVariable final
.store(a.changeActivity()
.setActivityName(activityData.activityName)
.setProjectId(activityData.projectId)
.setProjectActivity(activityData.projectActivity)
.setActivityId(activityData.activityId)
.setHidden(activityData.hidden)
.build());
} else {
Expand Down
4 changes: 2 additions & 2 deletions codebase/ptm_backend/src/main/resources/templates/overview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,15 @@ <h4 class="card-header text-center">Activities</h4>
<th class="nowrap">Id</th>
<th class="nowrap">Activity Name</th>
<th class="nowrap">Project Id</th>
<th class="nowrap">Project Activity</th>
<th class="nowrap">Activity Id</th>
</tr>
</thead>
<tbody>
<tr th:each="act : ${allActivities}">
<td th:text="|${act.getId()}|" />
<td th:text="|${act.getActivityName()}|" />
<td th:text="|${act.getProjectId()}|" />
<td th:text="|${act.getProjectActivity()}|" />
<td th:text="|${act.getActivityId()}|" />
</tr>
</tbody>
</table>
Expand Down
4 changes: 2 additions & 2 deletions codebase/ptm_backend/src/test/java/de/lgblaumeiser/ptm/rest/ActivityControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void testRoundtripCreateAndRetrieveActivity() throws Exception {
ActivityBody data = new ActivityBody();
data.activityName = TESTACT_HIDDEN_NAME;
data.projectId = TESTACT_HIDDEN_PROJ;
data.projectActivity = TESTACT_HIDDEN_SUB;
data.activityId = TESTACT_HIDDEN_SUB;
data.hidden = true;
createActivity(data, getUser1());

Expand Down Expand Up @@ -116,7 +116,7 @@ public void testActivitiesWithDifferentUser() throws Exception {
ActivityBody data = new ActivityBody();
data.activityName = TESTACT_HIDDEN_NAME;
data.projectId = TESTACT_HIDDEN_PROJ;
data.projectActivity = TESTACT_HIDDEN_SUB;
data.activityId = TESTACT_HIDDEN_SUB;
data.hidden = true;

performPost(ACTIVITY_RESOURCE_API + "/" + ACTIVITY_ID_2, data, getUser1())
Expand Down
Loading

0 comments on commit 3ae9f4c

Please sign in to comment.