KRACOEUS-7969: truncating long department names

kuali · Feb 17, 2015 · 3a66bce · 3a66bce
1 parent 21693a5
commit 3a66bce
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 77 deletions.
diff --git a/...sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonBase.java b/...sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonBase.java
@@ -77,6 +77,7 @@ public abstract class RRKeyPersonBase extends S2SBaseFormGenerator{
 	protected static final int DIVISION_NAME_MAX_LENGTH = 30;
 	protected static final String NIH_CO_INVESTIGATOR = "Co-Investigator";
     protected static final String ERROR_ERA_COMMON_USER_NAME="eRA Commons User Name is missing for ";
+    protected static final int DEPARTMENT_NAME_MAX_LENGTH = 30;
 
     @Autowired
     @Qualifier("unitRepositoryService")

diff --git a/.../src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonBaseGenerator.java b/.../src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonBaseGenerator.java
@@ -18,10 +18,6 @@
  */
 package org.kuali.coeus.s2sgen.impl.generate.support;
 
-import org.kuali.coeus.s2sgen.impl.person.S2SProposalPersonService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-
 /**
  * This abstract class has methods that are common to all the versions of RRKeyPerson form.
  * 
@@ -31,7 +27,6 @@ public abstract class RRKeyPersonBaseGenerator extends RRKeyPersonBase {
 
     protected static final String BIOSKETCH_TYPE = "1";
     protected static final String CURRENT_PENDING_TYPE = "2";
-    protected static final String CO_INVESTIGATOR = "COI";
     protected static final int MAX_KEY_PERSON_COUNT = 8;
     protected static final int DIRECTORY_TITLE_MAX_LENGTH = 45;
     protected static final int ROLE_DESCRIPTION_MAX_LENGTH = 40;

diff --git a/...n/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonExpandedBaseGenerator.java b/...n/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonExpandedBaseGenerator.java
@@ -18,9 +18,6 @@
  */
 package org.kuali.coeus.s2sgen.impl.generate.support;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-
 /**
  * This abstract class has methods that are common to all the versions of
  * RRKeyPersonExpanded form.
@@ -32,7 +29,6 @@ public abstract class RRKeyPersonExpandedBaseGenerator extends
 
 
 	protected static final int PROFILE_TYPE = 18;
-	protected static final String CO_INVESTIGATOR = "COI";
 	protected static final int MAX_KEY_PERSON_COUNT = 40;
 	protected static final int DIRECTORY_TITLE_MAX_LENGTH = 45;
 	protected static final int ROLE_DESCRIPTION_MAX_LENGTH = 40;

diff --git a/...n/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonExpandedV1_0Generator.java b/...n/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonExpandedV1_0Generator.java
@@ -172,12 +172,12 @@ else if (PI.getRolodexId() != null) {
             if(PI.getHomeUnit() != null) {
                 KcPersonContract kcPerson = PI.getPerson();
                 String departmentName =  kcPerson.getOrganizationIdentifier();
-                profile.setDepartmentName(departmentName);
+                profile.setDepartmentName(StringUtils.substring(departmentName, 0, DEPARTMENT_NAME_MAX_LENGTH));
             }
             else
             {
                 DevelopmentProposalContract developmentProposal = pdDoc.getDevelopmentProposal();
-                profile.setDepartmentName(developmentProposal.getOwnedByUnit().getUnitName());
+                profile.setDepartmentName(StringUtils.substring(developmentProposal.getOwnedByUnit().getUnitName(), 0, DEPARTMENT_NAME_MAX_LENGTH));
             }
             String divisionName = PI.getDivision();
             if (divisionName != null) {
@@ -253,12 +253,12 @@ else if ((keyPerson.getRolodexId() != null) && pIPersonOrRolodexId.equals(keyPer
                 if(keyPerson.getHomeUnit() != null) {
                     KcPersonContract kcPerson = keyPerson.getPerson();
                     String departmentName =  kcPerson.getOrganizationIdentifier();
-                    profileKeyPerson.setDepartmentName(departmentName);
+                    profileKeyPerson.setDepartmentName(StringUtils.substring(departmentName, 0, DEPARTMENT_NAME_MAX_LENGTH));
                 }
                 else
                 {
                     DevelopmentProposalContract developmentProposal = pdDoc.getDevelopmentProposal();
-                    profileKeyPerson.setDepartmentName(developmentProposal.getOwnedByUnit().getUnitName());
+                    profileKeyPerson.setDepartmentName(StringUtils.substring(developmentProposal.getOwnedByUnit().getUnitName(), 0, DEPARTMENT_NAME_MAX_LENGTH));
                 }
                 String divisionName = keyPerson.getDivision();
                 if (divisionName != null) {

diff --git a/...n/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonExpandedV1_1Generator.java b/...n/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonExpandedV1_1Generator.java
@@ -189,12 +189,12 @@ private PersonProfileDataType getPersonProfilePI() {
 			if(PI.getHomeUnit() != null) {
                 KcPersonContract kcPerson = PI.getPerson();
                 String departmentName =  kcPerson.getOrganizationIdentifier();
-                profile.setDepartmentName(departmentName);
+                profile.setDepartmentName(StringUtils.substring(departmentName, 0, DEPARTMENT_NAME_MAX_LENGTH));
             }
             else
             {
                 DevelopmentProposalContract developmentProposal = pdDoc.getDevelopmentProposal();
-                profile.setDepartmentName(developmentProposal.getOwnedByUnit().getUnitName());
+                profile.setDepartmentName(StringUtils.substring(developmentProposal.getOwnedByUnit().getUnitName(), 0, DEPARTMENT_NAME_MAX_LENGTH));
             }
 			String divisionName = PI.getDivision();
 			if (divisionName != null) {
@@ -293,12 +293,12 @@ private PersonProfileDataType[] getpersonProfileKeyPerson() {
 				if(keyPerson.getHomeUnit() != null) {
                     KcPersonContract kcPerson = keyPerson.getPerson();
                     String departmentName =  kcPerson.getOrganizationIdentifier();
-                    profileKeyPerson.setDepartmentName(departmentName);
+                    profileKeyPerson.setDepartmentName(StringUtils.substring(departmentName, 0, DEPARTMENT_NAME_MAX_LENGTH));
                 }
                 else
                 {
                     DevelopmentProposalContract developmentProposal = pdDoc.getDevelopmentProposal();
-                    profileKeyPerson.setDepartmentName(developmentProposal.getOwnedByUnit().getUnitName());
+                    profileKeyPerson.setDepartmentName(StringUtils.substring(developmentProposal.getOwnedByUnit().getUnitName(), 0, DEPARTMENT_NAME_MAX_LENGTH));
                 }
 				String divisionName = keyPerson.getDivision();
 				if (divisionName != null) {

diff --git a/...n/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonExpandedV1_2Generator.java b/...n/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonExpandedV1_2Generator.java
@@ -257,12 +257,12 @@ private void setDepartmentNameToProfile(Profile profile, ProposalPersonContract
 		if(PI.getHomeUnit() != null) {
             KcPersonContract kcPerson = PI.getPerson();
             String departmentName =  kcPerson.getOrganizationIdentifier();
-            profile.setDepartmentName(departmentName);
+            profile.setDepartmentName(StringUtils.substring(departmentName, 0, DEPARTMENT_NAME_MAX_LENGTH));
         }
         else
         {
             DevelopmentProposalContract developmentProposal = pdDoc.getDevelopmentProposal();
-            profile.setDepartmentName(developmentProposal.getOwnedByUnit().getUnitName());
+            profile.setDepartmentName(StringUtils.substring(developmentProposal.getOwnedByUnit().getUnitName(), 0, DEPARTMENT_NAME_MAX_LENGTH));
         }
 	}
 

diff --git a/...n/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonExpandedV2_0Generator.java b/...n/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonExpandedV2_0Generator.java
@@ -315,12 +315,12 @@ private void setDepartmentNameToProfile(Profile profile, ProposalPersonContract
 		if(PI.getHomeUnit() != null) {
             KcPersonContract kcPerson = PI.getPerson();
             String departmentName =  kcPerson.getUnit().getUnitName();
-            profile.setDepartmentName(departmentName);
+            profile.setDepartmentName(StringUtils.substring(departmentName, 0, DEPARTMENT_NAME_MAX_LENGTH));
         }
         else
         {
             DevelopmentProposalContract developmentProposal = pdDoc.getDevelopmentProposal();
-            profile.setDepartmentName(developmentProposal.getOwnedByUnit().getUnitName());
+            profile.setDepartmentName(StringUtils.substring(developmentProposal.getOwnedByUnit().getUnitName(), 0, DEPARTMENT_NAME_MAX_LENGTH));
         }
 	}
 

diff --git a/.../src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonV1_0Generator.java b/.../src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonV1_0Generator.java
@@ -161,12 +161,12 @@ else if (PI.getRolodexId() != null) {
             if(PI.getHomeUnit() != null) {
                 KcPersonContract kcPerson = PI.getPerson();
                 String departmentName =  kcPerson.getOrganizationIdentifier();
-                profile.setDepartmentName(departmentName);
+                profile.setDepartmentName(StringUtils.substring(departmentName, 0, DEPARTMENT_NAME_MAX_LENGTH));
             }
             else
             {
                 DevelopmentProposalContract developmentProposal = pdDoc.getDevelopmentProposal();
-                profile.setDepartmentName(developmentProposal.getOwnedByUnit().getUnitName());
+                profile.setDepartmentName(StringUtils.substring(developmentProposal.getOwnedByUnit().getUnitName(), 0, DEPARTMENT_NAME_MAX_LENGTH));
             }
             String divisionName = PI.getDivision();
             if (divisionName != null) {
@@ -240,12 +240,12 @@ else if ((keyPerson.getRolodexId() != null) && pIPersonOrRolodexId.equals(keyPer
                 if(keyPerson.getHomeUnit() != null) {
                     KcPersonContract kcPerson = keyPerson.getPerson();
                     String departmentName =  kcPerson.getOrganizationIdentifier();
-                    profileKeyPerson.setDepartmentName(departmentName);
+                    profileKeyPerson.setDepartmentName(StringUtils.substring(departmentName, 0, DEPARTMENT_NAME_MAX_LENGTH));
                 }
                 else
                 {
                     DevelopmentProposalContract developmentProposal = pdDoc.getDevelopmentProposal();
-                    profileKeyPerson.setDepartmentName(developmentProposal.getOwnedByUnit().getUnitName());
+                    profileKeyPerson.setDepartmentName(StringUtils.substring(developmentProposal.getOwnedByUnit().getUnitName(), 0, DEPARTMENT_NAME_MAX_LENGTH));
                 }
                 String divisionName = keyPerson.getDivision();
                 if (divisionName != null) {

diff --git a/.../src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonV1_1Generator.java b/.../src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRKeyPersonV1_1Generator.java
@@ -177,12 +177,12 @@ else if (PI.getRolodexId() != null) {
             if(PI.getHomeUnit() != null) {
                 KcPersonContract kcPerson = PI.getPerson();
                 String departmentName =  kcPerson.getOrganizationIdentifier();
-                profile.setDepartmentName(departmentName);
+                profile.setDepartmentName(StringUtils.substring(departmentName, 0, DEPARTMENT_NAME_MAX_LENGTH));
             }
             else
             {
                 DevelopmentProposalContract developmentProposal = pdDoc.getDevelopmentProposal();
-                profile.setDepartmentName(developmentProposal.getOwnedByUnit().getUnitName());
+                profile.setDepartmentName(StringUtils.substring(developmentProposal.getOwnedByUnit().getUnitName(), 0, DEPARTMENT_NAME_MAX_LENGTH));
             }
             String divisionName = PI.getDivision();
             if (divisionName != null) {
@@ -272,12 +272,12 @@ else if (keyPerson.getRolodexId() != null) {
                 if(keyPerson.getHomeUnit() != null) {
                     KcPersonContract kcPerson = keyPerson.getPerson();
                     String departmentName =  kcPerson.getOrganizationIdentifier();
-                    profileKeyPerson.setDepartmentName(departmentName);
+                    profileKeyPerson.setDepartmentName(StringUtils.substring(departmentName, 0, DEPARTMENT_NAME_MAX_LENGTH));
                 }
                 else
                 {
                     DevelopmentProposalContract developmentProposal = pdDoc.getDevelopmentProposal();
-                    profileKeyPerson.setDepartmentName(developmentProposal.getOwnedByUnit().getUnitName());
+                    profileKeyPerson.setDepartmentName(StringUtils.substring(developmentProposal.getOwnedByUnit().getUnitName(), 0, DEPARTMENT_NAME_MAX_LENGTH));
                 }
                 String divisionName = keyPerson.getDivision();
                 if (divisionName != null) {

diff --git a/...impl/src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRSF424V1_0Generator.java b/...impl/src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRSF424V1_0Generator.java
@@ -350,7 +350,6 @@ private ApplicantInfo getApplicationInfo() {
 	 *
 	 * This method is used to get Contact person information
 	 *
-	 * @param rolodexOrganization
 	 * @return ContactPersonInfo corresponding to the Rolodex object.
 	 */
 	private ContactPersonInfo getContactInfo(RolodexContract rolodexOrganization) {
@@ -567,12 +566,12 @@ private OrganizationContactPersonDataType getPDPI() {
 				if(PI.getHomeUnit() != null) {
                     KcPersonContract kcPerson = PI.getPerson();
 		            String departmentName =  kcPerson.getOrganizationIdentifier();
-		            PDPI.setDepartmentName(departmentName);
+		            PDPI.setDepartmentName(StringUtils.substring(departmentName, 0, DEPARTMENT_NAME_MAX_LENGTH));
 		        }
 		        else
 		        {
 		            DevelopmentProposalContract developmentProposal = pdDoc.getDevelopmentProposal();
-		            PDPI.setDepartmentName(developmentProposal.getOwnedByUnit().getUnitName());
+		            PDPI.setDepartmentName(StringUtils.substring(developmentProposal.getOwnedByUnit().getUnitName(), 0, DEPARTMENT_NAME_MAX_LENGTH));
 		        }
 
 				// divisionName
@@ -619,7 +618,7 @@ private AORInfoType getAORInfoType() {
             if (StringUtils.isNotEmpty(departmentalPerson.getFaxNumber())) {
 			    aorInfoType.setFax(departmentalPerson.getFaxNumber());
             }
-			aorInfoType.setDepartmentName(departmentalPerson.getDirDept());
+			aorInfoType.setDepartmentName(departmentalPerson.getDirDept().substring(0, DEPARTMENT_NAME_MAX_LENGTH));
 			aorInfoType.setEmail(departmentalPerson.getEmailAddress());
 			if (departmentalPerson.getHomeUnit() != null) {
 				aorInfoType.setDivisionName(StringUtils.substring(departmentalPerson.getHomeUnit(), 0, DIVISION_NAME_MAX_LENGTH));

diff --git a/...impl/src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRSF424V1_1Generator.java b/...impl/src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRSF424V1_1Generator.java
@@ -364,7 +364,7 @@ private ApplicantInfo getApplicationInfo() {
 	 * 
 	 * This method is used to get Contact person information
 	 * 
-	 * @param rolodex(Rolodex)
+	 * @param rolodex Rolodex
 	 * @return ContactPersonInfo corresponding to the Rolodex object.
 	 */
 	private ContactPersonInfo getContactInfo(RolodexContract rolodex) {
@@ -554,12 +554,12 @@ private OrganizationContactPersonDataType getPDPI() {
 				if(PI.getHomeUnit() != null) {
                     KcPersonContract kcPerson = PI.getPerson();
                     String departmentName =  kcPerson.getOrganizationIdentifier();
-                    PDPI.setDepartmentName(departmentName);
+                    PDPI.setDepartmentName(StringUtils.substring(departmentName, 0, DEPARTMENT_NAME_MAX_LENGTH));
                 }
                 else
                 {
                     DevelopmentProposalContract developmentProposal = pdDoc.getDevelopmentProposal();
-                    PDPI.setDepartmentName(developmentProposal.getOwnedByUnit().getUnitName());
+                    PDPI.setDepartmentName(StringUtils.substring(developmentProposal.getOwnedByUnit().getUnitName(), 0, DEPARTMENT_NAME_MAX_LENGTH));
                 }
 				// divisionName
 				String divisionName = proposalPerson.getDivision();
@@ -617,7 +617,7 @@ private AORInfoType getAORInfoType() {
             if (StringUtils.isNotEmpty(departmentalPerson.getFaxNumber())) {
 			    aorInfoType.setFax(departmentalPerson.getFaxNumber());
             }
-			aorInfoType.setDepartmentName(departmentalPerson.getDirDept());
+			aorInfoType.setDepartmentName(departmentalPerson.getDirDept().substring(0, DEPARTMENT_NAME_MAX_LENGTH));
 			aorInfoType.setEmail(departmentalPerson.getEmailAddress());
 			if (departmentalPerson.getHomeUnit() != null) {
 				aorInfoType.setDivisionName(StringUtils.substring(departmentalPerson.getHomeUnit(), 0, DIVISION_NAME_MAX_LENGTH));

diff --git a/...impl/src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRSF424V1_2Generator.java b/...impl/src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRSF424V1_2Generator.java
@@ -316,7 +316,7 @@ private OrganizationDataType getOrganizationDataType() {
 	 * 
 	 * This method is used to get Contact person information
 	 * 
-	 * @param rolodex(Rolodex)
+	 * @param rolodex Rolodex
 	 * @return ContactPersonInfo corresponding to the Rolodex object.
 	 */
 	private ContactPersonInfo getContactInfo(RolodexContract rolodex) {
@@ -519,12 +519,12 @@ private void setDepartmentName(OrganizationContactPersonDataType PDPI,ProposalPe
 	    if(PI.getHomeUnit() != null) {
             KcPersonContract kcPerson = PI.getPerson();
 	        String departmentName =  kcPerson.getOrganizationIdentifier();
-	        PDPI.setDepartmentName(departmentName);
+	        PDPI.setDepartmentName(StringUtils.substring(departmentName, 0, DEPARTMENT_NAME_MAX_LENGTH));
 	    }
 	    else
 	    {
 	        DevelopmentProposalContract developmentProposal = pdDoc.getDevelopmentProposal();
-	        PDPI.setDepartmentName(developmentProposal.getOwnedByUnit().getUnitName());
+	        PDPI.setDepartmentName(StringUtils.substring(developmentProposal.getOwnedByUnit().getUnitName(), 0, DEPARTMENT_NAME_MAX_LENGTH));
 	    }
 	}
 

diff --git a/...l/src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRSF424_2_0_V2Generator.java b/...l/src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/RRSF424_2_0_V2Generator.java
@@ -325,7 +325,7 @@ private OrganizationDataType getOrganizationDataType() {
 	 * 
 	 * This method is used to get Contact person information
 	 * 
-	 * @param rolodex(Rolodex)
+	 * @param rolodex Rolodex
 	 * @return ContactPersonInfo corresponding to the Rolodex object.
 	 */
 	private ContactPersonInfo getContactInfo(RolodexContract rolodex) {
@@ -569,12 +569,12 @@ private void setDepartmentName(OrganizationContactPersonDataType PDPI,ProposalPe
 	    if(PI.getHomeUnit() != null) {
 	    	String personId = PI.getPersonId();
 	    	String departmentName = getPrimaryDepartment(personId);
-	        PDPI.setDepartmentName(departmentName);
+	        PDPI.setDepartmentName(StringUtils.substring(departmentName, 0, DEPARTMENT_NAME_MAX_LENGTH));
 	    }
 	    else
 	    {
 	        DevelopmentProposalContract developmentProposal = pdDoc.getDevelopmentProposal();
-	        PDPI.setDepartmentName(developmentProposal.getOwnedByUnit().getUnitName());
+	        PDPI.setDepartmentName(StringUtils.substring(developmentProposal.getOwnedByUnit().getUnitName(), 0, DEPARTMENT_NAME_MAX_LENGTH));
 	    }
 	}