Improve demo and error handling
This commit is contained in:
@@ -31,7 +31,13 @@ class TransactionManagerService implements Service {
|
||||
}
|
||||
|
||||
def builder = new TransactionBuilder()
|
||||
queryBuilder.build(builder)
|
||||
try{
|
||||
queryBuilder.build(builder)
|
||||
} catch (Exception e) {
|
||||
log.error('Failed to build transaction', e)
|
||||
return Promise.error(e)
|
||||
}
|
||||
|
||||
def transaction = builder.build()
|
||||
|
||||
log.info("Sending transaction $transaction.id to ledger at $config.ledger.remoteUrl")
|
||||
@@ -39,6 +45,7 @@ class TransactionManagerService implements Service {
|
||||
spec.body.text(mapper.writeValueAsString(transaction))
|
||||
}).onError {
|
||||
log.error("Failed to send transaction $transaction.id to ledger $config.ledger.remoteUrl")
|
||||
return Promise.error(it)
|
||||
}.map { response ->
|
||||
if(response.status == Status.OK) {
|
||||
mapper.readTree(response.body.text)
|
||||
@@ -68,7 +75,14 @@ class TransactionManagerService implements Service {
|
||||
|
||||
log.info("Updating transaction $transactionId content with new query")
|
||||
def builder = new TransactionBuilder(oldTransaction)
|
||||
queryBuilder.build(builder)
|
||||
|
||||
try {
|
||||
queryBuilder.build(builder)
|
||||
} catch (Exception e) {
|
||||
log.error("Failed to update transaction", e)
|
||||
return Promise.error(e)
|
||||
}
|
||||
|
||||
def transaction = builder.build()
|
||||
|
||||
if(transaction.id != transactionId) {
|
||||
@@ -80,6 +94,7 @@ class TransactionManagerService implements Service {
|
||||
spec.body.text(mapper.writeValueAsString(transaction))
|
||||
}).onError {
|
||||
log.error("Failed to send transaction $transaction.id to ledger $config.ledger.remoteUrl")
|
||||
return Promise.error(it)
|
||||
}
|
||||
}.map { response ->
|
||||
mapper.readTree(response.body.text)
|
||||
@@ -100,16 +115,21 @@ class TransactionManagerService implements Service {
|
||||
this.transaction = transaction
|
||||
}
|
||||
|
||||
void query(String sql){
|
||||
TransactionBuilder query(String sql){
|
||||
if(sql == null || sql == '' || sql.trim() == '') {
|
||||
throw new IllegalArgumentException("SQL statement cannot be null")
|
||||
}
|
||||
queries << sql
|
||||
this
|
||||
}
|
||||
|
||||
String id() {
|
||||
transaction.id
|
||||
}
|
||||
|
||||
void complete() {
|
||||
TransactionBuilder complete() {
|
||||
transaction.end()
|
||||
this
|
||||
}
|
||||
|
||||
private BlockTransaction build() {
|
||||
|
||||
@@ -72,5 +72,17 @@ ratpack {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post('executeQuery') {
|
||||
def transactionManager = get(TransactionManagerService)
|
||||
parse(Form).then { Form form ->
|
||||
def query = form.get('query')
|
||||
transactionManager.execute {
|
||||
it.query(query).complete()
|
||||
} .then {
|
||||
response.send(it.toString())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
<input type="hidden" name="transactionId" id="transactionId" />
|
||||
<input name="query" style="width:300px" placeholder="Add query here..." />
|
||||
<button type="submit">Submit Query</button>
|
||||
<button id="submitAndExecute">Submit&Execute Query</button>
|
||||
</form>
|
||||
<form id="executeTransactionForm" action='/'>
|
||||
<input type="hidden" name="transactionId" id="transactionId" />
|
||||
@@ -42,7 +43,7 @@
|
||||
|
||||
function refreshLedger() {
|
||||
$.get('/ledger', function(data) {
|
||||
editor.setValue(JSON.stringify(data, null, 2));
|
||||
editor.setValue(JSON.stringify(data.reverse(), null, 2));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -68,9 +69,20 @@
|
||||
});
|
||||
}
|
||||
|
||||
function executeSingleQueryTransaction(event) {
|
||||
event.preventDefault();
|
||||
var queryData = $('form#addQueryForm').serialize();
|
||||
$.post( '/executeQuery', queryData, function(data) {
|
||||
$('input#transactionId').val(null);
|
||||
$('button#executeTransactionButton').hide();
|
||||
refreshLedger();
|
||||
}, 'json');
|
||||
}
|
||||
|
||||
$( "#addQueryForm" ).submit(addQueryToTransaction);
|
||||
$( "#executeTransactionForm" ).submit(executeTransaction);
|
||||
$('button#executeTransactionButton').hide();
|
||||
$('button#submitAndExecute').click(executeSingleQueryTransaction);
|
||||
window.onload = refreshLedger();
|
||||
</script>
|
||||
</body>
|
||||
|
||||
Reference in New Issue
Block a user