[Missions] Refactor: Changed the login of the MissionYear's

MissionProcessSearch to not use workflowQueues, but the MissionStates instead
ist-dsi · Jun 17, 2013 · 82c8cb0 · 82c8cb0
1 parent f916d5d
commit 82c8cb0
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/expenditure-tracking/src/main/java/module/mission/domain/MissionYear.java b/expenditure-tracking/src/main/java/module/mission/domain/MissionYear.java
@@ -33,6 +33,7 @@
 
 import module.mission.domain.util.MissionAuthorizationMap;
 import module.mission.domain.util.MissionPendingProcessCounter;
+import module.mission.domain.util.MissionState;
 import module.organization.domain.Party;
 import module.organization.domain.Person;
 import module.workflow.domain.WorkflowProcess;
@@ -269,10 +270,10 @@ private PendingProcessingPersonelInformationSearch(final SortedSet<MissionProces
 
         @Override
         boolean shouldAdd(final MissionProcess missionProcess, final User user) {
-            return (!missionProcess.hasCurrentOwner() || missionProcess.isTakenByCurrentUser())
-                    && (missionProcess.hasAnyCurrentQueues() && missionProcess.isCurrentUserAbleToAccessAnyQueues()
-                            && (missionProcess.isAuthorized() || missionProcess.hasNoItemsAndParticipantesAreAuthorized()) && missionProcess
-                                .areAllParticipantsAuthorized()) || missionProcess.isReadyForMissionTermination(user)
+            return (missionProcess.getCurrentOwner() == null || missionProcess.isTakenByCurrentUser())
+                    && missionProcess.isCurrentUserAbleToAccessAnyQueues()
+                    && MissionState.PERSONAL_INFORMATION_PROCESSING.isPending(missionProcess)
+                    || missionProcess.isReadyForMissionTermination(user)
                     || (missionProcess.isTerminated() && !missionProcess.isArchived() && missionProcess.canArchiveMission());
         }
 
@@ -363,10 +364,9 @@ public SortedSet<MissionProcess> getPendingDirectProcessingPersonelInformation()
         return new MissionProcessSearch() {
             @Override
             boolean shouldAdd(final MissionProcess missionProcess, final User user) {
-                return (!missionProcess.hasCurrentOwner() || missionProcess.isTakenByCurrentUser())
-                        && (missionProcess.hasAnyCurrentQueues() && missionProcess.isCurrentUserAbleToAccessAnyQueues()
-                                && (missionProcess.isAuthorized() || missionProcess.hasNoItemsAndParticipantesAreAuthorized()) && missionProcess
-                                    .areAllParticipantsAuthorized())
+                return (missionProcess.getCurrentOwner() == null || missionProcess.isTakenByCurrentUser())
+                        && missionProcess.isCurrentUserAbleToAccessAnyQueues()
+                        && MissionState.PERSONAL_INFORMATION_PROCESSING.isPending(missionProcess)
                         || missionProcess.isReadyForMissionTermination(user)
                         || (missionProcess.isTerminated() && !missionProcess.isArchived() && missionProcess
                                 .canArchiveMissionDirect());