Merge pull request #153 in EDELIVERY/smp from...

Merge pull request #153 in EDELIVERY/smp from bugfix/EDELIVERY-4442-error-adding-user-2 to development

* commit '69306cdcc0058c36b8716c8f3f9d2b4d1be68da1':
  add Username as certificate ID  for users without username.

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverter.java

@@ -3,7 +3,7 @@ package eu.europa.ec.edelivery.smp.conversion;
 import eu.europa.ec.edelivery.smp.data.model.DBUser;
 import eu.europa.ec.edelivery.smp.data.ui.CertificateRO;
 import eu.europa.ec.edelivery.smp.data.ui.UserRO;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.converter.Converter;
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
 
+
 /**
  * @author Sebastian-Ion TINCU
  */
@@ -33,6 +34,12 @@ public class DBUserToUserROConverter implements Converter<DBUser, UserRO> {
         if (source.getCertificate() != null) {
             CertificateRO certificateRO = conversionService.convert(source.getCertificate(), CertificateRO.class);
             target.setCertificate(certificateRO);
+            if(StringUtils.equalsIgnoreCase(source.getCertificate().getCertificateId(), source.getUsername())) {
+                // clear username if is the same as certificate id.
+                // username as cert id is set to database to force unique users
+                // and to fix issue with mysql - where null value is also unique...
+                target.setUsername(null);
+            }
         }
         return target;
     }

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/UserROToDBUserConverter.java

@@ -3,11 +3,14 @@ package eu.europa.ec.edelivery.smp.conversion;
 import eu.europa.ec.edelivery.smp.data.model.DBCertificate;
 import eu.europa.ec.edelivery.smp.data.model.DBUser;
 import eu.europa.ec.edelivery.smp.data.ui.UserRO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Component;
 
+import java.util.Objects;
+
 /**
  * @author Sebastian-Ion TINCU
  */
@@ -29,6 +32,13 @@ public class UserROToDBUserConverter implements Converter<UserRO, DBUser> {
         if (source.getCertificate() != null) {
             DBCertificate certData = conversionService.convert(source.getCertificate(), DBCertificate.class);
             target.setCertificate(certData);
+
+            if(StringUtils.isBlank(source.getUsername())) {
+                // set username with certificate id.
+                // username as cert id is set to database to force unique users
+                // and to fix issue with mysql - where null value is also unique...
+                target.setUsername(certData.getCertificateId());
+            }
         }
         return target;
     }