Merge pull request #116 from sanjiva/master

Small changes in all 3 pieces (see individual commit messages)
ECLK · Nov 16, 2019 · a68ac45 · a68ac45
2 parents f786b60 + f29856f
commit a68ac45
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/distributor/src/distributor/messenger.bal b/distributor/src/distributor/messenger.bal
@@ -53,6 +53,7 @@ function sendSMS(string message, string resultId) {
  log:printInfo("Sending SMS for " + resultId);
  }
  foreach string targetMobile in currentMobileSubscribers {
+ log:printInfo("Sending SMS for " + resultId + " to " + targetMobile);
  var response = twilioClient->sendSms(sourceMobile, targetMobile, message);
  if response is error {
  log:printError("Message sending failed for \'" + targetMobile + "\' due to error:" +

diff --git a/subscriber/src/subscriber/save.bal b/subscriber/src/subscriber/save.bal
@@ -105,7 +105,7 @@ function saveImagePdf(map<json> imageJson) {
 # + return - returns the base name for the file 
 function getFileNameBase(string electionCode, map<json> result) returns string {
  // start with sequence # and type code
- string name = electionCode + "-" + result.sequence_number.toString() + "-" +
+ string name = (wantCode ? electionCode + "-" : "") + result.sequence_number.toString() + "-" +
  (result.'type.toString() == PRESIDENTIAL_RESULT ? "PE1" : "PE2") + "-";
 
  string resultLevel = result.level.toString();

diff --git a/subscriber/src/subscriber/subscriber.bal b/subscriber/src/subscriber/subscriber.bal
@@ -39,6 +39,8 @@ boolean wantXml = false;
 boolean wantHtml = false;
 boolean sortedHtml = false;
 
+boolean wantCode = false;
+
 http:OutboundAuthConfig? auth = ();
 http:Client? imageClient = ();
 
@@ -52,6 +54,7 @@ public function main (string secret, // secret to send to the hub
  boolean image = false, // do I want the image?
  boolean html = false, // do I want HTML?
  boolean sorted = true, // do I want HTML results sorted highest to lowest
+ boolean wantCode = false, // do I want electionCode in the filename
  string homeURL = "https://resultstest.ecdev.opensource.lk", // where do I subscribe at
  int port = 1111, // port I'm going to open
  string myURL = "" // how to reach me over the internet

diff --git a/testdriver/src/testdriver/sendresults.bal b/testdriver/src/testdriver/sendresults.bal
@@ -302,16 +302,16 @@ function sendResult (http:Client hc, string electionCode, string resType, string
  http:Response hr;
 
  // sent alert
- string params = "?level=" + <string>result.level;
+ string params = "/?level=" + <string>result.level;
  if result.ed_name is string {
  params += "&ed_name=" + check encoding:encodeUriComponent(<string>result.ed_name, "UTF-8");
  if result.pd_name is string {
  params += "&pd_name=" + check encoding:encodeUriComponent(<string>result.pd_name, "UTF-8");
  }
  }
- hr = check hc->post ("/result/notification/" + electionCode + "/" + resType + "/" + resCode + "/?level=" + <string>result.level, <json>{});
+ hr = check hc->post ("/result/notification/" + electionCode + "/" + resType + "/" + resCode + params, <json>{});
  if hr.statusCode != http:STATUS_ACCEPTED {
- io:println("Error while posting result notification to: /result/notification/" + electionCode + "/" + resType + "/" + resCode);
+ io:println("Error while posting result notification to: /result/notification/" + electionCode + "/" + resType + "/" + resCode + params);
  io:println("\tstatus=", hr.statusCode, ", contentType=", hr.getContentType(), " payload=", hr.getTextPayload());
  return error ("Unable to post notification for " + resCode);
  }