using archive in history

rajatshuvro · Jun 19, 2022 · d4a8e9c · d4a8e9c
1 parent ec291d8
commit d4a8e9c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/com/nola/databases/DbUtilities.java b/src/com/nola/databases/DbUtilities.java
@@ -155,6 +155,12 @@ public static TransactionDb LoadTransactionsDb(BookDb bookDb, UserDb userDb) {
 
         return getTransactionDb(bookDb, userDb, inputStream);
     }
+    public static TransactionDb LoadTransactionArchiveDb(BookDb bookDb, UserDb userDb) {
+        var filePath = DbCommons.getTransactionArchiveFilePath();
+        var inputStream = GetFileReadStream(filePath);
+
+        return getTransactionDb(bookDb, userDb, inputStream);
+    }
 
     private static TransactionDb getTransactionDb(BookDb bookDb, UserDb userDb, InputStream inputStream) {
         var transactions = ReadTransactions(inputStream);

diff --git a/src/com/nola/subcommands/History.java b/src/com/nola/subcommands/History.java
@@ -42,13 +42,18 @@ public static void Run(String[] args) {
                 var bookDb = DbUtilities.LoadBookDb();
                 var userDb = DbUtilities.LoadUserDb();
                 var transactionDb = DbUtilities.LoadTransactionsDb(bookDb, userDb);
+                var archiveDb = DbUtilities.LoadTransactionArchiveDb(bookDb, userDb);
 
                 if (userId.equals("all")){
                     for (var user: userDb.GetAllUsers()) {
+                        PrintUserHistory(user.Id, bookDb, archiveDb);
                         PrintUserHistory(user.Id, bookDb, transactionDb);
                     }
                 }
-                else PrintUserHistory(userId, bookDb, transactionDb);
+                else {
+                    PrintUserHistory(userId, bookDb, archiveDb);
+                    PrintUserHistory(userId, bookDb, transactionDb);
+                }
             }
 
         }
@@ -63,7 +68,6 @@ private static void PrintUserHistory(String userId, BookDb bookDb, TransactionDb
         var transactions = transactionDb.GetUserActivity(userId);
         if (transactions == null || transactions.size()==0){
             return;
-            //PrintUtilities.PrintLine("No transactions found for user:" + userId);
         }
         else {
             PrintUtilities.PrintLine("USER ID:"+ userId);

diff --git a/src/com/nola/subcommands/archive.java b/src/com/nola/subcommands/archive.java
@@ -3,7 +3,6 @@
 import com.nola.databases.AppendUtilities;
 import com.nola.databases.DbCommons;
 import com.nola.databases.DbUtilities;
-import com.nola.databases.TransactionDb;
 import com.nola.utilities.PrintUtilities;
 import org.apache.commons.cli.*;