D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor

This commit is contained in:
Michele Artini 2021-04-23 12:25:53 +02:00
parent cc6e65138e
commit 00139e31fe
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/OpenaireInternalApiController.java
View File

@ -52,7 +52,8 @@ public class OpenaireInternalApiController extends AbstractDnetController {
}
}).start();
} else {
throw new RuntimeException("An import is already running");
final long now = System.currentTimeMillis();
return new ImportExecution(null, now, now, ImportStatus.NOT_LAUNCHED, "An other import is running");
}
}
@ -84,9 +85,19 @@ public class OpenaireInternalApiController extends AbstractDnetController {
private String id;
private Long dateStart;
private Long dateEnd;
private ImportStatus status = ImportStatus.NOT_LAUNCHED;
private ImportStatus status = ImportStatus.NOT_YET_STARTED;
private String message;
public ImportExecution() {}
public ImportExecution(final String id, final Long dateStart, final Long dateEnd, final ImportStatus status, final String message) {
this.id = id;
this.dateStart = dateStart;
this.dateEnd = dateEnd;
this.status = status;
this.message = message;
}
public String getId() {
return id;
}
@ -163,5 +174,6 @@ enum ImportStatus {
SUCCESS,
FAILED,
RUNNING,
NOT_LAUNCHED
NOT_LAUNCHED,
NOT_YET_STARTED
}