git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application/perform-service@177079 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/application/perform/service/ServiceConstants.java

@@ -25,6 +25,8 @@ public interface ServiceConstants {
 		public static final String FARM_ID_PARAMETER="farmid";
 		public static final String EXCEL_FILE_PARAMETER="source";
 		public static final String EXCEL_FILE_VERSION_PARAMETER="source_version";
+		public static final String STATUS_PARAMETER="status";
+		public static final String LAST_METHOD="last";
 	}
 	
 	
@@ -36,5 +38,8 @@ public interface ServiceConstants {
 		public static final String SPECIES_ID_PARAMETER="speciesid";
 		public static final String BATCH_TYPE_PARAMETER="batch_type";
 		public static final String PERIOD_PARAMETER="period";
+		
+		
+		public static final String STATISTICS_PATH="statistics";
 	}
 }

src/main/java/org/gcube/application/perform/service/engine/Importer.java

@@ -15,4 +15,5 @@ public interface Importer {
 	
 	public ImportRoutineDescriptor importExcel(ImportRequest request) throws DMException, BeanNotFound, SQLException, InternalException;
 	public List<ImportRoutineDescriptor> getDescriptors(DBQueryDescriptor query) throws SQLException, InternalException;
+	public List<ImportRoutineDescriptor> getGroupedDescriptors(DBQueryDescriptor desc) throws SQLException, InternalException ;
 }

src/main/java/org/gcube/application/perform/service/engine/PerformanceManager.java

@@ -8,6 +8,7 @@ import org.gcube.application.perform.service.engine.dm.DMException;
 import org.gcube.application.perform.service.engine.model.CSVExportRequest;
 import org.gcube.application.perform.service.engine.model.InternalException;
 import org.gcube.application.perform.service.engine.model.InvalidRequestException;
+import org.gcube.application.perform.service.engine.model.importer.AnalysisType;
 import org.gcube.application.perform.service.engine.model.importer.ImportRoutineDescriptor;
 
 public interface PerformanceManager {
@@ -15,4 +16,6 @@ public interface PerformanceManager {
 	public Map<String,String> generateCSV(CSVExportRequest request)throws SQLException, InvalidRequestException, InternalException, IOException;
 	
 	public void loadOutputData(ImportRoutineDescriptor desc)throws SQLException, InvalidRequestException, InternalException, IOException, DMException;
+	
+	public Map<String,String> getStatistics(AnalysisType type)throws SQLException, InvalidRequestException, InternalException, IOException;
 }

src/main/java/org/gcube/application/perform/service/engine/impl/ImporterImpl.java

@@ -235,8 +235,29 @@ public class ImporterImpl implements Importer {
 	}
 
 
-
+	/**
-
+	 * Select * from imports where farmid=13625424 AND 
+	 * (batch_type,end_time) IN 
+	 * (Select batch_type,max(end_time) as end_time from imports 
+	 * WHERE farmid=13625424 AND status = 'COMPLETE' group by batch_type order by batch_type)
+	 * 
+	 * @return
+	 */
+	@Override
+	public List<ImportRoutineDescriptor> getGroupedDescriptors(DBQueryDescriptor desc)throws SQLException, InternalException {
+		DataBaseManager db=DataBaseManager.get();
+		Connection conn=db.getConnection();
+		try {
+			PreparedStatement ps=Queries.LAST_GROUPED_IMPORTS.get(conn, desc);
+			ResultSet rs=ps.executeQuery();
+			ArrayList<ImportRoutineDescriptor> toReturn=new ArrayList<>();
+			while (rs.next())
+				toReturn.add(Queries.rowToDescriptor(rs));
+			return toReturn;
+		}finally {
+			conn.close();
+		}
+	}
 
 
 }

src/main/java/org/gcube/application/perform/service/engine/impl/PerformanceManagerImpl.java

@@ -58,7 +58,7 @@ public class PerformanceManagerImpl implements PerformanceManager{
 	public Map<String, String> generateCSV(CSVExportRequest request) throws SQLException, InvalidRequestException, InternalException, IOException {
 		log.trace("Serving {} ",request);
 		HashMap<String,String> toReturn=new HashMap<>();
-		Set<ImportedTable> tables=getAnalysisSet(request);
+		Set<ImportedTable> tables=getAnalysisSet(request.getType());
 		log.debug("Found {} tables in configuration",tables.size());
 		for(ImportedTable t:tables) {
 			SchemaDefinition schema=t.getSchema();
@@ -70,6 +70,24 @@ public class PerformanceManagerImpl implements PerformanceManager{
 		return toReturn;
 	}
 
+	
+	@Override
+	public Map<String, String> getStatistics(AnalysisType type)
+			throws SQLException, InvalidRequestException, InternalException, IOException {
+		log.trace("Getting statistics for {} ",type);
+		HashMap<String,String> toReturn=new HashMap<>();
+		Set<ImportedTable> tables=getAnalysisSet(type);
+		log.debug("Found {} tables in configuration",tables.size());
+		for(ImportedTable t:tables) {			
+			
+				log.debug("Exporting {} : {} ",t.getSchema().getRelatedDescription(),t.getTableName());			
+				toReturn.putAll(t.exportStatistics());				
+			
+		}
+		return toReturn;
+	}
+	
+	
 	@Override
 	public void loadOutputData(ImportRoutineDescriptor desc) throws SQLException, InvalidRequestException, InternalException, IOException, DMException{
 		log.info("Importing output for {} ",desc);
@@ -135,11 +153,10 @@ public class PerformanceManagerImpl implements PerformanceManager{
 
 
 
-	static Set<ImportedTable> getAnalysisSet(CSVExportRequest request) throws InvalidRequestException{
+	static Set<ImportedTable> getAnalysisSet(AnalysisType type) throws InvalidRequestException{		
-		AnalysisType type=request.getType();
 		if(!analysisConfiguration.containsKey(type))
 			throw new InvalidRequestException("Analysis Configuration not found for "+type);
-		return analysisConfiguration.get(request.getType());
+		return analysisConfiguration.get(type);
 	}
 
 	private static final void removeOlderEquivalents(ImportRoutineDescriptor last,Connection conn) throws SQLException, InvalidRequestException {

src/main/java/org/gcube/application/perform/service/engine/impl/Queries.java

@@ -95,6 +95,13 @@ public class Queries {
 			new DBField[]{DBField.ImportRoutine.fields.get(ImportRoutine.FARM_ID)});
 	
 	
+	public static final Query LAST_GROUPED_IMPORTS=new Query("Select * from "+ImportRoutine.TABLE+" where "+ImportRoutine.FARM_ID+"=? AND ("+ImportRoutine.BATCH_TYPE+","+ImportRoutine.END+") IN "
+			+ "(Select "+ImportRoutine.BATCH_TYPE+",max("+ImportRoutine.END+") as "+ImportRoutine.END+" from "+ImportRoutine.TABLE+" WHERE "+ImportRoutine.FARM_ID+"=? AND "+ImportRoutine.STATUS+" = ? group by "+ImportRoutine.BATCH_TYPE+")",
+			new DBField[]{DBField.ImportRoutine.fields.get(ImportRoutine.FARM_ID),
+					DBField.ImportRoutine.fields.get(ImportRoutine.FARM_ID),
+					DBField.ImportRoutine.fields.get(ImportRoutine.STATUS)});
+	
+	
 	
 	public static final Query UPDATE_IMPORT_STATUS=new Query("UPDATE "+ImportRoutine.TABLE+" SET "+ImportRoutine.STATUS+"= ?, "+ImportRoutine.END+"=? WHERE "+ImportRoutine.ID+"=?",
 			new DBField[]{DBField.ImportRoutine.fields.get(ImportRoutine.STATUS),

src/main/java/org/gcube/application/perform/service/engine/model/importer/ImportedTable.java

@@ -208,6 +208,21 @@ public class ImportedTable {
 
 	}
 
+	public Map<String,String> exportStatistics() throws SQLException, InternalException{
+		log.debug("Exporting statistics from {} ",this);
+		Connection conn= DataBaseManager.get().getConnection();
+		try {
+			// for statistic operations
+			// get statistics query
+			// export as CSV
+			throw new RuntimeException("Not Yet implemented");
+		}finally {
+			conn.close();
+
+		}	
+	}
+
+
 	public Map<String,String> exportCSV(CSVExportRequest request) throws InvalidRequestException, SQLException, InternalException, IOException {
 
 

src/main/java/org/gcube/application/perform/service/rest/Import.java

@@ -3,6 +3,7 @@ package org.gcube.application.perform.service.rest;
 import java.util.List;
 
 import javax.inject.Inject;
+import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -21,6 +22,7 @@ import org.gcube.application.perform.service.engine.model.DBField;
 import org.gcube.application.perform.service.engine.model.DBQueryDescriptor;
 import org.gcube.application.perform.service.engine.model.importer.ImportRequest;
 import org.gcube.application.perform.service.engine.model.importer.ImportRoutineDescriptor;
+import org.gcube.application.perform.service.engine.model.importer.ImportStatus;
 import org.gcube.smartgears.annotations.ManagedBy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -90,6 +92,30 @@ public class Import {
 		}
 	}
 	
+	/**
+	 * Returns all Import routine per farm id
+	 * 
+	 * 
+	 * @return
+	 */
+	@GET
+	@Produces(MediaType.APPLICATION_JSON)
+	@Path(ServiceConstants.Import.LAST_METHOD+"/{"+ServiceConstants.Import.FARM_ID_PARAMETER+"}")
+	public Response getGrouped(@PathParam(ServiceConstants.Import.FARM_ID_PARAMETER) Long farmid,
+			@DefaultValue("COMPLETE") @QueryParam(ServiceConstants.Import.STATUS_PARAMETER) String status){
+		try {
 			
+			List<ImportRoutineDescriptor> toReturn=importer.getGroupedDescriptors(
+					new DBQueryDescriptor().
+					add(DBField.ImportRoutine.fields.get(DBField.ImportRoutine.FARM_ID), farmid).
+					add(DBField.ImportRoutine.fields.get(DBField.ImportRoutine.STATUS), status));
+			
+			GenericEntity<List<ImportRoutineDescriptor>> entity=new GenericEntity<List<ImportRoutineDescriptor>>(toReturn) {};
+			return Response.ok(entity).build();			
+		}catch(Throwable t) {
+			log.warn("Unexpected Exception ",t);
+			throw new WebApplicationException("Unexpected Exception.", t,Response.Status.INTERNAL_SERVER_ERROR);
+		}
+	}
 	
 }

src/main/java/org/gcube/application/perform/service/rest/Performance.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Context;
@@ -92,6 +93,11 @@ public class Performance {
 		}
 	}
 
-
+	@GET
+	@Produces(MediaType.APPLICATION_JSON)
+	@Path(ServiceConstants.Performance.STATISTICS_PATH+"/{"+ServiceConstants.Performance.BATCH_TYPE_PARAMETER+"}")
+	public Map<String,String> getStatistics(@PathParam(ServiceConstants.Performance.BATCH_TYPE_PARAMETER) String batchType){
+		throw new WebApplicationException("Method Unavailable.", Response.Status.NOT_IMPLEMENTED);
+	}
 
 }

src/test/java/org/gcube/application/perform/service/ImportTests.java

@@ -29,11 +29,11 @@ public class ImportTests extends CommonTest{
 		System.out.println(target.getUri());
 		Response resp=target.request().post(null);
 		System.out.println("Status : "+resp.getStatus() );	
-		try {
+//		try {
-			Thread.sleep(1000*60*10);
+//			Thread.sleep(1000*60*10);
-		} catch (InterruptedException e) {
+//		} catch (InterruptedException e) {
-			
+//			
-		}
+//		}
 	}
 
 	
@@ -46,4 +46,15 @@ public class ImportTests extends CommonTest{
 		Response resp=target.request().get();		
 		System.out.println(resp.getStatus() + " : "+ resp.readEntity(String.class));		
 	}
+	
+	@Test
+	public void getGrouped() {
+		WebTarget target=
+				target(ServiceConstants.Import.PATH).
+				path(ServiceConstants.Import.LAST_METHOD).
+				path(13625424+"");
+		System.out.println(target.getUri());
+		Response resp=target.request().get();		
+		System.out.println(resp.getStatus() + " : "+ resp.readEntity(String.class));		
+	}
 }

src/test/java/org/gcube/application/perform/service/PerformanceTest.java

@@ -30,15 +30,15 @@ public class PerformanceTest extends CommonTest{
 		File folder= Files.createTempDir();
 		
 		
-		for(AnalysisType analysis:PerformanceManagerImpl.getAnalysisConfiguration().keySet()) {
+//		for(AnalysisType analysis:PerformanceManagerImpl.getAnalysisConfiguration().keySet()) {
-//		AnalysisType analysis=new AnalysisType("GROW_OUT_INDIVIDUAL","GROW_OUT_INDIVIDUAL");
+		AnalysisType analysis=new AnalysisType("GROW_OUT_INDIVIDUAL","GROW_OUT_INDIVIDUAL");
 			WebTarget target=
 					target(ServiceConstants.Performance.PATH).
 //					queryParam(ServiceConstants.Performance.AREA_PARAMETER, "A1","A2").
 ////					queryParam(ServiceConstants.Performance.QUARTER_PARAMETER, "Q1","Q2").
 //					queryParam(ServiceConstants.Performance.SPECIES_ID_PARAMETER, "Gadilidae","Tonno").
 //					queryParam(ServiceConstants.Performance.PERIOD_PARAMETER, "First","Spring").
-					queryParam(ServiceConstants.Performance.FARM_ID_PARAMETER, "13625424").
+					queryParam(ServiceConstants.Performance.FARM_ID_PARAMETER, "12682549").
 					queryParam(ServiceConstants.Performance.BATCH_TYPE_PARAMETER, analysis.getId());
 
 			System.out.println(target.getUri());		
@@ -58,7 +58,7 @@ public class PerformanceTest extends CommonTest{
 //			System.out.println(analysis.getId()+" "+resp.getStatus() + " : "+ resp.readEntity(String.class));		
 			
 			
-		}
+//		}
 		System.out.println("Wrote to : "+ folder.getAbsolutePath());
 	}
 
@@ -68,4 +68,5 @@ public class PerformanceTest extends CommonTest{
 	
 	
 	
+	
 }