More trace updates

This is the version used to generate the logs in D4
saquibmian · Dec 2, 2014 · 199a8b8 · 199a8b8
1 parent 7f517b0
commit 199a8b8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/Banker/MonthlyUpdateOperation.cpp b/Banker/MonthlyUpdateOperation.cpp
@@ -45,6 +45,8 @@ namespace Operations{
 
                         if ( account.Balance - payment < 0 ){
 
+
+                            ENTER("Bank::FailedPayment&freezingCustomerCard");
                             Logger::error() << "Card Frozen." << endl;
 
                             if(Io::fileExists(user->Name+".creditcard.dat.payments.dat")){
@@ -99,10 +101,15 @@ namespace Operations{
                             }
 
 
+                            EXIT("Bank::FailedPayment&freezingCustomerCard");
+
+
                         } else {
                             account.withdraw( payment );
                             context.getData().storeAccount( *user, account );
 
+                            ENTER("customer::SuccessfulPayment");
+
                             if(Io::fileExists(user->Name+".creditcard.dat.payments.dat")){
 
 
@@ -159,7 +166,7 @@ namespace Operations{
                                 }
 
                             }
-                            
+                         EXIT("customer::SuccessfulPayment");
                         }
 
 
@@ -175,7 +182,10 @@ namespace Operations{
 
                         if ( account.Balance - payment < 0 ){
 
-                            Logger::error() << "Invalid. The balance will be less than 0. Overdraft is not enabled" << endl;
+
+                            ENTER("Bank::FailedPayment&freezingCustomerCard");
+
+                            Logger::error() << "Card frozen." << endl;
 
                             if(Io::fileExists(user->Name+".creditcard.dat.payments.dat")){
 
@@ -230,11 +240,15 @@ namespace Operations{
 
                             }
 
+                            EXIT("Bank::FailedPayment&freezingCustomerCard");
+
 
                         } else {
                             account.withdraw( payment );
                             context.getData().storeAccount( *user, account );
 
+                            ENTER("customer::SuccessfulPayment");
+
                             if(Io::fileExists(user->Name+".creditcard.dat.payments.dat")){
 
 
@@ -292,6 +306,8 @@ namespace Operations{
 
                             }
 
+                            EXIT("customer::SuccessfulPayment");
+
                         }
 
 
@@ -314,6 +330,8 @@ namespace Operations{
 
         }
 
+        EXIT("MonthlyUpdateOperation::Execute");
+
     }
 
 

diff --git a/Banker/Vendor.cpp b/Banker/Vendor.cpp
@@ -43,7 +43,7 @@ namespace Vendors{
         ENTER("Vendor::checkPin");
        // User customer = context.getData().getUser(inputUsername);
 
-        if (data.checkPin(customer, inputPin) ) { // CHANGE THIS TO APPROPRIATE MODIFIER
+        if (data.checkPin(customer, inputPin) ) {
 
             EXIT("Vendor::checkPin-true");
             return true;
@@ -53,7 +53,7 @@ namespace Vendors{
             return false;
         }
 
-        EXIT("Vendor::checkPin"); //May not be reached.
+        //EXIT("Vendor::checkPin");  not reached.
     }
 
     bool Vendor::isCardFrozen (FilesystemData data, User customer){
@@ -62,6 +62,9 @@ namespace Vendors{
 
 
         if(Io::fileExists(customer.Name+".creditcard.frozen.dat")){
+            ENTER("customer::isNotifiedOfFrozen");
+            EXIT("customer::isNotifiedOfFrozen");
+
             EXIT("Vendor::isCardFrozen-true");
             return true;
         }
@@ -99,7 +102,6 @@ namespace Vendors{
 
         ENTER("Vendor::purchaseSession");
 
-        // You did a lot of -> without checking whether you should in this one.
 
         /* Real date function adapted from http://stackoverflow.com/questions/16357999/current-date-and-time-as-string . This one suited my purpose by providing a simple, streamlined way to get the real date. I didn't feel it should be controlled by the vendor. */
 
@@ -182,7 +184,10 @@ namespace Vendors{
                     creditAccount.withdraw( purchasePrice );
 
                     // Collectively, these three statements will add a transaction history.
+                    //ENTER("Vendor::updateCustomer");
                     _transferData->storeAccount( customer, creditAccount );
+                   // EXIT("Vendor::updateCustomer");
+                  //  ENTER("Vendor::notifyBank");
                     _transferData->storeTransaction ( inputUsername, CreditCard, thisVendor.updateCustomer(purchasePrice) );
                     thisVendor.updateVendor(purchasePrice, inputUsername);
 
@@ -221,6 +226,7 @@ namespace Vendors{
     void Vendor::updateVendor (double purchasePrice, string clientName ){
 
         ENTER("Vendor::updateVendor");
+        ENTER("Vendor::notifyBank");
 
         time_t timeVar;
         struct tm * timeinfo;
@@ -296,7 +302,7 @@ namespace Vendors{
 
 
 
-
+        EXIT("Vendor::notifyBank");
         EXIT("Vendor::updateVendor");
         /*myfile.open ("example.txt");
         myfile << "Writing this to a file.\n";