Author: echatellier Date: 2014-07-08 10:43:00 +0200 (Tue, 08 Jul 2014) New Revision: 359 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/359 Log: Correction des contraintes d'unicit?\195?\169 pour les clients et ediReturn Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-07-07 16:29:06 UTC (rev 358) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-07-08 08:43:00 UTC (rev 359) @@ -40,12 +40,17 @@ com.franciaflex.faxtomail.persistence.entities.DemandType.attribute.label.tagvalue.naturalId=true # Client +com.franciaflex.faxtomail.persistence.entities.Client.attribute.brand.tagvalue.naturalId=true com.franciaflex.faxtomail.persistence.entities.Client.attribute.code.tagvalue.naturalId=true # NewClient com.franciaflex.faxtomail.persistence.entities.NewClient.attribute.code.tagvalue.notNull=true +com.franciaflex.faxtomail.persistence.entities.NewClient.attribute.brand.tagvalue.notNull=true com.franciaflex.faxtomail.persistence.entities.NewClient.attribute.type.tagvalue.notNull=true +#�EdiReturn +com.franciaflex.faxtomail.persistence.entities.EdiReturn.attribute.rangeRowTopiaId.tagvalue.notNull=true + # EmailAccount com.franciaflex.faxtomail.persistence.entities.EmailAccount.attribute.protocol.tagvalue.naturalId=true com.franciaflex.faxtomail.persistence.entities.EmailAccount.attribute.host.tagvalue.naturalId=true Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-07 16:29:06 UTC (rev 358) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-08 08:43:00 UTC (rev 359) @@ -133,15 +133,16 @@ case UPDATE: // find client to create or update - Client client = clientDao.forCodeEquals(newClient.getCode()).findUniqueOrNull(); + Client client = clientDao.forCodeEquals(newClient.getCode()) + .addEquals(Client.PROPERTY_BRAND, newClient.getBrand()).findUniqueOrNull(); if (client == null) { client = new ClientImpl(); if (type == NewClientType.UPDATE && log.isWarnEnabled()) { - log.warn("Can't find client code " + newClient.getCode() + " to update. Client created."); + log.warn(String.format("Can't find client code %s/%s to update. Client created.", newClient.getCode(), newClient.getBrand())); } } else { if (type == NewClientType.CREATION && log.isWarnEnabled()) { - log.warn("Creating a already existing client " + newClient.getCode() + ". Client updated."); + log.warn(String.format("Creating a already existing client %s/%s. Client updated.", newClient.getCode(), newClient.getBrand())); } } @@ -168,16 +169,17 @@ break; case DELETION: - Client deleteClient = clientDao.forCodeEquals(newClient.getCode()).findUniqueOrNull(); + Client deleteClient = clientDao.forCodeEquals(newClient.getCode()) + .addEquals(Client.PROPERTY_BRAND, newClient.getBrand()).findUniqueOrNull(); if (deleteClient == null) { if (log.isWarnEnabled()) { - log.warn("Can't find client code " + newClient.getCode() + " to delete"); + log.warn(String.format("Can't find client code %s/%s to delete", newClient.getCode(), newClient.getBrand())); } } else { // FIXME le delete ne fonctionnera pas si des mails porte sur ce client clientDao.delete(deleteClient); if (log.isDebugEnabled()) { - log.debug("Client " + newClient.getCode() + " deleted"); + log.debug(String.format("Client %s/%s deleted", newClient.getCode(), newClient.getBrand())); } } break; Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java 2014-07-07 16:29:06 UTC (rev 358) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java 2014-07-08 08:43:00 UTC (rev 359) @@ -73,6 +73,7 @@ // add new clients NewClient newClient = new NewClientImpl(); newClient.setCode("99154"); + newClient.setBrand("FX"); newClient.setEmailAddress("gerard.menvussa@lutin.com"); newClient.setType(NewClientType.UPDATE); newClient = newClientDao.create(newClient); @@ -86,6 +87,7 @@ // add new clients NewClient deleteClient = new NewClientImpl(); deleteClient.setCode("99154"); + deleteClient.setBrand("FX"); deleteClient.setType(NewClientType.DELETION); deleteClient = newClientDao.create(deleteClient);