Modifications des REST

Zak
1 parent ffbf5d61
Showing 6 changed files with 68 additions and 49 deletions Show diff stats
pom.xml
src/main/java/fr/plil/sio/web/mvc/Dette.java
src/main/java/fr/plil/sio/web/mvc/UserRestController.java
src/main/java/fr/plil/sio/web/mvc/UserService.java
src/main/webapp/WEB-INF/pages/viewUsers.jsp
src/main/webapp/js/kawafile.js
@@ -41,6 +41,10 @@
 			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<scope>provided</scope>
 		</dependency>
+                <dependency>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-devtools</artifactId>
+  </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
@@ -16,42 +16,17 @@ public class Dette {
  
  
     @ManyToOne(optional = false)
-    private User dueToUser;
+    private User creditor;
  
     @ManyToOne(optional = false)
-    private User holderOfDebt;
-    
-     public Double getSommeDette() {
-        return sommeDette;
-    }
-
-    public void setSommeDette(Double sommeDette) {
-        this.sommeDette = sommeDette;
-    }
-
+    private User borrower;
  
-    public User getDueToUser() {
-        return dueToUser;
-    }
-
-    public void setDueToUser(User dueToUser) {
-        this.dueToUser = dueToUser;
-    }
-
-    public User getHolderOfDebt() {
-        return holderOfDebt;
-    }
-
-    public void setHolderOfDebt(User holderOfDebt) {
-        this.holderOfDebt = holderOfDebt;
-    }
-    
-    
-    
     @Override
     public int hashCode() {
-        int hash = 5;
-        hash = 71 * hash + Objects.hashCode(this.sommeDette);
+        int hash = 7;
+        hash = 97 * hash + Objects.hashCode(this.sommeDette);
+        hash = 97 * hash + Objects.hashCode(this.creditor);
+        hash = 97 * hash + Objects.hashCode(this.borrower);
         return hash;
     }
  
@@ -64,18 +39,45 @@ public class Dette {
             return false;
         }
         final Dette other = (Dette) obj;
+        if (!Objects.equals(this.id, other.id)) {
+            return false;
+        }
         if (!Objects.equals(this.sommeDette, other.sommeDette)) {
             return false;
         }
-        if (!Objects.equals(this.dueToUser, other.dueToUser)) {
+        if (!Objects.equals(this.creditor, other.creditor)) {
             return false;
         }
-        if (!Objects.equals(this.holderOfDebt, other.holderOfDebt)) {
+        if (!Objects.equals(this.borrower, other.borrower)) {
             return false;
         }
         return true;
     }
  
+    public User getCreditor() {
+        return creditor;
+    }
+
+    public void setCreditor(User creditor) {
+        this.creditor = creditor;
+    }
+
+    public User getBorrower() {
+        return borrower;
+    }
+
+    public void setBorrower(User borrower) {
+        this.borrower = borrower;
+    }
+    
+     public Double getSommeDette() {
+        return sommeDette;
+    }
+
+    public void setSommeDette(Double sommeDette) {
+        this.sommeDette = sommeDette;
+    }
+                 
  
  
  
@@ -25,13 +25,13 @@ public class UserRestController {
         return userService.findByUsername(username);
     }
  
-    @RequestMapping(value = "/api/debts/{username}/", method = RequestMethod.GET)
-    public List<Dette> listDettes(@PathVariable String username) {
-        return userService.findDettesByUsername(username);
+    @RequestMapping(value = "/api/debts/", method = RequestMethod.GET)
+    public List<Dette> listDettes() {        
+        return userService.findDettes();
     }
  
     @RequestMapping(value = "/api/addDette/", method = RequestMethod.POST)
-    public boolean addDette(@RequestParam(value="username",required=false) String username,@RequestParam(value="sommeDette",required=false) String sommeDette) {
+    public Dette addDette(@RequestParam(value="username",required=false) String username,@RequestParam(value="sommeDette",required=false) String sommeDette) {
         return userService.addDette(username,sommeDette);
     }
  
@@ -9,9 +9,9 @@ public interface UserService {
  
     User findByUsername(String username);
  
-    List<Dette> findDettesByUsername(String username);
+    List<Dette> findDettes();
  
     List<User> findAll();
  
-    boolean addDette(String username,String sommeDette);
+    Dette addDette(String username,String sommeDette);
 }
@@ -7,13 +7,17 @@
 </jsp:include>
 <body>
  
+    <div id="dettes">
+        
+    </div>
+    
+    
     <form>
         <div class="form-group">
                 <label for="debt">Somme de la dette</label>
                 <input type="number" class="form-control" id="sommeDette"/>
                 <label for="debtFor">A : </label>
                 <input type="text" class="form-control" id="username"/>
-            
         </div>
         <button type="submit" onclick="updateDebtOfUser()">Update</button>
     </form>
 var debtsOfUser = [];
  
-function getDebtsOfUser(username){
-    var url = "/api/userDebts"+username;
-    
-    $.getJson(url,function(d){
-            debtsOfUser = d;
+function getDebtsOfUser(){
+    var url = "/api/debts/";
+    var html ="";
+    $.getJSON(url,function(d){
+        html+="<ul>";
+            $.each(d,function(index,item){
+                html+="<li>"+item.holderOfDebt.username+"</li>";
+                html+="<li>"+item.sommeDette+"</li>";
+            });
     });
+    $("#dettes").html(html);
 }
  
 function updateDebtOfUser(){
@@ -36,13 +41,17 @@ function updateDebtOfUser(){
     $.ajax({
         url:url,
         method:"POST",
-        data:requestData       
+        data:requestData,
+        async:false,
     }).done(function(d){
         alert("Ok");
+         getDebtsOfUser();
     }).success(function(d){
-        console.log(d);
+      getDebtsOfUser();
+     }).fail(function(d){
+         alert("Erreur");
      });
-//        
+        getDebtsOfUser();
 }
  
  
@@ -50,7 +59,7 @@ function updateDebtOfUser(){
     'use strict';
  
  
-    
+    getDebtsOfUser();
  
  
 })();