Merge branch 'master' of archives.plil.fr:LeClubInfo/etunicorn-server

Geoffrey PREUD'HOMME
2 parents 19eb4d26 3e3b38c1
Showing 3 changed files with 18 additions and 4 deletions Show diff stats
.idea/dataSources.local.xml
.idea/dataSources.xml
src/main/java/etunicorn/controller/PersonneController.java
@@ -0,0 +1,8 @@
+<?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="" version="" jdbc-version="" driver-name="" driver-version="" />
+    </data-source>
+  </component>
+</project>
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="bade@localhost" uuid="d63e2d8c-a4c6-4db5-9ff9-2f8eb96100ee">
+    <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://localhost:3306/bade</jdbc-url>
+      <jdbc-url>jdbc:mysql://192.168.0.28:3306/bade</jdbc-url>
       <driver-properties>
         <property name="autoReconnect" value="true" />
         <property name="zeroDateTimeBehavior" value="convertToNull" />
@@ -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());