Skip to content
Snippets Groups Projects
Commit db25d962 authored by Mirco Nasuti's avatar Mirco Nasuti
Browse files

bugfixes

parent 9c0cdde2
No related branches found
No related tags found
No related merge requests found
......@@ -9,6 +9,7 @@ import io.swagger.annotations.*;
import org.apache.log4j.Logger;
import org.hbp.mip.configuration.SecurityConfiguration;
import org.hbp.mip.model.*;
import org.hbp.mip.repositories.ConfigRepository;
import org.hbp.mip.repositories.DatasetRepository;
import org.hbp.mip.repositories.ModelRepository;
import org.hbp.mip.repositories.QueryRepository;
......@@ -46,6 +47,9 @@ public class ModelsApi {
@Autowired
QueryRepository queryRepository;
@Autowired
ConfigRepository configRepository;
private static final String DATA_FILE = "data/values.csv";
@ApiOperation(value = "Get models", response = Model.class, responseContainer = "List")
......@@ -75,6 +79,7 @@ public class ModelsApi {
for (Iterator<Model> i = models.iterator(); i.hasNext(); )
{
Model m = i.next();
m.setDataset(datasetRepository.findOne(m.getDataset().getCode()));
if(valid != m.getValid())
{
i.remove();
......@@ -82,10 +87,6 @@ public class ModelsApi {
}
}
for(Model model:models){
model.setDataset(datasetRepository.findOne(model.getDataset().getCode()));
}
return new ResponseEntity<List<Model>>(HttpStatus.OK).ok(models);
}
......@@ -153,6 +154,9 @@ public class ModelsApi {
map.put("text", model.getTitle());
model.getConfig().setTitle(map);
configRepository.save(model.getConfig());
queryRepository.save(model.getQuery());
datasetRepository.save(model.getDataset());
modelRepository.save(model);
return new ResponseEntity<Model>(HttpStatus.CREATED).ok(model);
......
......@@ -66,7 +66,7 @@ ALTER TABLE app OWNER TO postgres;
CREATE TABLE article (
slug character varying(255) NOT NULL,
_abstract text,
abstract text,
content text,
createdat timestamp without time zone,
publishedat timestamp without time zone,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment