Skip to content
Snippets Groups Projects

WIP: Resolve "Rozsirenie instance o atributy"

Closed Ľuboslav Pivarč requested to merge 5-rozsirenie-instance-o-atributy-2 into v2
12 files
+ 219
174
Compare changes
  • Side-by-side
  • Inline
Files
12
package cz.muni.ics.edirex.cbioondemandK8S.api;
import cz.muni.ics.edirex.cbioondemandK8S.model.InitialBody;
import cz.muni.ics.edirex.cbioondemandK8S.model.Instance;
import cz.muni.ics.edirex.cbioondemandK8S.model.InstanceExtend;
import cz.muni.ics.edirex.cbioondemandK8S.model.InstanceId;
import cz.muni.ics.edirex.cbioondemandK8S.model.User;
import cz.muni.ics.edirex.cbioondemandK8S.service.CBioOnDemandService;
import cz.muni.ics.edirex.cbioondemandK8S.model.v2.InstanceId;
import cz.muni.ics.edirex.cbioondemandK8S.model.v2.User;
import cz.muni.ics.edirex.cbioondemandK8S.model.v2.CbioDemand;
import cz.muni.ics.edirex.cbioondemandK8S.model.v2.Instance;
import cz.muni.ics.edirex.cbioondemandK8S.model.v2.InstanceDTO;
import cz.muni.ics.edirex.cbioondemandK8S.service.v2.CBioOnDemandService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -21,8 +21,8 @@ import java.util.List;
@RestController
@RequestMapping("/v2")
public class V2 {
private final String cbiood = "/cbioondemand";
private final String cbioods = "/cbioondemands";
private final String cbio = "/cbioondemand";
private final String allCbio = "/cbioondemands";
private CBioOnDemandService cBioOnDemand;
@@ -30,40 +30,38 @@ public class V2 {
this.cBioOnDemand = cBioOnDemand;
}
@PostMapping(cbiood)
public ResponseEntity createCbioOnDemand(@RequestBody InitialBody demand){
@PostMapping(cbio)
public ResponseEntity createCbioOnDemand(@RequestBody CbioDemand demand){
Instance instance = cBioOnDemand.create(demand);
if(instance == null)
return new ResponseEntity<>(HttpStatus.SERVICE_UNAVAILABLE);
return new ResponseEntity<>(instance , HttpStatus.OK);
}
@GetMapping(cbiood)
@GetMapping(cbio)
public ResponseEntity statusCbioOnDemand(InstanceId id){
Instance instance = cBioOnDemand.status(id.getInstance());
if(instance == null)
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
return new ResponseEntity<>(instance, HttpStatus.OK);
}
@DeleteMapping(cbiood)
@DeleteMapping(cbio)
public ResponseEntity removeCbioOnDemand(InstanceId id){
if(!cBioOnDemand.remove(id.getInstance()))
return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
return new ResponseEntity<>(HttpStatus.OK);
}
@PutMapping(cbiood)
public ResponseEntity extendCbioOnDemand(@RequestBody InstanceExtend extend){
Instance instance = cBioOnDemand.extend(extend.getInstance());
@PutMapping(cbio)
public ResponseEntity extendCbioOnDemand(@RequestBody InstanceDTO extend){
Instance instance = cBioOnDemand.extend(extend);
if (instance == null)
return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
return new ResponseEntity(HttpStatus.OK);
}
@GetMapping(cbioods)
@GetMapping(allCbio)
public ResponseEntity listInstancesForUser(User user){
List<Instance> instances = cBioOnDemand.listInstancesForUser(user);
if (instances == null){
Loading