Author: fdesbois Date: 2010-10-03 14:27:26 +0000 (Sun, 03 Oct 2010) New Revision: 648 Log: Ano #2500 : error import contact CSV : - CONT_COMMENT field not imported Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-10-03 14:15:34 UTC (rev 647) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-10-03 14:27:26 UTC (rev 648) @@ -25,11 +25,12 @@ package fr.ifremer.wao.io.csv; +import org.apache.commons.lang.BooleanUtils; + import java.text.DateFormat; import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.util.Locale; -import org.apache.commons.lang.BooleanUtils; /** * CsvHeader @@ -332,6 +333,10 @@ CONT_SOCIETE_VALID(31), /** Contact program validation **/ CONT_PROGRAM_VALID(32); +// /** Contact company comment **/ +// CONT_COMMENT_SOCIETE(33), +// /** Contact program comment **/ +// CONT_COMMENT_PROGRAM(34); private int contactHeader; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-10-03 14:15:34 UTC (rev 647) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-10-03 14:27:26 UTC (rev 648) @@ -704,6 +704,10 @@ contact.setDataInputDate( ImportHelper.readDate(reader, CONTACT.CONT_ALLEGRO)); + contact.setComment( + ImportHelper.read(reader, CONTACT.CONT_COMMENT) + ); + if (updateValidation) { if (log.isDebugEnabled()) { log.debug("SuperAdmin import :: validations"); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-10-03 14:15:34 UTC (rev 647) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-10-03 14:27:26 UTC (rev 648) @@ -57,7 +57,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -163,14 +163,14 @@ SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction); logger.info("SampleMonth : 03/2010 _ row 2010_0001"); - Date monthDate = DateUtils.createDate(1, 3, 2010); + Date monthDate = DateUtil.createDate(1, 3, 2010); sampleMonth = monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, SampleMonth.PERIOD_DATE, monthDate); - monthDate = DateUtils.createDate(1, 4, 2010); + monthDate = DateUtil.createDate(1, 4, 2010); monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, SampleMonth.PERIOD_DATE, monthDate); - Date contactDate = DateUtils.createDate(18, 3, 2010); + Date contactDate = DateUtil.createDate(18, 3, 2010); when(contact.getTideBeginDate()).thenReturn(contactDate); when(contact.getSampleRow()).thenReturn(sampleRow); @@ -220,7 +220,7 @@ // SampleMonthDAO monthDAO = // WaoDAOHelper.getSampleMonthDAO(transaction); // -// Date contactDate = DateUtils.createDate(18, 10, 2010); +// Date contactDate = DateUtil.createDate(18, 10, 2010); // when(contact.getTideBeginDate()).thenReturn(contactDate); // // service.getExistingSampleMonthForContact(monthDAO, @@ -406,7 +406,7 @@ when(contact.getContactState()). thenReturn(ContactState.BOARDING_DONE); when(contact.getTideBeginDate()). - thenReturn(DateUtils.createDate(3, 4, 2010)); + thenReturn(DateUtil.createDate(3, 4, 2010)); service.updateSampleMonthTidesValue(transaction, contactReference, contact, true); @@ -426,7 +426,7 @@ SampleMonthDAO dao = WaoDAOHelper.getSampleMonthDAO(transaction); TopiaQuery query = dao.createQuery(); - query.addEquals(SampleMonth.PERIOD_DATE, DateUtils.createDate(1, 4, 2010)); + query.addEquals(SampleMonth.PERIOD_DATE, DateUtil.createDate(1, 4, 2010)); SampleMonth month = dao.findByQuery(query); @@ -538,7 +538,6 @@ WaoBusinessException, IOException, ImportRefusedException, - ImportRefusedException, ParseException { logger.info("testLoadContactCsv"); @@ -573,6 +572,9 @@ thenReturn("18/03/10"); when(reader.get(CONTACT.CONT_CODE.name())). thenReturn(""); + String comment = "Commentaire sur le contact\nAutre ligne"; + when(reader.get(CONTACT.CONT_COMMENT.name())). + thenReturn(comment); when(creator.getCompany()).thenReturn(company); when(creator.isAdmin()).thenReturn(false); @@ -586,20 +588,21 @@ try { result.initialize(transaction, creator, 1); service.loadContactCsv(reader, result, false); - Date createDate = DateUtils.createDate(18,3,2010); + Date createDate = DateUtil.createDate(18,3,2010); assertEquals(createDate, result.getTopiaCreateDate()); assertEquals(ContactState.BOARDING_DONE, result.getContactState()); assertEquals(observer, result.getObserver()); assertEquals(sampleRow, result.getSampleRow()); assertEquals(boat, result.getBoat()); - assertEquals(DateUtils.createDate(22,3,2010), + assertEquals(DateUtil.createDate(22,3,2010), result.getTideBeginDate()); - assertEquals(DateUtils.createDate(22,3,2010), + assertEquals(DateUtil.createDate(22,3,2010), result.getTideEndDate()); assertEquals(1, result.getNbObservants()); assertFalse(result.getMammalsCapture()); - assertTrue(result.getMammalsObservation()); - assertEquals(DateUtils.createDate(25,3,2010), + assertTrue(result.getMammalsObservation()); + assertEquals(comment, result.getComment()); + assertEquals(DateUtil.createDate(25,3,2010), result.getDataInputDate()); // No validation update : creator is not an admin assertNull(result.getValidationCompany()); @@ -669,7 +672,7 @@ // Don't use a mock in this case Contact newContact = service.getNewContact(observer, sampleRow, boat); - newContact.setTopiaCreateDate(DateUtils.createDate(2, 3, 2010)); + newContact.setTopiaCreateDate(DateUtil.createDate(2, 3, 2010)); /** EXEC METHOD **/ @@ -713,8 +716,8 @@ logger.info("test 2 : Update the contact with state BOARDING_DONE, " + "tideBeginDate, tideEndDate and NbObservants"); - Date tideBeginDate = DateUtils.createDate(18,3,2010); - Date tideEndDate = DateUtils.createDate(19,3,2010); + Date tideBeginDate = DateUtil.createDate(18,3,2010); + Date tideEndDate = DateUtil.createDate(19,3,2010); try { transaction = manager.getContext().beginTransaction();