Korjaus rooli attribuuttiin

Author: JarToi

src/main/java/fi/mpass/shibboleth/attribute/resolver/data/School.java

@@ -31,7 +31,14 @@ public School(String id, String name, String parentOid, String parentName) {
 		this.parentName = parentName;
 	}
 
-	
+	public School(String id, String name, String oid, String parentOid, String parentName) {
+		this.id = id;
+		this.oid = oid;
+		this.name = name;
+		this.parentOid = parentOid;
+		this.parentName = parentName;
+	}
+
 	public School(String id, String name, String oid, String officeOid, String officeName, String parentOid,
 			String parentName, String organizationType) {
 		this.id = id;

src/main/java/fi/mpass/shibboleth/attribute/resolver/data/UserDTO.java

@@ -313,7 +313,7 @@ public String getNickName() {
 	 * @param newNickName The value to be set.
 	 */
 	public void setNickName(String newNickName) {
-		this.firstName = newNickName;
+		this.nickName = newNickName;
 	}
 
 	/**

src/main/java/fi/mpass/shibboleth/attribute/resolver/dc/impl/RestDataConnector.java

@@ -954,8 +954,9 @@ protected void populateStructuredRole(final Map<String, IdPAttribute> attributes
 	 */
 	protected void populateStructuredRole(@Nonnull final Map<String, IdPAttribute> attributes,
 			@Nonnull final School school, @Nonnull final UserDTO.RolesDTO role) {
-		if (school.getId() != null && school.getParentOid() != null) {
+		if ((school.getId() != null || school.getOid() != null ) && school.getParentOid() != null) {
 			final String group = role.getGroup() != null ? role.getGroup() : "";
+			final String schoolId = school.getId() != null ? school.getId() : "";
 			final String schoolOid = school.getOid() != null ? school.getOid() : "";
 			final String officeOid = school.getOfficeOid() != null ? school.getOfficeOid() : "";
 
@@ -975,7 +976,7 @@ protected void populateStructuredRole(@Nonnull final Map<String, IdPAttribute> a
 				codeInSchool = "";
 			}
 
-			final String structuredRoleWithParentOid = school.getParentOid() + ";" + school.getId() + ";" + group + ";"
+			final String structuredRoleWithParentOid = school.getParentOid() + ";" + schoolId + ";" + group + ";"
 					+ roleInSchool+ ";" + codeInSchool + ";" + schoolOid + ";"+ officeOid;
 			log.debug("Populating structuredRoleWithParentOid: {}", structuredRoleWithParentOid);
 

src/test/java/fi/mpass/shibboleth/attribute/resolver/dc/impl/RestDataConnectorTest.java

@@ -251,9 +251,9 @@ public void testPopulateStructuredRole_whenSchoolObjectAsParam_shouldReturnRoleW
 		final RestDataConnector dataConnector = new RestDataConnector();
 		dataConnector.setResultAttributePrefix("");
 
-		final String expected = expectedParentOid + ";" + expectedSchoolId + ";;;;;";
+		final String expected = expectedParentOid + ";" + expectedSchoolId + ";;;;"+expectedSchoolOid+";";
 
-		School school = new School(expectedSchoolId, expectedSchoolName, expectedParentOid, expectedParentName);
+		School school = new School(expectedSchoolId, expectedSchoolName, expectedSchoolOid, expectedParentOid, expectedParentName);
 		dataConnector.populateStructuredRole(attributes, school, role);
 		final IdPAttribute attribute = attributes.get(RestDataConnector.ATTR_ID_STRUCTURED_ROLES_WITH_PARENT_OID);