Merge pull request #482 from ase-101/1.1.5.5-mor-fix

MOSIP-22235

Author: ase-101

registration/registration-services/src/main/java/io/mosip/registration/entity/Registration.java

@@ -77,10 +77,6 @@ public class Registration extends RegistrationCommonFields {
 	@Column(name = "ADDITIONAL_INFO")
 	private byte[] additionalInfo;
 
-	@ManyToOne
-	@JoinColumn(name = "CR_BY", referencedColumnName = "id", insertable = false, updatable = false)
-	private UserDetail userdetail;
-
 	public String getId() {
 		return id;
 	}
@@ -289,14 +285,6 @@ public void setLatestRegTrnTimestamp(Timestamp latestRegTrnTimestamp) {
 		this.latestRegTrnTimestamp = Timestamp.valueOf(DateUtils.getUTCCurrentDateTime());
 	}
 
-	public UserDetail getUserdetail() {
-		return userdetail;
-	}
-
-	public void setUserdetail(UserDetail userdetail) {
-		this.userdetail = userdetail;
-	}
-
 	/**
 	 * @return the preRegId
 	 */

registration/registration-services/src/test/java/io/mosip/registration/test/dao/impl/RegistrationDAOTest.java

@@ -172,7 +172,7 @@ public void testGetRegistrationsByStatus() {
 		regobject.setCrBy("Mosip123");
 		regobject.setAckFilename("file1");
 
-		regobject.setUserdetail(regUserDetail);
+		//regobject.setUserdetail(regUserDetail);
 		details.add(regobject);
 
 		Mockito.when(registrationRepository.findByclientStatusCodeOrderByCrDtime("R")).thenReturn(details);
@@ -182,7 +182,7 @@ public void testGetRegistrationsByStatus() {
 		assertEquals("123456", enrollmentsByStatus.get(0).getId());
 		assertEquals("R", enrollmentsByStatus.get(0).getClientStatusCode());
 		assertEquals("Mosip123", enrollmentsByStatus.get(0).getCrBy());
-		assertEquals("RegistrationOfficer", enrollmentsByStatus.get(0).getUserdetail().getName());
+		//assertEquals("RegistrationOfficer", enrollmentsByStatus.get(0).getUserdetail().getName());
 		assertEquals("file1", enrollmentsByStatus.get(0).getAckFilename());
 	}
 

registration/registration-services/src/test/java/io/mosip/registration/test/service/RegistrationApprovalServiceTest.java

@@ -90,7 +90,7 @@ public void testGetEnrollmentByStatus() throws RegBaseCheckedException {
 		regobject.setCrDtime(time);
 		regobject.setAckFilename("file1");
 
-		regobject.setUserdetail(regUserDetail);
+		//regobject.setUserdetail(regUserDetail);
 		details.add(regobject);
 
 		Mockito.when(registrationDAO.getEnrollmentByStatus("R")).thenReturn(details);
@@ -120,7 +120,7 @@ public void testPacketUpdateStatus() throws RegBaseCheckedException {
 		regobject.setApproverRoleCode(SessionContext.userContext().getRoles().get(0));
 		regobject.setAckFilename("file1");
 
-		regobject.setUserdetail(regUserDetail);
+		//regobject.setUserdetail(regUserDetail);
 
 		Mockito.when(registrationDAO.updateRegistration("123456", "", "R")).thenReturn(regobject);