Skip to content

Commit

Permalink
update arch. diagram
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonambridge
simonambridge committed Jan 2, 2018
1 parent a219e35 commit 90f3e6f
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
7 changes: 4 additions & 3 deletions TransactionHandlers/consumer/src/main/scala/TransactionConsumer.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,12 @@ object TransactionConsumer extends App {
// .select("ttl_txn_hr", "approved_txn_hr")

val totalTxnHr = totalTxnMin + (if (result.count() > 0) result.first.getInt(0) else 0)
// debug:
// println("ttl_txn_hr="+(if (result.count() > 0) result.first.getInt(0) else 0))
val approvedTxnHr = approvedTxnMin + (if (result.count() > 0) result.first.getInt(1) else 0)
val pctApprovedHr = if (totalTxnHr > 0) ((approvedTxnHr/totalTxnHr.toDouble)*100.0) else 0.0

// debug:
// println("ttl_txn_hr="+(if (result.count() > 0) result.first.getInt(0) else 0))

// Format a timestamp value

var yearString=year.toString()
Expand Down Expand Up @@ -262,7 +263,7 @@ object TransactionConsumer extends App {
// val tsTime = unix_timestamp(time, "MM/dd/yyyy HH:mm:ss").cast("timestamp")

/*
* Make a new DataFrame with tour results
* Make a new DataFrame with our results
*/
val dfCount = sc.makeRDD(Seq((year, month, day, hour, min, time, pctApprovedMin, totalTxnMin, approvedTxnMin, pctApprovedHr, totalTxnHr, approvedTxnHr)))
.toDF("year", "month", "day", "hour", "minute", "time", "approved_rate_min", "ttl_txn_min", "approved_txn_min", "approved_rate_hr", "ttl_txn_hr", "approved_txn_hr")
Expand Down
Binary file modified architecture-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions restRTFAP/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ app.get('/transactionsover', function(req, res) {

console.log("Amount = " + amount);

const queryString = 'SELECT * FROM rtfap.transactions where solr_query = \'\{"q":"*:*", "fq":"amount:[' + amount + ' TO *]"\}\'';
const queryString = 'SELECT * FROM rtfap.transactions where solr_query = \'\{"q":"*:*", "fq":"amount:[' + amount + ' TO *]"\}\' ALLOW FILTERING;';
console.log("Query = " + queryString);

client.execute(queryString, { prepare: true }, function(err, result)
Expand All @@ -88,7 +88,7 @@ app.get('/rejectedtransactions', function(req, res) {
// SELECT * FROM rtfap.transactions WHERE solr_query='{"q":"status: Rejected"}';

var client = new cassandra.Client({ contactPoints: ['localhost'] , keyspace: 'rtfap'});
const queryString = 'SELECT * FROM rtfap.transactions WHERE solr_query=\'\{"q":"status: Rejected"\}\';';
const queryString = 'SELECT * FROM rtfap.transactions WHERE solr_query=\'\{"q":"status: Rejected"\}\' ALLOW FILTERING;';
console.log("Query = " + queryString);

client.execute(queryString, function(err, result)
Expand All @@ -114,7 +114,7 @@ app.get('/transactionsfacetedbymerchant', function(req, res) {
// SELECT * FROM rtfap.transactions WHERE solr_query='{"q":"*:*", "facet":{"field":"merchant"}}';

var client = new cassandra.Client({ contactPoints: ['localhost'] , keyspace: 'rtfap'});
const queryString = 'SELECT * FROM rtfap.transactions WHERE solr_query=\'\{"q":"*:*", "facet":{"field":"merchant"}\}\';';
const queryString = 'SELECT * FROM rtfap.transactions WHERE solr_query=\'\{"q":"*:*", "facet":{"field":"merchant"}\}\' ALLOW FILTERING;';
console.log("Query = " + queryString);

client.execute(queryString, function(err, result)
Expand Down Expand Up @@ -146,7 +146,7 @@ app.get('/transactionsbystatusinlast', function(req, res) {

if (req.query.period !== undefined) {

const queryString = 'SELECT * FROM rtfap.transactions WHERE solr_query = \'\{"q":"*:*", "fq":"txn_time:[NOW-1' + req.query.period + ' TO *]","facet":{"field":"status"}}\';';
const queryString = 'SELECT * FROM rtfap.transactions WHERE solr_query = \'\{"q":"*:*", "fq":"txn_time:[NOW-1' + req.query.period + ' TO *]","facet":{"field":"status"}}\' ALLOW FILTERING;';
console.log("Query = " + queryString);

client.execute(queryString, { prepare: true }, function(err, result)
Expand Down Expand Up @@ -184,7 +184,7 @@ app.get('/transactionsbycardandstatusinlast', function(req, res) {

if (req.query.card !== undefined && req.query.period !== undefined) {

const queryString = 'SELECT * FROM rtfap.transactions where solr_query = \'{"q":"cc_no:' + req.query.card + '*", "fq":"txn_time:[NOW-1' + req.query.period + ' TO *]","facet":{"field":"status"}}\';';
const queryString = 'SELECT * FROM rtfap.transactions where solr_query = \'{"q":"cc_no:' + req.query.card + '*", "fq":"txn_time:[NOW-1' + req.query.period + ' TO *]","facet":{"field":"status"}}\' ALLOW FILTERING;';
console.log("Query = " + queryString);

client.execute(queryString, { prepare: true }, function(err, result)
Expand Down Expand Up @@ -221,7 +221,7 @@ app.get('/transactionsbycard', function(req, res) {

if (req.query.card !== undefined) {

const queryString = 'SELECT * FROM rtfap.transactions where solr_query=\'{"q":"cc_no:' + req.query.card + '"}\';';
const queryString = 'SELECT * FROM rtfap.transactions where solr_query=\'{"q":"cc_no:' + req.query.card + '"}\' ALLOW FILTERING;';

console.log("Query = " + queryString);

Expand Down Expand Up @@ -259,7 +259,7 @@ app.get('/fraudulenttransactionsbycard', function(req, res) {

if (req.query.card !== undefined) {

const queryString = 'SELECT * FROM rtfap.transactions where solr_query=\'{"q":"cc_no:' + req.query.card + '", "fq":["tags:Fraudulent"]}\';';
const queryString = 'SELECT * FROM rtfap.transactions where solr_query=\'{"q":"cc_no:' + req.query.card + '", "fq":["tags:Fraudulent"]}\' ALLOW FILTERING;';

console.log("Query = " + queryString);

Expand Down Expand Up @@ -298,7 +298,7 @@ app.get('/fraudulenttransactionsinlast', function(req, res) {

if (req.query.period !== undefined) {

const queryString = 'SELECT * FROM transactions where solr_query = \'{"q":"*:*", "fq":["txn_time:[NOW-1' + req.query.period + ' TO *]", "tags:Fraudulent"]}\';';
const queryString = 'SELECT * FROM transactions ;';

console.log("Query = " + queryString);

Expand Down Expand Up @@ -379,7 +379,7 @@ app.get('/transactionsperminute', function(req, res) {

var client = new cassandra.Client({ contactPoints: ['localhost'] , keyspace: 'rtfap'});
// const queryString = 'SELECT ttl_txn_hr, time FROM rtfap.txn_count_min WHERE solr_query = \'{"q":"*:*", "fq":"time:[NOW-24HOUR TO *]","sort":"time asc"}\';';
const queryString = 'SELECT ttl_txn_min, time FROM rtfap.txn_count_min WHERE solr_query = \'{"q":"*:*", "fq":"time:[NOW-1YEAR TO *]","sort":"time asc"}\';';
const queryString = 'SELECT ttl_txn_min, time FROM rtfap.txn_count_min WHERE solr_query = \'{"q":"*:*", "fq":"time:[NOW-1YEAR TO *]","sort":"time asc"}\' ALLOW FILTERING;';
console.log("Query = " + queryString);

client.execute(queryString, { prepare: true }, function(err, result)
Expand All @@ -406,7 +406,7 @@ app.get('/approvedtransactionsperminute', function(req, res) {

var client = new cassandra.Client({ contactPoints: ['localhost'] , keyspace: 'rtfap'});
// const queryString = 'SELECT ttl_txn_hr, time FROM rtfap.txn_count_min WHERE solr_query = \'{"q":"*:*", "fq":"time:[NOW-24HOUR TO *]","sort":"time asc"}\';';
const queryString = 'SELECT approved_txn_min, time FROM rtfap.txn_count_min WHERE solr_query = \'{"q":"*:*", "fq":"time:[NOW-1YEAR TO *]","sort":"time asc"}\';';
const queryString = 'SELECT approved_txn_min, time FROM rtfap.txn_count_min WHERE solr_query = \'{"q":"*:*", "fq":"time:[NOW-1YEAR TO *]","sort":"time asc"}\' ALLOW FILTERING;';
console.log("Query = " + queryString);

client.execute(queryString, { prepare: true }, function(err, result)
Expand Down
4 changes: 2 additions & 2 deletions restRTFAP/public/txnchart.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}

//======================================================================================================
// Total Transactions Per Minute
// 1. Total Transactions Per Minute
function buildLineChart_1(data, title, element, width, height, xaxislabel, yaxislabel) {

var this_array = data.slice(0);
Expand Down Expand Up @@ -149,7 +149,7 @@
});
}

// Approved Transactions Per Minute
// 2. Approved Transactions Per Minute
function buildLineChart_2(data, title, element, width, height, xaxislabel, yaxislabel) {

var this_array = data.slice(0);
Expand Down

0 comments on commit 90f3e6f

Please sign in to comment.