lada/lada-server: src/main/java/de/intevation/lada/rest/AuditTrailService.java comparison

Insert timestamp into audit trail changed fields instead of date string.

author	Raimund Renkert <raimund.renkert@intevation.de>
date	Wed, 08 Mar 2017 15:59:47 +0100
parents	d531e8e8afa2
children	6fbfb8f0927a

comparison

equal deleted inserted replaced

-:d531e8e8afa2
+:c5721e624c0e
 javax.persistence.Query query = manager.createNativeQuery(sql);
 List<String> result = query.getResultList();
 return result.get(0);
 }
-private String formatDate(String format, String date) {
+private Long formatDate(String format, String date) {
 DateFormat inFormat = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ssXXX");
-DateFormat outFormat = new SimpleDateFormat("dd.MM.yyyy hh:mm");
-Date input;
 try {
-input = inFormat.parse(date);
+return inFormat.parse(date).getTime();
 } catch (ParseException e) {
-return date;
+return 0L;
 }
-return outFormat.format(input);
 }
 /**
 * Translate all known foreign keys
 */
 private ObjectNode translateValues(ObjectNode node) {
 for (Iterator<String> i = node.fieldNames(); i.hasNext();) {
 String key = i.next();
 if (mappings.containsKey(key)) {
 TableMapper m = mappings.get(key);
-String value = "";
 if (m.mappingTable.equals("date")) {
-value = formatDate(m.valueField, node.get(key).asText());
+Long value = formatDate(m.valueField, node.get(key).asText());
+node.put(key, value);
 }
 else {
-value = translateId(
+String value = translateId(
 m.mappingTable,
 m.valueField,
 node.get(key).asText(),
 "id",
 "stamm");
+node.put(key, value);
 }
-node.put(key, value);
 }
 }
 return node;
 }
 }

Mercurial > lada > lada-server