OO-4207: Respect user visibility when get the fully assessed from passed

src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java

@@ -530,7 +530,7 @@ public class CourseAssessmentManagerImpl implements AssessmentManager {
 		assessmentEntry = assessmentService.updateAssessmentEntry(assessmentEntry);
 		DBFactory.getInstance().commit();
 		
-		nodeAccessService.onPassedUpdated(courseNode, userCourseEnv, passed, Role.auto);
+		nodeAccessService.onPassedUpdated(courseNode, userCourseEnv, passed, assessmentEntry.getUserVisibility(), by);
 		nodeAccessService.onStatusUpdated(courseNode, userCourseEnv, assessmentEntry.getAssessmentStatus(), by);
 		DBFactory.getInstance().commit();
 		

src/main/java/org/olat/course/condition/ConditionNodeAccessProvider.java

@@ -105,7 +105,7 @@ public class ConditionNodeAccessProvider implements NodeAccessProvider {
 	}
 
 	@Override
-	public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed, Role by) {
+	public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed, Boolean userVisibility, Role by) {
 		// nothing to do
 	}
 

src/main/java/org/olat/course/learningpath/LearningPathConfigs.java

@@ -40,7 +40,7 @@ public interface LearningPathConfigs {
 	
 	public FullyAssessedResult isFullyAssessedOnConfirmation();
 
-	public FullyAssessedResult isFullyAssessedOnPassed(Boolean passed);
+	public FullyAssessedResult isFullyAssessedOnPassed(Boolean passed, Boolean userVisibility);
 	
 	public FullyAssessedResult isFullyAssessedOnStatus(AssessmentEntryStatus status);
 	

src/main/java/org/olat/course/learningpath/manager/LearningPathNodeAccessProvider.java

@@ -120,8 +120,9 @@ public class LearningPathNodeAccessProvider implements NodeAccessProvider {
 	}
 
 	@Override
-	public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed, Role by) {
-		FullyAssessedResult result = getConfigs(courseNode).isFullyAssessedOnPassed(passed);
+	public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed,
+			Boolean userVisibility, Role by) {
+		FullyAssessedResult result = getConfigs(courseNode).isFullyAssessedOnPassed(passed, userVisibility);
 		updateFullyAssessed(courseNode, userCourseEnv, by, result);
 	}
 

src/main/java/org/olat/course/learningpath/model/ModuleLearningPathConfigs.java

@@ -98,10 +98,10 @@ public class ModuleLearningPathConfigs implements LearningPathConfigs {
 	}
 
 	@Override
-	public FullyAssessedResult isFullyAssessedOnPassed(Boolean passed) {
+	public FullyAssessedResult isFullyAssessedOnPassed(Boolean passed, Boolean userVisibility) {
 		String doneTriggerName = getDoneTriggerName();
 		if (CONFIG_VALUE_TRIGGER_PASSED.equals(doneTriggerName)) {
-			boolean fullyAssessed = Boolean.TRUE.equals(passed);
+			boolean fullyAssessed = Boolean.TRUE.equals(passed) && Boolean.TRUE.equals(userVisibility);
 			return LearningPathConfigs.fullyAssessed(true, fullyAssessed, doneOnFullyAssessed);
 		}
 		return LearningPathConfigs.notFullyAssessed();
@@ -115,8 +115,8 @@ public class ModuleLearningPathConfigs implements LearningPathConfigs {
 	public FullyAssessedResult isFullyAssessedOnStatus(AssessmentEntryStatus status) {
 		String doneTriggerName = getDoneTriggerName();
 		if (CONFIG_VALUE_TRIGGER_STATUS_DONE.equals(doneTriggerName)) {
-			boolean fulylAssessed = AssessmentEntryStatus.done.equals(status);
-			return LearningPathConfigs.fullyAssessed(true, fulylAssessed, false);
+			boolean fullyAssessed = AssessmentEntryStatus.done.equals(status);
+			return LearningPathConfigs.fullyAssessed(true, fullyAssessed, false);
 		}
 		return LearningPathConfigs.notFullyAssessed();
 	}

src/main/java/org/olat/course/learningpath/model/UnsupportedLearningPathConfigs.java

@@ -57,7 +57,7 @@ public class UnsupportedLearningPathConfigs implements LearningPathConfigs {
 	}
 
 	@Override
-	public FullyAssessedResult isFullyAssessedOnPassed(Boolean passed) {
+	public FullyAssessedResult isFullyAssessedOnPassed(Boolean passed, Boolean userVisibility) {
 		return LearningPathConfigs.notFullyAssessed();
 	}
 

src/main/java/org/olat/course/nodeaccess/NodeAccessProvider.java

@@ -50,7 +50,7 @@ public interface NodeAccessProvider extends NodeAccessProviderIdentifier {
 
 	public void onAssessmentConfirmed(CourseNode courseNode, UserCourseEnvironment userCourseEnv);
 	
-	public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed, Role by);
+	public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed, Boolean userVisibility, Role by);
 
 	public void onStatusUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv,
 			AssessmentEntryStatus status, Role by);

src/main/java/org/olat/course/nodeaccess/NodeAccessService.java

@@ -91,9 +91,11 @@ public interface NodeAccessService {
 	 * @param courseNode
 	 * @param userCourseEnv
 	 * @param passed 
+	 * @param userVisibility 
 	 * @param by
 	 */
-	public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed, Role by);
+	public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed,
+			Boolean userVisibility, Role by);
 
 	/**
 	 * Hook after the completion and the run status is updated.

src/main/java/org/olat/course/nodeaccess/manager/NodeAccessServiceImpl.java

@@ -104,9 +104,10 @@ public class NodeAccessServiceImpl implements NodeAccessService, NodeVisitedList
 	}
 
 	@Override
-	public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed, Role by) {
+	public void onPassedUpdated(CourseNode courseNode, UserCourseEnvironment userCourseEnv, Boolean passed,
+			Boolean userVisibility, Role by) {
 		NodeAccessType type = NodeAccessType.of(userCourseEnv);
-		getNodeAccessProvider(type).onPassedUpdated(courseNode, userCourseEnv, passed, by);
+		getNodeAccessProvider(type).onPassedUpdated(courseNode, userCourseEnv, passed, userVisibility, by);
 	}
 
 	@Override

src/main/java/org/olat/course/nodes/ScormCourseNode.java

@@ -178,7 +178,7 @@ public class ScormCourseNode extends AbstractAccessableCourseNode {
 		boolean hasPassed = new ScormAssessmentConfig(getModuleConfiguration()).hasPassed();
 		boolean isPassedTrigger = CoreSpringFactory.getImpl(ScormLearningPathNodeHandler.class)
 				.getConfigs(this)
-				.isFullyAssessedOnPassed(null)
+				.isFullyAssessedOnPassed(null, null)
 				.isFullyAssessed();
 		return isPassedTrigger && !hasPassed;
 	}

src/main/java/org/olat/course/nodes/st/assessment/STLearningPathConfigs.java

@@ -57,7 +57,7 @@ public class STLearningPathConfigs implements LearningPathConfigs {
 	}
 
 	@Override
-	public FullyAssessedResult isFullyAssessedOnPassed(Boolean passed) {
+	public FullyAssessedResult isFullyAssessedOnPassed(Boolean passed, Boolean userVisibility) {
 		return LearningPathConfigs.notFullyAssessed();
 	}
 

src/test/java/org/olat/course/learningpath/manager/LearningPathNodeAccessProviderTest.java

@@ -234,9 +234,9 @@ public class LearningPathNodeAccessProviderTest {
 	
 	@Test
 	public void shouldInvokePassedConfig() {
-		sut.onPassedUpdated(courseNodeMock, coachCourseEnv, null, null);
+		sut.onPassedUpdated(courseNodeMock, coachCourseEnv, null, null, null);
 
-		verify(configMock).isFullyAssessedOnPassed(any());
+		verify(configMock).isFullyAssessedOnPassed(any(), null);
 	}
 	
 	@Test