From 3e3b38c1fe8b0c636100060cd12fe31a0546a621 Mon Sep 17 00:00:00 2001
From: Benoît Verhaeghe <badetitou@gmail.com>
Date: Sun, 5 Feb 2017 19:06:49 +0100
Subject: [PATCH] VITE JE SUIS LE PREMIER

---
 .idea/dataSources.local.xml                                | 15 +++++++++++++++
 .idea/dataSources.xml                                      | 19 +++++++++++++++++++
 src/main/java/etunicorn/controller/PersonneController.java | 10 ++++++++--
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 .idea/dataSources.local.xml
 create mode 100644 .idea/dataSources.xml

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
new file mode 100644
index 0000000..7ed7a3d
--- /dev/null
+++ b/.idea/dataSources.local.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="dataSourceStorageLocal">
+    <data-source name="bade@192.168.0.28" uuid="7e4ff828-d2d1-4752-a033-bfc8d5c3ccd8">
+      <database-info product="MySQL" version="5.5.5-10.1.20-MariaDB" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.35 ( Revision: 5fb9c5849535c13917c2cf9baaece6ef9693ef27 )">
+        <extra-name-characters>#@</extra-name-characters>
+        <identifier-quote-string>`</identifier-quote-string>
+      </database-info>
+      <case-sensitivity plain-identifiers="exact" quoted-identifiers="exact" />
+      <secret-storage>master_key</secret-storage>
+      <user-name>bade</user-name>
+      <resolve-scope>bade:</resolve-scope>
+    </data-source>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
new file mode 100644
index 0000000..a3eda13
--- /dev/null
+++ b/.idea/dataSources.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="bade@192.168.0.28" uuid="7e4ff828-d2d1-4752-a033-bfc8d5c3ccd8">
+      <driver-ref>mysql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://192.168.0.28:3306/bade</jdbc-url>
+      <driver-properties>
+        <property name="autoReconnect" value="true" />
+        <property name="zeroDateTimeBehavior" value="convertToNull" />
+        <property name="tinyInt1isBit" value="false" />
+        <property name="characterEncoding" value="utf8" />
+        <property name="characterSetResults" value="utf8" />
+        <property name="yearIsDateType" value="false" />
+      </driver-properties>
+    </data-source>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/etunicorn/controller/PersonneController.java b/src/main/java/etunicorn/controller/PersonneController.java
index 8680602..72592f3 100644
--- a/src/main/java/etunicorn/controller/PersonneController.java
+++ b/src/main/java/etunicorn/controller/PersonneController.java
@@ -17,7 +17,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.LinkedHashMap;
 import java.util.List;
 
@@ -42,8 +43,13 @@ public class PersonneController extends BaseController implements etunicorn.gene
     }
 
     private ResponseEntity<?> mergePersonne(Personne personne, UpdatePersonneRequest updatePersonneRequest) {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         if (updatePersonneRequest.getNaissance() != null) {
-            personne.setNaissance(new Date(updatePersonneRequest.getNaissance()));
+            try {
+                personne.setNaissance(format.parse(updatePersonneRequest.getNaissance()));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
         }
         if (updatePersonneRequest.getCarte() != null) {
             personne.setCarte(updatePersonneRequest.getCarte());
--
libgit2 0.21.2