Author: echatellier Date: 2014-07-07 13:05:17 +0200 (Mon, 07 Jul 2014) New Revision: 354 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/354 Log: Utilisation du code plutot que l'id de correspondance Modified: 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-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 10:59:14 UTC (rev 353) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-07 11:05:17 UTC (rev 354) @@ -133,15 +133,15 @@ case UPDATE: // find client to create or update - Client client = clientDao.forIdEquals(newClient.getId()).findUniqueOrNull(); + Client client = clientDao.forCodeEquals(newClient.getCode()).findUniqueOrNull(); if (client == null) { client = new ClientImpl(); if (type == NewClientType.UPDATE && log.isWarnEnabled()) { - log.warn("Can't find client " + newClient.getId() + " to update. Client created."); + log.warn("Can't find client code " + newClient.getCode() + " to update. Client created."); } } else { if (type == NewClientType.CREATION && log.isWarnEnabled()) { - log.warn("Creating a already existing client " + newClient.getId() + ". Client updated."); + log.warn("Creating a already existing client " + newClient.getCode() + ". Client updated."); } } @@ -168,16 +168,16 @@ break; case DELETION: - Client deleteClient = clientDao.forIdEquals(newClient.getId()).findUniqueOrNull(); + Client deleteClient = clientDao.forCodeEquals(newClient.getCode()).findUniqueOrNull(); if (deleteClient == null) { if (log.isWarnEnabled()) { - log.warn("Can't find client " + newClient.getId() + " to delete"); + log.warn("Can't find client code " + newClient.getCode() + " to delete"); } } else { // FIXME le delete ne fonctionnera pas si des mails porte sur ce client clientDao.delete(deleteClient); if (log.isDebugEnabled()) { - log.debug("Client " + newClient.getId() + " deleted"); + log.debug("Client " + newClient.getCode() + " deleted"); } } 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 10:59:14 UTC (rev 353) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java 2014-07-07 11:05:17 UTC (rev 354) @@ -72,7 +72,7 @@ // add new clients NewClient newClient = new NewClientImpl(); - newClient.setId("253142"); + newClient.setCode("99154"); newClient.setEmailAddress("gerard.menvussa@lutin.com"); newClient.setType(NewClientType.UPDATE); newClient = newClientDao.create(newClient); @@ -85,7 +85,7 @@ // add new clients NewClient deleteClient = new NewClientImpl(); - deleteClient.setId("253142"); + deleteClient.setCode("99154"); deleteClient.setType(NewClientType.DELETION); deleteClient = newClientDao.create(deleteClient); @@ -93,6 +93,6 @@ clientService.updateNewClients(); // asserts - Assert.assertNull(clientDao.forIdEquals("253142").findAnyOrNull()); + Assert.assertNull(clientDao.forCodeEquals("99154").findAnyOrNull()); } }