Merge branches 'master' and 'yolp' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosServer into yolp

Fork: 0

nitta-lab-2019 / CosmosServer

Browse code Merge branches 'master' and 'yolp' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosServer into yolp master yolp
commit dc7ef4de9791b650db714861fe141e822da82f03 2 parents 6cc2015 + b432f86 t-kume authored on 14 Nov 2019

Patch

Unified Split

Showing 4 changed files

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          src/main/java/com/example/cosmos_serversb/jsons/RequestJson.java
         SetIssuerByUid(request.getIssuerUid());
        setProduct(request.getProduct());
        setDeadline(request.getDeadline());
        setLocation(request.getLocation());
        this.done = false;
        setDone(request.getDone());
    }
 
    private void setrId(String rId){
        this.rId = rId;
         SetIssuerByUid(request.getIssuerUid());
         setProduct(request.getProduct());
         setDeadline(request.getDeadline());
         setLocation(request.getLocation());
+        this.done = false;
+        setDone(request.getDone());
     }
     private void setrId(String rId){
         this.rId = rId;

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          src/main/java/com/example/cosmos_serversb/jsons/RequestsJson.java
         this.requests = requests;
    }
 
    private void changeRequests(Set<Request> set, int quantity){
        if(quantity <= 0) return;
        if(quantity <= 0) quantity = 5;
        for( Request request : (Set<Request>) set ) {
            requests.add(new RequestJson(request));
            if(requests.size() == quantity) break;
        }
         this.requests = requests;
     }
     private void changeRequests(Set<Request> set, int quantity){
+        if(quantity <= 0) return;
+        if(quantity <= 0) quantity = 5;
         for( Request request : (Set<Request>) set ) {
             requests.add(new RequestJson(request));
             if(requests.size() == quantity) break;
         }

                Ignore Space
               Show notes
              View
            
          
          8 ■■■■■
          src/main/java/com/example/cosmos_serversb/models/Groups.java
 //
//        return testRequest;
    }
 
    public static DeleteResult deleteRequest(String gId, String rId){
    public static String deleteRequest(String gId, String rId){
        Session session = SessionManager.getInstance().getSession();
        Request request = session.get(Request.class, rId);
        if(request != null) {
            session.get(Group.class, gId).updateRequestHash(request);
            session.delete(request);
            return DeleteResult.SUCCESS;
        }
        return DeleteResult.FAILURE;
            return "SUCCESS";
        }
        return "FAILURE";
    }
 
    /*
    //テスト用にHashMapの作成
 //
 //        return testRequest;
     }
+    public static DeleteResult deleteRequest(String gId, String rId){
+    public static String deleteRequest(String gId, String rId){
         Session session = SessionManager.getInstance().getSession();
         Request request = session.get(Request.class, rId);
         if(request != null) {
             session.get(Group.class, gId).updateRequestHash(request);
             session.delete(request);
+            return DeleteResult.SUCCESS;
+        }
+        return DeleteResult.FAILURE;
+            return "SUCCESS";
+        }
+        return "FAILURE";
     }
     /*
     //テスト用にHashMapの作成

Ignore Space Show notes View src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java

Show line notes below